hako 2.11.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a98d5923ebdf748ea9b2520a31b8e9081907a5e786866e0a108e8fb75cb12f6
-  data.tar.gz: ba1ed9526beb23c582b45da2e3d4da5b6fbfd1cb503bd98543bc5cfd3356855b
+  metadata.gz: 3778068a414fb367352ba788d4d957e863848258766bbc59efc5cf6a7b5344b5
+  data.tar.gz: c9e21cd8877bd3445739d328551fb85b28457e19fb12ff770ac53b604ab021be
 SHA512:
-  metadata.gz: e78054720c6d8c06c5158e188f8d496972396b3d289546f2fb592462f7df28fbfec76746e8ab5d6a7e137729f7c2bd0bc2c73c311052c9ca56ba20593cd88864
-  data.tar.gz: a769ebb32b9ea79fecfbe34f8c25264781ce81efa5ab0dd9949f0305a84875aca65956b009eaf76816b64d178256f719e056a2b2dcc4f04950cf42e1b152ef13
+  metadata.gz: d8d4beb5835cb3efe38fdfae553b50ebfd254fff8df7c454a8087105158dbfb5b655e83472e47c27934d365146d0b4d34fd4babefa850963f06ec6c50319ac66
+  data.tar.gz: ab158b547e18cb9a6231ee3726d5ba99934847f53699ef57cacc4779bc3551b2b1dfe51951d986904871b35286d7cc468f2cc683b6f5d3e15d7961b867395cd8

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
   - ruby-head
 before_install:
   - gem update --system # https://github.com/rubygems/rubygems/pull/1819

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.12.0 (2019-09-09)
+## New features
+- Support more overrides options for `hako oneshot`
+  - `--app-cpu`, `--app-memory` and `--app-memory-reservation` are added
+
+## Bug fixes
+- Show `--health-*` options in dry-run
+
+## Bug fixes
+
 # 2.11.1 (2019-05-17)
 ## Bug fixes
 - Fix comparison of `system_controls` parameter

data/lib/hako/cli.rb

@@ -147,6 +147,8 @@ module Hako
     end
 
     class Oneshot
+      Overrides = Struct.new(:app_cpu, :app_memory, :app_memory_reservation)
+
       def run(argv)
         parse!(argv)
         require 'hako/application'
@@ -162,7 +164,7 @@ module Hako
           else
             {}
           end
-        Commander.new(Application.new(@definition_path, options)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait)
+        Commander.new(Application.new(@definition_path, options)).oneshot(@argv, tag: @tag, containers: @containers, env: @env, dry_run: @dry_run, no_wait: @no_wait, overrides: @overrides)
       end
 
       def parse!(argv)
@@ -171,6 +173,7 @@ module Hako
         @env = {}
         @verbose = false
         @no_wait = false
+        @overrides = Overrides.new
         parser.parse!(argv)
         @definition_path = argv.shift
         @argv = argv
@@ -194,6 +197,9 @@ module Hako
             k, v = arg.split('=', 2)
             @env[k] = v
           end
+          opts.on('--app-cpu=VAL', Integer, 'Override the default cpu for the app container') { |v| @overrides.app_cpu = v }
+          opts.on('--app-memory=VAL', Integer, 'Override the default memory for the app container') { |v| @overrides.app_memory = v }
+          opts.on('--app-memory-reservation=VAL', Integer, 'Override the default memory reservation for the app container') { |v| @overrides.app_memory_reservation = v }
         end
       end
     end

data/lib/hako/commander.rb

@@ -46,8 +46,9 @@ module Hako
     # @param [Hash<String, String>] env
     # @param [Boolean] dry_run
     # @param [Boolean] no_wait
+    # @param [Hako::CLI::Oneshot::Overrides, nil] overrides
     # @return [nil]
-    def oneshot(commands, tag:, containers:, env: {}, dry_run: false, no_wait: false)
+    def oneshot(commands, tag:, containers:, env: {}, dry_run: false, no_wait: false, overrides: nil)
       containers = load_containers(tag, dry_run: dry_run, with: containers)
       scripts = @app.definition.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       volumes = @app.definition.fetch('volumes', {})
@@ -55,7 +56,7 @@ module Hako
 
       scripts.each { |script| script.oneshot_starting(containers) }
       exit_code = with_oneshot_signal_handlers(scheduler) do
-        scheduler.oneshot(containers, commands, env, no_wait: no_wait)
+        scheduler.oneshot(containers, commands, env, no_wait: no_wait, overrides: overrides)
       end
       scripts.each { |script| script.oneshot_finished(containers) }
       exit exit_code

data/lib/hako/schedulers/ecs.rb

@@ -198,8 +198,9 @@ module Hako
       # @param [Array<String>] commands
       # @param [Hash<String, String>] env
       # @param [Boolean] no_wait
+      # @param [Hako::CLI::Oneshot::Overrides, nil] overrides
       # @return [Integer] Returns exit code
-      def oneshot(containers, commands, env, no_wait: false)
+      def oneshot(containers, commands, env, no_wait: false, overrides: nil)
         definitions = create_definitions(containers)
 
         if @dry_run
@@ -210,7 +211,7 @@ module Hako
             if d[:name] == 'app'
               d[:command] = commands
             end
-            print_definition_in_cli_format(d, additional_env: env)
+            print_definition_in_cli_format(d, additional_env: env, overrides: overrides)
             check_secrets(d)
           end
           0
@@ -221,7 +222,7 @@ module Hako
           else
             Hako.logger.info "Task definition isn't changed: #{task_definition.task_definition_arn}"
           end
-          @task = run_task(task_definition, commands, env)
+          @task = run_task(task_definition, commands, env, overrides)
           Hako.logger.info "Started task: #{@task.task_arn}"
           @scripts.each { |script| script.oneshot_started(self) }
           if no_wait
@@ -658,21 +659,13 @@ module Hako
       # @param [Aws::ECS::Types::TaskDefinition] task_definition
       # @param [Array<String>] commands
       # @param [Hash<String, String>] env
+      # @param [Hako::CLI::Oneshot::Overrides] overrides
       # @return [Aws::ECS::Types::Task]
-      def run_task(task_definition, commands, env)
-        environment = env.map { |k, v| { name: k, value: v } }
+      def run_task(task_definition, commands, env, overrides)
         result = ecs_client.run_task(
           cluster: @cluster,
           task_definition: task_definition.task_definition_arn,
-          overrides: {
-            container_overrides: [
-              {
-                name: 'app',
-                command: commands,
-                environment: environment,
-              },
-            ],
-          },
+          overrides: overrides_option(commands, env, overrides),
           count: 1,
           placement_constraints: @placement_constraints,
           started_by: 'hako oneshot',
@@ -702,6 +695,25 @@ module Hako
         end
       end
 
+      # @param [Array<String>] commands
+      # @param [Hash<String, String>] env
+      # @param [Hako::CLI::Oneshot::Overrides, nil] overrides
+      # @doc https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ContainerOverride.html
+      def overrides_option(commands, env, overrides)
+        {
+          container_overrides: [
+            {
+              name: 'app',
+              cpu: overrides&.app_cpu,
+              memory: overrides&.app_memory,
+              memory_reservation: overrides&.app_memory_reservation,
+              command: commands,
+              environment: env.map { |k, v| { name: k, value: v } },
+            },
+          ],
+        }
+      end
+
       # @return [Fixnum]
       def wait_for_oneshot_finish
         containers = wait_for_task(@task)
@@ -1154,17 +1166,33 @@ module Hako
 
       # @param [Hash] definition
       # @param [Hash<String, String>] additional_env
+      # @param [Hako::CLI::Oneshot::Overrides, nil] overrides
       # @return [nil]
-      def print_definition_in_cli_format(definition, additional_env: {})
+      def print_definition_in_cli_format(definition, additional_env: {}, overrides: nil)
         cmd = %w[docker run]
         cmd << '--name' << definition.fetch(:name)
-        cmd << '--cpu-shares' << definition.fetch(:cpu)
-        if definition[:memory]
-          cmd << '--memory' << "#{definition[:memory]}M"
-        end
-        if definition[:memory_reservation]
-          cmd << '--memory-reservation' << "#{definition[:memory_reservation]}M"
+
+        if overrides && definition.fetch(:name) == 'app'
+          cpu = overrides.app_cpu || definition.fetch(:cpu)
+          cmd << '--cpu-shares' << cpu
+          memory = overrides.app_memory || definition[:memory]
+          if memory
+            cmd << '--memory' << "#{memory}M"
+          end
+          memory_reservation = overrides.app_memory_reservation || definition[:memory_reservation]
+          if memory_reservation
+            cmd << '--memory-reservation' << "#{memory_reservation}M"
+          end
+        else
+          cmd << '--cpu-shares' << definition.fetch(:cpu)
+          if definition[:memory]
+            cmd << '--memory' << "#{definition[:memory]}M"
+          end
+          if definition[:memory_reservation]
+            cmd << '--memory-reservation' << "#{definition[:memory_reservation]}M"
+          end
         end
+
         definition.fetch(:links).each do |link|
           cmd << '--link' << link
         end
@@ -1227,9 +1255,6 @@ module Hako
             cmd << '--tmpfs' << "#{tmpfs[:container_path]}:#{options.join(',')}"
           end
         end
-        definition.fetch(:volumes_from).each do |volumes_from|
-          p volumes_from
-        end
         if definition[:user]
           cmd << '--user' << definition[:user]
         end
@@ -1247,6 +1272,28 @@ module Hako
             cmd << '--sysctl' << "#{system_control.fetch(:namespace)}=#{system_control.fetch(:value)}"
           end
         end
+        if definition[:health_check]
+          if definition[:health_check][:command]
+            health_check_command_type = definition[:health_check][:command][0]
+            case health_check_command_type
+            when 'NONE'
+              cmd << '--no-healthcheck'
+            when 'CMD', 'CMD-SHELL'
+              health_check_command = definition[:health_check][:command][1..-1].join(' ')
+              cmd << '--health-cmd' << health_check_command.inspect
+            else
+              raise "Health check command type #{health_check_command_type} is not supported. CMD, CMD-SHELL and NONE are supported."
+            end
+          end
+          if definition[:health_check][:retries]
+            cmd << '--health-retries' << definition[:health_check][:retries]
+          end
+          %i[interval timeout start_period].each do |property|
+            if definition[:health_check][property]
+              cmd << "--health-#{property}" << "#{definition[:health_check][property]}s"
+            end
+          end
+        end
 
         cmd << "\\\n  "
         definition.fetch(:environment).each do |env|

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling