firespring_dev_commands 1.4.2 → 1.4.3.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50324d3a1a3e2eb483d989c25c3621c9e8daa47218ad9fabdb0ca06a0ba26177
-  data.tar.gz: 5365e89808d4ae62dfc9294858a77518f928c32493c6697aae53b4b70f824fd7
+  metadata.gz: 6202dfc1befb402bba5013a33cc9fb85181aa1ba704eed0cae6b1fc1a1a14a89
+  data.tar.gz: 5a83b16623b5f0d0ebb822dcd4bf3bc4a171b349a76c7e53a489c346a50e920e
 SHA512:
-  metadata.gz: 791680ecd764ff90a500ba413b70a667eb99e5e2497193b87851d8ba0618c341889ade9f6026cba8f31216970618b8d6a86b8b18f280edf5242b2dec554fbaf9
-  data.tar.gz: 10215141fb15130d6850629acb9e2cf7f95f2f2f2082fdd76e823cb4384f7fc8d320271afd49d19eb5e57fef7b92fd741df7f73cea8488a3d0c2b187e38885fd
+  metadata.gz: ee53711a91212ce350041b15b338230bd1ca7c314fc165b154ee73e3997329194184dea206b6ebfe222672e2705e1de9a625c3628bc14a2c15ec20a7d9cb24f7
+  data.tar.gz: 79fe039edb3293f8b5dd4a507d8d4639b34964c1e58614497517c5d37631bc8e0e6a6f6f7af8aa9166f569ca627be54941571e07c621ad45ac2a9f75f0d78f80

data/lib/firespring_dev_commands/aws/account.rb

@@ -3,7 +3,11 @@ 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)
+
+      # TODO: Can we add a "login_to_account_registry?
+      # TODO: And then add additional_registries?
+
+      Config = Struct.new(:root, :children, :default, :registry, :registries)
 
       # Instantiates a new top level config object if one hasn't already been created
       # Yields that config object to any given block
@@ -22,7 +26,7 @@ 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
+      attr_accessor :root, :children, :default, :registry, :registries
 
       # Instantiate an account object
       # Requires that root account and at least one child account have been configured
@@ -35,7 +39,7 @@ module Dev
         @root = self.class.config.root
         @children = self.class.config.children
         @default = self.class.config.default
-        @registry = self.class.config.registry
+        @registries = (Array(self.class.config.registries) << self.class.config.registry).compact.uniq
       end
 
       # Returns all configured account information objects

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
@@ -67,7 +67,17 @@ 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: Dev::Aws::DEFAULT_REGION)
+      def registry_logins!(registry_ids: Dev::Aws::Account.new.registries, 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.registries, 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?
 
@@ -85,17 +95,17 @@ module Dev
       def docker_login!(registry_id: Dev::Aws::Account.new.registry, 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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: