afterlife 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a748ce7d12a9ee07b9811468a33b25852ab857dc26e35af99ace77826f150c3
-  data.tar.gz: d969d2522b6cf783cb43426d3f8556ac5049f009fad5fba08b16065a91fd15cc
+  metadata.gz: 50bb80b8a5c213397eb84b52d78f39fc6ff72491a45df415e0c7700d1c2eb4bc
+  data.tar.gz: d6a8963da3e0d48f511e182d4bcf5c49f20e4e7449e29e9d8cc1f35c2a43fcc8
 SHA512:
-  metadata.gz: 873c5cfa91704940ccbc7fff7a70d339c9f73271c63ba60e2f2b7011e61d58b601595982027f26e94f006ece37f2abd4061ac05179ba0a0f7ed444ce21dfc735
-  data.tar.gz: 1e064e211cd77e8ae137e047eaa877b9174ba6098296c8723aa05d2a9f6bf7bc9268ffa8e43ea877e25b05613499588548e3ee09120e5702133ba380c1e04156
+  metadata.gz: '0594d2bce7f949b133c67536d8a3115b2bcdc3a12dc6826135335d6aa5d1cd5e0bd938088a5437bb0381aef2b509b06f990c5268b5a21e8d667882b1355ed274'
+  data.tar.gz: 8b40060493294350391a2aec32c866cadd04a7aaf087ada970fb267430e836c3f724b4dc1ef683beb3337e59cd8b3a77f420afd168830d6972b7c8ee301e8fb8

data/lib/afterlife/cli.rb

@@ -31,12 +31,13 @@ module Afterlife
     desc 'deploy <stage>', 'Deploy current repo'
     option 'no-build', type: :boolean
     option 'no-install', type: :boolean
+    option 'no-auth', type: :boolean
     option 'dry-run', type: :boolean
     option 'skip-after-hooks', type: :boolean
     option :yes, type: :boolean
     def deploy(stage)
       invoke Deploy::Cli, :call, [stage], options
-    rescue Deploy::Error
+    rescue Error
       fatal!(e.message)
     rescue Interrupt
       log_interrupted

data/lib/afterlife/config/provider.rb

@@ -3,10 +3,6 @@
 module Afterlife
   module Config
     class Provider
-      def self.file
-        Afterlife.local_path.join('config.yml')
-      end
-
       def respond_to_missing?(sym, include_all)
         config.key?(sym) || super
       end
@@ -15,6 +11,12 @@ module Afterlife
         config.key?(sym) ? config[sym] : super
       end
 
+      def file_exist?
+        return @file_exist if defined?(@file_exist)
+
+        @file_exist ||= file.exist?
+      end
+
       def stages
         @stages ||= config.delete(:stages)&.to_h do |name, val|
           [name, Stage.new(val.merge(name: name.to_s))]
@@ -24,7 +26,28 @@ module Afterlife
     private
 
       def config
-        @config ||= YAML.load_file(Provider.file).deep_symbolize_keys
+        @config ||= !file_exist? && default_config
+        @config ||= YAML.load_file(file).deep_symbolize_keys
+      end
+
+      def default_config
+        {
+          credentials: {
+            aws: {
+              profile: ENV.fetch('AWS_PROFILE', nil),
+            },
+          },
+          stages: {},
+        }
+      end
+
+      def file
+        Pathname(
+          ENV.fetch(
+            'AFTERLIFE_CONFIG_PATH',
+            Afterlife.local_path.join('config.yml'),
+          ),
+        )
       end
     end
   end

data/lib/afterlife/deploy/cdn_deployment.rb

@@ -12,12 +12,14 @@ module Afterlife
       end
 
       def setup
-        repo.env.merge!(
-          'AWS_PROFILE' => Afterlife.config.credentials.dig(:aws, :profile),
+        # only use the defined AWS_PROFILE if its not already been defined
+        repo.env.set(
+          'AWS_PROFILE' => Afterlife.config&.credentials&.dig(:aws, :profile),
           'AWS_BUCKET' => Afterlife.current_stage.bucket,
           'AWS_REGION' => Afterlife.current_stage.region,
-          'S3_FULL_PATH' => s3_full_path,
         )
+        # in nested deployments we need the current path, not the parent's
+        repo.env.set!('S3_FULL_PATH' => s3_full_path)
       end
 
       def initial_message
@@ -33,14 +35,12 @@ module Afterlife
 
       def commands
         [
-          repo_command || javascripts,
-          revision,
-        ].flatten
+          repo_command || upload_javascripts,
+          upload_revision,
+        ]
       end
 
-      def javascripts
-        # by default we use no-cache, if something else is needed
-        # do it in the deploy.command option
+      def upload_javascripts
         <<-BASH
           aws s3 sync
             %<DIST_PATH>s
