Add the time when it will expire to debug log

Versent · Dec 20, 2021 · 1eb5eed · 1eb5eed
1 parent f872b40
commit 1eb5eed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/saml2aws/commands/login.go b/cmd/saml2aws/commands/login.go
@@ -52,8 +52,9 @@ func Login(loginFlags *flags.LoginExecFlags) error {
 		return nil
 	}
 
-	if !sharedCreds.Expired() && !loginFlags.Force {
-		logger.Debug("Credentials are not expired. Skipping.")
+	expired, expireTime := sharedCreds.Expired()
+	if !expired && !loginFlags.Force {
+		logger.Debug("Credentials are not expired. It will expire at ", expireTime, ". Skipping.")
 		previousCreds, err := sharedCreds.Load()
 		if err != nil {
 			log.Println("Unable to load cached credentials.")

diff --git a/pkg/awsconfig/awsconfig.go b/pkg/awsconfig/awsconfig.go
@@ -113,13 +113,13 @@ func (p *CredentialsProvider) Load() (*AWSCredentials, error) {
 }
 
 // Expired checks if the current credentials are expired
-func (p *CredentialsProvider) Expired() bool {
+func (p *CredentialsProvider) Expired() (bool, *time.Time) {
 	creds, err := p.Load()
 	if err != nil {
-		return true
+		return true, nil
 	}
 
-	return time.Now().After(creds.Expires)
+	return time.Now().After(creds.Expires), &creds.Expires
 }
 
 // ensureConfigExists verify that the config file exists