hako 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e976128af20ee669b05e2e9531dc84d3b0ad46dcba305fa732cfbf0e24215dc
-  data.tar.gz: 0cde6cd9e06468444bd63a55f869424b3daae0926d6b8cd9a049e5511ba8ef30
+  metadata.gz: 3eeaab8400e80caccbf550eed190e25ca59d729f04f450c0fa3c34596036a0af
+  data.tar.gz: '039cc2afb69aacceaa40976bb74dca8be034dc4e4780423c4a5d30040f17775f'
 SHA512:
-  metadata.gz: 27279574a6d795bbe859463056f7460b501e3d2a0c38f6fa147aeafb419970ec9a02efed532fd35497f040a5fcb758145d224e6611bcc68cc003e586dc101753
-  data.tar.gz: ebb6948d88f10ff6f8ad3e7dbc3f47ea674cfb45d35b391c6611de9cbdb87bd73ea8cca02112f2dc4e27b6798a9e0308bb437aaa5db2586e2d2e747e7363ad8e
+  metadata.gz: 84b31ceebf0c3bc2cc3262b8b977d092269b527c6d33c1082ee01715514e61c8e439a1c78390e96590cf5d8777a44e120d631bd269269c3219c0b7818109f5d2
+  data.tar.gz: 136f00906ce0b1e94a67d4fe6a0919efecae7744a402fba58f0cbd4ff86f9dd6f8187a6bdd68ca52002f000c998efd87404dcf5536918360fac047a5d900db47

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.8.0 (2019-03-17)
+## New features
+- Add `deploy_failed` method to Hako::Script which is called when `hako deploy` fails
+- Add .app.tag field to definition to specify the default value of app container's tag
+  - The default value was fixed to "latest", but you can now specify custom default value.
+
 # 2.7.0 (2019-03-15)
 ## New features
 - Support `entry_point` parameter

data/lib/hako/app_container.rb

@@ -6,7 +6,7 @@ module Hako
   class AppContainer < Container
     # @return [String]
     def image_tag
-      "#{@definition['image']}:#{@definition['tag']}"
+      "#{@definition['image']}:#{@definition.fetch('tag', 'latest')}"
     end
   end
 end

data/lib/hako/cli.rb

@@ -80,7 +80,6 @@ module Hako
 
       def parse!(argv)
         @force = false
-        @tag = 'latest'
         @dry_run = false
         @verbose = false
         @timeout = DEFAULT_TIMEOUT
@@ -98,7 +97,7 @@ module Hako
           opts.banner = 'hako deploy [OPTIONS] FILE'
           opts.version = VERSION
           opts.on('-f', '--force', 'Run deployment even if nothing is changed') { @force = true }
-          opts.on('-t', '--tag=TAG', 'Specify tag (default: latest)') { |v| @tag = v }
+          opts.on('-t', '--tag=TAG', 'Specify tag') { |v| @tag = v }
           opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
           opts.on('-v', '--verbose', 'Enable verbose logging') { @verbose = true }
           opts.on('--timeout=TIMEOUT_SEC', "Timeout deployment after TIMEOUT_SEC seconds (default: #{DEFAULT_TIMEOUT})") { |v| @timeout = v.to_i }
@@ -167,7 +166,6 @@ module Hako
       end
 
       def parse!(argv)
-        @tag = 'latest'
         @dry_run = false
         @containers = []
         @env = {}
@@ -187,7 +185,7 @@ module Hako
         @parser ||= OptionParser.new do |opts|
           opts.banner = 'hako oneshot [OPTIONS] FILE COMMAND ARG...'
           opts.version = VERSION
-          opts.on('-t', '--tag=TAG', 'Specify tag (default: latest)') { |v| @tag = v }
+          opts.on('-t', '--tag=TAG', 'Specify tag') { |v| @tag = v }
           opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
           opts.on('-c', '--container=NAME', 'Additional container name to start with the app container') { |v| @containers << v }
           opts.on('-v', '--verbose', 'Enable verbose logging') { @verbose = true }

data/lib/hako/commander.rb

@@ -15,10 +15,10 @@ module Hako
     end
 
     # @param [Boolean] force
-    # @param [String] tag
+    # @param [String, nil] tag
     # @param [Boolean] dry_run
     # @return [nil]
-    def deploy(force: false, tag: 'latest', dry_run: false, timeout:)
+    def deploy(force: false, tag:, dry_run: false, timeout:)
       containers = load_containers(tag, dry_run: dry_run)
       scripts = @app.definition.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       volumes = @app.definition.fetch('volumes', {})
