Merge pull request #1274 from timharris777/master

Fixing saved credential issue for --credential-process introduced by #896

cmd/saml2aws/commands/login.go

@@ -148,6 +148,18 @@ func Login(loginFlags *flags.LoginExecFlags) error {
 		if err != nil {
 			return err
 		}
+		// Check if a custom credential file is used
+		customCredentialsFile, err := CustomCredentialsFile(sharedCreds.Filename)
+		if err != nil {
+			return err
+		}
+		// If a custom credential file is used then save credentials. This allows for autorefreshing of credentials, which is not supported with the default credential file. See https://github.com/Versent/saml2aws/issues/895
+		if customCredentialsFile {
+			err = saveCredentials(awsCreds, sharedCreds)
+			if err != nil {
+				return err
+			}
+		}
 	} else {
 		err = saveCredentials(awsCreds, sharedCreds)
 		if err != nil {
@@ -409,6 +421,20 @@ func CredentialsToCredentialProcess(awsCreds *awsconfig.AWSCredentials) (string,
 
 }
 
+func CustomCredentialsFile(credentialsFile string) (bool, error) {
+
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		return false, err
+	}
+	defaultCredentialsFile := fmt.Sprintf("%s/.aws/credentials", homeDir)
+	if defaultCredentialsFile == credentialsFile {
+		return false, nil
+	}
+	return true, nil
+
+}
+
 // PrintCredentialProcess Prints a Json output that is compatible with the AWS credential_process
 // https://github.com/awslabs/awsprocesscreds
 func PrintCredentialProcess(awsCreds *awsconfig.AWSCredentials) error {

cmd/saml2aws/commands/login_test.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -94,3 +95,33 @@ func TestCredentialsToCredentialProcess(t *testing.T) {
 	assert.Empty(t, err)
 	assert.Equal(t, aws_json_expected_output, json)
 }
+
+func TestCustomCredentialsFile(t *testing.T) {
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		t.Error("Error getting os.UserHomeDir() in test")
+	}
+
+	defaultCredentialsFile := fmt.Sprintf("%s/.aws/credentials", homeDir)
+	customCredentialsFile := fmt.Sprintf("%s/.aws/saml2aws.creds", homeDir)
+
+	// Testing default credential file
+	got, err := CustomCredentialsFile(defaultCredentialsFile)
+	if err != nil {
+		t.Error("Error running CustomCredentialsFile in test")
+	}
+	want := false
+	if got != want {
+		t.Errorf("got %t, wanted %t", got, want)
+	}
+
+	// Testing custom credential file
+	got, err = CustomCredentialsFile(customCredentialsFile)
+	if err != nil {
+		t.Error("Error running CustomCredentialsFile in test")
+	}
+	want = true
+	if got != want {
+		t.Errorf("got %t, wanted %t", got, want)
+	}
+}