fix: use duration value set from cli

enable retrieval from secretStore for both cred types

Author: dnitsch

cmd/saml.go

@@ -11,7 +11,7 @@ var (
 	principalArn string
 	acsUrl       string
 	role         string
-	duration     int
+	duration     int64
 	samlCmd      = &cobra.Command{
 		Use:   "saml <SAML ProviderUrl>",
 		Short: "Get AWS credentials and out to stdout",
@@ -24,7 +24,7 @@ func init() {
 	samlCmd.PersistentFlags().StringVarP(&providerUrl, "provider", "p", "", "Saml Entity StartSSO Url")
 	samlCmd.PersistentFlags().StringVarP(&principalArn, "principal", "", "", "Principal Arn of the SAML IdP in AWS")
 	samlCmd.PersistentFlags().StringVarP(&acsUrl, "acsurl", "a", "https://signin.aws.amazon.com/saml", "Override the default ACS Url, used for checkin the post of the SAMLResponse")
-	samlCmd.PersistentFlags().IntVarP(&duration, "max-duration", "d", 900, "Override default max session duration, in seconds, of the role session [900-43200]")
+	samlCmd.PersistentFlags().Int64VarP(&duration, "max-duration", "d", 900, "Override default max session duration, in seconds, of the role session [900-43200]")
 	rootCmd.AddCommand(samlCmd)
 }
 

internal/auth/awssts.go

@@ -33,7 +33,7 @@ func LoginStsSaml(samlResponse string, role *util.AWSRole) (*util.AWSCredentials
 		PrincipalArn:    aws.String(role.PrincipalARN), // Required
 		RoleArn:         aws.String(role.RoleARN),      // Required
 		SAMLAssertion:   aws.String(samlResponse),      // Required
-		DurationSeconds: aws.Int64(int64(role.Duration)),
+		DurationSeconds: aws.Int64(role.Duration),
 	}
 
 	resp, err := svc.AssumeRoleWithSAML(params)

internal/auth/saml.go

@@ -21,9 +21,7 @@ func GetSamlCreds(conf config.SamlConfig) {
 	var err error
 
 	// Try to reuse stored credential in secret
-	if !conf.BaseConfig.StoreInProfile {
-		awsCreds, err = secretStore.AWSCredential()
-	}
+	awsCreds, err = secretStore.AWSCredential()
 
 	if !util.IsValid(awsCreds) || err != nil {
 		webBrowser = web.New()

internal/config/config.go

@@ -19,5 +19,5 @@ type SamlConfig struct {
 	ProviderUrl  string
 	PrincipalArn string
 	AcsUrl       string
-	Duration     int
+	Duration     int64
 }

internal/util/types.go

@@ -17,5 +17,5 @@ type AWSRole struct {
 	RoleARN      string
 	PrincipalARN string
 	Name         string
-	Duration     int
+	Duration     int64
 }