@@ -42,7 +42,7 @@ module Hako
     end
 
     # @param [Array<String>] commands
-    # @param [String] tag
+    # @param [String, nil] tag
     # @param [Hash<String, String>] env
     # @param [Boolean] dry_run
     # @param [Boolean] no_wait
@@ -110,12 +110,12 @@ module Hako
       exit_code
     end
 
-    # @param [String] tag
+    # @param [String, nil] tag
     # @param [Boolean] dry_run
     # @param [Array<String>, nil] with
     # @return [Hash<String, Container>]
     def load_containers(tag, dry_run:, with: nil)
-      DefinitionLoader.new(@app, dry_run: dry_run).load(tag, with: with)
+      DefinitionLoader.new(@app, dry_run: dry_run).load(tag: tag, with: with)
     end
 
     # @param [Hash] scheduler_definition

data/lib/hako/definition_loader.rb

@@ -14,10 +14,10 @@ module Hako
       @dry_run = dry_run
     end
 
-    # @param [String] tag
+    # @param [String, nil] tag
     # @param [Array<String>, nil] with
     # @return [Hash<String, Container>]
-    def load(tag, with: nil)
+    def load(tag: nil, with: nil)
       # XXX: Load additional_containers for compatibility
       sidecars = @app.definition.fetch('sidecars', @app.definition.fetch('additional_containers', {}))
       container_names = ['app']
@@ -32,7 +32,7 @@ module Hako
 
     private
 
-    # @param [String] tag
+    # @param [String, nil] tag
     # @param [Array<String>] container_names
     # @param [Hash<String, Hash>] sidecars
     # @return [Hash<String, Container>]
@@ -44,7 +44,8 @@ module Hako
           containers[name] =
             case name
             when 'app'
-              AppContainer.new(@app, @app.definition['app'].merge('tag' => tag), dry_run: @dry_run)
+              @app.definition['app']['tag'] = tag if tag
+              AppContainer.new(@app, @app.definition['app'], dry_run: @dry_run)
             else
               Container.new(@app, sidecars.fetch(name), dry_run: @dry_run)
             end

data/lib/hako/schedulers/ecs.rb

@@ -150,6 +150,7 @@ module Hako
               @service_discovery.apply
             end
             unless wait_for_ready(service)
+              @scripts.each { |script| script.deploy_failed(containers, task_ids: @started_task_ids) }
               if task_definition_changed
                 Hako.logger.error("Rolling back to #{current_service.task_definition}")
                 update_service(service, current_service.task_definition)
@@ -912,7 +913,7 @@ module Hako
             Process.clock_gettime(Process::CLOCK_MONOTONIC)
           end
 
-        started_task_ids = []
+        @started_task_ids = []
 
         loop do
           if started_at
@@ -936,16 +937,16 @@ module Hako
             Hako.logger.info "#{e.created_at}: #{e.message}"
             task_id = extract_task_id(e.message)
             if task_id && e.message.include?(' has started ')
-              started_task_ids << task_id
+              @started_task_ids << task_id
             end
           end
           latest_event_id = find_latest_event_id(s.events)
           Hako.logger.debug "  latest_event_id=#{latest_event_id}, deployments=#{s.deployments}"
           no_active = s.deployments.all? { |d| d.status != 'ACTIVE' }
           primary = s.deployments.find { |d| d.status == 'PRIMARY' }
-          if primary.desired_count < started_task_ids.size
+          if primary.desired_count < @started_task_ids.size
             Hako.logger.error('Some started tasks are stopped. It seems new deployment is failing to start')
-            ecs_client.describe_tasks(cluster: service.cluster_arn, tasks: started_task_ids).tasks.each do |task|
+            ecs_client.describe_tasks(cluster: service.cluster_arn, tasks: @started_task_ids).tasks.each do |task|
               report_task_diagnostics(task)
             end
             return false

data/lib/hako/script.rb

@@ -23,6 +23,10 @@ module Hako
     # @param [Hash<String, Container>] _containers
     def deploy_finished(_containers); end
 
+    # @param [Hash<String, Container>] _containers
+    # @param [Hash] _options
+    def deploy_failed(_containers, _options); end
+
     def rollback_starting; end
 
     # @param [String] _current_image_tag

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '2.7.0'
+  VERSION = '2.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling