firespring_dev_commands 1.4.2 → 1.4.3.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50324d3a1a3e2eb483d989c25c3621c9e8daa47218ad9fabdb0ca06a0ba26177
-  data.tar.gz: 5365e89808d4ae62dfc9294858a77518f928c32493c6697aae53b4b70f824fd7
+  metadata.gz: cb403fd1ae12470807a778fbb3314f74b80a5f7d7c8fe0cf1ac28bab1d56d837
+  data.tar.gz: ff65c1e27fe4f4d63f3d31f5817b552d5dd4c930b615fadb0403e178e30fa597
 SHA512:
-  metadata.gz: 791680ecd764ff90a500ba413b70a667eb99e5e2497193b87851d8ba0618c341889ade9f6026cba8f31216970618b8d6a86b8b18f280edf5242b2dec554fbaf9
-  data.tar.gz: 10215141fb15130d6850629acb9e2cf7f95f2f2f2082fdd76e823cb4384f7fc8d320271afd49d19eb5e57fef7b92fd741df7f73cea8488a3d0c2b187e38885fd
+  metadata.gz: 864a3659c6164459f8623f55e9d995cf77c09d03da85fe23c1b6e9f45e7dde3fe0982891b6e662b0b3942695a12f98d4ba4abe71eb3131e3f9898fa5afa146bd
+  data.tar.gz: 323ed9adeba33220e791ef078c0e3c4390ed93cdc262b3c3aa18e9b103099bf2f57e727e1b1e412773f3c54cd734fda8b1304953b5bdc2bd1350ba4fdf7a58a4

data/lib/firespring_dev_commands/aws/account.rb

@@ -3,7 +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
-      Config = Struct.new(:root, :children, :default, :registry)
+      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
       # Yields that config object to any given block
@@ -22,7 +22,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, :ecr_registry_ids
 
       # Instantiate an account object
       # Requires that root account and at least one child account have been configured
@@ -35,7 +35,12 @@ 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 = Array(self.class.config.ecr_registry_ids)
+        @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 = @ecr_registry_ids.flatten.compact.reject(&:empty?).uniq
       end
 
       # Returns all configured account information objects
@@ -55,7 +60,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,16 +16,6 @@ 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
@@ -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.ecr_registry_ids, 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/aws/profile.rb

@@ -33,10 +33,8 @@ 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 as #{current_role} in the #{current_account_name} (#{current}) account".light_yellow
+        puts "  Currently logged in to the #{Dev::Aws::Account.new.name_by_account(current)} (#{current})".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
@@ -52,15 +50,6 @@ module Dev
         puts "    export AWS_SESSION_TOKEN=#{ENV.fetch('AWS_SESSION_TOKEN', nil)}"
         puts
       end
-
-      # Print the export commands for the current credentials
-      def export_info
-        Dev::Aws::Credentials.new.export!
-        puts "export AWS_DEFAULT_REGION=#{ENV.fetch('AWS_DEFAULT_REGION', nil)}"
-        puts "export AWS_ACCESS_KEY_ID=#{ENV.fetch('AWS_ACCESS_KEY_ID', nil)}"
-        puts "export AWS_SECRET_ACCESS_KEY=#{ENV.fetch('AWS_SECRET_ACCESS_KEY', nil)}"
-        puts "export AWS_SESSION_TOKEN=#{ENV.fetch('AWS_SESSION_TOKEN', nil)}"
-      end
     end
   end
 end

data/lib/firespring_dev_commands/templates/aws.rb

@@ -31,20 +31,6 @@ module Dev
             task profile: %w(init) do
               Dev::Aws::Profile.new.info
             end
-
-            namespace :profile do
-              desc 'Return the commands to export your AWS credentials into your environment'
-              task :export do
-                # Turn off all logging except for errors
-                LOG.level = Logger::ERROR
-
-                # Run the init
-                Rake::Task[:init].invoke
-
-                # Print the export info
-                Dev::Aws::Profile.new.export_info
-              end
-            end
           end
         end
       end

data/lib/firespring_dev_commands/templates/base_interface.rb

@@ -118,9 +118,9 @@ DEV_COMMANDS_TOP_LEVEL.instance_eval do
 
   # Define an empty _pre_down_hooks handler which can be overridden by the user
   task :_pre_down_hooks do
-    # The user may define custom _pre_down_hooks tasks to add any pre-down actions the down process
-    # Define this process in the appropriate namespace to add them only to a specific down
-    #   In that case it is recommended that you call the base _pre_down_hooks as a dependency of that task
+    # The user may define custom _pre_logs_hooks tasks to add any pre-logs actions the logs process
+    # Define this process in the appropriate namespace to add them only to a specific logs
+    #   In that case it is recommended that you call the base _pre_logs_hooks as a dependency of that task
   end
 
   # Define an empty _post_down_hooks handler which can be overridden by the user
@@ -130,20 +130,6 @@ DEV_COMMANDS_TOP_LEVEL.instance_eval do
     #   In that case it is recommended that you call the base _post_down_hooks as a dependency of that task
   end
 
-  # Define an empty _pre_stop_hooks handler which can be overridden by the user
-  task :_pre_stop_hooks do
-    # The user may define custom _pre_stop_hooks tasks to add any pre-stop actions the stop process
-    # Define this process in the appropriate namespace to add them only to a specific stop
-    #   In that case it is recommended that you call the base _pre_stop_hooks as a dependency of that task
-  end
-
-  # Define an empty _post_stop_hooks handler which can be overridden by the user
-  task :_post_stop_hooks do
-    # The user may define custom _post_stop_hooks tasks to add any post-stop actions the stop process
-    # Define this process in the appropriate namespace to add them only to a specific stop
-    #   In that case it is recommended that you call the base _post_stop_hooks as a dependency of that task
-  end
-
   # Define an empty _pre_reload_hooks handler which can be overridden by the user
   task :_pre_reload_hooks do
     # The user may define custom _pre_reload_hooks tasks to add any pre-reload actions the reload process

data/lib/firespring_dev_commands/templates/docker/application.rb

@@ -108,7 +108,7 @@ module Dev
             namespace application do
               return if exclude.include?(:down)
 
-              desc "Shut down the #{application} container and remove associated resources"
+              desc "Stops the #{application} container"
               task down: %w(init_docker _pre_down_hooks) do
                 LOG.debug "In #{application} down"
 
@@ -125,25 +125,6 @@ module Dev
           end
         end
 
-        # Create the rake task which runs a docker compose stop for the application name
-        def create_stop_task!
-          application = @name
-          exclude = @exclude
-
-          DEV_COMMANDS_TOP_LEVEL.instance_eval do
-            namespace application do
-              return if exclude.include?(:stop)
-
-              desc "Stops the #{application} container"
-              task stop: %w(init_docker _pre_stop_hooks) do
-                LOG.debug "In #{application} stop"
-                Dev::Docker::Compose.new(services: [application]).stop
-                Rake::Task[:_post_stop_hooks].execute
-              end
-            end
-          end
-        end
-
         # Create the rake task which stops, cleans, and starts the application
         def create_reload_task!
           application = @name

data/lib/firespring_dev_commands/templates/docker/default.rb

@@ -76,30 +76,6 @@ module Dev
           end
         end
 
-        # Create the rake task which stops all running containers
-        def create_stop_task!
-          exclude = @exclude
-
-          DEV_COMMANDS_TOP_LEVEL.instance_eval do
-            return if exclude.include?(:stop)
-
-            desc 'Stops all running containers'
-            task stop: %w(init_docker _pre_stop_hooks) do
-              LOG.debug('In base stop')
-
-              containers = ::Docker::Container.all(filters: {status: %w(restarting running)}.to_json)
-              containers.each do |container|
-                next if container&.info&.dig('Names')&.any? { |name| name.start_with?('/windows_tcp') }
-
-                LOG.info "Stopping container #{container.id[0, 12]}"
-                container.stop(timeout: 120)
-              end
-
-              Rake::Task[:_post_stop_hooks].execute
-            end
-          end
-        end
-
         # Create the rake task which runs a docker compose down followed by an up
         def create_reload_task!
           exclude = @exclude

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.1'.freeze
   end
 end

metadata

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