hako 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3defba0a6b4f94fe0288e2adddf94e7ed3fa0f747ed5af52923e191ac6980b8f
-  data.tar.gz: 2e8d3ebca2cc2193106e9b2daa1619e71d455d3feacc6a539330652db436f5a7
+  metadata.gz: 2de7cfe5e38e22aaf20d4bca43d9a3b579eafd5eb68173a260c448df063864cc
+  data.tar.gz: 9ff76702eb2e6be3ffff566cd897cf670e84fe8fd3addd45cba17d5b025426d3
 SHA512:
-  metadata.gz: ce6babefafe1cc36fe1846f55d9be70ec0e1b1afad8f6a6887aaf3df2669650c57a7c0474b484cd941627160bf0bc247c1f44533560e09e16073e58139cdc8a8
-  data.tar.gz: 3103640c9dd528a861dec9ea902e124cf5bb7b8657ed19aed74e53460fc63d04ce54e5c9dd66931c8a0b8948419760b85923b3d3e4260ca1b49c0dfcfc90d3e5
+  metadata.gz: 299bb255b8e7f1e7a768c298b303a1a1ef9366959cbaf3c29560a121a2100e72f9b07b0ae8e8af1c52f1e12f8d659bf112ed32cda636590ba088b8933b423332
+  data.tar.gz: c9937025cda397635911b79e8fafca65cfdaa423eb26386c62e14cbe5aaed7d10bc3ad8f1cdaadbed09a4025617282ca75531c126e5249a3a3ccc3c9f45bb6c5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.0.4 (2018-02-26)
+## Bug fixes
+- Pass AWS region of ECS scheduler to other AWS clients (CloudWatch, ApplicationAutoScaling)
+- Eliminate `--memory` parameter from dry-run output if it's not given
+- Give missing unit to the value of `--memory` parameter in dry-run output
+- Take `memory_reservation` into account when calculating required memory
+
 # 2.0.3 (2018-02-16)
 ## Bug fixes
 - create_aws_cloud_watch_logs_log_group script: Skip creating CloudWatch log group on dry-run

data/lib/hako/schedulers/ecs.rb

@@ -44,7 +44,7 @@ module Hako
         end
         @dynamic_port_mapping = options.fetch('dynamic_port_mapping', @ecs_elb_options.nil?)
         if options.key?('autoscaling')
-          @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
+          @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), @region, dry_run: @dry_run)
         end
         @autoscaling_group_for_oneshot = options.fetch('autoscaling_group_for_oneshot', nil)
         @autoscaling_topic_for_oneshot = options.fetch('autoscaling_topic_for_oneshot', nil)
@@ -939,7 +939,7 @@ module Hako
 
       RUN_TASK_INTERVAL = 10
       def try_scale_out_with_sns(task_definition)
-        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + d.memory] }
+        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + (d.memory_reservation || d.memory)] }
         @hako_task_id ||= SecureRandom.uuid
         message = JSON.dump(
           group_name: @autoscaling_group_for_oneshot,
@@ -1022,7 +1022,7 @@ module Hako
       # @param [Array<Aws::ECS::Types::ContainerInstance>] container_instances
       # @return [Boolean]
       def has_capacity?(task_definition, container_instances)
-        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + d.memory] }
+        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + (d.memory_reservation || d.memory)] }
         container_instances.any? do |ci|
           cpu = ci.remaining_resources.find { |r| r.name == 'CPU' }.integer_value
           memory = ci.remaining_resources.find { |r| r.name == 'MEMORY' }.integer_value
@@ -1037,7 +1037,9 @@ module Hako
         cmd = %w[docker run]
         cmd << '--name' << definition.fetch(:name)
         cmd << '--cpu-shares' << definition.fetch(:cpu)
-        cmd << '--memory' << definition.fetch(:memory)
+        if definition[:memory]
+          cmd << '--memory' << "#{definition[:memory]}M"
+        end
         definition.fetch(:links).each do |link|
           cmd << '--link' << link
         end

data/lib/hako/schedulers/ecs_autoscaling.rb

@@ -8,7 +8,8 @@ require 'hako/error'
 module Hako
   module Schedulers
     class EcsAutoscaling
-      def initialize(options, dry_run:)
+      def initialize(options, region, dry_run:)
+        @region = region
         @dry_run = dry_run
         @role_arn = required_option(options, 'role_arn')
         @min_capacity = required_option(options, 'min_capacity')
@@ -124,12 +125,12 @@ module Hako
 
       # @return [Aws::ApplicationAutoScaling]
       def autoscaling_client
-        @autoscaling_client ||= Aws::ApplicationAutoScaling::Client.new
+        @autoscaling_client ||= Aws::ApplicationAutoScaling::Client.new(region: @region)
       end
 
       # @return [Aws::CloudWatch::Client]
       def cw_client
-        @cw_client ||= Aws::CloudWatch::Client.new
+        @cw_client ||= Aws::CloudWatch::Client.new(region: @region)
       end
 
       # @param [Aws::ECS::Types::Service] service

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -23,7 +23,7 @@ module Hako
         Schema::Structure.new.tap do |struct|
           struct.member(:image, Schema::String.new)
           struct.member(:cpu, Schema::Integer.new)
-          struct.member(:memory, Schema::Integer.new)
+          struct.member(:memory, Schema::Nullable.new(Schema::Integer.new))
           struct.member(:memory_reservation, Schema::Nullable.new(Schema::Integer.new))
           struct.member(:links, Schema::UnorderedArray.new(Schema::String.new))
           struct.member(:port_mappings, Schema::UnorderedArray.new(port_mapping_schema))

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -367,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Deploy Docker container