Add ExpiredAt()

cmd/saml2aws/commands/login.go

@@ -52,9 +52,12 @@ func Login(loginFlags *flags.LoginExecFlags) error {
 		return nil
 	}
 
-	expired, expireTime := sharedCreds.Expired()
-	if !expired && !loginFlags.Force {
-		logger.Debug("Credentials are not expired. It will expire at ", expireTime, ". Skipping.")
+	if !sharedCreds.Expired() && !loginFlags.Force {
+		logger.Debug("Credentials are not expired. Skipping.")
+		expiredAt := sharedCreds.ExpiredAt()
+		if expiredAt != nil {
+			logger.Debug("Credentials will expire at", &expiredAt)
+		}
 		previousCreds, err := sharedCreds.Load()
 		if err != nil {
 			log.Println("Unable to load cached credentials.")

pkg/awsconfig/awsconfig.go

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