tweaks

g-linville · g-linville · commit cc244ebc53ba · 2024-09-16T16:46:52.000-04:00
Signed-off-by: Grant Linville &lt;grant@acorn.io&gt;
diff --git a/pkg/credentials/store.go b/pkg/credentials/store.go
@@ -112,7 +112,7 @@ func (s Store) Add(ctx context.Context, cred Credential) error {
 }
 
 func (s Store) Remove(ctx context.Context, toolName string) error {
-	if len(s.credCtxs) > 1 {
+	if len(s.credCtxs) > 1 || first(s.credCtxs) == AllCredentialContexts {
 		return fmt.Errorf("error: credential deletion is not supported when multiple credential contexts are provided")
 	}
 
@@ -160,7 +160,6 @@ func (s Store) List(ctx context.Context) ([]Credential, error) {
 	}
 
 	// Go through the contexts in reverse order so that higher priority contexts override lower ones.
-	// TODO - is this how we want to do it?
 	credsByName := make(map[string]Credential)
 	for i := len(s.credCtxs) - 1; i >= 0; i-- {
 		for _, c := range credsByContext[s.credCtxs[i]] {

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func (s Store) Add(ctx context.Context, cred Credential) error {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func (s Store) Remove(ctx context.Context, toolName string) error {`
`115`		`- if len(s.credCtxs) > 1 {`
	`115`	`+ if len(s.credCtxs) > 1 \|\| first(s.credCtxs) == AllCredentialContexts {`
`116`	`116`	`return fmt.Errorf("error: credential deletion is not supported when multiple credential contexts are provided")`
`117`	`117`	`}`
`118`	`118`
`@@ -160,7 +160,6 @@ func (s Store) List(ctx context.Context) ([]Credential, error) {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`// Go through the contexts in reverse order so that higher priority contexts override lower ones.`
`163`		`- // TODO - is this how we want to do it?`
`164`	`163`	`credsByName := make(map[string]Credential)`
`165`	`164`	`for i := len(s.credCtxs) - 1; i >= 0; i-- {`
`166`	`165`	`for _, c := range credsByContext[s.credCtxs[i]] {`