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

Implement client.List, change list API

Browse Source 
[]string, []string -> map[string]string because the other APIs assume a
1:1 correspondence

Signed-off-by: Jake Sanders <jsand@google.com>
This commit is contained in:
Jake Sanders
2016-09-02 15:12:18 -07:00
parent 80833adff5
commit c45d9e9e28
11 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
secretservice/secretservice_linux.go
+10 -9
View File
@@ -79,7 +79,8 @@ func (h Secretservice) Get(serverURL string) (string, string, error) {
return user, pass, nil
}
func (h Secretservice) List() ([]string, []string, error) {
// List returns the stored URLs and corresponding usernames.
func (h Secretservice) List() (map[string]string, error) {
var pathsC **C.char
defer C.free(unsafe.Pointer(pathsC))
var acctsC **C.char
@@ -88,18 +89,18 @@ func (h Secretservice) List() ([]string, []string, error) {
err := C.list(&pathsC, &acctsC, &listLenC)
if err != nil {
defer C.free(unsafe.Pointer(err))
return nil, nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library")
return nil, errors.New("Error from list function in secretservice_linux.c likely due to error in secretservice library")
}
defer C.freeListData(&pathsC, listLenC)
defer C.freeListData(&acctsC, listLenC)
listLen := int(listLenC)
pathTmp := (*[1 << 30]*C.char)(unsafe.Pointer(pathsC))[:listLen:listLen]
acctTmp := (*[1 << 30]*C.char)(unsafe.Pointer(acctsC))[:listLen:listLen]
paths := make([]string, listLen)
accts := make([]string, listLen)
resp := make(map[string]string)
for i := 0; i < listLen; i++ {
paths[i] = C.GoString(pathTmp[i])
accts[i] = C.GoString(acctTmp[i])
resp[C.GoString(pathTmp[i])] = C.GoString(acctTmp[i])
}
C.freeListData(&pathsC, listLenC)
C.freeListData(&acctsC, listLenC)
return paths, accts, nil
return resp, nil
}
secretservice/secretservice_linux_test.go
+3 -3
View File
@@ -36,12 +36,12 @@ func TestSecretServiceHelper(t *testing.T) {
if err := helper.Delete(creds.ServerURL); err != nil {
t.Fatal(err)
}
paths, accts, err := helper.List()
if err != nil || len(paths) == 0 || len(accts) == 0 {
auths, err := helper.List()
if err != nil || len(auths) == 0 {
t.Fatal(err)
}
helper.Add(creds)
if newpaths, newaccts, err := helper.List(); (len(newpaths)-len(paths)) != 1 || (len(newaccts)-len(accts)) != 1 {
if newauths, err := helper.List(); (len(newauths) - len(auths)) != 1 {
t.Fatal(err)
}
}