firespring_dev_commands 1.5.0.pre.alpha.1 → 1.5.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3652c102b7a6ec3395c7b524db518655b574a6050d8f740f2c20daedf63aed
-  data.tar.gz: 162e4aa151f14b901b7fcfea1c2b8e3cb1b20ab3de2d9102d00a35b0754e5773
+  metadata.gz: c00aad2781f73b860860758fa26f0976413ec9917c472a702e4dc93caeffe725
+  data.tar.gz: bad9dce8ab37b9e3a71ba479f05fd23405c0ab91abad53ef1f57f2b5f7daf073
 SHA512:
-  metadata.gz: 724282fb3154de07595863a899f29b1ffeea0e5fda1d3d2aa5fb31fd3e17f57bfbc0e9baaf534c4a0e259b8b95b051ba05b6d7072d1cdd4bc544799f665e519a
-  data.tar.gz: b60bf002f396a052f0814838940dcb441d95c263a4001bdbdcd18878d0d1a8ee0b7f1a8b5b4026ce43664a92666ab93b23a27e0d9d765669f827171c377d4d3d
+  metadata.gz: 1818bc0df7bc48e264a95b4a091e0b02776ae9e5fb3f56a06b6e2d39d0bf6aa9ca3275a9af6aba06bd62a139c999951a18fd9859a41601910d6bc986680be4bc
+  data.tar.gz: 3259dd964ab887e049166cba3552e3cdc87f9b9e67170acc48363daf3f1495543fd691dbd5be51c63d3cbe44c15ecebbc784f5f4df826fcec452bbbb06caedc8

data/lib/firespring_dev_commands/aws/account.rb

@@ -3,7 +3,8 @@ module Dev
     # Class containing useful methods for interacting with the Aws account
     class Account
       # Config object for setting top level Aws account config options
-      Config = Struct.new(:root, :children, :default, :registry, :default_login_role_name)
+      # TODO: registry is deprecated and should be removed on the next major release
+      Config = Struct.new(:root, :children, :default, :registry, :ecr_registry_ids, :login_to_account_ecr_registry, :default_login_role_name)
 
       # Instantiates a new top level config object if one hasn't already been created
       # Yields that config object to any given block
@@ -22,7 +23,8 @@ module Dev
       # The name of the file containing the Aws settings
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/config".freeze
 
-      attr_accessor :root, :children, :default, :registry
+      # TODO: registry is deprecated and should be removed on the next major release
+      attr_accessor :root, :children, :default, :registry, :ecr_registry_ids
 
       # Instantiate an account object
       # Requires that root account and at least one child account have been configured
@@ -35,7 +37,13 @@ module Dev
         @root = self.class.config.root
         @children = self.class.config.children
         @default = self.class.config.default
-        @registry = self.class.config.registry
+
+        # Create the ecr registry list based off several possible configuration values
+        @ecr_registry_ids = [self.class.config.registry]
+        @ecr_registry_ids << Dev::Aws::Profile.new.current if self.class.config.login_to_account_ecr_registry
+        @ecr_registry_ids.concat(Array(self.class.config.ecr_registry_ids))
+        @ecr_registry_ids = @ecr_registry_ids.flatten.compact.reject(&:empty?).uniq
+        @registry = @ecr_registry_ids.first
       end
 
       # Returns all configured account information objects
@@ -55,7 +63,7 @@ module Dev
 
       # Look up the account name for the given account id
       def name_by_account(account)
-        all.find { |it| it.id == account }.name
+        all.find { |it| it.id == account }&.name
       end
 
       # Setup base Aws settings

data/lib/firespring_dev_commands/aws/credentials.rb

@@ -16,6 +16,16 @@ module Dev
         ::Aws::STS::Client.new.get_caller_identity.account
       end
 
+      # The arn of the currently logged in identity
+      def logged_in_arn
+        ::Aws::STS::Client.new.get_caller_identity.arn
+      end
+
+      # The role the current identity is using
+      def logged_in_role
+        logged_in_arn.split(%r{/})[1]
+      end
+
       # The region associated with the current login
       def logged_in_region
         ::Aws::STS::Client.new.send(:config).region

data/lib/firespring_dev_commands/aws/login.rb

@@ -8,7 +8,7 @@ module Dev
     class Login
       # Main interface for logging in to an AWS account
       # If an account is not specified the user is given an account selection menu
-      # If an account registry has been configured, the user is also logged in to the docker registry
+      # If account registries have been configured, the user is also logged in to the docker registries
       def login!(account = nil)
         # If more than one child account has been configured, have the user select the account they want to log in to
         account ||= Dev::Aws::Account.new.select
@@ -22,8 +22,8 @@ module Dev
         # Load credentials into the ENV for subprocesses
         Dev::Aws::Credentials.new.export!
 
-        # Login in to the docker registry if the user has configured one
-        registry_login! if Dev::Aws::Account.new.registry
+        # Login in to all configured docker registries
+        registry_logins!
       end
 
       # Authorize your local credentials
@@ -82,7 +82,18 @@ module Dev
 
       # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
-      def registry_login!(registry_id: Dev::Aws::Account.new.registry, region: nil)
+      def registry_logins!(registry_ids: Dev::Aws::Account.new.ecr_registry_ids, region: nil)
+        region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
+        return if registry_ids.empty?
+
+        puts
+        registry_ids.each { |id| registry_login!(registry_id: id, region: region) }
+        puts
+      end
+
+      # Authroizes the docker cli to pull/push images from the Aws container registry (e.g. if docker compose needs to pull an image)
+      # Authroizes the docker ruby library to pull/push images from the Aws container registry
+      def registry_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         raise 'registry_id is required' if registry_id.to_s.strip.empty?
         raise 'region is required' if region.to_s.strip.empty?
@@ -98,26 +109,26 @@ module Dev
       # Authroizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
-      def docker_login!(registry_id: Dev::Aws::Account.new.registry, region: nil)
+      def docker_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         warn '[DEPRECATION] `Dev::Aws::Login#docker_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
         docker_cli_login!(registry: "#{registry_id}.dkr.ecr.#{region}.amazonaws.com", region: region)
+        puts
       end
 
       # Authroizes the docker cli to pull/push images from the Aws container registry
       # (e.g. if docker compose needs to pull an image)
       private def docker_cli_login!(registry:, region:)
-        print('  Logging in to ECR in docker... ')
+        print("  Logging in to #{registry} in docker... ")
         login_cmd = "aws --profile=#{Dev::Aws::Profile.new.current} ecr --region=#{region} get-login-password"
         login_cmd << ' | '
         login_cmd << "docker login --password-stdin --username AWS #{registry}"
         Dev::Common.new.run_command([login_cmd])
-        puts
       end
 
       # Authroizes the docker ruby library to pull/push images from the Aws container registry
       # @deprecated Please use {Dev::Aws::Login#registry_login!} instead
-      def ecr_login!(registry_id: Dev::Aws::Account.new.registry, region: nil)
+      def ecr_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, region: nil)
         region ||= Dev::Aws::Credentials.new.logged_in_region || Dev::Aws::DEFAULT_REGION
         warn '[DEPRECATION] `Dev::Aws::Login#ecr_login!` is deprecated. Please use `Dev::Aws::Login#registry_login!` instead.'
         docker_lib_login!(registry_id: registry_id, region: region)

data/lib/firespring_dev_commands/aws/profile.rb

@@ -33,8 +33,10 @@ module Dev
       # Print the profile info for the current account
       def info
         Dev::Aws::Credentials.new.export!
+        current_role = Dev::Aws::Credentials.new.logged_in_role
+        current_account_name = Dev::Aws::Account.new.name_by_account(current)
         puts
-        puts "  Currently logged in to the #{Dev::Aws::Account.new.name_by_account(current)} (#{current})".light_yellow
+        puts "  Currently logged in as #{current_role} in the #{current_account_name} (#{current}) account".light_yellow
         puts
         puts '  To use this profile in your local aws cli, you must either pass the profile as a command line argument ' \
              'or export the corresponding aws variable:'.light_white

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 = '1.5.0.pre.alpha.1'.freeze
+    VERSION = '1.5.0.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.alpha.1
+  version: 1.5.0.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport