hako 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be720c4761b90dbbae3c8d302cbe3c50421c915a
-  data.tar.gz: 40a6297d8e167ea157cb3080749d56c70ab9cbe0
+  metadata.gz: 1c3cbac9e99948d6066a1298afe5ca3076760291
+  data.tar.gz: b0839a1b24e6999fb06bdd966d91361920a62410
 SHA512:
-  metadata.gz: b5f6863cebd0493b0d47a72bc82296490195446aa8a8fd74a2f401f0b67046aa472f14266928ceba3e71694da7aa8a5050d4e6bfa81399cdb44a552c5600e2e4
-  data.tar.gz: 13e21ae6fa1ae860a5598f8abe5910b5b8e759889ec9a439f9984b79d407588c4b43719a51f90b09eb2bd1530913f1993fb206e54bad07d172330b18c240fc7b
+  metadata.gz: b37865f52d9b2c08d2892659d1cfe7b0706f08ba62e8ec44102e27a347b91ce334d1dfeafe5583c0dc3169848c3180ae291c2efa0cb0bbf95a6afd29f0905a47
+  data.tar.gz: aca7ab571e6f2a6d3d584f303430a17eaf2d5c435e67ec08912512a0e991465cdc2188b62f1bac0dc8b00954295accdfb15d8ec6d05dc0bf60475bddb5dc6470

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.3.2 (2017-05-23)
+## Bug fixes
+- Pass placement_configurations in oneshot mode
+- Symbolize port_mapping keys to compare definitions correctly
+
+## Improvements
+- Reduce the number of DescribeTaskDefinition calls
+
 # 1.3.1 (2017-05-16)
 ## Bug fixes
 - Retry DescribeAutoScalingGroups when rate limited

data/lib/hako/container.rb

@@ -25,7 +25,6 @@ module Hako
       memory
       memory_reservation
       links
-      port_mappings
       command
       user
       privileged
@@ -44,6 +43,17 @@ module Hako
       @expanded_env ||= expand_env(@definition.fetch('env'))
     end
 
+    # @return [Array<Hash>]
+    def port_mappings
+      @definition['port_mappings'].map do |port_mapping|
+        {
+          container_port: port_mapping.fetch('container_port'),
+          host_port: port_mapping.fetch('host_port'),
+          protocol: port_mapping.fetch('protocol', 'tcp'),
+        }
+      end
+    end
+
     # @return [Array<Hash>]
     def mount_points
       @definition['mount_points'].map do |mount_point|

data/lib/hako/schedulers/ecs.rb

@@ -69,13 +69,11 @@ module Hako
           end
         else
           current_service = describe_service
-          task_definition = register_task_definition(definitions)
-          task_definition_changed = task_definition != :noop
+          task_definition_changed, task_definition = register_task_definition(definitions)
           if task_definition_changed
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
           else
-            Hako.logger.info "Task definition isn't changed"
-            task_definition = ecs_client.describe_task_definition(task_definition: @app_id).task_definition
+            Hako.logger.info "Task definition isn't changed: #{task_definition.task_definition_arn}"
           end
           unless current_service
             current_service = create_initial_service(task_definition.task_definition_arn, front_port)
@@ -151,12 +149,11 @@ module Hako
           end
           0
         else
-          task_definition = register_task_definition_for_oneshot(definitions)
-          if task_definition == :noop
-            Hako.logger.info "Task definition isn't changed"
-            task_definition = ecs_client.describe_task_definition(task_definition: "#{@app_id}-oneshot").task_definition
-          else
+          updated, task_definition = register_task_definition_for_oneshot(definitions)
+          if updated
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
+          else
+            Hako.logger.info "Task definition isn't changed: #{task_definition.task_definition_arn}"
           end
           @task = run_task(task_definition, commands, env)
           Hako.logger.info "Started task: #{@task.task_arn}"
@@ -353,26 +350,25 @@ module Hako
         end
       end
 
-      # @param [String] family
-      # @param [Array<Hash>] definitions
-      # @return [Boolean]
-      def task_definition_changed?(family, definitions)
+      # @param [Array<Hash>] desired_definitions
+      # @param [Aws::ECS::Types::TaskDefinition] actual_definition
+      # @return [Array<Boolean]
+      def task_definition_changed?(desired_definitions, actual_definition)
         if @force
           return true
         end
-        task_definition = ecs_client.describe_task_definition(task_definition: family).task_definition
         container_definitions = {}
-        task_definition.container_definitions.each do |c|
+        actual_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
         end
 
-        if task_definition.task_role_arn != @task_role_arn
+        if actual_definition.task_role_arn != @task_role_arn
           return true
         end
-        if different_volumes?(task_definition.volumes)
+        if different_volumes?(actual_definition.volumes)
           return true
         end
-        if definitions.any? { |definition| different_definition?(definition, container_definitions.delete(definition[:name])) }
+        if desired_definitions.any? { |definition| different_definition?(definition, container_definitions.delete(definition[:name])) }
           return true
         end
         !container_definitions.empty?
@@ -408,17 +404,19 @@ module Hako
       end
 
       # @param [Array<Hash>] definitions
-      # @return [Aws::ECS::Types::TaskDefinition, Symbol]
+      # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition>]
       def register_task_definition(definitions)
-        if task_definition_changed?(@app_id, definitions)
-          ecs_client.register_task_definition(
+        current_task_definition = ecs_client.describe_task_definition(task_definition: @app_id).task_definition
+        if task_definition_changed?(definitions, current_task_definition)
+          new_task_definition = ecs_client.register_task_definition(
             family: @app_id,
             task_role_arn: @task_role_arn,
             container_definitions: definitions,
             volumes: volumes_definition,
           ).task_definition
+          [true, new_task_definition]
         else
-          :noop
+          [false, current_task_definition]
         end
       end
 
@@ -431,18 +429,20 @@ module Hako
       end
 
       # @param [Array<Hash>] definitions
-      # @return [Aws::ECS::Types::TaskDefinition, Symbol]
+      # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition]
       def register_task_definition_for_oneshot(definitions)
         family = "#{@app_id}-oneshot"
-        if task_definition_changed?(family, definitions)
-          ecs_client.register_task_definition(
-            family: "#{@app_id}-oneshot",
+        current_task_definition = ecs_client.describe_task_definition(task_definition: family).task_definition
+        if task_definition_changed?(definitions, current_task_definition)
+          new_task_definition = ecs_client.register_task_definition(
+            family: family,
             task_role_arn: @task_role_arn,
             container_definitions: definitions,
             volumes: volumes_definition,
           ).task_definition
+          [true, new_task_definition]
         else
-          :noop
+          [false, current_task_definition]
         end
       end
 
@@ -500,6 +500,7 @@ module Hako
             ],
           },
           count: 1,
+          placement_constraints: @placement_constraints,
           started_by: 'hako oneshot',
         )
         result.failures.each do |failure|
@@ -898,7 +899,7 @@ module Hako
           cmd << '--link' << link
         end
         definition.fetch(:port_mappings).each do |port_mapping|
-          cmd << '--publish' << "#{port_mapping.fetch('host_port')}:#{port_mapping.fetch('container_port')}"
+          cmd << '--publish' << "#{port_mapping.fetch(:host_port)}:#{port_mapping.fetch(:container_port)}"
         end
         definition.fetch(:docker_labels).each do |key, val|
           if key != 'cc.wanko.hako.version'

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk