Remove the authfile parameter of MakeXRegistryConfigHeader

Having a parameter that modifies the provides types.SystemContext
seems rather unexpected and risky to have around - and the only
user of that is actually a no-op; so, remove that option and simplify.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

3 files changed, 5 insertions, 8 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 {
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index f643b3c89..54c831c36 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -294,12 +294,12 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		err     error
 	)
 	if options.SystemContext == nil {
-		headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, "", "", "")
+		headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, "", "")
 	} else {
 		if options.SystemContext.DockerAuthConfig != nil {
 			headers, err = auth.MakeXRegistryAuthHeader(options.SystemContext, options.SystemContext.AuthFilePath, options.SystemContext.DockerAuthConfig.Username, options.SystemContext.DockerAuthConfig.Password)
 		} else {
-			headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, options.SystemContext.AuthFilePath, "", "")
+			headers, err = auth.MakeXRegistryConfigHeader(options.SystemContext, "", "")
 		}
 	}
 	if err != nil {