diff options
Diffstat (limited to 'pkg/auth')
| -rw-r--r-- | pkg/auth/auth.go | 5 | ||||
| -rw-r--r-- | pkg/auth/auth_test.go | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index b68109429..006572b09 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -144,13 +144,10 @@ func getAuthCredentials(headers []string) (*types.DockerAuthConfig, map[string]t // MakeXRegistryConfigHeader returns a map with the XRegistryConfigHeader set which can // conveniently be used in the http stack. -func MakeXRegistryConfigHeader(sys *types.SystemContext, authfile, username, password string) (map[string]string, error) { +func MakeXRegistryConfigHeader(sys *types.SystemContext, username, password string) (map[string]string, error) { if sys == nil { sys = &types.SystemContext{} } - if authfile != "" { - sys.AuthFilePath = authfile - } authConfigs, err := imageAuth.GetAllCredentials(sys) if err != nil { return nil, err diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go index ec5c1c9e7..a727a9d50 100644 --- a/pkg/auth/auth_test.go +++ b/pkg/auth/auth_test.go @@ -81,7 +81,7 @@ func TestMakeXRegistryConfigHeaderGetCredentialsRoundtrip(t *testing.T) { } { inputAuthFile, cleanup := tempAuthFilePath(t, tc.fileContents) defer cleanup() - headers, err := MakeXRegistryConfigHeader(nil, inputAuthFile, tc.username, tc.password) + headers, err := MakeXRegistryConfigHeader(&types.SystemContext{AuthFilePath: inputAuthFile}, tc.username, tc.password) require.NoError(t, err) req, err := http.NewRequest(http.MethodPost, "/", nil) require.NoError(t, err, tc.name) @@ -208,7 +208,7 @@ func TestMakeXRegistryConfigHeader(t *testing.T) { } { authFile, cleanup := tempAuthFilePath(t, tc.fileContents) defer cleanup() - res, err := MakeXRegistryConfigHeader(nil, authFile, tc.username, tc.password) + res, err := MakeXRegistryConfigHeader(&types.SystemContext{AuthFilePath: authFile}, tc.username, tc.password) if tc.shouldErr { assert.Error(t, err, tc.name) } else { |