ecs_deploy 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a731ec39a6928bb4365fbb4784b91dd92737eb5b5796da19e3be8185d6bc10b8
-  data.tar.gz: '04758ae740d9ab1bb9108d5dcae1df72102fd161e0f96a38f1e30b461415bc7f'
+  metadata.gz: c835fe6c187c1e2558ba6de3c957bb41f3eafde5804b79fd611864f0ef32aa31
+  data.tar.gz: 47b1b66e32e8a246bd97658f85b473f5c07942d73e4bc932685a8fbe7386fd4a
 SHA512:
-  metadata.gz: 429dc1f441f7a67a973293adf8c48a62671ab3f5710cee596186a7fe5773b772b643b9ef879fb0b2143d7f7100754b6521ec6823094122fec85bfd189ca3c306
-  data.tar.gz: 03f568218e5e77e2c9b86560ac5dd4f41e19440f98da1ee102ee09057bc7ec8fdf7caa5366b56d06946d5887a0a60d8bae0c1ce04e80e0a50df7a51e40642da0
+  metadata.gz: e599e6a06c67bf78dc17a6b746ba680e8043440dda0870595bd2aa36cb08b6357eb3350c88875897510327fa261fb45cdbd7ff237f0cd5c52a1d6021f910d9fb
+  data.tar.gz: f65b908df4382062dec6ba228d1714df5f2b64a516c42450482767ebf48c52345a3d72db465c57fd6058f4082d6b07b2569ce18b369337a2eb71f2ffe9121769

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # v1.0
 
+## Release v1.0.6 - 2024/03/19
+
+### Enhancement
+
+- Make region fallback logic consistent in Capistrano tasks https://github.com/reproio/ecs_deploy/pull/91
+- Add runtime_platform to task_definition. https://github.com/reproio/ecs_deploy/pull/92
+
+### Bug fixes
+
+- Delete option :placement_strategy if DAEMON service https://github.com/reproio/ecs_deploy/pull/93
+
+## 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

@@ -1,30 +1,26 @@
 # EcsDeploy
 
-Helper script for deployment to Amazon ECS.
+Helper script for deployment to Amazon ECS, designed to be compatible with `capistrano`. 
 
 This gem is experimental.
 
-Main purpose is combination with capistrano API.
-
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ecs_deploy', github: "reproio/ecs_deploy"
+gem "ecs_deploy", github: "reproio/ecs_deploy"
 ```
 
 And then execute:
 
     $ bundle
 
-## Usage
-
-Use by Capistrano.
+## Configuration
 
 ```ruby
 # Capfile
-require 'ecs_deploy/capistrano'
+require "ecs_deploy/capistrano"
 
 # deploy.rb
 set :ecs_default_cluster, "ecs-cluster-name"
@@ -33,6 +29,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, [
   {
@@ -92,11 +89,11 @@ set :ecs_tasks, [
 
 set :ecs_scheduled_tasks, [
   {
-    cluster: "default", # Unless this key, use fetch(:ecs_default_cluster)
+    cluster: "default", # Defaults to fetch(:ecs_default_cluster)
     rule_name: "schedule_name",
     schedule_expression: "cron(0 12 * * ? *)",
     description: "schedule_description", # Optional
-    target_id: "task_name", # Unless this key, use task_definition_name
+    target_id: "task_name", # Defaults to the task_definition_name
     task_definition_name: "myapp-#{fetch(:rails_env)}",
     task_count: 2, # Default 1
     revision: 12, # Optional
@@ -129,12 +126,14 @@ set :ecs_services, [
 ]
 ```
 
+## Usage
+
 ```sh
-cap <stage> ecs:register_task_definition # register ecs_tasks as TaskDefinition
-cap <stage> ecs:deploy_scheduled_task # register ecs_scheduled_tasks to CloudWatchEvent
-cap <stage> ecs:deploy # create or update Service by ecs_services info
+bundle exec cap <stage> ecs:register_task_definition # register ecs_tasks as TaskDefinition
+bundle exec cap <stage> ecs:deploy_scheduled_task # register ecs_scheduled_tasks to CloudWatchEvent
+bundle exec cap <stage> ecs:deploy # create or update Service by ecs_services info
 
-cap <stage> ecs:rollback # deregister current task definition and update Service by previous revision of current task definition
+bundle exec cap <stage> ecs:rollback # deregister current task definition and update Service by previous revision of current task definition
 ```
 
 ### Rollback example
@@ -193,7 +192,7 @@ The autoscaler of `ecs_deploy` supports auto scaling of ECS services and cluster
 
 ### Prerequisits
 
-* You use a ECS cluster whose instances belong to either an auto scaling group or a spot fleet request
+* An ECS cluster whose instances belong to either an Auto Scaling group or a Spot Fleet request
 * You have CloudWatch alarms and you want to scale services when their state changes
 
 ### How to use autoscaler
@@ -282,7 +281,7 @@ Then, execute the following command:
 ecs_auto_scaler <config yaml>
 ```
 
-I recommends deploy `ecs_auto_scaler` on ECS too.
+It is recommended to run the `ecs_auto_scaler` via a container on ECS.
 
 ### Signals
 
@@ -459,7 +458,7 @@ The following permissions are required for the preceding configuration of "repro
 
 ### How to deploy faster with Auto Scaling Group
 
-Add following configuration to your deploy.rb and hooks if you need.
+Add the following configuration and hooks to your `config/deploy.rb`:
 
 ```ruby
 # deploy.rb

data/lib/ecs_deploy/auto_scaler/auto_scaling_group_config.rb

@@ -35,7 +35,7 @@ module EcsDeploy
           if decreased_capacity > 0
             new_desired_capacity = current_asg.desired_capacity - decreased_capacity
             cluster_resource_manager.trigger_capacity_update(current_asg.desired_capacity, new_desired_capacity)
-            @logger.info "#{log_prefix} Update desired_capacity to #{new_desired_capacity}"
+            @logger.info "#{log_prefix} Updated desired_capacity to #{new_desired_capacity}"
           else
             @logger.info "#{log_prefix} Tried to Update desired_capacity but there were no deregisterable instances"
           end
@@ -47,7 +47,7 @@ module EcsDeploy
             desired_capacity: desired_capacity,
           )
           cluster_resource_manager.trigger_capacity_update(current_asg.desired_capacity, desired_capacity)
-          @logger.info "#{log_prefix} Update desired_capacity to #{desired_capacity}"
+          @logger.info "#{log_prefix} Updated desired_capacity to #{desired_capacity}"
         end
       rescue => e
         AutoScaler.error_logger.error(e)
@@ -74,7 +74,7 @@ module EcsDeploy
           )
         end
 
-        @logger.info "#{log_prefix} Detach instances from ASG: #{instance_ids.inspect}"
+        @logger.info "#{log_prefix} Detached instances from ASG: #{instance_ids.inspect}"
       end
 
       private
@@ -89,7 +89,7 @@ module EcsDeploy
             auto_scaling_group_instances.any? {|instance| instance.instance_id == i.ec2_instance_id }
         end
 
-        @logger.info "#{log_prefix} Fetch deregisterable instances: #{deregisterable_instances.map(&:ec2_instance_id).inspect}"
+        @logger.info "#{log_prefix} Fetched deregisterable instances: #{deregisterable_instances.map(&:ec2_instance_id).inspect}"
 
         az_to_instance_count = auto_scaling_group_instances.each_with_object(Hash.new(0)) { |i, h| h[i.availability_zone] += 1 }
         az_to_deregisterable_instances = deregisterable_instances.group_by do |i|

data/lib/ecs_deploy/auto_scaler/cluster_resource_manager.rb

@@ -27,7 +27,7 @@ module EcsDeploy
 
       def acquire(capacity, timeout: nil)
         @mutex.synchronize do
-          @logger&.debug("#{log_prefix} Try to acquire #{capacity} capacity (capacity: #{@capacity}, used_capacity: #{@used_capacity})")
+          @logger&.debug("#{log_prefix} Trying to acquire #{capacity} capacity (capacity: #{@capacity}, used_capacity: #{@used_capacity})")
           Timeout.timeout(timeout) do
             while @capacity - @used_capacity < capacity
               @resource.wait(@mutex)
@@ -77,7 +77,7 @@ module EcsDeploy
         return if new_desired_capacity == old_desired_capacity
 
         th = Thread.new do
-          @logger&.info "#{log_prefix} Start updating capacity: #{old_desired_capacity} -> #{new_desired_capacity}"
+          @logger&.info "#{log_prefix} Updating capacity: #{old_desired_capacity} -> #{new_desired_capacity}"
           Timeout.timeout(180) do
             until @capacity == new_desired_capacity ||
                 (new_desired_capacity > old_desired_capacity && @capacity > new_desired_capacity) ||
@@ -91,7 +91,7 @@ module EcsDeploy
 
               sleep interval
             end
-            @logger&.info "#{log_prefix} capacity is updated to #{@capacity}"
+            @logger&.info "#{log_prefix} updated capacity to #{@capacity}"
           end
         rescue Timeout::Error => e
           msg = "#{log_prefix} `#{__method__}': #{e} (#{e.class})"
@@ -108,7 +108,7 @@ module EcsDeploy
         end
 
         if wait_until_capacity_updated
-          @logger&.info "#{log_prefix} Wait for the capacity of active instances to become #{new_desired_capacity} from #{old_desired_capacity}"
+          @logger&.info "#{log_prefix} Waiting for the number of active instances to reach #{new_desired_capacity} (from #{old_desired_capacity})"
           th.join
         end
       end

data/lib/ecs_deploy/auto_scaler/instance_drainer.rb

@@ -79,7 +79,7 @@ module EcsDeploy
         cl = ecs_client(region)
         config_to_instance_ids.each do |config, instance_ids|
           if config.disable_draining == true || config.disable_draining == "true"
-            @logger.info "Skip draining instances: region: #{region}, cluster: #{config.cluster}, instance_ids: #{instance_ids.inspect}"
+            @logger.info "Skipped draining instances: region: #{region}, cluster: #{config.cluster}, instance_ids: #{instance_ids.inspect}"
             next
           end
 

data/lib/ecs_deploy/auto_scaler/service_config.rb

@@ -40,7 +40,7 @@ module EcsDeploy
           next if difference >= trigger.step
 
           if trigger.match?
-            @logger.info "#{log_prefix} Fire upscale trigger by #{trigger.alarm_name} #{trigger.state}"
+            @logger.info "#{log_prefix} Firing upscale trigger by #{trigger.alarm_name} #{trigger.state}"
             difference = trigger.step
           end
         end
@@ -50,7 +50,7 @@ module EcsDeploy
             next if difference > 0 && !trigger.prioritized_over_upscale_triggers?
             next unless trigger.match?
 
-            @logger.info "#{log_prefix} Fire downscale trigger by #{trigger.alarm_name} #{trigger.state}"
+            @logger.info "#{log_prefix} Firing downscale trigger by #{trigger.alarm_name} #{trigger.state}"
             difference = [difference, -trigger.step].min
           end
         end
@@ -124,28 +124,28 @@ module EcsDeploy
         if current_level < next_level && overheat? # next max
           level = next_level
           @reach_max_at = nil
-          @logger.info "#{log_prefix} Service is overheat, uses next max count"
+          @logger.info "#{log_prefix} Service is overheated, uses next max count"
         elsif current_level < next_level && !overheat? # wait cooldown
           level = current_level
           now = Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
           @reach_max_at ||= now
-          @logger.info "#{log_prefix} Service waits cooldown elapsed #{(now - @reach_max_at).to_i}sec"
+          @logger.info "#{log_prefix} Service waiting for cooldown period to elapse #{(now - @reach_max_at).to_i}sec"
         elsif current_level == next_level && next_desired_count >= max_task_count[current_level] # reach current max
           level = current_level
           now = Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
           @reach_max_at ||= now
-          @logger.info "#{log_prefix} Service waits cooldown elapsed #{(now - @reach_max_at).to_i}sec"
+          @logger.info "#{log_prefix} Service waiting for cooldown period to elapse #{(now - @reach_max_at).to_i}sec"
           if next_desired_count > max_task_count[current_level] && current_level == max_task_count.size - 1
             @logger.warn "#{log_prefix} Desired count has reached the maximum value and couldn't be increased"
           end
         elsif current_level == next_level && next_desired_count < max_task_count[current_level]
           level = current_level
           @reach_max_at = nil
-          @logger.info "#{log_prefix} Service clears cooldown state"
+          @logger.info "#{log_prefix} Service has finished cooling down"
         elsif current_level > next_level
           level = next_level
           @reach_max_at = nil
-          @logger.info "#{log_prefix} Service clears cooldown state"
+          @logger.info "#{log_prefix} Service has finished cooling down"
         end
 
         next_desired_count = [next_desired_count, max_task_count[level]].min
@@ -156,7 +156,7 @@ module EcsDeploy
         end
 
         @last_updated_at = Process.clock_gettime(Process::CLOCK_MONOTONIC, :second)
-        @logger.info "#{log_prefix} Update desired_count to #{next_desired_count}"
+        @logger.info "#{log_prefix} Updated desired_count to #{next_desired_count}"
       rescue => e
         AutoScaler.error_logger.error(e)
       end
@@ -197,7 +197,7 @@ module EcsDeploy
 
         cl.wait_until(:services_stable, cluster: cluster, services: [name]) do |w|
           w.before_wait do
-            @logger.debug "#{log_prefix} wait service stable"
+            @logger.debug "#{log_prefix} waiting for service to stabilize"
           end
         end
 
@@ -205,7 +205,7 @@ module EcsDeploy
         stopping_task_arns.each_slice(MAX_DESCRIBABLE_TASK_COUNT) do |arns|
           cl.wait_until(:tasks_stopped, cluster: cluster, tasks: arns) do |w|
             w.before_wait do
-              @logger.debug "#{log_prefix} wait stopping tasks stopped"
+              @logger.debug "#{log_prefix} waiting for tasks to finish stopping"
             end
           end
         end

data/lib/ecs_deploy/auto_scaler/spot_fleet_request_config.rb

@@ -43,7 +43,7 @@ module EcsDeploy
           # Wait until the capacity is updated to prevent the process from terminating before container draining is completed
           wait_until_capacity_updated: desired_capacity < request_config.target_capacity,
         )
-        @logger.info "#{log_prefix} Update desired_capacity to #{desired_capacity}"
+        @logger.info "#{log_prefix} Updated desired_capacity to #{desired_capacity}"
       rescue => e
         AutoScaler.error_logger.error(e)
       end

data/lib/ecs_deploy/auto_scaler.rb

@@ -50,7 +50,7 @@ module EcsDeploy
         loop_with_polling_interval("loop of #{cluster_scaling_config.name}") do
           ths = cluster_scaling_config.service_configs.map do |service_config|
             Thread.new(service_config) do |s|
-              @logger.debug "Start service scaling of #{s.name}"
+              @logger.debug "Scaling service #{s.name}"
               s.adjust_desired_count(cluster_scaling_config.cluster_resource_manager)
             end
           end
@@ -58,7 +58,7 @@ module EcsDeploy
 
           ths.each(&:join)
 
-          @logger.debug "Start cluster scaling of #{cluster_scaling_config.name}"
+          @logger.debug "Scaling cluster #{cluster_scaling_config.name}"
 
           required_capacity = cluster_scaling_config.service_configs.sum { |s| s.desired_count * s.required_capacity }
           cluster_scaling_config.update_desired_capacity(required_capacity)

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"]
@@ -41,6 +42,7 @@ namespace :ecs do
             cpu: t[:cpu],
             memory: t[:memory],
             tags: t[:tags],
+            runtime_platform: t[:runtime_platform],
           )
           result = task_definition.register
           ecs_registered_tasks[region][t[:name]] = result
@@ -54,7 +56,7 @@ namespace :ecs do
   task deploy_scheduled_task: [:configure, :register_task_definition] do
     if fetch(:ecs_scheduled_tasks)
       regions = Array(fetch(:ecs_region))
-      regions = [nil] if regions.empty?
+      regions = [EcsDeploy.config.default_region] if regions.empty?
       regions.each do |r|
         fetch(:ecs_scheduled_tasks).each do |t|
           scheduled_task = EcsDeploy::ScheduledTask.new(
@@ -84,7 +86,7 @@ namespace :ecs do
   task deploy: [:configure, :register_task_definition] do
     if fetch(:ecs_services)
       regions = Array(fetch(:ecs_region))
-      regions = [nil] if regions.empty?
+      regions = [EcsDeploy.config.default_region] if regions.empty?
       regions.each do |r|
         services = fetch(:ecs_services).map do |service|
           if fetch(:target_cluster) && fetch(:target_cluster).size > 0
@@ -127,7 +129,7 @@ namespace :ecs do
   task rollback: [:configure] do
     if fetch(:ecs_services)
       regions = Array(fetch(:ecs_region))
-      regions = [nil] if regions.empty?
+      regions = [EcsDeploy.config.default_region] if regions.empty?
 
       rollback_routes = {}
       regions.each do |r|
@@ -164,7 +166,7 @@ namespace :ecs do
 
           EcsDeploy.logger.info "#{current_task_definition_arn} -> #{rollback_arn}"
 
-          raise "Past task_definition_arns is nothing" unless rollback_arn
+          raise "Past task_definition_arns is empty" unless rollback_arn
 
           service_options = {
             region: r,

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

@@ -21,7 +21,7 @@ module EcsDeploy
     def increase
       asg = fetch_auto_scaling_group
 
-      @logger.info("Increase desired capacity of #{@auto_scaling_group_name}: #{asg.desired_capacity} => #{asg.max_size}")
+      @logger.info("Increasing desired capacity of #{@auto_scaling_group_name}: #{asg.desired_capacity} => #{asg.max_size}")
       as_client.update_auto_scaling_group(auto_scaling_group_name: @auto_scaling_group_name, desired_capacity: asg.max_size)
 
       # Run in background because increasing instances may take time
@@ -47,7 +47,7 @@ module EcsDeploy
         @logger.info("The capacity is already #{asg.desired_capacity}")
         return
       end
-      @logger.info("Decrease desired capacity of #{@auto_scaling_group_name}: #{asg.desired_capacity} => #{@desired_capacity}")
+      @logger.info("Decreasing desired capacity of #{@auto_scaling_group_name}: #{asg.desired_capacity} => #{@desired_capacity}")
 
       container_instances = ecs_client.list_container_instances(cluster: @cluster).flat_map do |resp|
         ecs_client.describe_container_instances(
@@ -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
@@ -61,7 +62,7 @@ module EcsDeploy
         state: @enabled ? "ENABLED" : "DISABLED",
         description: @description,
       )
-      EcsDeploy.logger.info "create cloudwatch event rule [#{res.rule_arn}] [#{@region}] [#{Paint['OK', :green]}]"
+      EcsDeploy.logger.info "created cloudwatch event rule [#{res.rule_arn}] [#{@region}] [#{Paint['OK', :green]}]"
     end
 
     def put_targets
@@ -89,7 +90,7 @@ module EcsDeploy
         targets: [target]
       )
       if res.failed_entry_count.zero?
-        EcsDeploy.logger.info "create cloudwatch event target [#{@target_id}] [#{@region}] [#{Paint['OK', :green]}]"
+        EcsDeploy.logger.info "created cloudwatch event target [#{@target_id}] [#{@region}] [#{Paint['OK', :green]}]"
       else
         res.failed_entries.each do |entry|
           EcsDeploy.logger.error "failed to create cloudwatch event target [#{@region}] target_id=#{entry.target_id} error_code=#{entry.error_code} error_message=#{entry.error_message}"

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
@@ -102,9 +103,10 @@ module EcsDeploy
         if @scheduling_strategy == 'DAEMON'
           service_options[:scheduling_strategy] = @scheduling_strategy
           service_options.delete(:desired_count)
+          service_options.delete(:placement_strategy)
         end
         @response = @client.create_service(service_options)
-        EcsDeploy.logger.info "create service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
+        EcsDeploy.logger.info "created service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
       else
         return delete_service if @delete
 
@@ -116,8 +118,11 @@ module EcsDeploy
         service_options.merge!({force_new_deployment: true}) if need_force_new_deployment?(current_service)
 
         update_tags(@service_name, @tags)
+        if @scheduling_strategy == 'DAEMON'
+          service_options.delete(:placement_strategy)
+        end
         @response = @client.update_service(service_options)
-        EcsDeploy.logger.info "update service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
+        EcsDeploy.logger.info "updated service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
       end
     end
 
@@ -144,7 +149,7 @@ module EcsDeploy
         sleep 1
       end
       @client.delete_service(cluster: @cluster, service: @service_name)
-      EcsDeploy.logger.info "delete service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
+      EcsDeploy.logger.info "deleted service [#{@service_name}] [#{@cluster}] [#{@region}] [#{Paint['OK', :green]}]"
     end
 
     def update_tags(service_name, tags)
@@ -181,11 +186,12 @@ 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
-              EcsDeploy.logger.info "wait service stable [#{chunked_service_names.join(", ")}] [#{cl}]"
+              EcsDeploy.logger.info "waiting for services to stabilize [#{chunked_service_names.join(", ")}] [#{cl}]"
               resp = client.describe_services(cluster: cl, services: chunked_service_names)
               resp.services.each do |s|
                 # cf. https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-ecs/lib/aws-sdk-ecs/waiters.rb#L91-L96

data/lib/ecs_deploy/task_definition.rb

@@ -1,19 +1,13 @@
 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,
       })
-      EcsDeploy.logger.info "deregister task definition [#{arn}] [#{client.config.region}] [#{Paint['OK', :green]}]"
+      EcsDeploy.logger.info "deregistered task definition [#{arn}] [#{client.config.region}] [#{Paint['OK', :green]}]"
     end
 
     def initialize(
@@ -23,12 +17,14 @@ module EcsDeploy
       execution_role_arn: nil,
       requires_compatibilities: nil,
       cpu: nil, memory: nil,
-      tags: nil
+      tags: nil,
+      runtime_platform: {}
     )
       @task_definition_name = task_definition_name
       @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,9 +42,9 @@ 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
+      @runtime_platform = runtime_platform
     end
 
     def recent_task_definition_arns
@@ -72,9 +68,10 @@ module EcsDeploy
         execution_role_arn: @execution_role_arn,
         requires_compatibilities: @requires_compatibilities,
         cpu: @cpu, memory: @memory,
-        tags: @tags
+        tags: @tags,
+        runtime_platform: @runtime_platform
       })
-      EcsDeploy.logger.info "register task definition [#{@task_definition_name}] [#{@region}] [#{Paint['OK', :green]}]"
+      EcsDeploy.logger.info "registered task definition [#{@task_definition_name}] [#{@region}] [#{Paint['OK', :green]}]"
       res.task_definition
     end
   end

data/lib/ecs_deploy/version.rb

@@ -1,3 +1,3 @@
 module EcsDeploy
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 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.6
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 2024-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-autoscaling
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: AWS ECS deploy helper