notkshitij/docker-credential-helpers
1
0
Fork 0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30
Code Releases 1 Activity

osxkeychain: use a switch for handling errors

Browse Source 
Makes the error-handling slightly cleaner.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-05-27 16:48:48 +02:00
parent 1ed95cb020
commit 7f00c5c8bd
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osxkeychain/osxkeychain_darwin.go
+10 -12
View File
@@ -93,16 +93,15 @@ func (h Osxkeychain) Get(serverURL string) (string, string, error) {
errMsg := C.keychain_get(s, &usernameLen, &username, &secretLen, &secret) errMsg := C.keychain_get(s, &usernameLen, &username, &secretLen, &secret)
if errMsg != nil { if errMsg != nil {
defer C.free(unsafe.Pointer(errMsg)) defer C.free(unsafe.Pointer(errMsg))
goMsg := C.GoString(errMsg) switch goMsg := C.GoString(errMsg); goMsg {
if goMsg == errCredentialsNotFound { case errCredentialsNotFound:
return "", "", credentials.NewErrCredentialsNotFound() return "", "", credentials.NewErrCredentialsNotFound()
} case errInteractionNotAllowed:
if goMsg == errInteractionNotAllowed {
return "", "", ErrInteractionNotAllowed return "", "", ErrInteractionNotAllowed
} default:
return "", "", errors.New(goMsg) return "", "", errors.New(goMsg)
} }
}
user := C.GoStringN(username, C.int(usernameLen)) user := C.GoStringN(username, C.int(usernameLen))
pass := C.GoStringN(secret, C.int(secretLen)) pass := C.GoStringN(secret, C.int(secretLen))
@@ -124,16 +123,15 @@ func (h Osxkeychain) List() (map[string]string, error) {
defer C.freeListData(&acctsC, listLenC) defer C.freeListData(&acctsC, listLenC)
if errMsg != nil { if errMsg != nil {
defer C.free(unsafe.Pointer(errMsg)) defer C.free(unsafe.Pointer(errMsg))
goMsg := C.GoString(errMsg) switch goMsg := C.GoString(errMsg); goMsg {
if goMsg == errCredentialsNotFound { case errCredentialsNotFound:
return make(map[string]string), nil return make(map[string]string), nil
} case errInteractionNotAllowed:
if goMsg == errInteractionNotAllowed {
return nil, ErrInteractionNotAllowed return nil, ErrInteractionNotAllowed
} default:
return nil, errors.New(goMsg) return nil, errors.New(goMsg)
} }
}
var listLen int var listLen int
listLen = int(listLenC) listLen = int(listLenC)