shipitron 1.2.0 → 1.4.0

data/lib/shipitron/server/deploy_application.rb

@@ -31,6 +31,8 @@ module Shipitron
       optional :build_script
       optional :post_builds
       optional :repository_branch
+      optional :skip_push, default: false
+      optional :registry
 
       around do |interactor|
         if ENV['CONSUL_HOST'].nil?

data/lib/shipitron/server/docker/build_image.rb

@@ -12,7 +12,10 @@ module Shipitron
 
         required :application
         required :docker_image
-        required :git_sha
+        required :git_info
+        required :named_tag
+        required :region
+        optional :registry
 
         organize [
           DownloadBuildCache,

data/lib/shipitron/server/docker/configure.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shipitron/consul_keys'
+require 'json'
 
 module Shipitron
   module Server
@@ -9,22 +10,48 @@ module Shipitron
         include ConsulKeys
 
         required :application
+        optional :registry
 
         before do
           configure_consul_client!
         end
 
         def call
-          docker_auth = begin
-                          key = fetch_key(key: "shipitron/#{application}/docker_auth")
-                          key = fetch_key!(key: 'shipitron/docker_auth') if key.nil?
-                          key
-                        end
-          auth_file = Pathname.new('/home/shipitron/.docker/config.json')
-          auth_file.parent.mkpath
-          auth_file.open('wb') do |file|
-            file.puts(docker_auth.to_s)
-            file.chmod(0600)
+          username = fetch_scoped_key('docker_user')
+          password = fetch_scoped_key('docker_password')
+
+          if username && password
+            Logger.info `docker login --username #{username} --password #{password}`
+            if $? != 0
+              fail_with_error!(message: 'Docker login failed.')
+            end
+          end
+
+          if registry
+            case registry
+            when /docker\.io/
+              # do nothing
+            when /\d+\.dkr\.ecr\.us-east-1\.amazonaws\.com/
+              # ECR
+              config_file = Pathname.new('/home/shipitron/.docker/config.json')
+              config_file.parent.mkpath
+
+              config_hash = {}
+              if config_file.file?
+                config_file.open('rb') do |file|
+                  json = file.read
+                  config_hash = JSON.parse(json) rescue {}
+                end
+              end
+
+              config_hash['credHelpers'] ||= {}
+              config_hash['credHelpers'][registry] = 'ecr-login'
+
+              config_file.open('wb') do |file|
+                file.puts(JSON.generate(config_hash))
+                file.chmod(0600)
+              end
+            end
           end
         end
 
@@ -33,6 +60,15 @@ module Shipitron
           context.application
         end
 
+        def registry
+          context.registry
+        end
+
+        def fetch_scoped_key(key)
+          value = fetch_key(key: "shipitron/#{application}/#{key}")
+          value = fetch_key(key: "shipitron/#{key}") if value.nil?
+          value
+        end
       end
     end
   end

data/lib/shipitron/server/docker/push_image.rb

@@ -8,8 +8,11 @@ module Shipitron
 
         required :docker_image
         required :named_tag
+        optional :skip_push, default: false
 
         def call
+          return if context.skip_push
+
           Logger.info "Pushing docker image #{docker_image} and #{docker_image.name_with_tag(named_tag)}"
 
           Logger.info `docker tag #{docker_image} #{docker_image.name_with_tag(named_tag)}`

data/lib/shipitron/server/docker/run_build_script.rb

@@ -9,17 +9,16 @@ module Shipitron
 
         required :application
         required :docker_image
-        required :git_sha
-        optional :build_script
-
-        before do
-          context.build_script ||= 'shipitron/build.sh'
-        end
+        required :git_info
+        required :named_tag
+        optional :build_script, default: 'shipitron/build.sh'
+        optional :registry
 
         def call
           Logger.info 'Building docker image'
 
-          docker_image.tag = git_sha
+          docker_image.registry = registry if registry != nil
+          docker_image.tag = git_info.short_sha
 
           FileUtils.cd("/home/shipitron/#{application}") do
             unless Pathname.new(build_script).exist?
@@ -27,7 +26,7 @@ module Shipitron
             end
 
             cmd = TTY::Command.new
-            result = cmd.run!("#{build_script} #{docker_image}")
+            result = cmd.run!("#{build_script} #{docker_image} #{named_tag}")
 
             if result.failure?
               fail_with_error!(message: "build script exited with non-zero code: #{result.exit_status}")
@@ -44,13 +43,21 @@ module Shipitron
           context.docker_image
         end
 
-        def git_sha
-          context.git_sha
+        def git_info
+          context.git_info
+        end
+
+        def named_tag
+          context.named_tag
         end
 
         def build_script
           context.build_script
         end
+
+        def registry
+          context.registry
+        end
       end
     end
   end

data/lib/shipitron/server/download_build_cache.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shipitron/fetch_bucket'
+require 'shipitron/s3_copy'
 
 module Shipitron
   module Server
@@ -9,11 +10,12 @@ module Shipitron
       required :application
       required :s3_cache_bucket
       required :build_cache_location
+      required :region
 
       def call
         Logger.info "Downloading build cache from bucket #{s3_cache_bucket}"
 
-        s3_file = bucket.files.get("#{application}.build-cache.archive")
+        s3_file = bucket.files.head("#{application}.build-cache.archive")
         if s3_file.nil?
           Logger.warn 'Build cache not found.'
           return
@@ -21,8 +23,14 @@ module Shipitron
 
         build_cache = Pathname.new("/home/shipitron/#{application}/#{build_cache_location}")
         build_cache.parent.mkpath
-        build_cache.open('wb') do |local_file|
-          local_file.write(s3_file.body)
+
+        result = S3Copy.call(
+          source: "s3://#{s3_cache_bucket}/#{application}.build-cache.archive",
+          destination: build_cache.to_s,
+          region: context.region
+        )
+        if result.failure?
+          fail_with_error!(message: 'Failed to download build cache!')
         end
 
         Logger.info 'Download complete.'

data/lib/shipitron/server/fetch_deploy.rb

@@ -0,0 +1,50 @@
+require 'shipitron'
+require 'aws-sdk-s3'
+require 'json'
+
+module Shipitron
+  module Server
+    class FetchDeploy
+      include Metaractor
+
+      required :deploy_bucket
+      required :deploy_bucket_region
+      required :deploy_id
+
+      def call
+        s3_key = "#{Shipitron::DEPLOY_BUCKET_PREFIX}#{context.deploy_id}"
+        Logger.info "Fetching deploy config from s3://#{deploy_bucket}/#{s3_key}"
+
+        response = client.get_object(
+          bucket: deploy_bucket,
+          key: s3_key
+        )
+
+        context.deploy_options =
+          JSON.parse(response.body.read)
+          .transform_keys {|k| k.to_sym }
+      end
+
+      private
+
+      def client
+        Aws::S3::Client.new(
+          region: deploy_bucket_region,
+          **client_opts
+        )
+      end
+
+      def client_opts
+        {}
+      end
+
+      def deploy_bucket
+        context.deploy_bucket
+      end
+
+      def deploy_bucket_region
+        context.deploy_bucket_region
+      end
+    end
+  end
+end

data/lib/shipitron/server/git/clone_local_copy.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shellwords'
+require 'shipitron/git_info'
 
 module Shipitron
   module Server
@@ -12,7 +13,7 @@ module Shipitron
         optional :repository_branch
 
         before do
-          context.repository_branch ||= 'master'
+          context.repository_branch ||= 'main'
         end
 
         def call
@@ -22,10 +23,8 @@ module Shipitron
           end
 
           Logger.info 'Using this git commit:'
-          FileUtils.cd("/home/shipitron/#{application}") do
-            context.git_sha = `git rev-parse --short=12 HEAD`.chomp
-            Logger.info `git --no-pager log --format='%aN (%h): %s' -n 1`.chomp
-          end
+          context.git_info = GitInfo.from_path(path: "/home/shipitron/#{application}")
+          Logger.info context.git_info.one_liner
         end
 
         private

data/lib/shipitron/server/git/update_cache.rb

@@ -13,7 +13,7 @@ module Shipitron
         optional :repository_branch
 
         before do
-          context.repository_branch ||= 'master'
+          context.repository_branch ||= 'main'
         end
 
         def call
@@ -25,6 +25,7 @@ module Shipitron
           else
             Logger.info 'Fetching new git commits'
             FileUtils.cd('/home/shipitron/git-cache') do
+              `git gc --auto`
               `git fetch -f #{Shellwords.escape repository_url} #{Shellwords.escape repository_branch}:#{Shellwords.escape repository_branch}`
             end
           end

data/lib/shipitron/server/run_post_build.rb

@@ -9,6 +9,7 @@ module Shipitron
 
       required :region
       required :clusters
+      required :git_info
       optional :post_builds
 
       def call
@@ -26,7 +27,41 @@ module Shipitron
                 container_overrides: [
                   {
                     name: post_build.container_name,
-                    command: post_build.command_ary
+                    command: post_build.command_ary,
+                    environment: [
+                      {
+                        name: "GIT_SHA",
+                        value: git_info.sha
+                      },
+                      {
+                        name: "GIT_SHORT_SHA",
+                        value: git_info.short_sha
+                      },
+                      {
+                        name: "GIT_EMAIL",
+                        value: git_info.email
+                      },
+                      {
+                        name: "GIT_NAME",
+                        value: git_info.name
+                      },
+                      {
+                        name: "GIT_MESSAGE",
+                        value: git_info.summary
+                      },
+                      {
+                        name: "GIT_TIMESTAMP",
+                        value: git_info.timestamp
+                      },
+                      {
+                        name: "GIT_BRANCH",
+                        value: git_info.branch
+                      },
+                      {
+                        name: "GIT_TAG",
+                        value: git_info.tag
+                      }
+                    ]
                   }
                 ]
               },
@@ -75,6 +110,10 @@ module Shipitron
       def clusters
         context.clusters
       end
+
+      def git_info
+        context.git_info
+      end
     end
   end
 end

data/lib/shipitron/server/transform_cli_args.rb

@@ -12,6 +12,7 @@ module Shipitron
       required :application
       required :repository_url
       optional :repository_branch
+      optional :registry
       required :s3_cache_bucket
       required :build_cache_location
       required :image_name
@@ -23,6 +24,7 @@ module Shipitron
       optional :ecs_services
       optional :ecs_service_templates
       optional :build_script
+      optional :skip_push, default: false
       optional :post_builds
 
       before do
@@ -37,6 +39,7 @@ module Shipitron
           application
           repository_url
           repository_branch
+          registry
           s3_cache_bucket
           build_cache_location
           named_tag
@@ -44,6 +47,7 @@ module Shipitron
           clusters
           ecs_services
           build_script
+          skip_push
         ].each_with_object(cli_args) { |k, args| args[k] = context[k] }
 
         cli_args.docker_image = DockerImage.new(name: context.image_name)

data/lib/shipitron/server/update_ecs_task_definitions.rb

@@ -14,11 +14,12 @@ module Shipitron
       required :docker_image
       required :ecs_task_defs
       optional :ecs_task_def_templates
+      optional :registry
 
       before do
         context.ecs_task_def_templates ||= []
         context.templates = context.ecs_task_def_templates
-        context.template_context = { tag: docker_image.tag }
+        context.template_context = { tag: docker_image.tag, registry: context.registry }
       end
 
       organize [

data/lib/shipitron/server/upload_build_cache.rb

@@ -9,6 +9,7 @@ module Shipitron
       required :application
       required :s3_cache_bucket
       required :build_cache_location
+      required :region
 
       def call
         Logger.info "Uploading build cache to bucket #{s3_cache_bucket}"
@@ -19,11 +20,15 @@ module Shipitron
           return
         end
 
-        build_cache.open('rb') do |local_file|
-          bucket.files.create(
-            key: "#{application}.build-cache.archive",
-            body: local_file.read
-          )
+        result = S3Copy.call(
+          source: build_cache.to_s,
+          destination: "s3://#{s3_cache_bucket}/#{application}.build-cache.archive",
+          region: context.region
+        )
+        if result.failure?
+          Logger.warn 'Failed to upload build cache!'
+        else
+          Logger.info 'Upload complete.'
         end
       end
 
@@ -39,10 +44,6 @@ module Shipitron
       def build_cache_location
         context.build_cache_location
       end
-
-      def bucket
-        @bucket ||= FetchBucket.call!(name: s3_cache_bucket).bucket
-      end
     end
   end
 end