ecs_deploy 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a731ec39a6928bb4365fbb4784b91dd92737eb5b5796da19e3be8185d6bc10b8
-  data.tar.gz: '04758ae740d9ab1bb9108d5dcae1df72102fd161e0f96a38f1e30b461415bc7f'
+  metadata.gz: a9b02fc9a3cfda6288d7e00f339487fd2050b441e973d5fc7a822f9c261ea272
+  data.tar.gz: 9c002ab5e543435304d8d56eb88d19fceac56b4d70916f1b740176b6c3070dfc
 SHA512:
-  metadata.gz: 429dc1f441f7a67a973293adf8c48a62671ab3f5710cee596186a7fe5773b772b643b9ef879fb0b2143d7f7100754b6521ec6823094122fec85bfd189ca3c306
-  data.tar.gz: 03f568218e5e77e2c9b86560ac5dd4f41e19440f98da1ee102ee09057bc7ec8fdf7caa5366b56d06946d5887a0a60d8bae0c1ce04e80e0a50df7a51e40642da0
+  metadata.gz: c88b02664cb84e45ae1b14b4bbd97907d984a46d3ff6eb817f48d0ffb626f7b8c88311f1b6c5a31c8f8b27a2eaeee8ed9a06c61c93551e4b3dd1c3099d382628
+  data.tar.gz: 144449c85ed16c1f4dbfe8340cb6a11b1b4aee8ac55de07e2322dda654932c3bbfb12a125b39776aad3294841487b0047098dd9e65e46f2d44aec125c933b9e4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # v1.0
 
+## Release v1.0.5 - 2023/03/15
+
+### Enhancement
+
+- Add variable of capistrano `ecs_client_retry_params` to override parameter of ECS::Client#initialize https://github.com/reproio/ecs_deploy/pull/88
+
 ## Release v1.0.4 - 2023/02/10
 
 ### Bug fixes

data/README.md

@@ -33,6 +33,7 @@ set :ecs_service_role, "customEcsServiceRole" # default: ecsServiceRole
 set :ecs_deploy_wait_timeout, 600 # default: 300
 set :ecs_wait_until_services_stable_max_attempts, 40 # optional
 set :ecs_wait_until_services_stable_delay, 15 # optional
+set :ecs_client_params, { retry_mode: "standard", max_attempts: 10 } # default: {}
 
 set :ecs_tasks, [
   {

data/lib/ecs_deploy/capistrano.rb

@@ -10,6 +10,7 @@ namespace :ecs do
       c.default_region = Array(fetch(:ecs_region))[0] if fetch(:ecs_region)
       c.ecs_wait_until_services_stable_max_attempts = fetch(:ecs_wait_until_services_stable_max_attempts) if fetch(:ecs_wait_until_services_stable_max_attempts)
       c.ecs_wait_until_services_stable_delay = fetch(:ecs_wait_until_services_stable_delay) if fetch(:ecs_wait_until_services_stable_delay)
+      c.ecs_client_params = fetch(:ecs_client_params) if fetch(:ecs_client_params)
     end
 
     if ENV["TARGET_CLUSTER"]

data/lib/ecs_deploy/configuration.rb

@@ -8,7 +8,8 @@ module EcsDeploy
       :deploy_wait_timeout,
       :ecs_service_role,
       :ecs_wait_until_services_stable_max_attempts,
-      :ecs_wait_until_services_stable_delay
+      :ecs_wait_until_services_stable_delay,
+      :ecs_client_params
 
     def initialize
       @log_level = :info
@@ -16,6 +17,7 @@ module EcsDeploy
       # The following values are the default values of Aws::ECS::Waiters::ServicesStable
       @ecs_wait_until_services_stable_max_attempts = 40
       @ecs_wait_until_services_stable_delay = 15
+      @ecs_client_params = {}
     end
   end
 end

data/lib/ecs_deploy/instance_fluctuation_manager.rb

@@ -113,7 +113,7 @@ module EcsDeploy
     end
 
     def ecs_client
-      @ecs_client ||= Aws::ECS::Client.new(aws_params)
+      @ecs_client ||= Aws::ECS::Client.new(aws_params.merge(EcsDeploy.config.ecs_client_params))
     end
 
     def fetch_auto_scaling_group

data/lib/ecs_deploy/scheduled_task.rb

@@ -27,9 +27,10 @@ module EcsDeploy
       @platform_version = platform_version
       @group = group
       region ||= EcsDeploy.config.default_region
+      params ||= EcsDeploy.config.ecs_client_params
       @container_overrides = container_overrides
 
-      @client = region ? Aws::ECS::Client.new(region: region) : Aws::ECS::Client.new
+      @client = region ? Aws::ECS::Client.new(params.merge(region: region)) : Aws::ECS::Client.new(params)
       @region = @client.config.region
       @cloud_watch_events = Aws::CloudWatchEvents::Client.new(region: @region)
     end

data/lib/ecs_deploy/service.rb

@@ -49,7 +49,8 @@ module EcsDeploy
       @response = nil
 
       region ||= EcsDeploy.config.default_region
-      @client = region ? Aws::ECS::Client.new(region: region) : Aws::ECS::Client.new
+      params ||= EcsDeploy.config.ecs_client_params
+      @client = region ? Aws::ECS::Client.new(params.merge(region: region)) : Aws::ECS::Client.new(params)
       @region = @client.config.region
 
       @delete = delete
@@ -181,7 +182,8 @@ module EcsDeploy
 
     def self.wait_all_running(services)
       services.group_by { |s| [s.cluster, s.region] }.flat_map do |(cl, region), ss|
-        client = Aws::ECS::Client.new(region: region)
+        params ||= EcsDeploy.config.ecs_client_params
+        client = Aws::ECS::Client.new(params.merge(region: region))
         ss.reject(&:delete).map(&:service_name).each_slice(MAX_DESCRIBE_SERVICES).map do |chunked_service_names|
           Thread.new do
             EcsDeploy.config.ecs_wait_until_services_stable_max_attempts.times do

data/lib/ecs_deploy/task_definition.rb

@@ -1,15 +1,9 @@
 module EcsDeploy
   class TaskDefinition
-    RETRY_BACKOFF = lambda do |c|
-      sleep(1)
-    end
-
-    RETRY_LIMIT = 10
-
     def self.deregister(arn, region: nil)
       region ||= EcsDeploy.config.default_region
-      param = {retry_backoff: RETRY_BACKOFF, retry_limit: RETRY_LIMIT}
-      client = region ? Aws::ECS::Client.new(param.merge(region: region)) : Aws::ECS::Client.new(param)
+      params ||= EcsDeploy.config.ecs_client_params
+      client = region ? Aws::ECS::Client.new(params.merge(region: region)) : Aws::ECS::Client.new(params)
       client.deregister_task_definition({
         task_definition: arn,
       })
@@ -29,6 +23,7 @@ module EcsDeploy
       @task_role_arn        = task_role_arn
       @execution_role_arn   = execution_role_arn
       region ||= EcsDeploy.config.default_region
+      params ||= EcsDeploy.config.ecs_client_params
 
       @container_definitions = container_definitions.map do |cd|
         if cd[:docker_labels]
@@ -46,8 +41,7 @@ module EcsDeploy
       @cpu = cpu&.to_s
       @memory = memory&.to_s
       @tags = tags
-      param = {retry_backoff: RETRY_BACKOFF, retry_limit: RETRY_LIMIT}
-      @client = region ? Aws::ECS::Client.new(param.merge(region: region)) : Aws::ECS::Client.new(param)
+      @client = region ? Aws::ECS::Client.new(params.merge(region: region)) : Aws::ECS::Client.new(params)
       @region = @client.config.region
     end
 

data/lib/ecs_deploy/version.rb

@@ -1,3 +1,3 @@
 module EcsDeploy
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling