gsadmin/certctl
1
0
Fork 0
mirror of https://github.com/shankar0123/certctl.git synced 2026-06-12 01:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ssh: fix staticcheck ST1008 — error is last return from restoreFromBackups

Browse Source 
CI's golangci-lint run on commit eb39059 ("ssh: pre-deploy snapshot
+ reload-failure rollback") caught a staticcheck ST1008 violation:
restoreFromBackups returned (error, map[string]string) — error must
be the last return value per Go convention.

Reorder the return tuple to (map[string]string, error) and update
the single caller in DeployCertificate. No behavior change; pure
signature shuffle to satisfy the lint gate.

Verified locally:
- gofmt -l ./internal/connector/target/ssh/  clean
- go vet ./internal/connector/target/ssh/  clean
- go test -race -count=1 ./internal/connector/target/ssh/  green
This commit is contained in:
shankar0123
2026-05-02 17:35:45 +00:00
parent eb39059490
commit 534c27d451
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/connector/target/ssh/ssh.go
+6 -6
View File
@@ -395,7 +395,7 @@ func (c *Connector) DeployCertificate(ctx context.Context, request target.Deploy
for _, p := range writePaths { for _, p := range writePaths {
paths = append(paths, p.path) paths = append(paths, p.path)
} }
rollbackErr, restoreStatuses := c.restoreFromBackups(ctx, paths, backups, modes) restoreStatuses, rollbackErr := c.restoreFromBackups(ctx, paths, backups, modes)
// Merge per-key restore status into backupStatus so operators // Merge per-key restore status into backupStatus so operators
// see whether the rollback ran cleanly per file. restoreFromBackups // see whether the rollback ran cleanly per file. restoreFromBackups
// returns statuses keyed by metadata key (cert/key/chain), not // returns statuses keyed by metadata key (cert/key/chain), not
@@ -487,12 +487,12 @@ func (c *Connector) DeployCertificate(ctx context.Context, request target.Deploy
// restoreFromBackups walks the configured deploy paths and either restores // restoreFromBackups walks the configured deploy paths and either restores
// each path from the in-memory backup (when the file existed pre-deploy) or // each path from the in-memory backup (when the file existed pre-deploy) or
// Removes the new bytes (first-time-deploy partial state). Returns the // Removes the new bytes (first-time-deploy partial state). Returns the
// first error encountered — caller surfaces the wrapped error to the // per-path status map (always populated, used by callers to emit accurate
// operator. The per-path status map is always populated so callers can // Metadata) and the first error encountered — caller surfaces the wrapped
// emit accurate Metadata. // error to the operator. Per staticcheck ST1008, error is the last return.
// //
// Bundle 6 of the 2026-05-02 deployment-target audit. // Bundle 6 of the 2026-05-02 deployment-target audit.
func (c *Connector) restoreFromBackups(ctx context.Context, paths []string, backups map[string][]byte, modes map[string]os.FileMode) (error, map[string]string) { func (c *Connector) restoreFromBackups(ctx context.Context, paths []string, backups map[string][]byte, modes map[string]os.FileMode) (map[string]string, error) {
statuses := make(map[string]string, len(paths)) statuses := make(map[string]string, len(paths))
pathToKey := map[string]string{ pathToKey := map[string]string{
c.config.CertPath: "cert", c.config.CertPath: "cert",
@@ -544,7 +544,7 @@ func (c *Connector) restoreFromBackups(ctx context.Context, paths []string, back
c.logger.Info("rollback removed first-time-deploy file", "path", path) c.logger.Info("rollback removed first-time-deploy file", "path", path)
} }
} }
return firstErr, statuses return statuses, firstErr
} }
// buildMetadataWithBackup assembles the per-deploy Metadata map with the // buildMetadataWithBackup assembles the per-deploy Metadata map with the