firespring_dev_commands 1.4.3.pre.alpha.1 → 1.4.3.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb403fd1ae12470807a778fbb3314f74b80a5f7d7c8fe0cf1ac28bab1d56d837
-  data.tar.gz: ff65c1e27fe4f4d63f3d31f5817b552d5dd4c930b615fadb0403e178e30fa597
+  metadata.gz: 764aab3927a5dc24b6474ba35af2e54f7b97dfa93ac54ae8187989ff954cfbbe
+  data.tar.gz: 33c04cd996134dcb26fa12358b5ec3ab436dcaa07f5db69f0f96d8b13fb1c5e4
 SHA512:
-  metadata.gz: 864a3659c6164459f8623f55e9d995cf77c09d03da85fe23c1b6e9f45e7dde3fe0982891b6e662b0b3942695a12f98d4ba4abe71eb3131e3f9898fa5afa146bd
-  data.tar.gz: 323ed9adeba33220e791ef078c0e3c4390ed93cdc262b3c3aa18e9b103099bf2f57e727e1b1e412773f3c54cd734fda8b1304953b5bdc2bd1350ba4fdf7a58a4
+  metadata.gz: 572c3b804cf02d5d7e4a62060a4a779b67843a14047a36f207b3e1198868326eb1379b3cc44ee0160c714ef8bbdfaf14e3c76ccf58e75cf88784415df4595ea5
+  data.tar.gz: f91c0898808c71729efe61cb841eec2901824f7793d49a50fe42bee80b2accb42b415baf20659e52e95850b4a9fae6355c5f82b70f02a7fa4e19dcd12d28ba5f

data/README.md

@@ -11,7 +11,7 @@ gem 'firespring_dev_commands', '~> 0.0.1'
   * This is not common
   * It is mostly used for testing local changes before the gem is released
 ```
-gem 'firespring_dev_commands', path: '/path/to/firespring/dev-commands-ruby'
+gem 'firespring_dev_commands', path: '/path/to/dev_commands'
 ```
 
 * Add the following to your Rakefile

data/lib/firespring_dev_commands/aws/account.rb

@@ -60,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
@@ -78,7 +78,7 @@ module Dev
         region_default = defaultini['region'] || ENV['AWS_DEFAULT_REGION'] || Dev::Aws::DEFAULT_REGION
         defaultini['region'] = Dev::Common.new.ask('Default region name', region_default)
 
-        mfa_default = defaultini['mfa_serial'] || ENV['AWS_MFA_ARN'] || "arn:aws:iam::#{root}:mfa/#{ENV.fetch('USERNAME', nil)}"
+        mfa_default = defaultini['mfa_serial'] || ENV['AWS_MFA_ARN'] || "arn:aws:iam::#{root.id}:mfa/#{ENV.fetch('USERNAME', nil)}"
         defaultini['mfa_serial'] = Dev::Common.new.ask('Default mfa arn', mfa_default)
 
         session_name_default = defaultini['role_session_name'] || "#{ENV.fetch('USERNAME', nil)}_cli"

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

@@ -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.registries, region: Dev::Aws::DEFAULT_REGION)
+      def registry_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.last, 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.registry, region: Dev::Aws::DEFAULT_REGION)
+      def docker_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.last, 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.registry, region: Dev::Aws::DEFAULT_REGION)
+      def ecr_login!(registry_id: Dev::Aws::Account.new.ecr_registry_ids.last, 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/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
@@ -50,6 +52,15 @@ 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,6 +31,20 @@ 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_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
+    # 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
   end
 
   # Define an empty _post_down_hooks handler which can be overridden by the user
@@ -130,6 +130,20 @@ 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 "Stops the #{application} container"
+              desc "Shut down the #{application} container and remove associated resources"
               task down: %w(init_docker _pre_down_hooks) do
                 LOG.debug "In #{application} down"
 
@@ -125,6 +125,25 @@ 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,6 +76,30 @@ 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.3.pre.alpha.1'.freeze
+    VERSION = '1.4.3.pre.alpha.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.1
+  version: 1.4.3.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport