Merge pull request #72 from docker/keychain-darwin-fix

Benehiko · web-flow · commit bdecbeee9145 · 2025-07-02T09:47:08.000+02:00
keychain/darwin: should not error on delete when item not found
diff --git a/store/keychain/keychain_darwin.go b/store/keychain/keychain_darwin.go
@@ -69,7 +69,11 @@ func (k *keychainStore[T]) Delete(ctx context.Context, id store.ID) error {
 	}
 
 	item := newKeychainItem(id.String(), k)
-	return mapKeychainError(kc.DeleteItem(item))
+	err := kc.DeleteItem(item)
+	if err != nil && !errors.Is(err, kc.ErrorItemNotFound) {
+		return mapKeychainError(err)
+	}
+	return nil
 }
 
 func (k *keychainStore[T]) Get(ctx context.Context, id store.ID) (store.Secret, error) {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,11 @@ func (k *keychainStore[T]) Delete(ctx context.Context, id store.ID) error {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`item := newKeychainItem(id.String(), k)`
`72`		`- return mapKeychainError(kc.DeleteItem(item))`
	`72`	`+ err := kc.DeleteItem(item)`
	`73`	`+ if err != nil && !errors.Is(err, kc.ErrorItemNotFound) {`
	`74`	`+ return mapKeychainError(err)`
	`75`	`+ }`
	`76`	`+ return nil`
`73`	`77`	`}`
`74`	`78`
`75`	`79`	`func (k *keychainStore[T]) Get(ctx context.Context, id store.ID) (store.Secret, error) {`