firespring_dev_commands 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f226b6a68359f106c098bb36e5904e0cd0000452efe9f865c8db1cb272c44f3
-  data.tar.gz: 4f2e2cfe51f2da74ad2d2d3af0cf1ae7cb293878081ea918098508bba6bcbb61
+  metadata.gz: bc0c3856d6d9cce9b429f158ace60d901d373a5ea8067645285e8a3a21bc3d5b
+  data.tar.gz: c280047c0fc07d28a2aadfb7f554c19c3ddb80957d875988a67885d2222e83ae
 SHA512:
-  metadata.gz: 8b0bf1baed137fa76c7c2970a4c4f5133c334b5f56dea14b6ef886664a77200232980d6461a56750e716c40198fb0517914c1e9e84664523598de1354d59730e
-  data.tar.gz: 2feb5e0133dcdc77eec4031d724f4c07a0d30e51f05e91aa62200b3a0e386efe41b84b1ccafe472648f77fbf9889b4c185fb65884345c5cff81a01b1c1163b23
+  metadata.gz: f7f7b2a1723ca77b297f4d252f178958e2841ecc665613863cfbb3b20c120dcfad3aa6f96c036f8404ad1f6fb188b22182d9d5f961922de0b0f12d1d7c957332
+  data.tar.gz: d4f65836fe4afddbe6b97a39f5df1bc01e38e6b394bb8763751bfd8a373cbdfae0ad4f96cf744aed5543d783f78f5d283b556d4d1567dd2532d9e1bf671f3979

data/lib/firespring_dev_commands/aws/account.rb

@@ -10,7 +10,7 @@ module Dev
       # Yields that config object to any given block
       # Returns the resulting config object
       def self.config
-        @config ||= Config.new({default_login_role_name: Dev::Aws::DEFAULT_LOGIN_ROLE_NAME})
+        @config ||= Config.new(default_login_role_name: Dev::Aws::DEFAULT_LOGIN_ROLE_NAME)
         yield(@config) if block_given?
         @config
       end
@@ -23,6 +23,10 @@ module Dev
       # The name of the file containing the Aws settings
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/config".freeze
 
+      def self.config_ini
+        IniFile.new(filename: CONFIG_FILE, default: 'default')
+      end
+
       # TODO: registry is deprecated and should be removed on the next major release
       attr_accessor :root, :children, :default, :registry, :ecr_registry_ids
 
@@ -75,7 +79,7 @@ module Dev
         puts 'Configuring default login values'
 
         # Write region and mfa serial to config file
-        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+        cfgini = self.class.config_ini
         defaultini = cfgini['default']
 
         region_default = defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
@@ -101,7 +105,7 @@ module Dev
       # Setup Aws account specific settings
       def setup!(account)
         # Run base setup if it doesn't exist
-        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE)
+        Rake::Task['aws:configure:default'].invoke unless File.exist?(CONFIG_FILE) && self.class.config_ini.has_section?('default')
 
         puts
         puts "Configuring #{account} login values"
@@ -115,7 +119,7 @@ module Dev
         raise 'Configure default account settings first (rake aws:configure:default)' unless File.exist?(CONFIG_FILE)
 
         # Parse the ini file and load values
-        cfgini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        cfgini = self.class.config_ini
         defaultini = cfgini['default']
         profileini = cfgini["profile #{account}"]
 
@@ -124,13 +128,21 @@ module Dev
         region_default = profileini['region'] || defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
         profileini['region'] = Dev::Common.new.ask('Default region name', region_default)
 
-        # NOTE: We had an old config for "role_arn" which included the entire arn. We deprecated that config since
-        #       it made it much more difficult to switch between different accounts.
-        role_name_default = profileini['role_name'] || profileini['role_arn']&.split(%r{role/})&.last || self.class.config.default_login_role_name
-        profileini['role_name'] = Dev::Common.new.ask('Default role name', role_name_default)
-        # TODO: role_arn is deprecated. Eventually, we should delete the role_arn entry from the config. Leaving it for now
+        # NOTE: Turns out the role_arn is needed by the aws cli so we are changing directions here. Eventually we should remove the role_name
+        #       from the ini files and only store the role arn. However we need to still keep the functinoality so that the user is only asked
+        #       for the role name - not the entire arn
+        role_name_default = if profileini['role_name']
+                              profileini['role_name']
+                            elsif profileini['role_arn']
+                              profileini['role_arn']&.split(%r{role/})&.last
+                            else
+                              self.class.config.default_login_role_name
+                            end
+        role_name = Dev::Common.new.ask('Default role name', role_name_default)
+        profileini['role_arn'] = "arn:aws:iam::#{account}:role/#{role_name}"
+        # TODO: role_name is deprecated. Eventually, we should delete the role_name entry from the config. Leaving it for now
         #       because some projects may be using older versions of the dev_commands library
-        # profileini.delete('role_arn')
+        # profileini.delete('role_name')
 
         cfgini.write
       end

data/lib/firespring_dev_commands/aws/credentials.rb

@@ -11,6 +11,10 @@ module Dev
       # The local file where temporary credentials are stored
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/credentials".freeze
 
+      def self.config_ini
+        IniFile.new(filename: CONFIG_FILE, default: 'default')
+      end
+
       # The account the profile is currently logged in to
       def logged_in_account
         ::Aws::STS::Client.new.get_caller_identity.account
@@ -72,7 +76,7 @@ module Dev
         puts 'Configuring default credential values'
 
         # Write access key / secret key in the credentials file
-        credini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/credentials", default: 'default')
+        credini = self.class.config_ini
         defaultini = credini['default']
 
         access_key_default = defaultini['aws_access_key_id']
@@ -87,7 +91,7 @@ module Dev
       # Write Aws account specific settings to the credentials file
       def write!(account, creds)
         # Write access key / secret key / session token in the credentials file
-        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        credini = self.class.config_ini
         defaultini = credini[account]
 
         defaultini['aws_access_key_id'] = creds.access_key_id
@@ -132,7 +136,7 @@ module Dev
         return unless File.exist?(CONFIG_FILE)
 
         # Otherwise load access key / secret key / session token from the credentials file into the environment
-        credini = IniFile.new(filename: CONFIG_FILE, default: 'default')
+        credini = self.class.config_ini
         profile_credentials = credini[Dev::Aws::Profile.new.current]
         return unless profile_credentials
 

data/lib/firespring_dev_commands/aws/login.rb

@@ -42,9 +42,11 @@ module Dev
         serial = "arn:aws:iam::#{Dev::Aws::Account.new.root.id}:mfa/#{serial}" if serial
         serial ||= profileini['mfa_serial'] || defaultini['mfa_serial']
 
-        role = profileini['role_name'] || defaultini['role_name']
-        role = "arn:aws:iam::#{account}:role/#{role}" if role
-        role ||= profileini['role_arn'] || defaultini['role_arn']
+        role = profileini['role_arn'] || defaultini['role_arn']
+        # NOTE: We supported role name for a period of time but we are switching back to role_arn.
+        #       Leaving this here for a period of time until it can be deprecated
+        role ||= "arn:aws:iam::#{account}:role/#{profileini['role_name'] || defaultini['role_name']}"
+        # TODO: role_name is deprecated. Eventually, we should remove the above line
 
         session_name = profileini['role_session_name'] || defaultini['role_session_name']
         session_duration = profileini['session_duration'] || defaultini['session_duration']
@@ -72,10 +74,10 @@ module Dev
       # Returns the config ini file
       # Runs the setup for our current account if it's not already setup
       def setup_cfgini(account)
-        cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+        cfgini = Dev::Aws::Account.config_ini
         unless cfgini.has_section?("profile #{account}")
           Dev::Aws::Account.new.write!(account)
-          cfgini = IniFile.new(filename: "#{Dev::Aws::CONFIG_DIR}/config", default: 'default')
+          cfgini = Dev::Aws::Account.config_ini
         end
         cfgini
       end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '2.0.5'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport