hako 2.11.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001e7a2b3dccc96340e80481753f1090728f9f2cca4f27e94f7fca284e6a65f1
-  data.tar.gz: 544f03662039b57ef3e428d0de4b98a5a85dada6e41486ea8ce02777f4d305e2
+  metadata.gz: 1c1298dda5d9e120f1856ed3a559c520451b1023384d1a56bd921f66c70f6da5
+  data.tar.gz: 833a89a305a9e075df8016e90a7d4ad45f18c29ad208197e3ebdacba5a60848b
 SHA512:
-  metadata.gz: 2c20a94341bc32ea7f1ec3e02057b09aa4e4805c1fde173e136a7ad62a10b01395c16295afdc76c925a606d884fe55528c57cdbbff71b0210a5e503c34fe216e
-  data.tar.gz: ff1994cf309def51247e541876a6af52abb36b5ec12799cdad783de84791e0bcadb6fbc00f463c0308711db5191cce0a08804d69009207f3c5dba2cc696d6547
+  metadata.gz: bfba96a068f38a760e7760188574e7b5afe2dd5400ce745905f3611f71fe18f87d2cbe446878c2d00ee55e56b423ac0185baa96c91737b10847f3f77442d5035
+  data.tar.gz: cfa5202766106d88e125cba58011fcccff3954a843c2fdc56a301e62d476239b1ae955b627de3dfbcf185e08bfb721418669c6f86548f68d55765f164e969e56

data/.rubocop.yml

@@ -2,14 +2,17 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
+  NewCops: disable
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
+  Enabled: false
+Layout/LineLength:
   Enabled: false
 
 Naming/PredicateName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Naming/MemoizedInstanceVariableName:
   Enabled: false
@@ -35,6 +38,8 @@ Style/RaiseArgs:
   EnforcedStyle: compact
 Style/SignalException:
   Enabled: false
+Style/SoleNestedConditional:
+  Enabled: false
 Style/StderrPuts:
   Enabled: false
 Style/TrailingCommaInArguments:

data/.rubocop_todo.yml

@@ -6,8 +6,6 @@ Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ParameterLists:

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.4
-  - 2.4.1
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - ruby-head
-before_install:
-  - gem update --system # https://github.com/rubygems/rubygems/pull/1819
-  - gem install bundler
 matrix:
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+# 2.15.0 (2020-11-02)
+## New features
+- Support protocol_version and matcher option of ALB target groups
+
+# 2.14.0 (2020-05-20)
+## New features
+- Support tags for task definition and propagate them to ECS tasks
+    - Now all created ECS services and launched ECS tasks have `propagate_tags=TASK_DEFINITION` parameter.
+- Support repository_credentials
+
+# 2.13.0 (2020-01-10)
+## New features
+- Support capacity provider strategy
+
+## Bug fixes
+- Do not try to update assign_public_ip when it is not changed
+
+# 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
+
+# 2.11.1 (2019-05-17)
+## Bug fixes
+- Fix comparison of `system_controls` parameter
+
 # 2.11.0 (2019-05-17)
 ## New features
 - Support `system_controls` parameter in container definition

data/examples/hello-grpc.jsonnet

@@ -0,0 +1,60 @@
+{
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 2,
+    role: 'ecsServiceRole',
+    elb_v2: {
+      // Specify protocol_version for gRPC servers
+      protocol_version: 'GRPC',
+      // VPC id where the target group is located
+      vpc_id: 'vpc-WWWWWWWW',
+      // If you want internal ELB, then use 'scheme'. (ex. internal service that like microservice inside VPC)
+      scheme: 'internal',
+      // Health check path of the target group
+      health_check_path: '/AWS.ELB/healthcheck',
+      listeners: [
+        {
+          port: 50051,
+          protocol: 'HTTPS',
+          certificate_arn: 'arn:aws:acm:ap-northeast-1:012345678901:certificate/01234567-89ab-cdef-0123-456789abcdef',
+        },
+      ],
+      subnets: ['subnet-XXXXXXXX', 'subnet-YYYYYYYY'],
+      security_groups: ['sg-ZZZZZZZZ'],
+      load_balancer_attributes: {
+        'access_logs.s3.enabled': 'true',
+        'access_logs.s3.bucket': 'hako-access-logs',
+        'access_logs.s3.prefix': 'hako-hello-grpc',
+      },
+      target_group_attributes: {
+        // http://docs.aws.amazon.com/en_us/elasticloadbalancing/latest/application/load-balancer-target-groups.html#target-group-attributes
+        'deregistration_delay.timeout_seconds': '20',
+      },
+      // Route ELB traffic to app container directly
+      container_name: 'app',
+      container: 50051,
+    },
+  },
+  app: {
+    image: 'awesome-grpc-server',
+    memory: 128,
+    cpu: 256,
+    env: {
+      PORT: '50051',
+    },
+    secrets: [{
+      name: 'MESSAGE',
+      value_from: 'arn:aws:ssm:ap-northeast-1:012345678901:parameter/hako/hello-grpc/secret-message',
+    }],
+    port_mappings: [
+      {
+        container_port: 50051,
+        host_port: 0,
+        protocol: 'tcp',
+      },
+    ],
+  },
+  scripts: [],
+}

data/hako.gemspec

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_dependency 'aws-sdk-applicationautoscaling'
   spec.add_dependency 'aws-sdk-autoscaling'
   spec.add_dependency 'aws-sdk-cloudwatch'
   spec.add_dependency 'aws-sdk-cloudwatchlogs'
   spec.add_dependency 'aws-sdk-ec2'
-  spec.add_dependency 'aws-sdk-ecs', '>= 1.31.0'
+  spec.add_dependency 'aws-sdk-ecs', '>= 1.54.0'
   spec.add_dependency 'aws-sdk-elasticloadbalancing'
-  spec.add_dependency 'aws-sdk-elasticloadbalancingv2'
+  spec.add_dependency 'aws-sdk-elasticloadbalancingv2', '>= 1.54.0'
   spec.add_dependency 'aws-sdk-s3'
   spec.add_dependency 'aws-sdk-servicediscovery'
   spec.add_dependency 'aws-sdk-sns'

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

@@ -18,7 +18,7 @@ module Hako
     # @param [String, nil] tag
     # @param [Boolean] dry_run
     # @return [nil]
-    def deploy(force: false, tag:, dry_run: false, timeout:)
+    def deploy(tag:, timeout:, force: false, dry_run: false)
       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', {})
@@ -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
@@ -125,7 +126,7 @@ module Hako
     # @param [Boolean] dry_run
     # @param [Integer] timeout
     # @return [Scheduler]
-    def load_scheduler(scheduler_definition, scripts, volumes: {}, force: false, dry_run:, timeout: nil)
+    def load_scheduler(scheduler_definition, scripts, dry_run:, volumes: {}, force: false, timeout: nil)
       Loader.new(Hako::Schedulers, 'hako/schedulers').load(scheduler_definition.fetch('type')).new(@app.id, scheduler_definition, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run, timeout: timeout)
     end
 

data/lib/hako/container.rb

@@ -213,6 +213,15 @@ module Hako
       end
     end
 
+    # @return [Hash, nil]
+    def repository_credentials
+      if @definition.key?('repository_credentials')
+        {
+          credentials_parameter: @definition['repository_credentials'].fetch('credentials_parameter'),
+        }
+      end
+    end
+
     private
 
     PROVIDERS_KEY = '$providers'

data/lib/hako/env_providers/file.rb

@@ -7,7 +7,7 @@ module Hako
     class File < EnvProvider
       # @param [Pathname] root_path
       # @param [Hash<String, Object>] options
-      def initialize(root_path, options)
+      def initialize(root_path, options) # rubocop:disable Lint/MissingSuper
         unless options['path']
           validation_error!('path must be set')
         end

data/lib/hako/env_providers/yaml.rb

@@ -8,7 +8,7 @@ module Hako
     class Yaml < EnvProvider
       # @param [Pathname] root_path
       # @param [Hash<String, Object>] options
-      def initialize(root_path, options)
+      def initialize(root_path, options) # rubocop:disable Lint/MissingSuper
         unless options['path']
           validation_error!('path must be set')
         end

data/lib/hako/schedulers/ecs.rb

@@ -74,6 +74,15 @@ module Hako
         @memory = options.fetch('memory', nil)
         @requires_compatibilities = options.fetch('requires_compatibilities', nil)
         @launch_type = options.fetch('launch_type', nil)
+        if options.key?('capacity_provider_strategy')
+          @capacity_provider_strategy = options.fetch('capacity_provider_strategy').map do |strategy|
+            {
+              capacity_provider: strategy.fetch('capacity_provider'),
+              weight: strategy.fetch('weight', nil),
+              base: strategy.fetch('base', nil),
+            }
+          end
+        end
         @platform_version = options.fetch('platform_version', nil)
         if options.key?('network_configuration')
           network_configuration = options.fetch('network_configuration')
@@ -91,6 +100,7 @@ module Hako
         if options['service_discovery']
           @service_discovery = EcsServiceDiscovery.new(options.fetch('service_discovery'), @region, dry_run: @dry_run)
         end
+        @tags = options.fetch('tags', {}).map { |k, v| { key: k, value: v.to_s } }
 
         @started_at = nil
         @container_instance_arn = nil
@@ -198,8 +208,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 +221,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 +232,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
@@ -454,8 +465,9 @@ module Hako
 
       # @param [Array<Hash>] desired_definitions
       # @param [Aws::ECS::Types::TaskDefinition] actual_definition
-      # @return [Array<Boolean]
-      def task_definition_changed?(desired_definitions, actual_definition)
+      # @param [Array<Aws::ECS::Types::Tag>] actual_tags
+      # @return [Array<Boolean>]
+      def task_definition_changed?(desired_definitions, actual_definition, actual_tags)
         if @force
           return true
         end
@@ -504,6 +516,12 @@ module Hako
           return true
         end
 
+        actual_tags_set = Set.new(actual_tags.map { |t| { key: t.key, value: t.value } })
+        tags_set = Set.new(@tags)
+        if actual_tags_set != tags_set
+          return true
+        end
+
         false
       end
 
@@ -525,7 +543,10 @@ module Hako
       # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition>]
       def register_task_definition(definitions)
         current_task_definition = describe_task_definition(@app_id)
-        if task_definition_changed?(definitions, current_task_definition)
+        if current_task_definition
+          current_tags = ecs_client.list_tags_for_resource(resource_arn: current_task_definition.task_definition_arn).tags
+        end
+        if task_definition_changed?(definitions, current_task_definition, current_tags)
           new_task_definition = ecs_client.register_task_definition(
             family: @app_id,
             task_role_arn: @task_role_arn,
@@ -536,6 +557,7 @@ module Hako
             requires_compatibilities: @requires_compatibilities,
             cpu: @cpu,
             memory: @memory,
+            tags: @tags.empty? ? nil : @tags,
           ).task_definition
           [true, new_task_definition]
         else
@@ -555,34 +577,36 @@ module Hako
       # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition]
       def register_task_definition_for_oneshot(definitions)
         10.times do |i|
-          begin
-            family = "#{@app_id}-oneshot"
-            current_task_definition = describe_task_definition(family)
-            if task_definition_changed?(definitions, current_task_definition)
-              new_task_definition = ecs_client.register_task_definition(
-                family: family,
-                task_role_arn: @task_role_arn,
-                execution_role_arn: @execution_role_arn,
-                network_mode: @network_mode,
-                container_definitions: definitions,
-                volumes: volumes_definition,
-                requires_compatibilities: @requires_compatibilities,
-                cpu: @cpu,
-                memory: @memory,
-              ).task_definition
-              return [true, new_task_definition]
-            else
-              return [false, current_task_definition]
-            end
-          rescue Aws::ECS::Errors::ClientException => e
-            if e.message.include?('Too many concurrent attempts to create a new revision of the specified family')
-              Hako.logger.error(e.message)
-              interval = 2**i + rand(0.0..10.0)
-              Hako.logger.error("Retrying register_task_definition_for_oneshot after #{interval} seconds")
-              sleep(interval)
-            else
-              raise e
-            end
+          family = "#{@app_id}-oneshot"
+          current_task_definition = describe_task_definition(family)
+          if current_task_definition
+            current_tags = ecs_client.list_tags_for_resource(resource_arn: current_task_definition.task_definition_arn).tags
+          end
+          if task_definition_changed?(definitions, current_task_definition, current_tags)
+            new_task_definition = ecs_client.register_task_definition(
+              family: family,
+              task_role_arn: @task_role_arn,
+              execution_role_arn: @execution_role_arn,
+              network_mode: @network_mode,
+              container_definitions: definitions,
+              volumes: volumes_definition,
+              requires_compatibilities: @requires_compatibilities,
+              cpu: @cpu,
+              memory: @memory,
+              tags: @tags.empty? ? nil : @tags,
+            ).task_definition
+            return [true, new_task_definition]
+          else
+            return [false, current_task_definition]
+          end
+        rescue Aws::ECS::Errors::ClientException => e
+          if e.message.include?('Too many concurrent attempts to create a new revision of the specified family')
+            Hako.logger.error(e.message)
+            interval = 2**i + rand(0.0..10.0)
+            Hako.logger.error("Retrying register_task_definition_for_oneshot after #{interval} seconds")
+            sleep(interval)
+          else
+            raise e
           end
         end
         raise Error.new('Unable to register task definition for oneshot due to too many client errors')
@@ -652,33 +676,28 @@ module Hako
           readonly_root_filesystem: container.readonly_root_filesystem,
           docker_security_options: container.docker_security_options,
           system_controls: container.system_controls,
+          repository_credentials: container.repository_credentials,
         }
       end
 
       # @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',
           launch_type: @launch_type,
+          capacity_provider_strategy: @capacity_provider_strategy,
           platform_version: @platform_version,
           network_configuration: @network_configuration,
+          propagate_tags: 'TASK_DEFINITION',
         )
         result.failures.each do |failure|
           Hako.logger.error("#{failure.arn} #{failure.reason}")
@@ -702,6 +721,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)
@@ -852,6 +890,7 @@ module Hako
           desired_count: @desired_count,
           task_definition: task_definition_arn,
           deployment_configuration: @deployment_configuration,
+          capacity_provider_strategy: @capacity_provider_strategy,
           platform_version: @platform_version,
           network_configuration: @network_configuration,
           health_check_grace_period_seconds: @health_check_grace_period_seconds,
@@ -860,6 +899,20 @@ module Hako
           # Keep current desired_count if autoscaling is enabled
           params[:desired_count] = current_service.desired_count
         end
+        # Copy the current capacity provider strategy in order to avoid a
+        # perpetual diff when the service is created with no strategy to use the
+        # cluster's default capacity provider strategy, which results in the
+        # strategy being set to the default strategy at that moment.
+        # It is not allowed to update the service to use the cluster's default
+        # capacity provider strategy when it is using a non-default capacity
+        # provider strategy.
+        params[:capacity_provider_strategy] ||= current_service.capacity_provider_strategy&.map(&:to_h)
+        if different_capacity_provider_strategy?(params[:capacity_provider_strategy], current_service.capacity_provider_strategy)
+          # Switching from launch type to capacity provider strategy or making
+          # a change to a capacity provider strategy requires to force a new
+          # deployment.
+          params[:force_new_deployment] = true
+        end
         warn_placement_policy_change(current_service)
         warn_service_registries_change(current_service)
         if service_changed?(current_service, params)
@@ -883,9 +936,11 @@ module Hako
           placement_strategy: @placement_strategy,
           scheduling_strategy: @scheduling_strategy,
           launch_type: @launch_type,
+          capacity_provider_strategy: @capacity_provider_strategy,
           platform_version: @platform_version,
           network_configuration: @network_configuration,
           health_check_grace_period_seconds: @health_check_grace_period_seconds,
+          propagate_tags: 'TASK_DEFINITION',
         }
         if @scheduling_strategy != 'DAEMON'
           params[:desired_count] = 0
@@ -1154,17 +1209,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 +1298,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 +1315,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|
@@ -1301,6 +1391,15 @@ module Hako
         nil
       end
 
+      # @param [Hash, nil] expected_strategy
+      # @param [Aws::ECS::Types::CapacityProviderStrategyItem, nil] actual_strategy
+      # @return [Boolean]
+      def different_capacity_provider_strategy?(expected_strategy, actual_strategy)
+        expected = (expected_strategy || []).map { |s| [s[:capacity_provider], s[:weight] || 0, s[:base] || 0] }.sort
+        actual = (actual_strategy || []).map { |s| [s.capacity_provider, s.weight, s.base] }.sort
+        expected != actual
+      end
+
       # @param [Aws::ECS::Types::Service] service
       # @return [nil]
       def warn_placement_policy_change(service)

data/lib/hako/schedulers/ecs_autoscaling.rb

@@ -162,9 +162,7 @@ module Hako
       end
 
       class Policy
-        attr_reader :policy_type
-        attr_reader :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type
-        attr_reader :target_value, :predefined_metric_type, :scale_out_cooldown, :scale_in_cooldown, :disable_scale_in
+        attr_reader :policy_type, :alarms, :cooldown, :adjustment_type, :scaling_adjustment, :metric_interval_lower_bound, :metric_interval_upper_bound, :metric_aggregation_type, :target_value, :predefined_metric_type, :scale_out_cooldown, :scale_in_cooldown, :disable_scale_in
 
         # @param [Hash] options
         def initialize(options)

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -46,6 +46,7 @@ module Hako
           struct.member(:readonly_root_filesystem, Schema::Nullable.new(Schema::Boolean.new))
           struct.member(:docker_security_options, Schema::Nullable.new(Schema::UnorderedArray.new(Schema::String.new)))
           struct.member(:system_controls, Schema::Nullable.new(system_controls_schema))
+          struct.member(:repository_credentials, Schema::Nullable.new(repository_credentials_schema))
         end
       end
 
@@ -173,11 +174,21 @@ module Hako
       end
 
       def system_controls_schema
+        Schema::UnorderedArray.new(system_control_schema)
+      end
+
+      def system_control_schema
         Schema::Structure.new.tap do |struct|
           struct.member(:namespace, Schema::String.new)
           struct.member(:value, Schema::String.new)
         end
       end
+
+      def repository_credentials_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:credentials_parameter, Schema::String.new)
+        end
+      end
     end
   end
 end

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -89,13 +89,22 @@ module Hako
                              target_type: @elb_v2_config.fetch('target_type', nil),
                            ).target_groups[0]
                          else
+                           matcher =
+                             if @elb_v2_config.key?('matcher')
+                               {
+                                 http_code: @elb_v2_config.fetch('matcher')['http_code'],
+                                 grpc_code: @elb_v2_config.fetch('matcher')['grpc_code'],
+                               }
+                             end
                            elb_client.create_target_group(
                              name: target_group_name,
                              port: 80,
                              protocol: 'HTTP',
+                             protocol_version: @elb_v2_config.fetch('protocol_version', 'HTTP1'),
                              vpc_id: @elb_v2_config.fetch('vpc_id'),
                              health_check_path: @elb_v2_config.fetch('health_check_path', nil),
                              target_type: @elb_v2_config.fetch('target_type', nil),
+                             matcher: matcher,
                            ).target_groups[0]
                          end
 

data/lib/hako/schedulers/ecs_service_comparator.rb

@@ -23,6 +23,7 @@ module Hako
           struct.member(:desired_count, Schema::Integer.new)
           struct.member(:task_definition, Schema::String.new)
           struct.member(:deployment_configuration, Schema::WithDefault.new(deployment_configuration_schema, default_configuration))
+          struct.member(:capacity_provider_strategy, Schema::Nullable.new(Schema::UnorderedArray.new(capacity_provider_strategy_schema)))
           struct.member(:platform_version, Schema::WithDefault.new(Schema::String.new, 'LATEST'))
           struct.member(:network_configuration, Schema::Nullable.new(network_configuration_schema))
           struct.member(:health_check_grace_period_seconds, Schema::Nullable.new(Schema::Integer.new))
@@ -36,6 +37,14 @@ module Hako
         end
       end
 
+      def capacity_provider_strategy_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:capacity_provider, Schema::String.new)
+          struct.member(:weight, Schema::WithDefault.new(Schema::Integer.new, 0))
+          struct.member(:base, Schema::WithDefault.new(Schema::Integer.new, 0))
+        end
+      end
+
       def network_configuration_schema
         Schema::Structure.new.tap do |struct|
           struct.member(:awsvpc_configuration, awsvpc_configuration_schema)
@@ -46,7 +55,7 @@ module Hako
         Schema::Structure.new.tap do |struct|
           struct.member(:subnets, Schema::UnorderedArray.new(Schema::String.new))
           struct.member(:security_groups, Schema::UnorderedArray.new(Schema::String.new))
-          struct.member(:assign_public_ip, Schema::String.new)
+          struct.member(:assign_public_ip, Schema::WithDefault.new(Schema::String.new, 'DISABLED'))
         end
       end
 

data/lib/hako/scripts/nginx_front.rb

@@ -10,7 +10,7 @@ module Hako
     class NginxFront < Script
       S3Config = Struct.new(:region, :bucket, :prefix) do
         # @param [Hash] options
-        def initialize(options)
+        def initialize(options) # rubocop:disable Lint/MissingSuper
           self.region = options.fetch('region')
           self.bucket = options.fetch('bucket')
           self.prefix = options.fetch('prefix', nil)

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Kohei Suzuki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.31.0
+        version: 1.54.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-elasticloadbalancing
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.54.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +321,7 @@ files:
 - examples/hello-cap-add-app.jsonnet
 - examples/hello-fargate-batch.jsonnet
 - examples/hello-fargate.jsonnet
+- examples/hello-grpc.jsonnet
 - examples/hello-internal-nlb.jsonnet
 - examples/hello-lb-v2.jsonnet
 - examples/hello-lb.jsonnet
@@ -382,7 +383,7 @@ homepage: https://github.com/eagletmt/hako
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -390,15 +391,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Deploy Docker container
 test_files: []