firespring_dev_commands 2.1.27.pre.alpha.1 → 2.1.27.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f810ca7ab797bb1ec56674b67d42de056d5f88cd95a8e9c45b67d26a3570d19
-  data.tar.gz: 487bdc8a74717f11bb48b5b81a33093fde87ddb2b44d97cdf84a0372e3b93627
+  metadata.gz: fce5da47cf928179b220c2d30c295fb5c853aee03ca1cad7bbf9684f8b8aea3a
+  data.tar.gz: 33100d5b2127c7cb422f6695e19e85b3f8bfe41d0dd13f7f0ab4f4721351286b
 SHA512:
-  metadata.gz: 212273f4a640214bf8001c12419f33bb6dc621dc37a29b95e75d06c5b5e4bd3f7b7231c003cd032ed1be1c2dc0667d3474fb74892a7577ddd57eca248d96ab09
-  data.tar.gz: 480720fd9de858a1ce969644958e61238e866fef1126fb91909992eca3301275d04fd42df45c1f34a7c5126758172a4c89f7bfc0ea3c1b8e2528816de97dbfba
+  metadata.gz: fb735b569248c55a15bd51bb971054107ea1d885fb08e4a2da43bafdc3093b86daf00c42962fcb0ce4aeb543e76afff8ca06be4359bbbd4c489dc83c09d46bc6
+  data.tar.gz: 4e43a5eee15f6dbbbeab27c006a0dbdb1802be2c882008627b4d1025f99e72a52d3855c8121eba967b21fba4f766daf1e2f0e90e11bb06ab32f7c6e110f86d7e

data/lib/firespring_dev_commands/certificate.rb

@@ -43,7 +43,7 @@ module Dev
     def save(dest_dir)
       raise "directory #{dest_dir} must be an existing directory" unless File.directory?(dest_dir)
 
-      domain = domains.first.sub(/^\*\./, '')
+      domain = domains.first.sub(/^\*\./, '') # Need to strip off the '*.' if this is a wildcard cert
       directories = Dir.glob("/etc/letsencrypt/live/#{domain}*/")
       no_suffix = directories.delete("/etc/letsencrypt/live/#{domain}/")
       biggest_suffix = directories.max

data/lib/firespring_dev_commands/docker.rb

@@ -144,7 +144,7 @@ module Dev
       puts "\nPulling #{name}:#{tag}"
       opts = {
         fromImage: "#{name}:#{tag}",
-        platform: Dev::Common::Platform.new.architecture
+        platform: Dev::Platform.new.architecture
       }
       ::Docker::Image.create(**opts) { |response| Dev::Docker::Status.new.response_callback(response) }
     end

data/lib/firespring_dev_commands/platform.rb

@@ -1,40 +1,33 @@
 module Dev
-  class Common
-    # Class which returns information about the current platform
-    class Platform
-      # Constant containing all supported architectures
-      ALLOWED_ARCHITECTURES = %w(arm64 amd64).freeze
+  # Class which returns information about the current platform
+  class Platform
+    # Constant containing all supported architectures
+    ALLOWED_ARCHITECTURES = %w(linux/arm64 linux/amd64).freeze
 
-      # Normalize the ruby platform to return a docker platform architecture format
-      def determine_compute_architecture
-        case RUBY_PLATFORM
-        when /x86_64|amd64|x64-mingw/
-          'linux/amd64' # 64-bit Intel/AMD architecture
-        when /arm|aarch64/
-          'linux/arm64' # ARM architecture
-        else
-          raise 'Unknown or unsupported architecture'
-        end
-      end
+    # If an architecture was specified in the ENV, use that. Otherwise auto-deted based of the OS reported architecture
+    def architecture
+      arch = env_architecture || os_architecture
+      raise "Invalid DOCKER_ARCHITECTURE: #{arch} (allowed are #{ALLOWED_ARCHITECTURES.join(', ')})" unless ALLOWED_ARCHITECTURES.include?(arch)
 
-      # Determine the platform architecture
-      # If one was specified in the DOCKER_ARCHITECTURE variable, use it
-      # Otherwise, use the RUBY_PLATFORM built-in to auto-detect and architecture
-      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/')
+      arch
+    end
+
+    # Check to see if a docker architecture has been specified in the ENV
+    # If it has, verify the format and the value
+    private def env_architecture
+      arch = ENV['DOCKER_ARCHITECTURE'].to_s.strip.downcase
+      return nil if arch.empty?
+
+      "linux/#{arch}" unless arch.start_with?('linux/')
+      arch
+    end
 
-          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
+    # Returns a valid docker architecture based off the RUBY_PLATFORM
+    private def os_architecture
+      return 'linux/amd64' if RUBY_PLATFORM.match?(/x86_64|amd64|x64-mingw/)
+      return 'linux/arm64' if RUBY_PLATFORM.match?(/arm|aarch64/)
 
-          docker_architecture
-        end
-      end
+      raise 'Unknown or unsupported architecture'
     end
   end
 end

data/lib/firespring_dev_commands/templates/certificate.rb

@@ -4,10 +4,10 @@ module Dev
   module Template
     # Class contains rake templates for managing configured certificates
     class Certificate < Dev::Template::BaseInterface
-      attr_reader :names, :email, :paths
+      attr_reader :domains, :email, :paths
 
-      def initialize(names, email:, paths:, exclude: [])
-        @names = names
+      def initialize(domains, email:, paths:, exclude: [])
+        @domains = domains
         @email = email
         @paths = Array(paths)
 
@@ -17,7 +17,7 @@ module Dev
       # Create the rake task for the generate method
       def create_generate_task!
         # Have to set a local variable to be accessible inside of the instance_eval block
-        names = @names
+        domains = @domains
         email = @email
         paths = @paths
         exclude = @exclude
@@ -29,7 +29,7 @@ module Dev
             desc 'Requests a new certificate for the configured domain using the route53 validation and deposits it in the configured paths'
             task generate: %w(init_docker ensure_aws_credentials) do
               Dev::Docker.new.pull_image('certbot/dns-route53', 'latest')
-              c = Dev::Certificate.new(names, email)
+              c = Dev::Certificate.new(domains, email)
               c.request
               paths.each { |path| c.save(path) }
             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 = '2.1.27.pre.alpha.1'.freeze
+    VERSION = '2.1.27.pre.alpha.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.27.pre.alpha.1
+  version: 2.1.27.pre.alpha.2
 platform: ruby
 authors:
 - Firespring