hako 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126110ac130316221e7ac640144170031d9efceb2cf81f89c1c22525d2be6275
-  data.tar.gz: dd1934716a185d3e653b6d0343424b72a3afd62207ad566568b7ea19218d997d
+  metadata.gz: abb1bf796a54d7417e7f17bc3ff04a9fee504b4a7ad93a2ef40a7d3e8e12aa24
+  data.tar.gz: 5c00e175b2e6e4868923966cd85193a56784f8863c90c0a36bd077ad538fd0a1
 SHA512:
-  metadata.gz: ce6f9bba7385b6cdba908d70e268a299e24db76a63276cc96ae774f7d699ac830acce6224eaabf08caae2dc7d50d7df9a76b2dbcb206438e3920b97d6f84a182
-  data.tar.gz: 6954189052e21677c5cda4dab43b438b88287ae6975160a82bdd8c7350d2a3eb5630411f6e798a756cb9f53bd46b91ade81e04cd9e7e5eabcb81034972183bb2
+  metadata.gz: d2ddc3d4a5b056fd2a2bfa2ac4bc81149ede6ef93310b5d1575c46e40faf7ca1c635ec20441fac1739d4d1212e1e002f4d88d0b390f7f255c3997ccecc8f51d6
+  data.tar.gz: 81c559831ad9fbd2f46ae4e7596b92677c76e0bbe103c6d767d9745033409499854501254ddab16a14e8e223715067245dc8f1f1b9ebf820d873c07e89565a7c

data/CHANGELOG.md

@@ -1,7 +1,16 @@
+# 2.4.0 (2018-11-13)
+## New features
+- Support `readonly_root_filesystem` parameter
+- Support `docker_security_options` parameter
+- Support `ssl_policy` option in `elb_v2`
+
+## Bug fixes
+- Skip updating `desired_count` before removing service using daemon scheduling strategy
+
 # 2.3.1 (2018-09-26)
 ## Changes
 - Change show-definition output from YAML to JSON
-  - The show-definition output is still persable as YAML
+  - The show-definition output is still parsable as YAML
 
 ## Bug fixes
 - Set `deployment_configuration` to nil when absent

data/lib/hako/container.rb

@@ -29,6 +29,8 @@ module Hako
       command
       user
       privileged
+      readonly_root_filesystem
+      docker_security_options
     ].each do |name|
       define_method(name) do
         @definition[name]

data/lib/hako/schedulers/ecs.rb

@@ -289,10 +289,14 @@ module Hako
         service = describe_service
         if service
           if @dry_run
-            Hako.logger.info "ecs_client.update_service(cluster: #{service.cluster_arn}, service: #{service.service_arn}, desired_count: 0)"
+            unless service.scheduling_strategy == 'DAEMON'
+              Hako.logger.info "ecs_client.update_service(cluster: #{service.cluster_arn}, service: #{service.service_arn}, desired_count: 0)"
+            end
             Hako.logger.info "ecs_client.delete_service(cluster: #{service.cluster_arn}, service: #{service.service_arn})"
           else
-            ecs_client.update_service(cluster: service.cluster_arn, service: service.service_arn, desired_count: 0)
+            unless service.scheduling_strategy == 'DAEMON'
+              ecs_client.update_service(cluster: service.cluster_arn, service: service.service_arn, desired_count: 0)
+            end
             ecs_client.delete_service(cluster: service.cluster_arn, service: service.service_arn)
             Hako.logger.info "#{service.service_arn} is deleted"
           end
@@ -600,6 +604,8 @@ module Hako
           health_check: container.health_check,
           ulimits: container.ulimits,
           extra_hosts: container.extra_hosts,
+          readonly_root_filesystem: container.readonly_root_filesystem,
+          docker_security_options: container.docker_security_options,
         }
       end
 
@@ -918,7 +924,7 @@ module Hako
         end
       end
 
-      TASK_ID_RE = /\(task ([\h-]+)\)\.\z/
+      TASK_ID_RE = /\(task ([\h-]+)\)\.\z/.freeze
       # @param [String] message
       # @return [String, nil]
       def extract_task_id(message)
@@ -1175,6 +1181,12 @@ module Hako
         if definition[:user]
           cmd << '--user' << definition[:user]
         end
+        if definition[:readonly_root_filesystem]
+          cmd << '--read-only'
+        end
+        (definition[:docker_security_options] || []).each do |docker_security_option|
+          cmd << '--security-opt' << docker_security_option
+        end
 
         cmd << "\\\n  "
         definition.fetch(:environment).each do |env|

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -39,6 +39,8 @@ module Hako
           struct.member(:ulimits, Schema::Nullable.new(ulimits_schema))
           struct.member(:extra_hosts, Schema::Nullable.new(extra_hosts_schema))
           struct.member(:linux_parameters, Schema::Nullable.new(linux_parameters_schema))
+          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)))
         end
       end
 

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -108,6 +108,7 @@ module Hako
             load_balancer_arn: load_balancer.load_balancer_arn,
             protocol: l.fetch('protocol'),
             port: l.fetch('port'),
+            ssl_policy: l['ssl_policy'],
             default_actions: [{ type: 'forward', target_group_arn: target_group.target_group_arn }],
           }
           certificate_arn = l.fetch('certificate_arn', nil)
@@ -141,6 +142,22 @@ module Hako
           end
         end
 
+        new_listeners = @elb_v2_config.fetch('listeners')
+        if load_balancer
+          current_listeners = elb_client.describe_listeners(load_balancer_arn: load_balancer.load_balancer_arn).listeners
+          new_listeners.each do |new_listener|
+            current_listener = current_listeners.find { |l| l.port == new_listener['port'] }
+            if current_listener && new_listener['ssl_policy'] && new_listener['ssl_policy'] != current_listener.ssl_policy
+              if @dry_run
+                Hako.logger.info("elb_client.modify_listener(listener_arn: #{current_listener.listener_arn}, ssl_policy: #{new_listener['ssl_policy']}) (dry-run)")
+              else
+                Hako.logger.info("Updating ELBv2 listener #{new_listener['port']} ssl_policy to #{new_listener['ssl_policy']}")
+                elb_client.modify_listener(listener_arn: current_listener.listener_arn, ssl_policy: new_listener['ssl_policy'])
+              end
+            end
+          end
+        end
+
         if @elb_v2_config.key?('load_balancer_attributes')
           attributes = @elb_v2_config.fetch('load_balancer_attributes').map { |key, value| { key: key, value: value } }
           if @dry_run

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling