avoid shadowing rollback function with variables in upgrade subcommand

pchila · pchila · commit 1a376f15f7e1 · 2025-09-16T14:42:39.000+02:00
diff --git a/internal/pkg/agent/cmd/upgrade.go b/internal/pkg/agent/cmd/upgrade.go
@@ -167,12 +167,12 @@ func upgradeCmdWithClient(input *upgradeInput) error {
 		return fmt.Errorf("failed to retrieve command flag information while trying to upgrade the agent: %w", err)
 	}
 
-	rollback, err := cmd.Flags().GetBool(flagRollback)
+	rollbackFlag, err := cmd.Flags().GetBool(flagRollback)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve command flag information %q while trying to upgrade the agent: %w", flagRollback, err)
 	}
 
-	if rollback {
+	if rollbackFlag {
 		upgradeOperation = "Rollback"
 	}
 
@@ -195,7 +195,7 @@ func upgradeCmdWithClient(input *upgradeInput) error {
 	if err != nil {
 		return fmt.Errorf("failed to check if upgrade is already in progress: %w", err)
 	}
-	if isBeingUpgraded && !rollback {
+	if isBeingUpgraded && !rollbackFlag {
 		return errors.New("an upgrade is already in progress; please try again later.")
 	}
 
@@ -229,7 +229,7 @@ func upgradeCmdWithClient(input *upgradeInput) error {
 		}
 	}
 	skipDefaultPgp, _ := cmd.Flags().GetBool(flagSkipDefaultPgp)
-	version, err = c.Upgrade(context.Background(), version, rollback, sourceURI, skipVerification, skipDefaultPgp, pgpChecks...)
+	version, err = c.Upgrade(context.Background(), version, rollbackFlag, sourceURI, skipVerification, skipDefaultPgp, pgpChecks...)
 	if err != nil {
 		s, ok := status.FromError(err)
 		// Sometimes the gRPC server shuts down before replying to the command which is expected

Original file line number	Diff line number	Diff line change
`@@ -167,12 +167,12 @@ func upgradeCmdWithClient(input *upgradeInput) error {`
`167`	`167`	`return fmt.Errorf("failed to retrieve command flag information while trying to upgrade the agent: %w", err)`
`168`	`168`	`}`
`169`	`169`
`170`		`- rollback, err := cmd.Flags().GetBool(flagRollback)`
	`170`	`+ rollbackFlag, err := cmd.Flags().GetBool(flagRollback)`
`171`	`171`	`if err != nil {`
`172`	`172`	`return fmt.Errorf("failed to retrieve command flag information %q while trying to upgrade the agent: %w", flagRollback, err)`
`173`	`173`	`}`
`174`	`174`
`175`		`- if rollback {`
	`175`	`+ if rollbackFlag {`
`176`	`176`	`upgradeOperation = "Rollback"`
`177`	`177`	`}`
`178`	`178`
`@@ -195,7 +195,7 @@ func upgradeCmdWithClient(input *upgradeInput) error {`
`195`	`195`	`if err != nil {`
`196`	`196`	`return fmt.Errorf("failed to check if upgrade is already in progress: %w", err)`
`197`	`197`	`}`
`198`		`- if isBeingUpgraded && !rollback {`
	`198`	`+ if isBeingUpgraded && !rollbackFlag {`
`199`	`199`	`return errors.New("an upgrade is already in progress; please try again later.")`
`200`	`200`	`}`
`201`	`201`
`@@ -229,7 +229,7 @@ func upgradeCmdWithClient(input *upgradeInput) error {`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`	`skipDefaultPgp, _ := cmd.Flags().GetBool(flagSkipDefaultPgp)`
`232`		`- version, err = c.Upgrade(context.Background(), version, rollback, sourceURI, skipVerification, skipDefaultPgp, pgpChecks...)`
	`232`	`+ version, err = c.Upgrade(context.Background(), version, rollbackFlag, sourceURI, skipVerification, skipDefaultPgp, pgpChecks...)`
`233`	`233`	`if err != nil {`
`234`	`234`	`s, ok := status.FromError(err)`
`235`	`235`	`// Sometimes the gRPC server shuts down before replying to the command which is expected`