fix: make Native Store private (#48)

wangxiaoxuan273 · web-flow · commit 8f27cf85c543 · 2023-04-20T18:11:19.000+08:00
Signed-off-by: wangxiaoxuan273 &lt;wangxiaoxuan119@gmail.com&gt;
diff --git a/native_store.go b/native_store.go
@@ -28,22 +28,22 @@ const (
 	emptyUsername           = "<token>"
 )
 
-// NativeStore implements a credentials store using native keychain to keep
+// nativeStore implements a credentials store using native keychain to keep
 // credentials secure.
-type NativeStore struct {
+type nativeStore struct {
 	programFunc client.ProgramFunc
 }
 
 // NewNativeStore creates a new native store that uses a remote helper program to
 // manage credentials.
 func NewNativeStore(helperSuffix string) Store {
-	return &NativeStore{
+	return &nativeStore{
 		programFunc: client.NewShellProgramFunc(remoteCredentialsPrefix + helperSuffix),
 	}
 }
 
 // Get retrieves credentials from the store for the given server.
-func (ns *NativeStore) Get(_ context.Context, serverAddress string) (auth.Credential, error) {
+func (ns *nativeStore) Get(_ context.Context, serverAddress string) (auth.Credential, error) {
 	var cred auth.Credential
 	dockerCred, err := client.Get(ns.programFunc, serverAddress)
 	if err != nil {
@@ -64,7 +64,7 @@ func (ns *NativeStore) Get(_ context.Context, serverAddress string) (auth.Creden
 }
 
 // Put saves credentials into the store.
-func (ns *NativeStore) Put(_ context.Context, serverAddress string, cred auth.Credential) error {
+func (ns *nativeStore) Put(_ context.Context, serverAddress string, cred auth.Credential) error {
 	dockerCred := &credentials.Credentials{
 		ServerURL: serverAddress,
 		Username:  cred.Username,
@@ -78,6 +78,6 @@ func (ns *NativeStore) Put(_ context.Context, serverAddress string, cred auth.Cr
 }
 
 // Delete removes credentials from the store for the given server.
-func (ns *NativeStore) Delete(_ context.Context, serverAddress string) error {
+func (ns *nativeStore) Delete(_ context.Context, serverAddress string) error {
 	return client.Erase(ns.programFunc, serverAddress)
 }
diff --git a/native_store_test.go b/native_store_test.go
@@ -101,14 +101,14 @@ func testCommandFn(args ...string) client.Program {
 }
 
 func TestNativeStore_interface(t *testing.T) {
-	var ns interface{} = &NativeStore{}
+	var ns interface{} = &nativeStore{}
 	if _, ok := ns.(Store); !ok {
 		t.Error("&NativeStore{} does not conform Store")
 	}
 }
 
 func TestNativeStore_basicAuth(t *testing.T) {
-	ns := &NativeStore{
+	ns := &nativeStore{
 		programFunc: testCommandFn,
 	}
 	// Put
@@ -135,7 +135,7 @@ func TestNativeStore_basicAuth(t *testing.T) {
 }
 
 func TestNativeStore_refreshToken(t *testing.T) {
-	ns := &NativeStore{
+	ns := &nativeStore{
 		programFunc: testCommandFn,
 	}
 	// Put

Original file line number	Diff line number	Diff line change
`@@ -28,22 +28,22 @@ const (`
`28`	`28`	`emptyUsername = "<token>"`
`29`	`29`	`)`
`30`	`30`
`31`		`-// NativeStore implements a credentials store using native keychain to keep`
	`31`	`+// nativeStore implements a credentials store using native keychain to keep`
`32`	`32`	`// credentials secure.`
`33`		`-type NativeStore struct {`
	`33`	`+type nativeStore struct {`
`34`	`34`	`programFunc client.ProgramFunc`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// NewNativeStore creates a new native store that uses a remote helper program to`
`38`	`38`	`// manage credentials.`
`39`	`39`	`func NewNativeStore(helperSuffix string) Store {`
`40`		`- return &NativeStore{`
	`40`	`+ return &nativeStore{`
`41`	`41`	`programFunc: client.NewShellProgramFunc(remoteCredentialsPrefix + helperSuffix),`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Get retrieves credentials from the store for the given server.`
`46`		`-func (ns *NativeStore) Get(_ context.Context, serverAddress string) (auth.Credential, error) {`
	`46`	`+func (ns *nativeStore) Get(_ context.Context, serverAddress string) (auth.Credential, error) {`
`47`	`47`	`var cred auth.Credential`
`48`	`48`	`dockerCred, err := client.Get(ns.programFunc, serverAddress)`
`49`	`49`	`if err != nil {`
`@@ -64,7 +64,7 @@ func (ns *NativeStore) Get(_ context.Context, serverAddress string) (auth.Creden`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Put saves credentials into the store.`
`67`		`-func (ns *NativeStore) Put(_ context.Context, serverAddress string, cred auth.Credential) error {`
	`67`	`+func (ns *nativeStore) Put(_ context.Context, serverAddress string, cred auth.Credential) error {`
`68`	`68`	`dockerCred := &credentials.Credentials{`
`69`	`69`	`ServerURL: serverAddress,`
`70`	`70`	`Username: cred.Username,`
`@@ -78,6 +78,6 @@ func (ns *NativeStore) Put(_ context.Context, serverAddress string, cred auth.Cr`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// Delete removes credentials from the store for the given server.`
`81`		`-func (ns *NativeStore) Delete(_ context.Context, serverAddress string) error {`
	`81`	`+func (ns *nativeStore) Delete(_ context.Context, serverAddress string) error {`
`82`	`82`	`return client.Erase(ns.programFunc, serverAddress)`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,14 +101,14 @@ func testCommandFn(args ...string) client.Program {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func TestNativeStore_interface(t *testing.T) {`
`104`		`- var ns interface{} = &NativeStore{}`
	`104`	`+ var ns interface{} = &nativeStore{}`
`105`	`105`	`if _, ok := ns.(Store); !ok {`
`106`	`106`	`t.Error("&NativeStore{} does not conform Store")`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func TestNativeStore_basicAuth(t *testing.T) {`
`111`		`- ns := &NativeStore{`
	`111`	`+ ns := &nativeStore{`
`112`	`112`	`programFunc: testCommandFn,`
`113`	`113`	`}`
`114`	`114`	`// Put`
`@@ -135,7 +135,7 @@ func TestNativeStore_basicAuth(t *testing.T) {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`func TestNativeStore_refreshToken(t *testing.T) {`
`138`		`- ns := &NativeStore{`
	`138`	`+ ns := &nativeStore{`
`139`	`139`	`programFunc: testCommandFn,`
`140`	`140`	`}`
`141`	`141`	`// Put`