fix: use creds from creds store first (#1103)

Signed-off-by: Matej Vasek <mvasek@redhat.com>

docker/creds/credentials.go

@@ -189,6 +189,12 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
 	dockerConfigPath := filepath.Join(home, ".docker", "config.json")
 
 	var defaultCredentialLoaders = []CredentialsCallback{
+		func(registry string) (docker.Credentials, error) {
+			return getCredentialsByCredentialHelper(c.authFilePath, registry)
+		},
+		func(registry string) (docker.Credentials, error) {
+			return getCredentialsByCredentialHelper(dockerConfigPath, registry)
+		},
 		func(registry string) (docker.Credentials, error) {
 			creds, err := config.GetCredentials(sys, registry)
 			if err != nil {
@@ -199,12 +205,6 @@ func NewCredentialsProvider(opts ...Opt) docker.CredentialsProvider {
 				Password: creds.Password,
 			}, nil
 		},
-		func(registry string) (docker.Credentials, error) {
-			return getCredentialsByCredentialHelper(c.authFilePath, registry)
-		},
-		func(registry string) (docker.Credentials, error) {
-			return getCredentialsByCredentialHelper(dockerConfigPath, registry)
-		},
 		func(registry string) (docker.Credentials, error) { // empty credentials provider for unsecured registries
 			return docker.Credentials{}, nil
 		},

docker/creds/credentials_test.go

@@ -383,7 +383,9 @@ func TestNewCredentialsProvider(t *testing.T) {
 				promptUser:        pwdCbkThatShallNotBeCalled(t),
 				verifyCredentials: correctVerifyCbk,
 				registry:          "docker.io",
-				setUpEnv:          withPopulatedDockerAuthConfig,
+				setUpEnv: all(
+					withPopulatedDockerAuthConfig,
+					setUpMockHelper("docker-credential-mock", newInMemoryHelper())),
 			},
 			want: Credentials{Username: dockerIoUser, Password: dockerIoUserPwd},
 		},