Skip to content

Commit 9ec4709

Browse files
javirlnjavirln
authored
fix(cas-backend): Rotate credentials does not remove default flag (#2417)
1 parent 53cb11b commit 9ec4709

File tree

13 files changed

+218
-215
lines changed

13 files changed

+218
-215
lines changed

‎app/cli/cmd/casbackend.go‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ import (
2222
"github.com/spf13/cobra"
2323
)
2424

25+
var (
26+
isDefaultCASBackendUpdateOption *bool
27+
descriptionCASBackendUpdateOption *string
28+
)
29+
2530
func newCASBackendCmd() *cobra.Command {
2631
cmd := &cobra.Command{
2732
Use: "cas-backend",
@@ -119,3 +124,41 @@ func confirmationPrompt(msg string) bool {
119124

120125
return gotChallenge == "y" || gotChallenge == "Y"
121126
}
127+
128+
// captureUpdateFlags reads the --default and --description flags only when explicitly set and
129+
// stores their values in the package-level pointer options. This avoids treating their zero
130+
// values as an intention to update.
131+
func captureUpdateFlags(cmd *cobra.Command) error {
132+
if f := cmd.Flags().Lookup("default"); f != nil && f.Changed {
133+
v, err := cmd.Flags().GetBool("default")
134+
if err != nil {
135+
return err
136+
}
137+
isDefaultCASBackendUpdateOption = &v
138+
}
139+
140+
if f := cmd.Flags().Lookup("description"); f != nil && f.Changed {
141+
v, err := cmd.Flags().GetString("description")
142+
if err != nil {
143+
return err
144+
}
145+
descriptionCASBackendUpdateOption = &v
146+
}
147+
148+
return nil
149+
}
150+
151+
// handleDefaultUpdateConfirmation centralizes the confirmation logic when the --default flag
152+
// is provided. It returns (true, nil) when it's ok to proceed, (false, nil) when the user
153+
// declined confirmation, or (false, err) when an error happened.
154+
func handleDefaultUpdateConfirmation(actionOpts *action.ActionsOpts, name string) (bool, error) {
155+
if isDefaultCASBackendUpdateOption == nil {
156+
return true, nil
157+
}
158+
159+
if *isDefaultCASBackendUpdateOption {
160+
return confirmDefaultCASBackendOverride(actionOpts, name)
161+
}
162+
163+
return confirmDefaultCASBackendUnset(name, "You are setting the default CAS backend to false", actionOpts)
164+
}

‎app/cli/cmd/casbackend_update_azureblob.go‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,28 @@ func newCASBackendUpdateAzureBlobCmd() *cobra.Command {
2727
Use: "azure-blob",
2828
Short: "Update a AzureBlob CAS Backend description, credentials or default status",
2929
RunE: func(cmd *cobra.Command, args []string) error {
30-
// If we are setting the default, we list existing CAS backends
31-
// and ask the user to confirm the rewrite
32-
isDefault, err := cmd.Flags().GetBool("default")
33-
cobra.CheckErr(err)
34-
35-
description, err := cmd.Flags().GetString("description")
36-
cobra.CheckErr(err)
30+
// capture flags only when explicitly set
31+
if err := captureUpdateFlags(cmd); err != nil {
32+
return err
33+
}
3734

38-
// If we are overriding the default we ask for confirmation
39-
if isDefault {
40-
if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, backendName); err != nil {
41-
return err
42-
} else if !confirmed {
43-
log.Info("Aborting...")
44-
return nil
45-
}
46-
} else {
47-
// If we are removing the default we ask for confirmation too
48-
if confirmed, err := confirmDefaultCASBackendUnset(backendName, "You are setting the default CAS backend to false", actionOpts); err != nil {
49-
return err
50-
} else if !confirmed {
51-
log.Info("Aborting...")
52-
return nil
53-
}
35+
// If we are overriding/unsetting the default we ask for confirmation
36+
if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
37+
return err
38+
} else if !ok {
39+
log.Info("Aborting...")
40+
return nil
5441
}
5542

5643
opts := &action.NewCASBackendUpdateOpts{
5744
Name: backendName,
58-
Description: description,
45+
Description: descriptionCASBackendUpdateOption,
5946
Credentials: map[string]any{
6047
"tenantID": tenantID,
6148
"clientID": clientID,
6249
"clientSecret": clientSecret,
6350
},
64-
Default: isDefault,
51+
Default: isDefaultCASBackendUpdateOption,
6552
}
6653

6754
// this means that we are not updating credentials

‎app/cli/cmd/casbackend_update_inline.go‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,23 @@ func newCASBackendUpdateInlineCmd() *cobra.Command {
2727
Use: "inline",
2828
Short: "Update the Inline, fallback CAS Backend description or default status",
2929
RunE: func(cmd *cobra.Command, args []string) error {
30-
isDefault, err := cmd.Flags().GetBool("default")
31-
cobra.CheckErr(err)
32-
33-
description, err := cmd.Flags().GetString("description")
34-
cobra.CheckErr(err)
30+
// capture flags only when explicitly set
31+
if err := captureUpdateFlags(cmd); err != nil {
32+
return err
33+
}
3534

36-
// If we are overriding the default we ask for confirmation
37-
if isDefault {
38-
if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, backendName); err != nil {
39-
return err
40-
} else if !confirmed {
41-
log.Info("Aborting...")
42-
return nil
43-
}
44-
} else {
45-
// If we are removing the default we ask for confirmation too
46-
if confirmed, err := confirmDefaultCASBackendUnset(backendName, "You are setting the default CAS backend to false", actionOpts); err != nil {
47-
return err
48-
} else if !confirmed {
49-
log.Info("Aborting...")
50-
return nil
51-
}
35+
// If we are overriding/unsetting the default we ask for confirmation
36+
if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
37+
return err
38+
} else if !ok {
39+
log.Info("Aborting...")
40+
return nil
5241
}
5342

5443
opts := &action.NewCASBackendUpdateOpts{
5544
Name: backendName,
56-
Description: description,
57-
Default: isDefault,
45+
Description: descriptionCASBackendUpdateOption,
46+
Default: isDefaultCASBackendUpdateOption,
5847
}
5948

6049
res, err := action.NewCASBackendUpdate(actionOpts).Run(opts)

‎app/cli/cmd/casbackend_update_oci.go‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,27 @@ func newCASBackendUpdateOCICmd() *cobra.Command {
2727
Use: "oci",
2828
Short: "Update a OCI CAS Backend description, credentials or default status",
2929
RunE: func(cmd *cobra.Command, args []string) error {
30-
// If we are setting the default, we list existing CAS backends
31-
// and ask the user to confirm the rewrite
32-
isDefault, err := cmd.Flags().GetBool("default")
33-
cobra.CheckErr(err)
34-
35-
description, err := cmd.Flags().GetString("description")
36-
cobra.CheckErr(err)
30+
// capture flags only when explicitly set
31+
if err := captureUpdateFlags(cmd); err != nil {
32+
return err
33+
}
3734

38-
// If we are overriding the default we ask for confirmation
39-
if isDefault {
40-
if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, backendName); err != nil {
41-
return err
42-
} else if !confirmed {
43-
log.Info("Aborting...")
44-
return nil
45-
}
46-
} else {
47-
// If we are removing the default we ask for confirmation too
48-
if confirmed, err := confirmDefaultCASBackendUnset(backendName, "You are setting the default CAS backend to false", actionOpts); err != nil {
49-
return err
50-
} else if !confirmed {
51-
log.Info("Aborting...")
52-
return nil
53-
}
35+
// If we are overriding/unsetting the default we ask for confirmation
36+
if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
37+
return err
38+
} else if !ok {
39+
log.Info("Aborting...")
40+
return nil
5441
}
5542

5643
opts := &action.NewCASBackendUpdateOpts{
5744
Name: backendName,
58-
Description: description,
45+
Description: descriptionCASBackendUpdateOption,
5946
Credentials: map[string]any{
6047
"username": username,
6148
"password": password,
6249
},
63-
Default: isDefault,
50+
Default: isDefaultCASBackendUpdateOption,
6451
}
6552

6653
if username == "" && password == "" {

‎app/cli/cmd/casbackend_update_s3.go‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,28 @@ func newCASBackendUpdateAWSS3Cmd() *cobra.Command {
2727
Use: "aws-s3",
2828
Short: "Update a AWS S3 CAS Backend description, credentials or default status",
2929
RunE: func(cmd *cobra.Command, args []string) error {
30-
// If we are setting the default, we list existing CAS backends
31-
// and ask the user to confirm the rewrite
32-
isDefault, err := cmd.Flags().GetBool("default")
33-
cobra.CheckErr(err)
34-
35-
description, err := cmd.Flags().GetString("description")
36-
cobra.CheckErr(err)
30+
// capture flags only when explicitly set
31+
if err := captureUpdateFlags(cmd); err != nil {
32+
return err
33+
}
3734

38-
// If we are overriding the default we ask for confirmation
39-
if isDefault {
40-
if confirmed, err := confirmDefaultCASBackendOverride(actionOpts, backendName); err != nil {
41-
return err
42-
} else if !confirmed {
43-
log.Info("Aborting...")
44-
return nil
45-
}
46-
} else {
47-
// If we are removing the default we ask for confirmation too
48-
if confirmed, err := confirmDefaultCASBackendUnset(backendName, "You are setting the default CAS backend to false", actionOpts); err != nil {
49-
return err
50-
} else if !confirmed {
51-
log.Info("Aborting...")
52-
return nil
53-
}
35+
// If we are overriding/unsetting the default we ask for confirmation
36+
if ok, err := handleDefaultUpdateConfirmation(actionOpts, backendName); err != nil {
37+
return err
38+
} else if !ok {
39+
log.Info("Aborting...")
40+
return nil
5441
}
5542

5643
opts := &action.NewCASBackendUpdateOpts{
5744
Name: backendName,
58-
Description: description,
45+
Description: descriptionCASBackendUpdateOption,
5946
Credentials: map[string]any{
6047
"accessKeyID": accessKeyID,
6148
"secretAccessKey": secretAccessKey,
6249
"region": region,
6350
},
64-
Default: isDefault,
51+
Default: isDefaultCASBackendUpdateOption,
6552
}
6653

6754
// this means that we are not updating credentials

‎app/cli/internal/action/casbackend_update.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ type CASBackendUpdate struct {
2929

3030
type NewCASBackendUpdateOpts struct {
3131
Name string
32-
Description string
33-
Default bool
32+
Description *string
33+
Default *bool
3434
Credentials map[string]any
3535
}
3636

0 commit comments

Comments
 (0)