Merge pull request #1122 from 99designs/fix-cred-process

Fix credential_process
99designs · Feb 3, 2023 · 0f1764c · 0f1764c
2 parents dd8de8e + 5c669e7
commit 0f1764c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/vault/vault.go b/vault/vault.go
@@ -228,10 +228,6 @@ func (t *tempCredsCreator) getSourceCreds(config *Config) (sourcecredsProvider a
 		log.Printf("profile %s: sourcing credentials from profile %s", config.ProfileName, config.SourceProfile.ProfileName)
 		return t.GetProviderForProfile(config.SourceProfile)
 	}
-	if config.HasCredentialProcess() {
-		log.Printf("profile %s: sourcing credentials from credential process", config.ProfileName)
-		return NewCredentialProcessProvider(t.keyring.Keyring, config)
-	}
 
 	hasStoredCredentials, err := t.keyring.Has(config.ProfileName)
 	if err != nil {
@@ -257,6 +253,11 @@ func (t *tempCredsCreator) GetProviderForProfile(config *Config) (aws.Credential
 		return NewAssumeRoleWithWebIdentityProvider(t.keyring.Keyring, config)
 	}
 
+	if config.HasCredentialProcess() {
+		log.Printf("profile %s: using credential process", config.ProfileName)
+		return NewCredentialProcessProvider(t.keyring.Keyring, config)
+	}
+
 	sourcecredsProvider, err := t.getSourceCreds(config)
 	if err != nil {
 		return nil, err