From a701e3c310891608d1606d16ea58598b0ffdc62c Mon Sep 17 00:00:00 2001 From: David Calavera Date: Tue, 9 Feb 2016 13:03:40 -0800 Subject: [PATCH] Remove extra package. Signed-off-by: David Calavera --- plugin/plugin.go => credentials/credentials.go | 18 ++++++++---------- .../credentials_test.go | 16 +++++++--------- credentials/helper.go | 4 ++-- osxkeychain/cmd/main_darwin.go | 4 ++-- osxkeychain/osxkeychain_darwin.go | 2 +- 5 files changed, 20 insertions(+), 24 deletions(-) rename plugin/plugin.go => credentials/credentials.go (78%) rename plugin/plugin_test.go => credentials/credentials_test.go (87%) diff --git a/plugin/plugin.go b/credentials/credentials.go similarity index 78% rename from plugin/plugin.go rename to credentials/credentials.go index 5df3d0e..612c513 100644 --- a/plugin/plugin.go +++ b/credentials/credentials.go @@ -1,4 +1,4 @@ -package plugin +package credentials import ( "bufio" @@ -8,8 +8,6 @@ import ( "io" "os" "strings" - - "github.com/calavera/docker-credential-helpers/credentials" ) type credentialsGetResponse struct { @@ -17,15 +15,15 @@ type credentialsGetResponse struct { Password string } -// Serve initializes the store helper and parses the action argument. -func Serve(helper credentials.Helper) { +// Serve initializes the credentials helper and parses the action argument. +func Serve(helper Helper) { if err := handleCommand(helper); err != nil { fmt.Fprintf(os.Stdout, "%v\n", err) os.Exit(1) } } -func handleCommand(helper credentials.Helper) error { +func handleCommand(helper Helper) error { if len(os.Args) != 2 { return fmt.Errorf("Usage: %s ", os.Args[0]) } @@ -41,7 +39,7 @@ func handleCommand(helper credentials.Helper) error { return fmt.Errorf("Usage: %s ", os.Args[0]) } -func store(helper credentials.Helper, reader io.Reader) error { +func store(helper Helper, reader io.Reader) error { scanner := bufio.NewScanner(reader) buffer := new(bytes.Buffer) @@ -53,7 +51,7 @@ func store(helper credentials.Helper, reader io.Reader) error { return err } - var creds credentials.Credentials + var creds Credentials if err := json.NewDecoder(buffer).Decode(&creds); err != nil { return err } @@ -61,7 +59,7 @@ func store(helper credentials.Helper, reader io.Reader) error { return helper.Add(&creds) } -func get(helper credentials.Helper, reader io.Reader, writer io.Writer) error { +func get(helper Helper, reader io.Reader, writer io.Writer) error { scanner := bufio.NewScanner(reader) buffer := new(bytes.Buffer) @@ -94,7 +92,7 @@ func get(helper credentials.Helper, reader io.Reader, writer io.Writer) error { return nil } -func erase(helper credentials.Helper, reader io.Reader) error { +func erase(helper Helper, reader io.Reader) error { scanner := bufio.NewScanner(reader) buffer := new(bytes.Buffer) diff --git a/plugin/plugin_test.go b/credentials/credentials_test.go similarity index 87% rename from plugin/plugin_test.go rename to credentials/credentials_test.go index 89f40d2..67f8737 100644 --- a/plugin/plugin_test.go +++ b/credentials/credentials_test.go @@ -1,4 +1,4 @@ -package plugin +package credentials import ( "bytes" @@ -6,21 +6,19 @@ import ( "fmt" "strings" "testing" - - "github.com/calavera/docker-credential-helpers/credentials" ) type memoryStore struct { - creds map[string]*credentials.Credentials + creds map[string]*Credentials } func newMemoryStore() *memoryStore { return &memoryStore{ - creds: make(map[string]*credentials.Credentials), + creds: make(map[string]*Credentials), } } -func (m *memoryStore) Add(creds *credentials.Credentials) error { +func (m *memoryStore) Add(creds *Credentials) error { m.creds[creds.ServerURL] = creds return nil } @@ -40,7 +38,7 @@ func (m *memoryStore) Get(serverURL string) (string, string, error) { func TestStore(t *testing.T) { serverURL := "https://index.docker.io/v1/" - creds := &credentials.Credentials{ + creds := &Credentials{ ServerURL: serverURL, Username: "foo", Password: "bar", @@ -72,7 +70,7 @@ func TestStore(t *testing.T) { func TestGet(t *testing.T) { serverURL := "https://index.docker.io/v1/" - creds := &credentials.Credentials{ + creds := &Credentials{ ServerURL: serverURL, Username: "foo", Password: "bar", @@ -114,7 +112,7 @@ func TestGet(t *testing.T) { func TestErase(t *testing.T) { serverURL := "https://index.docker.io/v1/" - creds := &credentials.Credentials{ + creds := &Credentials{ ServerURL: serverURL, Username: "foo", Password: "bar", diff --git a/credentials/helper.go b/credentials/helper.go index ed696fc..1966d2e 100644 --- a/credentials/helper.go +++ b/credentials/helper.go @@ -16,6 +16,6 @@ type Helper interface { Get(serverURL string) (string, string, error) } -// Standarize the not found error, so every helper returns +// ErrCredentialsNotFound standarizes the not found error, so every helper returns // the same message and docker can handle it properly. -var NotFoundError = errors.New("credentials not found in native keychain") +var ErrCredentialsNotFound = errors.New("credentials not found in native keychain") diff --git a/osxkeychain/cmd/main_darwin.go b/osxkeychain/cmd/main_darwin.go index 2cfaa49..de434ee 100644 --- a/osxkeychain/cmd/main_darwin.go +++ b/osxkeychain/cmd/main_darwin.go @@ -1,10 +1,10 @@ package main import ( + "github.com/calavera/docker-credential-helpers/credentials" "github.com/calavera/docker-credential-helpers/osxkeychain" - "github.com/calavera/docker-credential-helpers/plugin" ) func main() { - plugin.Serve(osxkeychain.New()) + credentials.Serve(osxkeychain.New()) } diff --git a/osxkeychain/osxkeychain_darwin.go b/osxkeychain/osxkeychain_darwin.go index 94fc34b..f805a19 100644 --- a/osxkeychain/osxkeychain_darwin.go +++ b/osxkeychain/osxkeychain_darwin.go @@ -89,7 +89,7 @@ func (h osxkeychain) Get(serverURL string) (string, string, error) { goMsg := C.GoString(errMsg) if goMsg == notFoundError { - return "", "", credentials.NotFoundError + return "", "", credentials.ErrCredentialsNotFound } return "", "", errors.New(goMsg)