@@ -52,7 +52,7 @@ module Afterlife
         BASH
       end
 
-      def revision
+      def upload_revision
         <<-BASH
           echo "#{repo.current_revision}" |
             aws s3 cp --content-type text/plain --cache-control 'no-cache' - #{s3_revision_path}

data/lib/afterlife/deploy/cdn_stenciljs_deployment.rb

@@ -7,19 +7,31 @@ module Afterlife
 
       def commands
         [
-          add_revision_command,
-          repo_command || javascripts,
-          revision,
+          repo_command || [upload_parts, upload_esm],
+          upload_revision,
         ]
       end
 
-      def add_revision_command
-        Dir["#{repo.dist_path}/*.esm.js"].map do |file|
-          next if file.include?(repo.current_revision)
+      def upload_parts
+        <<-BASH
+          aws s3 sync
+            %<DIST_PATH>s
+            %<S3_FULL_PATH>s
+            --exclude '*.ts'
+            --exclude '*.tsx'
+            --exclude '*.esm.js'
+            --size-only
+            --cache-control 'public, max-age=31540000'
+        BASH
+      end
 
-          new_name = file.gsub('.esm.js', "-#{repo.current_revision}.esm.js")
-          "mv #{file} #{new_name}"
-        end
+      def upload_esm
+        <<-BASH
+          aws s3 cp
+            --cache-control 'public, max-age=31540000'
+            #{repo.dist_path}/#{repo.name}.esm.js
+            #{s3_full_path}/#{repo.name}-#{repo.current_revision}.esm.js
+        BASH
       end
 
       def s3_full_path

data/lib/afterlife/deploy/cli.rb

@@ -11,14 +11,14 @@ module Afterlife
       desc 'deploy <stage>', 'Deploy current repo'
       def call(stage)
         Afterlife.cli = self
-        Deploy.call(stage) do |deployment|
+        Deploy.call(stage, options) do |deployment|
           setup_deploy(deployment)
           say_status 'Deploying', deployment.initial_message
           deployment.run
           say_status 'Deployed', deployment.output
           run_after_hooks
         end
-      rescue Deploy::Error => e
+      rescue Afterlife::Error => e
         fatal!(e.message)
       end
 

data/lib/afterlife/deploy/deployment.rb

@@ -3,6 +3,13 @@
 module Afterlife
   module Deploy
     class Deployment
+
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+
       def run
         fail NotImplementedError
       end

