firespring_dev_commands 1.4.3.pre.alpha.3 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 764aab3927a5dc24b6474ba35af2e54f7b97dfa93ac54ae8187989ff954cfbbe
-  data.tar.gz: 33c04cd996134dcb26fa12358b5ec3ab436dcaa07f5db69f0f96d8b13fb1c5e4
+  metadata.gz: 0c6ea353daa4f8fc8157720f6023afdfc136444f029effffc346324cef4de3bf
+  data.tar.gz: 7f1d10ee1fa396ad27427d6d6acebfe9f8449680179945c227ea29d6d63b6600
 SHA512:
-  metadata.gz: 572c3b804cf02d5d7e4a62060a4a779b67843a14047a36f207b3e1198868326eb1379b3cc44ee0160c714ef8bbdfaf14e3c76ccf58e75cf88784415df4595ea5
-  data.tar.gz: f91c0898808c71729efe61cb841eec2901824f7793d49a50fe42bee80b2accb42b415baf20659e52e95850b4a9fae6355c5f82b70f02a7fa4e19dcd12d28ba5f
+  metadata.gz: 7aa966411494e77d23fd21f908950347b4ee2d67ccc8041f332071700a20c29fca6396b73ec32fe5bc0177ee9b14bd65edc072737e2b9372490a9233e47bb2a4
+  data.tar.gz: ead151951a9e1fff0d7b01397c7ee5d309f99f9dca13ca66ebf2137ba8ba025374bfafd943286367210e3e2978bf921907321c55e48e7fcbacc0784d7586b838

data/lib/firespring_dev_commands/aws/account.rb

@@ -3,6 +3,7 @@ module Dev
     # Class containing useful methods for interacting with the Aws account
     class Account
       # Config object for setting top level Aws account config options
+      # 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)
 
       # Instantiates a new top level config object if one hasn't already been created
@@ -22,6 +23,7 @@ module Dev
       # The name of the file containing the Aws settings
       CONFIG_FILE = "#{Dev::Aws::CONFIG_DIR}/config".freeze
 
+      # 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
@@ -37,10 +39,11 @@ module Dev
         @default = self.class.config.default
 
         # Create the ecr registry list based off several possible configuration values
-        @ecr_registry_ids = Array(self.class.config.ecr_registry_ids)
-        @ecr_registry_ids << self.class.config.registry
+        @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

data/lib/firespring_dev_commands/aws/login.rb

@@ -77,7 +77,7 @@ 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.ecr_registry_ids.last, region: Dev::Aws::DEFAULT_REGION)
+      def registry_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, 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?
 
@@ -92,7 +92,7 @@ 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.ecr_registry_ids.last, region: Dev::Aws::DEFAULT_REGION)
+      def docker_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, 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
@@ -110,7 +110,7 @@ module Dev
 
       # 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.ecr_registry_ids.last, region: Dev::Aws::DEFAULT_REGION)
+      def ecr_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.first, 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)
       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 = '1.4.3.pre.alpha.3'.freeze
+    VERSION = '1.4.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 1.4.3.pre.alpha.3
+  version: 1.4.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: