hako 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3778068a414fb367352ba788d4d957e863848258766bbc59efc5cf6a7b5344b5
-  data.tar.gz: c9e21cd8877bd3445739d328551fb85b28457e19fb12ff770ac53b604ab021be
+  metadata.gz: 8a30d74550945e62c5f12018b854c043b2e5c2221b64ab3f8f01060e696c0b65
+  data.tar.gz: 8fb3a566c799e12a0650afed8ea9015eae8d6999abdb8bc5383c1099a25b98e3
 SHA512:
-  metadata.gz: d8d4beb5835cb3efe38fdfae553b50ebfd254fff8df7c454a8087105158dbfb5b655e83472e47c27934d365146d0b4d34fd4babefa850963f06ec6c50319ac66
-  data.tar.gz: ab158b547e18cb9a6231ee3726d5ba99934847f53699ef57cacc4779bc3551b2b1dfe51951d986904871b35286d7cc468f2cc683b6f5d3e15d7961b867395cd8
+  metadata.gz: b9d56daa1b534da5e3d21192161d208a7aa3cefd432bb58a11bc26cf744233f669d2915450a8319464da3b88973c7a96e697fa0c1b303f6bd6b8020c0318ed06
+  data.tar.gz: f918907a6a4e5d1f0df0e9e00bd392e83c809c7a94be3040261bfa6826282a0f5cfe841765cc9adc933afc71ce1b00c7646065f66f69f7a80e8fc016dc72069b

data/.rubocop.yml

@@ -4,12 +4,12 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   Enabled: false
 
 Naming/PredicateName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 Naming/MemoizedInstanceVariableName:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 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`
@@ -6,8 +13,6 @@
 ## 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/hako.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   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-s3'

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')
@@ -670,6 +679,7 @@ module Hako
           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,
         )
@@ -864,6 +874,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,
@@ -872,6 +883,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)
@@ -895,6 +920,7 @@ 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,
@@ -1348,6 +1374,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_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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-01-10 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
@@ -397,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Deploy Docker container