Remove extra package.

Signed-off-by: David Calavera <david.calavera@gmail.com>

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.
+// Serve initializes the credentials helper and parses the action argument.
-func Serve(helper credentials.Helper) {
+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 <store|get|erase>", os.Args[0])
 	}
@@ -41,7 +39,7 @@ func handleCommand(helper credentials.Helper) error {
 	return fmt.Errorf("Usage: %s <store|get|erase>", 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)

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",

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")

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())
 }

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)