hako 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c72d876a8523117cb28e9b64938792732d01991
-  data.tar.gz: 49c8f8baab9ce2b173296c79d6327cee0abfca16
+  metadata.gz: 5f1cc622b196be1f0ce61dd7efa6fec85a3370ff
+  data.tar.gz: 55437297ffdc3357d1f190b092f60951090e7720
 SHA512:
-  metadata.gz: 03605a8ac2a59471ecf74c9f08f06fc62c84c3188adac5804d3b7001d742619dd1c0379a230f3fc1aa98b37238b6ff6cb788efe16a56f78b83384d0a2885a1af
-  data.tar.gz: eb370ef4164435c9f580080106f2af47ca2b5d93aad987dedf027a53e55995ede062a54dff8181a1fcba8216a94e0283d5f3a927d58d5ae640c9c7648639569f
+  metadata.gz: c1651fc600b1928e88209e297c256754ddc43993de868cd3a30414cc58983365b9518e21adde797940cde5404991300aeed6104cbcd49c849ae925b876091ba1
+  data.tar.gz: 8ef388bfd84c183154b98e417ad582029411a1c0d936c42185e849ab40b0ffb93edc6f5b0f6d462efc07e0c3f2928627aafa10efc67e4f25f5f8c916cac6e0e0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.8.2 (2017-09-15)
+## Bug fixes
+- Retry DeleteTargetGroup in `hako remove`
+    - Deleting a load balancer may take several seconds
+## Improvements
+- Add target_group_attributes option to elb_v2
+
 # 1.8.1 (2017-09-15)
 ## Improvements
 - Add container_name and container_port option to elb and elb_v2

data/examples/hello-lb-v2.yml

@@ -26,6 +26,9 @@ scheduler:
       access_logs.s3.enabled: 'true'
       access_logs.s3.bucket: hako-access-logs
       access_logs.s3.prefix: hako-hello-lb-v2
+    target_group_attributes:
+      deregistration_delay.timeout_seconds: '20'
+      # http://docs.aws.amazon.com/en_us/elasticloadbalancing/latest/application/load-balancer-target-groups.html#target-group-attributes
 app:
   image: ryotarai/hello-sinatra
   memory: 128

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -2,6 +2,7 @@
 
 require 'aws-sdk-elasticloadbalancingv2'
 require 'hako'
+require 'hako/error'
 
 module Hako
   module Schedulers
@@ -116,6 +117,20 @@ module Hako
             elb_client.modify_load_balancer_attributes(load_balancer_arn: load_balancer.load_balancer_arn, attributes: attributes)
           end
         end
+        if @elb_v2_config.key?('target_group_attributes')
+          target_group = describe_target_group
+          attributes = @elb_v2_config.fetch('target_group_attributes').map { |key, value| { key: key, value: value } }
+          if @dry_run
+            if target_group
+              Hako.logger.info("elb_client.modify_target_group_attributes(target_group_arn: #{target_group.target_group_arn}, attributes: #{attributes.inspect}) (dry-run)")
+            else
+              Hako.logger.info("elb_client.modify_target_group_attributes(target_group_arn: unknown, attributes: #{attributes.inspect}) (dry-run)")
+            end
+          else
+            Hako.logger.info("Updating target group attributes to #{attributes.inspect}")
+            elb_client.modify_target_group_attributes(target_group_arn: target_group.target_group_arn, attributes: attributes)
+          end
+        end
         nil
       end
 
@@ -142,7 +157,20 @@ module Hako
           if @dry_run
             Hako.logger.info("elb_client.delete_target_group(target_group_arn: #{target_group.target_group_arn})")
           else
-            elb_client.delete_target_group(target_group_arn: target_group.target_group_arn)
+            deleted = false
+            30.times do
+              begin
+                elb_client.delete_target_group(target_group_arn: target_group.target_group_arn)
+                deleted = true
+                break
+              rescue Aws::ElasticLoadBalancingV2::Errors::ResourceInUse => e
+                Hako.logger.warn("#{e.class}: #{e.message}")
+              end
+              sleep 1
+            end
+            unless deleted
+              raise Error.new("Cannot delete target group #{target_group.target_group_arn}")
+            end
             Hako.logger.info "Deleted target group #{target_group.target_group_arn}"
           end
         end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling