Merge pull request Versent#653 from myw/revert_and_fix_time_format

Revert changes to time format in Versent#651, use named format specifier
PerGon · Apr 14, 2021 · 7090ac3 · 7090ac3
2 parents df32ca6 + 77433ad
commit 7090ac3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/saml2aws/commands/login.go b/cmd/saml2aws/commands/login.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -370,7 +371,7 @@ func CredentialsToCredentialProcess(awsCreds *awsconfig.AWSCredentials) (string,
 		AccessKeyId:     awsCreds.AWSAccessKey,
 		SecretAccessKey: awsCreds.AWSSecretKey,
 		SessionToken:    awsCreds.AWSSessionToken,
-		Expiration:      awsCreds.Expires.Format("2006-01-02T15:04:05-07:00"),
+		Expiration:      awsCreds.Expires.Format(time.RFC3339),
 	}
 
 	p, err := json.Marshal(cred_process)

diff --git a/cmd/saml2aws/commands/login_test.go b/cmd/saml2aws/commands/login_test.go
@@ -54,7 +54,7 @@ func TestCredentialsToCredentialProcess(t *testing.T) {
 		AWSSessionToken: "somesessiontoken",
 		Expires:         time.Date(2020, time.January, 20, 22, 50, 0, 0, time.UTC),
 	}
-	aws_json_expected_output := "{\"Version\":1,\"AccessKeyId\":\"someawsaccesskey\",\"SecretAccessKey\":\"somesecretkey\",\"SessionToken\":\"somesessiontoken\",\"Expiration\":\"2020-01-20T22:50:00+00:00\"}"
+	aws_json_expected_output := "{\"Version\":1,\"AccessKeyId\":\"someawsaccesskey\",\"SecretAccessKey\":\"somesecretkey\",\"SessionToken\":\"somesessiontoken\",\"Expiration\":\"2020-01-20T22:50:00Z\"}"
 
 	json, err := CredentialsToCredentialProcess(aws_creds)
 	assert.Empty(t, err)