Skip to content

Commit ea7db52

Browse files
author
Peter Benjamin
committed
Rename master to ctrl. Prettify output.
1 parent 447e605 commit ea7db52

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

source/lib/auth.rb

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
class Auth
66

77
def self.get_mfa_code
8-
print "Enter MFA: "
8+
print Rainbow("Enter MFA: ").yellow
99
STDOUT.flush
1010
STDIN.gets(7).chomp
1111
end
1212

1313
def self.get_creds(username, defaults)
1414
region = defaults.fetch(:region)
15-
master = defaults.fetch(:master)
16-
master_account_number = master.fetch(:account_number)
17-
master_role_prefix = master.fetch(:role_prefix)
18-
master_role_name = master.fetch(:role_name)
15+
ctrl = defaults.fetch(:ctrl)
16+
ctrl_account_number = ctrl.fetch(:account_number)
17+
ctrl_role_prefix = ctrl.fetch(:role_prefix)
18+
ctrl_role_name = ctrl.fetch(:role_name)
1919

2020
target = defaults.fetch(:target)
2121
target_account_number = target.fetch(:account_number)
2222
target_role_prefix = target.fetch(:role_prefix)
2323
target_role_name = target.fetch(:role_name)
24-
25-
serial_number = "arn:aws:iam::#{master_account_number}:mfa/#{username}"
26-
puts "Logging into #{target.fetch(:label).upcase} using MFA: #{serial_number} (#{region})"
27-
role_arn = "arn:aws:iam::#{master_account_number}:role#{master_role_prefix}#{master_role_name}"
24+
target_label = target.fetch(:label)
25+
serial_number = "arn:aws:iam::#{ctrl_account_number}:mfa/#{username}"
26+
puts "Logging into #{Rainbow(target_label.upcase).yellow} using MFA: #{serial_number} (#{region})"
27+
role_arn = "arn:aws:iam::#{ctrl_account_number}:role#{ctrl_role_prefix}#{ctrl_role_name}"
2828
session_name = username[0..31]
2929

3030
sts_client = Aws::STS::Client.new(region: region)
@@ -53,7 +53,12 @@ def self.login(options, defaults, plane)
5353
Aws.config[:credentials] = Aws::SharedCredentials.new(profile_name: profile_name)
5454
creds = get_creds(options.fetch(:username), defaults)
5555
rescue KeyError => e
56-
raise "Error parsing #{CONFIG_FILE}, (#{e.message}), please ensure it is properly formatted"
56+
error = Rainbow("Error parsing #{CONFIG_FILE}, (#{e.message}), please ensure it is properly formatted").red
57+
raise error
58+
rescue => err
59+
error = Rainbow(err.message).red
60+
raise error
61+
exit
5762
end
5863
# now save to yaml
5964
File.open(auth_file, 'w') do |f|

0 commit comments

Comments
 (0)