diff --git a/README.md b/README.md index c2965abd..a8dade5c 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ Arguments: * `-a [account]` The ALKS account to use, be sure to wrap in quotes * `-r [role]` The ALKS role to use, be sure to wrap in quotes * `-i` Specifies you wish to work as an IAM/Admin user -* `-o [output]` Output format. Supports: `env`, `json`, `docker`, `creds`, `idea`, `export`, `set`, `powershell` +* `-o [output]` Output format. Supports: `env`, `json`, `docker`, `creds`, `idea`, `export`, `set`, `powershell`, `aws`, `fishshell`, `terraformenv`, `terraformarg` * `-n` If output is set to creds, use this named profile (defaults to default) * `-N` Forces a new session to be generated * `-d` Uses your default account from `alks developer configure` @@ -154,6 +154,7 @@ Output values: Arguments: * `-p [password]` Your password +* `-u [url]` Print the URL * `-a [account]` The ALKS account to use, be sure to wrap in quotes * `-r [role]` The ALKS role to use, be sure to wrap in quotes * `-i` Specifies you wish to work as an IAM/Admin user diff --git a/changelog.txt b/changelog.txt index d1ca4c34..d936fac6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,10 @@ -★ Release Notes: 2020-04-15 ★ +★ Release Notes: 2020-05-20 ★ ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡ Thanks for upgrading to the latest version of the ALKS CLI! -→ Converts a dependency to a tarball to fix breakages on install +→ Updated README.md to include `-o` and `-u` documentation +→ Normalized the "expires" field when working with sessions → Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues diff --git a/lib/keys.js b/lib/keys.js index 97a30813..f220b387 100644 --- a/lib/keys.js +++ b/lib/keys.js @@ -130,7 +130,7 @@ exports.addKey = function(accessKey, secretKey, sessionToken, alksAccount, alksR alksAccount: encrypt(alksAccount, enc), alksRole: encrypt(alksRole, enc), isIAM: isIAM, - expires: expires.getTime() + expires: expires }); db.save(function(err, data){ diff --git a/lib/sessions.js b/lib/sessions.js index 962ff78d..b718ee17 100644 --- a/lib/sessions.js +++ b/lib/sessions.js @@ -93,7 +93,7 @@ exports.getSessionKey = function(program, logger, alksAccount, alksRole, iamOnly // store session data in DB utils.log(program, logger, 'storing key: ' + JSON.stringify(key)); keys.addKey(key.accessKey, key.secretKey, key.sessionToken, - key.alksAccount, key.alksRole, key.expires.toDate(), auth, false); + key.alksAccount, key.alksRole, key.expires, auth, false); } else if(err.message.indexOf('please check API URL') !== -1){ err = new Error(utils.getBadAccountMessage()); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3d5313e8..54cbd193 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "alks", - "version": "3.0.6", + "version": "3.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 41d1c145..cc9391b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alks", - "version": "3.0.7", + "version": "3.0.8", "description": "CLI for working with ALKS", "main": "bin/alks", "scripts": {