Merge pull request #67 from Cox-Automotive/develop

2.11.1
Cox-Automotive · Jun 20, 2017 · 7e7487d · 7e7487d
2 parents 574dd5e + 471866e
commit 7e7487d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/bin/alks-iam-createrole b/bin/alks-iam-createrole
@@ -23,6 +23,7 @@ program
     .option('-d, --defaultPolicies', 'include default policies, default: false', false)
     .option('-a, --account [alksAccount]', 'alks account to use')
     .option('-r, --role [alksRole]', 'alks role to use')
+    .option('-F, --favorites', 'filters favorite accounts')
     .option('-v, --verbose', 'be verbose')
     .parse(process.argv);
 
@@ -31,7 +32,8 @@ var ROLE_NAME_REGEX = /^[a-zA-Z0-9!@+=._-]+$/g,
     roleType        = program.roletype,
     incDefPolicies  = program.defaultPolicies,
     alksAccount     = program.account,
-    alksRole        = program.role;
+    alksRole        = program.role,
+    filterFaves     = program.favorites || false;
 
 utils.log(program, logger, 'validating role name: ' + roleName);
 if(_.isEmpty(roleName) || !ROLE_NAME_REGEX.test(roleName)){
@@ -48,7 +50,7 @@ if(!_.isUndefined(alksAccount) && _.isUndefined(alksRole)){
     alksRole = utils.tryToExtractRole(alksAccount);
 }
 
-Iam.getIAMKey(program, logger, alksAccount, alksRole, false, function(err, key, developer, password){
+Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, function(err, key, developer, password){
     if(err){
         return utils.errorAndExit(err);
     }

diff --git a/bin/alks-iam-deleterole b/bin/alks-iam-deleterole
@@ -21,19 +21,21 @@ program
     .option('-n, --rolename [rolename]', 'the name of the role to delete')
     .option('-a, --account [alksAccount]', 'alks account to use')
     .option('-r, --role [alksRole]', 'alks role to use')
+    .option('-F, --favorites', 'filters favorite accounts')
     .option('-v, --verbose', 'be verbose')
     .parse(process.argv);
 
 var roleName        = program.rolename,
     alksAccount     = program.account,
+    filterFaves     = program.favorites || false,
     alksRole        = program.role;
 
 utils.log(program, logger, 'validating role name: ' + roleName);
 if(_.isEmpty(roleName)){
     utils.errorAndExit('The role name must be provided.');
 }
 
-Iam.getIAMKey(program, logger, alksAccount, alksRole, false, function(err, key, developer, password){
+Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, function(err, key, developer, password){
     if(err){
         return utils.errorAndExit(err);
     }

diff --git a/bin/alks-sessions-console b/bin/alks-sessions-console
@@ -22,6 +22,7 @@ program
     .option('-a, --account [alksAccount]', 'alks account to use')
     .option('-r, --role [alksRole]', 'alks role to use')
     .option('-i, --iam', 'create an IAM session')
+    .option('-F, --favorites', 'filters favorite accounts')
     .option('-p, --password [password]', 'my password')
     .option('-N, --newSession', 'forces a new session to be generated')
     .option('-d, --default', 'uses your default account from "alks developer configure"')
@@ -33,6 +34,7 @@ var alksAccount       = program.account,
     forceNewSession   = program.newSession,
     useDefaultAcct    = program.default,
     output            = program.output,
+    filterFaves       = program.favorites || false,
     logger            = 'sessions-console';
 
 if(!_.isUndefined(alksAccount) && _.isUndefined(alksRole)){
@@ -42,10 +44,10 @@ if(!_.isUndefined(alksAccount) && _.isUndefined(alksRole)){
 
 var execute = function(){
     if(_.isUndefined(program.iam)){
-        Sessions.getSessionKey(program, logger, alksAccount, alksRole, false, forceNewSession, onComplete);
+        Sessions.getSessionKey(program, logger, alksAccount, alksRole, false, forceNewSession, filterFaves, onComplete);
     }
     else{
-        Iam.getIAMKey(program, logger, alksAccount, alksRole, forceNewSession, onComplete);
+        Iam.getIAMKey(program, logger, alksAccount, alksRole, forceNewSession, filterFaves, onComplete);
     }
 };
 

diff --git a/changelog.txt b/changelog.txt
@@ -6,6 +6,9 @@ Thanks for upgrading to the latest version of the ALKS CLI!
 → You can now set favorite accounts: `alks developer favorites`
 → `alks sessions open` now floats your favorites to the top
 → `alks sessions open` now supports `-F` to filter your favorites
+→ `alks sessions console` now supports `-F` to filter your favorites
+→ `alks iam createrole` now supports `-F` to filter your favorites
+→ `alks iam deleterole` now supports `-F` to filter your favorites
 → Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 
 ☁☁☁☁☁☁  Happy Clouding! ☁☁☁☁☁☁
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alks",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "description": "CLI for working with ALKS",
   "main": "bin/alks",
   "scripts": {