firespring_dev_commands 2.1.3 → 2.1.4.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44213627e63b15337ede6416bf7dc17e6f70188d71ca2f2a19b601e61b21ae0e
-  data.tar.gz: 356826da99f48dcaa041afe7afa642fdb18f72b38536b2a46753fd0a336508fa
+  metadata.gz: 7bfc98cc8da862092d77bcb5781f7ea61260c56e4207ed72cc5c2b6812a6fbaf
+  data.tar.gz: 2b1a49276792b8f5d24dbd4e188eb7c89a70d77876625e80edd193d4b06fc9ca
 SHA512:
-  metadata.gz: 60b6e69d0bd7625fd033e528322d8d61512abdc3d1cd0637d295eeba000a65e8d55808a89c44c093fb09d136c6cba62a9641db4d30e54e0e248197a25693ca5e
-  data.tar.gz: 0b3f4c05a9d1900179e2bd8cc7322390243a990cf04ca48963508af32dc54e6f469dc4bb151af2ce4968a371fc2e387e554db80f4f23a79dc9deeff2ea78fafc
+  metadata.gz: f20f8b61f93b885fe0d3039abba3d922dce072f64a565472c9ca61eaac69047679de5615e92399ffbe494069fbef2d6469fbd3661edccd0c0e4c6aa65d7a3075
+  data.tar.gz: 26f3c929fe09590e24851b5075fb2d4525f6fe3e67a0940dfc11e4289095a5338fecbe128165ead9b48ed7d27064949e96b55742913712d95d9ca2e2297f93e9

data/lib/firespring_dev_commands/aws/login.rb

@@ -38,6 +38,12 @@ module Dev
 
         region = profileini['region'] || defaultini['region'] || Dev::Aws::DEFAULT_REGION
 
+        # Explicitly set the region to the one we are logging in to. Then exit if we are already logged in.
+        # This is to fix an issue where you are attempting to log in to an account in a different region.
+        # We were seeing issue where it would still be attempting to use the old region until the process exited
+        ENV['AWS_DEFAULT_REGION'] = region
+        return if Dev::Aws::Credentials.new.active?(account)
+
         serial = profileini['mfa_serial_name'] || defaultini['mfa_serial_name']
         serial = "arn:aws:iam::#{Dev::Aws::Account.new.root.id}:mfa/#{serial}" if serial
         serial ||= profileini['mfa_serial'] || defaultini['mfa_serial']

data/lib/firespring_dev_commands/templates/config.rb

@@ -6,11 +6,14 @@ module Dev
     class Application
       # Contains rake tasks for displaying and setting application variables in parameter store
       class Config < Dev::Template::ApplicationInterface
-        attr_reader :path
+        attr_reader :path_prefix, :key_parameter_path
+
+        # Allow for custom config path_prefix for the application
+        # Allow for custom key parameter path (otherwise base it off the path prefix)
+        def initialize(name, path_prefix, key_parameter_path: nil, exclude: [])
+          @path_prefix = path_prefix
+          @key_parameter_path = key_parameter_path || "#{path_prefix}/kms/id"
 
-        # Allow for custom config path for the application
-        def initialize(name, path, exclude: [])
-          @path = path
           super(name, exclude:)
         end
 
@@ -18,7 +21,7 @@ module Dev
         def create_list_task!
           # Have to set a local variable to be accessible inside of the instance_eval block
           application = @name
-          path = @path
+          path_prefix = @path_prefix
           exclude = @exclude
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -29,8 +32,10 @@ module Dev
                 desc "List all #{application} configs"
                 task list: %w(init) do
                   puts
-                  Dev::Aws::Parameter.new.list(path).each do |it|
-                    puts "  #{it.name} => #{it.value} (#{it.type})"
+                  puts "Listing all parameters which start with #{path_prefix}:".light_green
+                  puts
+                  Dev::Aws::Parameter.new.list(path_prefix).each do |it|
+                    puts "  #{it.name.light_white} => #{it.value.light_white} (#{it.type})"
                   end
                   puts
                 end
@@ -44,7 +49,8 @@ module Dev
         def create_set_task!
           # Have to set a local variable to be accessible inside of the instance_eval block
           application = @name
-          path = @path
+          path_prefix = @path_prefix
+          key_parameter_path = @key_parameter_path
           exclude = @exclude
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -58,7 +64,7 @@ module Dev
                      "\n\toptionally specify ENCRYPT=true to change a String type to a SecureString type"
                 task set: %w(ensure_aws_credentials) do
                   raise 'NAME is required' if ENV['NAME'].to_s.strip.blank?
-                  raise 'NAME is not found in this apps parameters' if Dev::Aws::Parameter.new.list(path).none? { |it| it.name == ENV['NAME'] }
+                  raise 'NAME is not found in this apps parameters' if Dev::Aws::Parameter.new.list(path_prefix).none? { |it| it.name == ENV['NAME'] }
                   raise 'VALUE is required' if ENV['VALUE'].to_s.strip.blank?
 
                   param_path = ENV.fetch('NAME', nil)
@@ -68,7 +74,7 @@ module Dev
                   params = {type: 'String'}
                   if ENV['ENCRYPT'].to_s.strip == 'true' || old_value.type == 'SecureString'
                     params[:type] = 'SecureString'
-                    params[:key_id] = Dev::Aws::Parameter.new.get_value("#{path}/kms/id")
+                    params[:key_id] = Dev::Aws::Parameter.new.get_value(key_parameter_path)
                   end
 
                   message = 'This will change '.light_green +

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 = '2.1.3'.freeze
+    VERSION = '2.1.4.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: 2.1.3
+  version: 2.1.4.pre.alpha.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -331,9 +331,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: