afterlife 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bb80b8a5c213397eb84b52d78f39fc6ff72491a45df415e0c7700d1c2eb4bc
-  data.tar.gz: d6a8963da3e0d48f511e182d4bcf5c49f20e4e7449e29e9d8cc1f35c2a43fcc8
+  metadata.gz: e03a1499e1af905014e5fb48d8865601a0bb354a856d56dc0a629a3b3c08a99b
+  data.tar.gz: 345db972b71109a69d3117e3ef5e3a8fc8cc4aec094c230f9b49ea46e2c206e3
 SHA512:
-  metadata.gz: '0594d2bce7f949b133c67536d8a3115b2bcdc3a12dc6826135335d6aa5d1cd5e0bd938088a5437bb0381aef2b509b06f990c5268b5a21e8d667882b1355ed274'
-  data.tar.gz: 8b40060493294350391a2aec32c866cadd04a7aaf087ada970fb267430e836c3f724b4dc1ef683beb3337e59cd8b3a77f420afd168830d6972b7c8ee301e8fb8
+  metadata.gz: 2a4b14afb3f286756663da5d5c6c039cd0c327cf8a9ad60a3c20b04d994fdba73b2270892b209cbf9ece8f424e17e2e6eab9798f93416c254aa4549b486a41fc
+  data.tar.gz: 89e9ec3e6d10345f8baeea198d0dde968d96b438cc5312a7d2f545176b4755bd6953b0ad0ad60663015c33b8ac477f5bacb3aa1948bc320a1495cfd1602396ef

data/lib/afterlife/cli.rb

@@ -32,6 +32,7 @@ module Afterlife
     option 'no-build', type: :boolean
     option 'no-install', type: :boolean
     option 'no-auth', type: :boolean
+    option 'no-apply', type: :boolean
     option 'dry-run', type: :boolean
     option 'skip-after-hooks', type: :boolean
     option :yes, type: :boolean

data/lib/afterlife/deploy/kubernetes_deployment.rb

@@ -27,7 +27,6 @@ module Afterlife
           authenticate_command,
           build_command,
           set_image_command,
-          local_stage? ? delete_kubernetes_resource : nil,
           apply_kubernetes_settings,
         ].flatten.compact
       end
@@ -35,40 +34,47 @@ module Afterlife
       # commands
 
       def authenticate_command
-        return if options['no-auth']
+        return if options['no-auth'] || local_stage?
 
-        <<-BASH
-          echo "#{aws_ecr_token}" | docker login --username AWS --password-stdin #{registry} &&
-          kubectl delete secret regcred &&
-          kubectl create secret docker-registry regcred
-            --docker-server=#{registry}
-            --docker-username=AWS
-            --docker-password=#{aws_ecr_token}
-            --docker-email=devs@mifiel.com
-        BASH
+        AwsAuth.new(registry).commands
       end
 
       def build_command
         return if options['no-build']
 
         <<-BASH
-          docker buildx bake -f docker-bake.hcl #{local_stage? ? '--load' : '--push'}
+          docker buildx bake -f docker-bake.hcl #{targets.join(' ')} #{local_stage? ? '--load' : '--push'}
         BASH
       end
 
       def set_image_command
         <<-BASH
-          $(cd #{kubelocation} && kustomize edit set image #{image_name}:latest=#{full_image_name})
+          cd #{kubelocation} &&
+          #{
+            targets.map do |target|
+              "kustomize edit set image #{full_image_name(target)}:latest=#{registry_image_name(target)}"
+            end.join(' && ')
+          }
         BASH
       end
 
-      def delete_kubernetes_resource
-        <<-BASH
-          kubectl delete -k #{kubelocation}
-        BASH
+      def targets
+        repo.conf.dig(:deploy, :targets) || %w[app]
+      end
+
+      def registry_image_name(target)
+        "#{registry}/#{full_image_name(target)}:#{repo.current_revision}"
+      end
+
+      def full_image_name(target)
+        return image_name if target == 'app'
+
+        "#{image_name}-#{target}"
       end
 
       def apply_kubernetes_settings
+        return if options['no-apply']
+
         <<-BASH
           kubectl apply -k #{kubelocation}
         BASH
@@ -88,12 +94,10 @@ module Afterlife
         ".afterlife/#{Afterlife.current_stage.name}"
       end
 
-      def full_image_name
-        "#{registry}/#{image_name}:#{repo.current_revision}"
-      end
-
       def image_name
-        @image_name ||= repo.conf.dig(:deploy, :image_name)
+        @image_name ||= repo.conf.dig(:deploy, :image_name).tap do |result|
+          fail Error, 'deploy.image_name for kubernetes deployments' unless result
+        end
       end
 
       # Priority:
@@ -106,10 +110,30 @@ module Afterlife
         @registry ||= Afterlife.current_repo.variable('deploy.registry') || Afterlife.current_stage.registry
       end
 
-      # command outputs
+      class AwsAuth
+        attr_reader :registry
+
+        def initialize(registry)
+          @registry = registry
+        end
+
+        def commands
+          [docker_login]
+        end
+
+        def docker_login
+          <<-BASH
+            echo "#{aws_ecr_token}" | docker login --username AWS --password-stdin #{registry}
+          BASH
+        end
+
+        def aws_ecr_token
+          @aws_ecr_token ||= Exec.result("aws ecr get-login-password --region #{region}")
+        end
 
-      def aws_ecr_token
-        @aws_ecr_token ||= `aws ecr get-login-password --region us-west-2`.strip
+        def region
+          @region ||= registry.gsub(/[^.]+\.dkr\.ecr\.([^.]+)\.amazonaws\.com/, '\1')
+        end
       end
     end
   end

data/lib/afterlife/exec.rb

@@ -5,7 +5,11 @@ require 'active_support/core_ext/string'
 
 module Afterlife
   class Exec
-    Error = Class.new StandardError
+    def self.result(arg)
+      fail Error, 'Exec.result only accepts strings' unless arg.is_a?(String)
+
+      new(arg).run(result: true).first
+    end
 
     def self.run(arg)
       new(arg).run
@@ -23,11 +27,14 @@ module Afterlife
       @commands = Array(arg)
     end
 
-    def run
-      parsed_commands.each do |command|
+    def run(result: false)
+      parsed_commands.map do |command|
         Afterlife.cli.log_info(command) if Afterlife.cli.options['verbose']
-        system(env_hash, command.squish, exception: true) unless Afterlife.cli.options['dry-run']
-      end
+        next if Afterlife.cli.options['dry-run']
+        next `#{command}`.squish if result
+
+        system(env_hash, command.squish, exception: true)
+      end.compact
     rescue RuntimeError => e
       raise Error, e
     end

data/lib/afterlife/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Afterlife
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport