Merge pull request #172 from Cox-Automotive/develop

webbbarker · web-flow · commit bdc6ca4542e8 · 2020-11-11T08:49:49.000-05:00
Merge develop to master
diff --git a/changelog.txt b/changelog.txt
@@ -1,10 +1,9 @@
-★ Release Notes: 2020-10-20 ★
+★ Release Notes: 2020-11-10 ★
 ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-→ Bumps alks-node version which includes better error handling for our internal ALKS calls
-→ Updates syntax to be up to date with ES6
+→ Corrects a bug with date formatting for the AWS output type
 
 → Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 
diff --git a/lib/keys.js b/lib/keys.js
@@ -268,7 +268,7 @@ exports.getKeyOutput = function(format, key, profile, force){
             'AccessKeyId': key.accessKey,
             'SecretAccessKey': key.secretKey,
             'SessionToken': key.sessionToken,
-            'Expiration': keyExpires
+            'Expiration': moment(key.expires).toISOString()
         });
     }
     else{
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alks",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "CLI for working with ALKS",
   "main": "bin/alks",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ exports.getKeyOutput = function(format, key, profile, force){`
`268`	`268`	`'AccessKeyId': key.accessKey,`
`269`	`269`	`'SecretAccessKey': key.secretKey,`
`270`	`270`	`'SessionToken': key.sessionToken,`
`271`		`- 'Expiration': keyExpires`
	`271`	`+ 'Expiration': moment(key.expires).toISOString()`
`272`	`272`	`});`
`273`	`273`	`}`
`274`	`274`	`else{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "alks",`
`3`		`- "version": "3.1.1",`
	`3`	`+ "version": "3.1.2",`
`4`	`4`	`"description": "CLI for working with ALKS",`
`5`	`5`	`"main": "bin/alks",`
`6`	`6`	`"scripts": {`