hako 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3cbac9e99948d6066a1298afe5ca3076760291
-  data.tar.gz: b0839a1b24e6999fb06bdd966d91361920a62410
+  metadata.gz: e670cdac7ce5a24b4d82bc026eceaa8068b6422f
+  data.tar.gz: 6b5a6ca2de09ae0a680e4ff1de903798cb04c78d
 SHA512:
-  metadata.gz: b37865f52d9b2c08d2892659d1cfe7b0706f08ba62e8ec44102e27a347b91ce334d1dfeafe5583c0dc3169848c3180ae291c2efa0cb0bbf95a6afd29f0905a47
-  data.tar.gz: aca7ab571e6f2a6d3d584f303430a17eaf2d5c435e67ec08912512a0e991465cdc2188b62f1bac0dc8b00954295accdfb15d8ec6d05dc0bf60475bddb5dc6470
+  metadata.gz: 2ca1d9c75bbc08407d04f1dbc510f695c24b84fb45b8ea03bd56562d7049e010f214dbc8514f413350a880892fbad2f6780ae368cff1e7e4491177c763b6d0cd
+  data.tar.gz: 6871ae244cf85ac56ff6256fbe6799b1f39540f9823a1288e97b9c67bda32301c32829ecd7cb9b06ebbc0b5dca1df0b86d4b5df48abba4f351a2f92c5b078a5a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.3.3 (2017-05-23)
+## Bug fixes
+- Fix error of autoscaling for oneshot when container instances are empty
+- Fix error when new task definition is registered
+    - Regression in v1.3.2
+
 # 1.3.2 (2017-05-23)
 ## Bug fixes
 - Pass placement_configurations in oneshot mode

data/lib/hako/schedulers/ecs.rb

@@ -357,6 +357,10 @@ module Hako
         if @force
           return true
         end
+        if !actual_definition
+          # Initial deployment
+          return true
+        end
         container_definitions = {}
         actual_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
@@ -372,9 +376,6 @@ module Hako
           return true
         end
         !container_definitions.empty?
-      rescue Aws::ECS::Errors::ClientException
-        # Task definition does not exist
-        true
       end
 
       # @param [Hash<String, Hash<String, String>>] actual_volumes
@@ -406,7 +407,7 @@ module Hako
       # @param [Array<Hash>] definitions
       # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition>]
       def register_task_definition(definitions)
-        current_task_definition = ecs_client.describe_task_definition(task_definition: @app_id).task_definition
+        current_task_definition = describe_task_definition(@app_id)
         if task_definition_changed?(definitions, current_task_definition)
           new_task_definition = ecs_client.register_task_definition(
             family: @app_id,
@@ -432,7 +433,7 @@ module Hako
       # @return [Array<Boolean, Aws::ECS::Types::TaskDefinition]
       def register_task_definition_for_oneshot(definitions)
         family = "#{@app_id}-oneshot"
-        current_task_definition = ecs_client.describe_task_definition(task_definition: family).task_definition
+        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,
@@ -456,6 +457,13 @@ module Hako
         end
       end
 
+      def describe_task_definition(family)
+        ecs_client.describe_task_definition(task_definition: family).task_definition
+      rescue Aws::ECS::Errors::ClientException
+        # Task definition does not exist
+        nil
+      end
+
       # @param [String] name
       # @param [Container] container
       # @return [Hash]
@@ -841,7 +849,13 @@ module Hako
             raise Error.new("AutoScaling Group '#{@autoscaling_group_for_oneshot}' does not exist")
           end
 
-          container_instances = ecs_client.list_container_instances(cluster: @cluster).flat_map { |c| ecs_client.describe_container_instances(cluster: @cluster, container_instances: c.container_instance_arns).container_instances }
+          container_instances = ecs_client.list_container_instances(cluster: @cluster).flat_map do |c|
+            if c.container_instance_arns.empty?
+              []
+            else
+              ecs_client.describe_container_instances(cluster: @cluster, container_instances: c.container_instance_arns).container_instances
+            end
+          end
           if has_capacity?(task_definition, container_instances)
             Hako.logger.info("There's remaining capacity. Start retrying...")
             return true

data/lib/hako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Kohei Suzuki