firespring_dev_commands 2.1.2 → 2.1.3.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85828d1b6033f43e6ca2829553e2166167e8196d0d48cadafe890baa34efda9f
-  data.tar.gz: ddc13774c33ec3d87da43d08828798857e728b07a7b411dd96d6771b84f6afb0
+  metadata.gz: 99853bd0ded5e80e210af8aba499cc56e82fba9e7c055cc57c2b34a041aa9931
+  data.tar.gz: 69deda63901b1338f1e4c1a712fa9b6da8e9c329f32b505a020e907ae2152518
 SHA512:
-  metadata.gz: 452d75899c5bd64e57edb48f7e1e18ea3d77a834fa7c8d1909cb5242894c4756b4a72119722c43c83b617b5deb6eafa41da30f76a8ad9d3950a1378b1fc40b1d
-  data.tar.gz: 2114bb304f9075f646dbf0efab44d8ac5070db797f12130a8c11bbe4cc0374b65f863375ec632b82148eb9d698a49c737fcd8c1606ca489076e7995573d9a6a1
+  metadata.gz: bafca03ccf03807edbf6518f0134450701734a5d998c3257207b83a7981c999520d51ea0dd662c7f37b385a81a07ffba13a14b491435d83535f36c3e5e60a5bb
+  data.tar.gz: 64d7b998e256508fbfd40fed21e92b15515723ec2d3acde424cad39e4e56b48e3cf63c5b7a72d46c3e8cbac8777c3ab3208509275dc2974ea910725aee44d7ef

data/lib/firespring_dev_commands/platform.rb

@@ -0,0 +1,36 @@
+module Dev
+  class Common
+    class Platform
+      ALLOWED_ARCHITECTURES = %w(arm64 amd64).freeze
+
+      def determine_compute_architecture
+        case RUBY_PLATFORM
+        when /x86_64|amd64/
+          'linux/amd64' # 64-bit Intel/AMD architecture
+        when /arm|aarch64/
+          'linux/arm64' # ARM architecture
+        else
+          raise 'Unknown or unsupported architecture'
+        end
+      end
+
+      def architecture
+        docker_architecture = ENV['DOCKER_ARCHITECTURE'].to_s.strip.downcase
+        if docker_architecture.empty?
+          determine_compute_architecture
+        else
+          raise "Missing 'linux/' prefix in DOCKER_ARCHITECTURE: #{docker_architecture}" unless docker_architecture.start_with?('linux/')
+
+          architecture_name = docker_architecture.split('/')[1]
+
+          unless ALLOWED_ARCHITECTURES.include?(architecture_name)
+            raise "Invalid DOCKER_ARCHITECTURE: #{architecture_name}. Allowed architectures are #{ALLOWED_ARCHITECTURES.join(', ')}"
+          end
+
+          docker_architecture
+
+        end
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/templates/config.rb

@@ -6,14 +6,11 @@ module Dev
     class Application
       # Contains rake tasks for displaying and setting application variables in parameter store
       class Config < Dev::Template::ApplicationInterface
-        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"
+        attr_reader :path
 
+        # Allow for custom config path for the application
+        def initialize(name, path, exclude: [])
+          @path = path
           super(name, exclude:)
         end
 
@@ -21,7 +18,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_prefix = @path_prefix
+          path = @path
           exclude = @exclude
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -32,10 +29,8 @@ module Dev
                 desc "List all #{application} configs"
                 task list: %w(init) do
                   puts
-                  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})"
+                  Dev::Aws::Parameter.new.list(path).each do |it|
+                    puts "  #{it.name} => #{it.value} (#{it.type})"
                   end
                   puts
                 end
@@ -49,8 +44,7 @@ module Dev
         def create_set_task!
           # Have to set a local variable to be accessible inside of the instance_eval block
           application = @name
-          path_prefix = @path_prefix
-          key_parameter_path = @key_parameter_path
+          path = @path
           exclude = @exclude
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -64,7 +58,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_prefix).none? { |it| it.name == ENV['NAME'] }
+                  raise 'NAME is not found in this apps parameters' if Dev::Aws::Parameter.new.list(path).none? { |it| it.name == ENV['NAME'] }
                   raise 'VALUE is required' if ENV['VALUE'].to_s.strip.blank?
 
                   param_path = ENV.fetch('NAME', nil)
@@ -74,7 +68,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(key_parameter_path)
+                    params[:key_id] = Dev::Aws::Parameter.new.get_value("#{path}/kms/id")
                   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.2'.freeze
+    VERSION = '2.1.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: 2.1.2
+  version: 2.1.3.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -293,6 +293,7 @@ files:
 - lib/firespring_dev_commands/node/audit.rb
 - lib/firespring_dev_commands/php.rb
 - lib/firespring_dev_commands/php/audit.rb
+- lib/firespring_dev_commands/platform.rb
 - lib/firespring_dev_commands/rake.rb
 - lib/firespring_dev_commands/ruby.rb
 - lib/firespring_dev_commands/ruby/audit.rb
@@ -330,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: