From a3c1b5b757478dd230287ffca98c6cf9f0ef8ec8 Mon Sep 17 00:00:00 2001 From: Emily Casey Date: Mon, 29 Apr 2019 10:04:46 -0400 Subject: [PATCH] Fix imports Signed-off-by: Emily Casey --- osxkeychain/osxkeychain_darwin.go | 2 +- osxkeychain/osxkeychain_darwin_test.go | 3 ++- registryurl/parse_test.go | 2 +- registryurl/url_non_go18.go | 2 +- wincred/wincred_windows.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/osxkeychain/osxkeychain_darwin.go b/osxkeychain/osxkeychain_darwin.go index 100b1fe..adfd2ec 100644 --- a/osxkeychain/osxkeychain_darwin.go +++ b/osxkeychain/osxkeychain_darwin.go @@ -10,11 +10,11 @@ package osxkeychain import "C" import ( "errors" - "github.com/docker/docker-credential-helpers/registryurl" "strconv" "unsafe" "github.com/docker/docker-credential-helpers/credentials" + "github.com/docker/docker-credential-helpers/registryurl" ) // errCredentialsNotFound is the specific error message returned by OS X diff --git a/osxkeychain/osxkeychain_darwin_test.go b/osxkeychain/osxkeychain_darwin_test.go index dce0d1f..27518e5 100644 --- a/osxkeychain/osxkeychain_darwin_test.go +++ b/osxkeychain/osxkeychain_darwin_test.go @@ -2,8 +2,9 @@ package osxkeychain import ( "fmt" - "github.com/docker/docker-credential-helpers/credentials" "testing" + + "github.com/docker/docker-credential-helpers/credentials" ) func TestOSXKeychainHelper(t *testing.T) { diff --git a/registryurl/parse_test.go b/registryurl/parse_test.go index 9b1e0d5..89feaa7 100644 --- a/registryurl/parse_test.go +++ b/registryurl/parse_test.go @@ -43,4 +43,4 @@ func TestHelperParseURL(t *testing.T) { t.Errorf("Error: expected URL: %q, but got %q for URL: %q", te.expectedURL, u.String(), te.url) } } -} \ No newline at end of file +} diff --git a/registryurl/url_non_go18.go b/registryurl/url_non_go18.go index ee187ab..7c8a88f 100644 --- a/registryurl/url_non_go18.go +++ b/registryurl/url_non_go18.go @@ -3,8 +3,8 @@ package registryurl import ( - "strings" url "net/url" + "strings" ) func GetHostname(u *url.URL) string { diff --git a/wincred/wincred_windows.go b/wincred/wincred_windows.go index 1a95e00..5c6f5ae 100644 --- a/wincred/wincred_windows.go +++ b/wincred/wincred_windows.go @@ -2,12 +2,12 @@ package wincred import ( "bytes" - "github.com/docker/docker-credential-helpers/registryurl" "net/url" "strings" winc "github.com/danieljoos/wincred" "github.com/docker/docker-credential-helpers/credentials" + "github.com/docker/docker-credential-helpers/registryurl" ) // Wincred handles secrets using the Windows credential service.