hako 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a30d74550945e62c5f12018b854c043b2e5c2221b64ab3f8f01060e696c0b65
-  data.tar.gz: 8fb3a566c799e12a0650afed8ea9015eae8d6999abdb8bc5383c1099a25b98e3
+  metadata.gz: 7ef02b44439fedefe65ec80e5af6d296bc735817dc271b9129b96abb8448ee6e
+  data.tar.gz: 382a1d4dc73953bd345a66e8c79ce1733fb1c7a926d9306feda1673bd1cd933d
 SHA512:
-  metadata.gz: b9d56daa1b534da5e3d21192161d208a7aa3cefd432bb58a11bc26cf744233f669d2915450a8319464da3b88973c7a96e697fa0c1b303f6bd6b8020c0318ed06
-  data.tar.gz: f918907a6a4e5d1f0df0e9e00bd392e83c809c7a94be3040261bfa6826282a0f5cfe841765cc9adc933afc71ce1b00c7646065f66f69f7a80e8fc016dc72069b
+  metadata.gz: a253c0e8147b6c00372ee07376397a29b2f8df83abeaafed018a352a99261ac3f161cee579225e314d3a01dd6582216ba31c5b5f773fb5485ab112a5420d78fb
+  data.tar.gz: 17cc31d59e1e53819eb1c47f8c78159d7a86c5bef6fc7e970a9d133fc4852afa02094c3ea4607dea8bd29b347691ab19ec45ff4cd26a1ba06cc33e69df934034

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 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

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/schedulers/ecs.rb

@@ -100,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
@@ -464,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
@@ -513,6 +515,11 @@ module Hako
         if actual_definition.requires_compatibilities != @requires_compatibilities
           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
@@ -535,7 +542,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,
@@ -546,6 +556,7 @@ module Hako
             requires_compatibilities: @requires_compatibilities,
             cpu: @cpu,
             memory: @memory,
+            tags: @tags.empty? ? nil : @tags,
           ).task_definition
           [true, new_task_definition]
         else
@@ -568,7 +579,10 @@ module Hako
           begin
             family = "#{@app_id}-oneshot"
             current_task_definition = describe_task_definition(family)
-            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: family,
                 task_role_arn: @task_role_arn,
@@ -579,6 +593,7 @@ module Hako
                 requires_compatibilities: @requires_compatibilities,
                 cpu: @cpu,
                 memory: @memory,
+                tags: @tags.empty? ? nil : @tags,
               ).task_definition
               return [true, new_task_definition]
             else
@@ -662,6 +677,7 @@ 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
 
@@ -682,6 +698,7 @@ module Hako
           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}")
@@ -924,6 +941,7 @@ module Hako
           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

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
 
@@ -182,6 +183,12 @@ module Hako
           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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling