Skip to content

Commit

Permalink
Merge pull request #140 from Cox-Automotive/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
americk0 authored Apr 17, 2020
2 parents eb6d333 + 4707e34 commit 8cbdee1
Show file tree
Hide file tree
Showing 4 changed files with 1,987 additions and 1,007 deletions.
6 changes: 3 additions & 3 deletions bin/alks-iam-createtrustrole
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if(!_.isUndefined(alksAccount) && _.isUndefined(alksRole)){
alksRole = utils.tryToExtractRole(alksAccount);
}

Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, function(err, key, developer){
Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, function(err, key, developer, auth){
if(err){
return utils.errorAndExit(err);
}
Expand All @@ -66,7 +66,7 @@ Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, functi
var data = _.extend({}, developer, key);
utils.log(program, logger, 'calling api to create trust role: ' + roleName);
delete data.userid;
alks.createIamTrustRole(data, null, roleName, roleType, trustArn, { debug: program.verbose, ua: utils.getUA() }, function(err, data){
alks.createIamTrustRole(data, auth, roleName, roleType, trustArn, { debug: program.verbose, ua: utils.getUA() }, function(err, data){
if(err){
return utils.errorAndExit(err);
}
Expand All @@ -79,4 +79,4 @@ Iam.getIAMKey(program, logger, alksAccount, alksRole, false, filterFaves, functi
utils.checkForUpdate();
Developer.trackActivity(logger);
});
});
});
6 changes: 3 additions & 3 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
★ Release Notes: 2020-02-12
★ Release Notes: 2020-04-15
≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡

Thanks for upgrading to the latest version of the ALKS CLI!

Adds support for exporting credentials to the AWS CLI
→ Fixes a minor bug with createtrustrole
Fixes warning messages when installing on MacOS
→ Fixes a bug relating to creating a trust role

→ Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues

Expand Down
Loading

0 comments on commit 8cbdee1

Please sign in to comment.