data/lib/afterlife/deploy/kubernetes_deployment.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+module Afterlife
+  module Deploy
+    class KubernetesDeployment < Deployment
+      def setup
+        Afterlife.current_repo.env.set('PLATFORM' => 'linux/amd64') if deploy_stage?
+
+        Afterlife.current_repo.env.set!(
+          'REGISTRY' => registry,
+          'TAG' => repo.current_revision,
+        )
+      end
+
+      def run
+        Exec.run(commands)
+      end
+
+      def confirmation_message
+        'You are about to deploy the current directory'
+      end
+
+    private
+
+      def commands
+        [
+          authenticate_command,
+          build_command,
+          set_image_command,
+          local_stage? ? delete_kubernetes_resource : nil,
+          apply_kubernetes_settings,
+        ].flatten.compact
+      end
+
+      # commands
+
+      def authenticate_command
+        return if options['no-auth']
+
+        <<-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
+      end
+
+      def build_command
+        return if options['no-build']
+
+        <<-BASH
+          docker buildx bake -f docker-bake.hcl #{local_stage? ? '--load' : '--push'}
+        BASH
+      end
+
+      def set_image_command
+        <<-BASH
+          $(cd #{kubelocation} && kustomize edit set image #{image_name}:latest=#{full_image_name})
+        BASH
+      end
+
+      def delete_kubernetes_resource
+        <<-BASH
+          kubectl delete -k #{kubelocation}
+        BASH
+      end
+
+      def apply_kubernetes_settings
+        <<-BASH
+          kubectl apply -k #{kubelocation}
+        BASH
+      end
+
+      # utils
+
+      def local_stage?
+        Afterlife.current_stage.name.to_sym == :local
+      end
+
+      def deploy_stage?
+        %i[qa production staging].include?(Afterlife.current_stage.name.to_sym)
+      end
+
+      def kubelocation
+        ".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)
+      end
+
+      # Priority:
+      # 1. Uses AFTERLIFE_DEPLOY_REGISTRY from the ENV if it's defined. It can be
+      #    either in real system ENV, or defined in the env section of the repo
+      #    .afterlife.yml config
+      # 2. Uses repo .afterlife.yml config at deploy.registry
+      # 3. Uses stages.$current_stage.registry if exists in ~/.afterlife/config.yml
+      def registry
+        @registry ||= Afterlife.current_repo.variable('deploy.registry') || Afterlife.current_stage.registry
+      end
+
+      # command outputs
+
+      def aws_ecr_token
+        @aws_ecr_token ||= `aws ecr get-login-password --region us-west-2`.strip
+      end
+    end
+  end
+end

data/lib/afterlife/deploy.rb

@@ -4,11 +4,9 @@ module Afterlife
   module Deploy
   module_function
 
-    Error = Class.new StandardError
-
-    def call(stage)
-      deployment = klass.new
-      setup_stage(stage)
+    def call(stage, options)
+      deployment = klass.new(options)
+      Afterlife.current_stage = stage
       fill_env
       deployment.setup
       yield deployment
@@ -28,16 +26,9 @@ module Afterlife
       end
     end
 
-    def setup_stage(stage)
-      unless Afterlife.config.stages.key?(stage.to_sym)
-        fail Error, "invalid stage '#{stage}'. Possible values: #{Afterlife.config.stages.keys.map(&:to_s)}"
-      end
-
-      Afterlife.current_stage = Afterlife.config.stages[stage.to_sym]
-    end
-
     def fill_env
-      Afterlife.current_repo.env.merge!(
+      # in nested deployments we need the current definition, not the parent's
+      Afterlife.current_repo.env.set!(
         'DIST_PATH' => Afterlife.current_repo.dist_path.to_s,
         'CURRENT_BRANCH' => Afterlife.current_repo.current_branch,
         'AFTERLIFE_STAGE' => Afterlife.current_stage.name,

data/lib/afterlife/environment.rb

@@ -5,7 +5,7 @@ module Afterlife
     attr_reader :repo, :env
 
     def self.from(repo)
-      env = new(repo).tap(&:call).env
+      env = new(repo).tap(&:call)
       yield env if block_given?
       env
     end
@@ -21,24 +21,38 @@ module Afterlife
       from_stage_envs
     end
 
-    def env_hash_by_branch
-      @env_hash_by_branch ||= env_hash&.dig(:by_branch, repo.current_branch.to_sym)
+    def [](key)
+      key = key.gsub('.', '_').upcase
+      env_name = "AFTERLIFE_#{key}"
+      return ENV[env_name] if ENV.key?(env_name)
+
+      @env[env_name]
     end
 
-    def env_hash_by_stage
-      @env_hash_by_stage ||= env_hash&.dig(:by_stage, Afterlife.current_stage.name.to_sym)
+    # soft set, do not override existent ENVs
+    def set(arg)
+      arg.each do |k, v|
+        fail ArgumentError, "key '#{k}' must be a string" unless k.is_a?(String)
+
+        @env[k] ||= ENV.fetch(k, v)
+      end
     end
 
-    def env_hash
-      @env_hash ||= repo.conf.dig(:deploy, :env)
+    # forces to be exactly dthe value
+    def set!(arg)
+      arg.each do |k, v|
+        fail ArgumentError, "key '#{k}' must be a string" unless k.is_a?(String)
+
+        @env[k] = v
+      end
     end
 
   private
 
     def from_flat_envs
-      return unless env_hash.is_a?(Hash)
+      return unless repo_env_config.is_a?(Hash)
 
-      env_hash.each do |key, value|
+      repo_env_config.each do |key, value|
         next if key == :by_branch
         next if key == :by_stage
 
@@ -54,6 +68,10 @@ module Afterlife
       end
     end
 
+    def env_hash_by_branch
+      @env_hash_by_branch ||= repo_env_config&.dig(:by_branch, repo.current_branch.to_sym)
+    end
+
     def from_stage_envs
       return unless env_hash_by_stage.is_a?(Hash)
 
@@ -61,5 +79,15 @@ module Afterlife
         @env[key.to_s] = value.to_s
       end
     end
+
+    def env_hash_by_stage
+      return unless Afterlife.current_stage
+
+      @env_hash_by_stage ||= repo_env_config&.dig(:by_stage, Afterlife.current_stage.name.to_sym)
+    end
+
+    def repo_env_config
+      @repo_env_config ||= repo.conf.dig(:deploy, :env) || {}
+    end
   end
 end

data/lib/afterlife/exec.rb

@@ -26,18 +26,22 @@ module Afterlife
     def run
       parsed_commands.each do |command|
         Afterlife.cli.log_info(command) if Afterlife.cli.options['verbose']
-        system(repo.env, command.squish, exception: true) unless Afterlife.cli.options['dry-run']
+        system(env_hash, command.squish, exception: true) unless Afterlife.cli.options['dry-run']
       end
     rescue RuntimeError => e
       raise Error, e
     end
 
     def parsed_commands
-      Exec.parse(commands, repo.env)
+      Exec.parse(commands, env_hash)
     end
 
     def repo
       Afterlife.current_repo
     end
+
+    def env_hash
+      repo.env.env
+    end
   end
 end

data/lib/afterlife/repo/config.rb

@@ -2,6 +2,8 @@
 
 module Afterlife
   class Repo
+    # Reads configuration from the repo,
+    # either from YML or from the repo instance methods
     class Config
       Error = Class.new StandardError
 
@@ -12,7 +14,7 @@ module Afterlife
       end
 
       def initialize(path)
-        @path = path.split('.').map(&:to_sym)
+        @path = path
       end
 
       def read(&block) # rubocop:disable Metrics/MethodLength
@@ -24,7 +26,7 @@ module Afterlife
         when String, Symbol
           yield(from_yml)
         else
-          fail Error, "No config with path '#{path.join('.')}'" unless repo_method?
+          fail Error, "No config with path '#{path}'" unless repo_method?
 
           yield(repo.public_send(repo_method))
         end
@@ -33,7 +35,7 @@ module Afterlife
     private
 
       def repo_method?
-        path.count == 1 && repo.public_methods(false).include?(repo_method)
+        path.count('.').zero? && repo.public_methods(false).include?(repo_method)
       end
 
       def repo_method
@@ -47,7 +49,7 @@ module Afterlife
       def from_yml
         return @from_yml if defined?(@from_yml)
 
-        @from_yml ||= repo.conf.dig(*path)
+        @from_yml ||= repo.variable(path)
       end
     end
   end

data/lib/afterlife/repo/provider.rb

@@ -2,6 +2,7 @@
 
 module Afterlife
   class Repo
+    # Reads (and builds) the .afterlife.yml file in the repo
     class Provider
       CONFIG_NAME = '.afterlife.yml'
 

data/lib/afterlife/repo.rb

@@ -46,6 +46,14 @@ module Afterlife
       full_path.join(conf.dig(:cdn, :dist) || DEFAULT_DIST)
     end
 
+    # 1. Searchs for the AFTERLIFE_#{name} env var
+    # 2. Searchs the path in the repo .afterlife.yml config
+    def variable(name)
+      return env[name] if env[name]
+
+      conf.dig(*name.split('.').map(&:to_sym))
+    end
+
     def env
       @env ||= Environment.from(self)
     end
@@ -79,7 +87,7 @@ module Afterlife
     end
 
     def name
-      full_name.split('/').last.gsub('-', '_')
+      full_name.split('/').last
     end
 
     def full_name
@@ -109,10 +117,6 @@ module Afterlife
       @package_json ||= JSON.parse(File.read(@pkg_path), symbolize_names: true)
     end
 
-    def branch_conf
-      conf.dig(:deploy, :env, :by_branch, current_branch.to_sym)
-    end
-
     def conf
       @conf ||= Provider.new(full_path).config
     end

data/lib/afterlife/stage.rb

@@ -6,6 +6,27 @@ module Afterlife
     :bucket,
     :region,
     :cdn_url,
+    :registry,
     keyword_init: true,
-  )
+  ) do
+    def self.build(name = nil)
+      Stage.new(
+        name: ENV.fetch('AFTERLIFE_STAGE', name),
+        bucket: ENV.fetch('AWS_BUCKET', nil),
+        region: ENV.fetch('AWS_REGION'),
+        cdn_url: ENV.fetch('AWS_BUCKET', nil),
+        registry: ENV.fetch('AFTERLIFE_DEPLOY_REGISTRY', nil),
+      )
+    end
+
+    def self.find(stage)
+      return build(stage) unless Afterlife.config.file_exist?
+
+      unless Afterlife.config.stages.key?(stage.to_sym)
+        fail Error, "invalid stage '#{stage}'. Possible values: #{Afterlife.config.stages.keys.map(&:to_s)}"
+      end
+
+      Afterlife.config.stages[stage.to_sym]
+    end
+  end
 end

data/lib/afterlife/version.rb

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

data/lib/afterlife.rb

@@ -33,7 +33,7 @@ module Afterlife
   end
 
   def self.current_stage=(other)
-    @current_stage = other
+    @current_stage = Stage.find(other)
   end
 
   def self.current_stage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterlife
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Genaro Madrid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,6 +130,7 @@ files:
 - lib/afterlife/deploy/cli.rb
 - lib/afterlife/deploy/custom_deployment.rb
 - lib/afterlife/deploy/deployment.rb
+- lib/afterlife/deploy/kubernetes_deployment.rb
 - lib/afterlife/environment.rb
 - lib/afterlife/exec.rb
 - lib/afterlife/release.rb