capistrano-asg-rolling 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cceded2d7adcb767bc8bb432781055a91af8268303514564a4c1de86ccb2ac2e
-  data.tar.gz: 8d08579c0a00000bb2457348e9808758d10d74751a08f7071e50fa794fb1ea72
+  metadata.gz: f2365c9ab16d5af20fe6502ec5ddb678b71d50516a6e9e514b87a94a6a34f60b
+  data.tar.gz: ab344dc87be037b41e0e56e18cdc3532339a0e368983cac5ce8c3707d8b82729
 SHA512:
-  metadata.gz: 964743e3ab4ad9813100f3968e45b044d80fc46d6e9141a85b07686b0b4566f8c12bb79f3614fa5d473b358782d3c002d03532f72b60440b666423c4bc5e4947
-  data.tar.gz: 3366b9a2268485d777a101d1f29335aba073979122347c48e3191f318188ed3ce41eb2f3ec39861b286fa4a0148f9632af23b1d57f93f4e1d857f8f742e929b8
+  metadata.gz: fac5e7d23d81518e9e71924b2596be4e630ab1b38d5f57a481c49bfe71abbb5ea704465e22364957998aa00373420d5f7b8ce3805fd0ba05c5ca97b1f373bb3a
+  data.tar.gz: 007da3693ba149357ffe55e600d772c52984295e432eb79b65ecb5696e0861572e0776aa36b40ff2adaaee758209337c4406683bc88cb313e064aea1b82d0c93

data/.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
 
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -5,7 +5,7 @@ plugins:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
   DisplayCopNames: true
   DisplayStyleGuide: true
 
@@ -39,5 +39,8 @@ RSpec/IndexedLet:
 RSpec/MultipleExpectations:
   Max: 5
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 11
+
 Style/GuardClause:
   Enabled: false

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at peter.postma@kentaa.nl. All
+reported by contacting the project team at tech-arnhem@iraiser.eu. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-asg-rolling (0.7.0)
+    capistrano-asg-rolling (0.9.0)
       aws-sdk-autoscaling (~> 1, >= 1.100.0)
       aws-sdk-ec2 (~> 1)
       capistrano (~> 3)
@@ -10,17 +10,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
-    airbrussh (1.6.0)
+    airbrussh (1.6.2)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1198.0)
-    aws-sdk-autoscaling (1.149.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
+    aws-partitions (1.1282.0)
+    aws-sdk-autoscaling (1.166.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.240.0)
+    aws-sdk-core (3.254.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -28,47 +28,47 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.587.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
+    aws-sdk-ec2 (1.641.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.3.0)
-    bigdecimal (4.0.1)
-    capistrano (3.20.0)
+    bigdecimal (4.1.2)
+    capistrano (3.20.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.8)
     crack (1.0.1)
       bigdecimal
       rexml
     diff-lcs (1.6.2)
     hashdiff (1.2.1)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.18.0)
-    language_server-protocol (3.17.0.5)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     logger (1.7.0)
     net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.3.0)
+    net-ssh (7.3.3)
     ostruct (0.6.3)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (1.28.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    prism (1.7.0)
-    public_suffix (6.0.2)
+    prism (1.9.0)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
-    regexp_parser (2.11.3)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
     rexml (3.4.4)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -79,36 +79,38 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.82.0)
-      json (~> 2.3)
+    rspec-support (3.13.7)
+    rubocop (1.90.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.26.1)
+      prism (~> 1.7)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.10.2)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      regexp_parser (>= 2.0)
+      rubocop (~> 1.86, >= 1.86.2)
     ruby-progressbar (1.13.0)
-    sshkit (1.25.0)
+    simplecov (1.1.1)
+    sshkit (1.25.1)
       base64
       logger
       net-scp (>= 1.1.2)
@@ -118,7 +120,7 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
-    webmock (3.26.1)
+    webmock (3.26.3)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -135,6 +137,7 @@ DEPENDENCIES
   rubocop-performance (~> 1.20)
   rubocop-rake (~> 0.6)
   rubocop-rspec (~> 3.0)
+  simplecov (~> 1.0)
   webmock (~> 3.11)
 
 BUNDLED WITH

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Kentaa BV
+Copyright (c) 2025 Kentaa BV
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -6,15 +6,15 @@
 
 Capistrano plugin for performing rolling updates to AWS Auto Scaling Groups using the [instance refresh feature](https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-instance-refresh.html).
 
-Instead of deploying to live servers, capistrano-asg-rolling will create a temporary instance for deployment and then trigger an instance refresh to perform a rolling update of the Auto Scaling Group(s). In more detail, during deployment it will:
+Instead of deploying to live servers, capistrano-asg-rolling will create temporary instances for deployment and then trigger an instance refresh to perform a rolling update of the Auto Scaling Group(s). In more detail, during deployment it will:
 
-- Launch an instance from the AMI defined in the Launch Template of the Auto Scaling Group(s).
+- Launch an instance for each Auto Scaling Group, from the AMI defined in its Launch Template.
 - Deploy your application to the launched instances.
 - After deployment, stop the instances and create an AMI for each instance.
 - Create new Launch Template versions for the new AMIs.
 - Trigger Instance Refresh on the Auto Scaling Group(s) to perform a rolling update.
 - Delete any outdated Launch Template versions, AMIs and snapshots created by previous deployments.
-- Terminate the no longer needed instances.
+- Terminate the temporary instances.
 
 ## Important
 
@@ -25,13 +25,13 @@ https://docs.aws.amazon.com/autoscaling/ec2/userguide/instance-refresh-overview.
 
 ### Launch Templates
 
-This gem depends on Auto Scaling Groups with Launch Templates. Using an Auto Scaling Group with a Launch Configuration is not supported, and will raise an `Capistrano::ASG::Rolling::NoLaunchTemplate`.
+This gem depends on Auto Scaling Groups with Launch Templates. Using an Auto Scaling Group with a Launch Configuration is not supported, and will raise a `Capistrano::ASG::Rolling::NoLaunchTemplate` error.
 
-Instance refresh uses the desired configuration to update the Launch Template version of the Auto Scaling Group after a succesful deployment. Setting the Launch Template version to `Latest` on the Auto Scaling Group is not needed.
+Instance refresh uses the desired configuration to update the Launch Template version of the Auto Scaling Group after a successful deployment. Setting the Launch Template version to `Latest` on the Auto Scaling Group is not needed.
 
 ### Experimental
 
-Please note that this gem works well for our configuration / use case, but it might not fit yours. Any feedback using GitHub issues / pull requests, is much appreciated.
+Please note that this gem works well for our configuration / use case, but it might not fit yours. Any feedback via GitHub issues / pull requests is much appreciated.
 
 ## Installation
 
@@ -59,60 +59,96 @@ install_plugin Capistrano::ASG::Rolling::Plugin
 
 ## Configuration
 
-Below are the Capistrano configuration options:
+Below you can find all configurable settings for this gem.
 
-Setup AWS credentials:
+### AWS
+
+Set up the AWS credentials and region:
 
 ```ruby
 # config/deploy.rb
 set :aws_access_key_id,     ENV['AWS_ACCESS_KEY_ID']
 set :aws_secret_access_key, ENV['AWS_SECRET_ACCESS_KEY']
+set :aws_session_token,     ENV['AWS_SESSION_TOKEN']
 set :aws_region,            ENV['AWS_REGION']
 ```
 
-After deployment, any outdated Launch Template versions, AMIs and snapshots will be deleted. By default, the number of `keep_releases` will be kept. Change this with:
+The AWS clients are configured with `adaptive` retry mode and a retry limit of 10 by default, so transient throttling (`Aws::AutoScaling::Errors::Throttling: Rate exceeded`) does not abort a deployment. You can tune both:
 
 ```ruby
 # config/deploy.rb
-set :asg_rolling_keep_versions, 10
+set :asg_aws_retry_mode, 'adaptive' # default; one of 'legacy', 'standard', 'adaptive'
+set :asg_aws_retry_limit, 10        # default
 ```
 
-Servers are added using their private IP address by default. Set to false to use the public IP address instead:
+### Launched instances
+
+Launched instances are added to Capistrano as servers using their private IP address by default. Set this option to false to use the public IP address instead:
 
 ```ruby
 # config/deploy.rb
 set :asg_rolling_use_private_ip_address, false
 ```
 
-Verbose logging is enabled by default, set to false for less verbose logging:
+When launching an instance, you can override any settings defined in the Launch Template with:
 
 ```ruby
 # config/deploy.rb
-set :asg_rolling_verbose, false
+set :asg_rolling_instance_overrides, { instance_type: 'c5.large' }
 ```
 
-When launching an Instance, you can override any settings defined in the Launch Template with:
+### AMI
+
+After creating an AMI, the gem waits until it becomes available before triggering an instance refresh. The defaults match the AWS SDK defaults (~10 minutes), but for larger root volumes (e.g. resizing 24 GB → 32 GB) the AMI can take longer to become available. Override the waiter via:
 
 ```ruby
 # config/deploy.rb
-set :asg_rolling_instance_overrides, { instance_type: 'c5.large' }
+set :asg_ami_wait_delay, 15         # seconds between polls (default: 15)
+set :asg_ami_wait_max_attempts, 40  # max polls (default: 40, ≈ 10 minutes)
 ```
 
-You can make Capistrano wait until the instances in the autoscaling group have completed refreshing with:
+### Instance refresh
+
+You can make Capistrano wait until the instance refresh on the Auto Scaling Group(s) has completed:
 
 ```ruby
 # config/deploy.rb
 set :asg_wait_for_instance_refresh, true
-set :asg_instance_refresh_polling_interval, 30 # default
+set :asg_instance_refresh_polling_interval, 30 # seconds (default: 30)
 ```
 
-Enable or disable auto-rollback on instance refreshes (default: false):
+Enable auto-rollback to have the Auto Scaling Group roll back to its previous configuration when the instance refresh fails (default: false):
 
 ```ruby
 # config/deploy.rb
 set :asg_instance_refresh_auto_rollback, true
 ```
 
+### Cleanup
+
+After deployment, any outdated Launch Template versions, AMIs and snapshots will be deleted. By default, the same number of versions as Capistrano's `keep_releases` will be kept. Change this with:
+
+```ruby
+# config/deploy.rb
+set :asg_rolling_keep_versions, 10
+```
+
+### Logging
+
+Verbose logging is enabled by default; set this option to false for less verbose logging:
+
+```ruby
+# config/deploy.rb
+set :asg_rolling_log_verbose, false
+```
+
+By default, the log output does not contain any timestamps; set the option below to true to enable timestamps:
+
+```ruby
+# config/deploy.rb
+set :asg_rolling_log_timestamp, true
+```
+
 ## Usage
 
 Specify the Auto Scaling Groups with the keyword `autoscale` instead of using the `server` keyword in Capistrano's stage configuration. Provide the name of the Auto Scaling Group and any properties you want to pass to the server:
@@ -129,7 +165,7 @@ Now start a deployment with `cap <stage> deploy` and enjoy.
 
 There might be cases where you just want to deploy your code to the servers in the Auto Scaling Group(s) without a rolling update.
 
-You can configure rolling updates per autoscaling group by using the `rolling` option:
+You can configure rolling updates per Auto Scaling Group by using the `rolling` option:
 
 ```ruby
 # config/deploy/<stage>.rb
@@ -137,28 +173,28 @@ autoscale 'app-autoscale-group', rolling: true    # default: use rolling deploym
 autoscale 'web-autoscale-group', rolling: false   # override: use normal deployment
 ```
 
-### Deploy with custom percentage of minimum/maximum healthy instances during the instance refresh
+### Deploy with custom minimum/maximum healthy percentages
 
 The instance refresh is triggered without specifying a value for the minimum / maximum healthy percentages. This means that either the default
 values will be used (minimum: 90%, maximum: 100%) or the percentages set in the instance maintenance policy for the Auto Scaling Group.
-You can tune both the minimum and maximum values to have more control about the desired capacity that must be healthy to proceed with replacing instances.
+You can tune both the minimum and maximum values to have more control over the desired capacity that must be healthy to proceed with replacing instances.
 
-For example: reducing the minimum healthy percentage allows more instances to be terminated and new instances to be brought up at once during the instance refresh. eg. a value of 0 would terminate all instances in the autoscaling group and replace them at once.
+For example, reducing the minimum healthy percentage allows more instances to be terminated and replaced at once during the instance refresh; a value of 0 would terminate and replace all instances in the Auto Scaling Group at once.
 
-You can configure the minimum healthy percentage per autoscaling group using the `min_healthy_percentage` option, and the maximum healthy percentage using the `max_healthy_percentage` option. Please note that if you specify `max_healthy_percentage`, you must also specify `min_healthy_percentage`.
+You can configure the minimum healthy percentage per Auto Scaling Group using the `min_healthy_percentage` option, and the maximum healthy percentage using the `max_healthy_percentage` option. Please note that if you specify `max_healthy_percentage`, you must also specify `min_healthy_percentage`.
 
 ```ruby
 # config/deploy/<stage>.rb
-autoscale 'app-autoscale-group',                                                           # use default percentages or percentages set in the instance maintenance policy
+autoscale 'app-autoscale-group'                                                            # use default percentages or percentages set in the instance maintenance policy
 autoscale 'web-autoscale-group', min_healthy_percentage: 75                                # allow 25% of instances to be terminated and replaced at once
 autoscale 'web-autoscale-group', min_healthy_percentage: 100, max_healthy_percentage: 110  # allow for 10% above desired capacity during instance refresh
 ```
 
 ### Custom stage
 
-The rolling configuration of the stage has a side-effect: any Capistrano tasks you run, will also launch instances per Auto Scaling Group.
+The rolling configuration of the stage has a side-effect: any Capistrano task you run will also launch instances per Auto Scaling Group.
 
-For example the command: `cap production rails:console`, will launch a new instance and run `rails:console` on that instance. While that can be useful, you often just want to run the task on the primary server. A solution is to create two stages with different rolling configurations, for example:
+For example, the command `cap production rails:console` will launch a new instance and run `rails:console` on that instance. While that can be useful, you often just want to run the task on the primary server. A solution is to create two stages with different rolling configurations, for example:
 
 ```ruby
 # config/deploy/production.rb
@@ -183,7 +219,7 @@ With these two stages, you can run any tasks with `cap production <task name>` a
 
 ### Tags
 
-During deployment, the following tags will be added to the AMI and snapshot containing information about the current application, stage and deployment:
+During deployment, the following tags will be added to the AMI and snapshot, containing information about the current application, stage and deployment:
 - `capistrano-asg-rolling:application`
 - `capistrano-asg-rolling:stage`
 - `capistrano-asg-rolling:deployment-branch`
@@ -192,7 +228,7 @@ During deployment, the following tags will be added to the AMI and snapshot cont
 - `capistrano-asg-rolling:deployment-user`
 
 In addition to that, the tag `capistrano-asg-rolling:gem-version` will be added with the value of the current gem version.
-This tag is also used to determine if the AMI was created by this gem, and can be deleted automatically.
+This tag is also used to determine whether the AMI was created by this gem and can therefore be deleted automatically.
 
 You can add custom tag(s) to the AMI and snapshot by setting the property `asg_rolling_ami_tags`, for example:
 
@@ -205,7 +241,7 @@ set :asg_rolling_ami_tags, { 'Application' => 'My Application', 'Environment' =>
 
 ### Test deployment
 
-Do a test deployment: run the deploy task, but do not trigger the update ASG task and do not automatically terminate instances.
+Do a test deployment: run the deploy task, but do not trigger an instance refresh and do not automatically terminate the launched instances.
 
 ```bash
 cap <stage> rolling:deploy_test
@@ -213,8 +249,8 @@ cap <stage> rolling:deploy_test
 
 ### Launch instances
 
-Just launch instance(s) defined in the Auto Scale Group(s) launch template.
-This instance is not attached to the Auto Scale Group and needs to be terminated manually.
+Launch instance(s) from the Launch Template of the Auto Scaling Group(s).
+These instances are not attached to the Auto Scaling Group and need to be terminated manually.
 
 ```bash
 cap <stage> rolling:launch_instances
@@ -222,8 +258,8 @@ cap <stage> rolling:launch_instances
 
 ### Create AMI of instance in ASG
 
-Pick an instance in the Auto Scale Group(s), put it into standby and stop it.
-Then create an AMI and a new launch template. Then start the instance and put it into service again.
+Pick an instance in the Auto Scaling Group(s), put it into standby and stop it.
+Then create an AMI, start the instance and put it back into service, and create a new Launch Template version with the new AMI.
 
 ```bash
 cap <stage> rolling:create_ami
@@ -231,7 +267,7 @@ cap <stage> rolling:create_ami
 
 ## Filtering
 
-You can filter any command to run on a specific Auto Scale Group by using the parameter `asg_name`.
+You can filter any command to run on a specific Auto Scaling Group by using the parameter `asg_name`.
 
 For example, the command:
 
@@ -239,7 +275,7 @@ For example, the command:
 cap <stage> deploy asg_name=app-autoscale-group
 ```
 
-Will do a deployment only on the Auto Scale Group with the name `app-autoscale-group`.
+This will do a deployment only on the Auto Scaling Group named `app-autoscale-group`.
 
 ## IAM policy
 

data/capistrano-asg-rolling.gemspec

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'capistrano/asg/rolling/version'
+require_relative 'lib/capistrano/asg/rolling/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-asg-rolling'
   spec.version       = Capistrano::ASG::Rolling::VERSION
-  spec.authors       = ['Kentaa']
-  spec.email         = ['developers@kentaa.nl']
+  spec.authors       = %w[Kentaa iRaiser]
+  spec.email         = ['tech-arnhem@iraiser.eu']
 
   spec.summary       = 'Capistrano plugin for performing rolling updates to AWS Auto Scaling Groups using Instance Refresh'
   spec.homepage      = 'https://github.com/KentaaNL/capistrano-asg-rolling'
@@ -26,11 +24,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.1.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'simplecov', '~> 1.0'
   spec.add_development_dependency 'webmock', '~> 3.11'
 
   spec.add_dependency 'aws-sdk-autoscaling', '~> 1', '>= 1.100.0'

data/lib/capistrano/asg/rolling/ami.rb

@@ -36,10 +36,17 @@ module Capistrano
           response = aws_ec2_client.create_image(options)
 
           begin
-            aws_ec2_client.wait_until(:image_available, image_ids: [response.image_id])
-          rescue Aws::Waiters::Errors::TooManyAttemptsError
+            aws_ec2_client.wait_until(:image_available, image_ids: [response.image_id]) do |waiter|
+              waiter.delay = Configuration.ami_wait_delay
+              waiter.max_attempts = Configuration.ami_wait_max_attempts
+            end
+          rescue Aws::Waiters::Errors::TooManyAttemptsError => e
             # When waiting for the AMI takes longer than the default (10 minutes),
-            # then assume it will eventually succeed and just continue.
+            # then assume it will eventually succeed and just continue. Surface a
+            # warning so operators can see that the wait did not complete in time
+            # (for example after increasing the root volume size of the source
+            # instance) before the subsequent Instance Refresh is started.
+            Kernel.warn("WARNING: timed out waiting for AMI #{response.image_id} to become available: #{e.message}")
           end
 
           new(response.image_id, instance)

data/lib/capistrano/asg/rolling/autoscale_group.rb

@@ -21,12 +21,6 @@ module Capistrano
           @name = name
           @properties = properties
 
-          if properties[:healthy_percentage]
-            properties[:min_healthy_percentage] = properties.delete(:healthy_percentage)
-
-            Kernel.warn('WARNING: the property `healthy_percentage` is deprecated and will be removed in a future release. Please update to `min_healthy_percentage`.')
-          end
-
           validate_properties!
         end
 
@@ -81,7 +75,11 @@ module Capistrano
               auto_rollback: auto_rollback
             }.compact
           ).instance_refresh_id
-        rescue Aws::AutoScaling::Errors::InstanceRefreshInProgress => e
+        rescue Aws::AutoScaling::Errors::ServiceError => e
+          # Wrap all AWS Auto Scaling service errors (InstanceRefreshInProgress,
+          # ValidationError, throttling, etc.) so the rake task can rescue a
+          # single gem-defined error type and continue with the remaining
+          # Auto Scaling Group(s).
           raise Capistrano::ASG::Rolling::StartInstanceRefreshError, e
         end
 
@@ -102,6 +100,10 @@ module Capistrano
           return nil if status.nil?
 
           InstanceRefreshStatus.new(status, percentage_complete)
+        rescue Aws::AutoScaling::Errors::ServiceError => e
+          # Wrap AWS service errors (typically throttling that exceeded the SDK's
+          # retry budget) so callers can rescue a gem-defined error type.
+          raise Capistrano::ASG::Rolling::InstanceRefreshStatusError, e
         end
 
         # Returns instances with lifecycle state "InService" for this Auto Scaling Group.

data/lib/capistrano/asg/rolling/autoscale_groups.rb

@@ -19,8 +19,24 @@ module Capistrano
           @groups.reject { |group| filtered?(group) }.each(&)
         end
 
+        def empty?
+          none?
+        end
+
+        def rolling
+          self.class.new(select(&:rolling?))
+        end
+
+        def standard
+          self.class.new(reject(&:rolling?))
+        end
+
+        def with_unique_images
+          self.class.new(uniq { |group| group.launch_template.image_id })
+        end
+
         def launch_templates
-          templates = @groups.map(&:launch_template)
+          templates = map(&:launch_template)
           LaunchTemplates.new(templates)
         end
 

data/lib/capistrano/asg/rolling/aws.rb

@@ -6,14 +6,16 @@ require 'aws-sdk-ec2'
 module Capistrano
   module ASG
     module Rolling
-      # AWS SDK.
+      # AWS SDK helpers. Clients are memoized per object and shared across objects on the same thread.
       module AWS
         def aws_autoscaling_client
-          @aws_autoscaling_client ||= ::Aws::AutoScaling::Client.new(aws_options)
+          @aws_autoscaling_client ||=
+            Thread.current[:aws_autoscaling_client] ||= ::Aws::AutoScaling::Client.new(aws_options)
         end
 
         def aws_ec2_client
-          @aws_ec2_client ||= ::Aws::EC2::Client.new(aws_options)
+          @aws_ec2_client ||=
+            Thread.current[:aws_ec2_client] ||= ::Aws::EC2::Client.new(aws_options)
         end
 
         private
@@ -22,6 +24,8 @@ module Capistrano
           options = {}
           options[:region] = aws_region if aws_region
           options[:credentials] = aws_credentials if aws_credentials.set?
+          options[:retry_mode] = Configuration.aws_retry_mode
+          options[:retry_limit] = Configuration.aws_retry_limit
           options[:http_wire_trace] = true if ENV['AWS_HTTP_WIRE_TRACE'] == '1'
           options
         end

data/lib/capistrano/asg/rolling/configuration.rb

@@ -3,25 +3,39 @@
 module Capistrano
   module ASG
     module Rolling
-      # Singleton that holds the configuration.
+      # Singleton that holds the configuration and global state of the plugin.
+      # State is eagerly initialized so accessors are lock-free.
       module Configuration
         extend Capistrano::DSL
 
+        # Registered Auto Scaling Groups.
+        @autoscale_groups = AutoscaleGroups.new
+
+        # Launched Instances.
+        @instances = Instances.new
+
+        # Updated Launch Templates.
+        @launch_templates = LaunchTemplates.new
+
         module_function
 
-        # Registered Auto Scaling Groups.
         def autoscale_groups
-          @autoscale_groups ||= AutoscaleGroups.new
+          @autoscale_groups
         end
 
-        # Launched Instances.
         def instances
-          @instances ||= Instances.new
+          @instances
         end
 
-        # Updated Launch Templates.
         def launch_templates
-          @launch_templates ||= LaunchTemplates.new
+          @launch_templates
+        end
+
+        # Resets all mutable state.
+        def reset!
+          @autoscale_groups = AutoscaleGroups.new
+          @instances        = Instances.new
+          @launch_templates = LaunchTemplates.new
         end
 
         def aws_access_key_id
@@ -44,10 +58,6 @@ module Capistrano
           fetch(:asg_rolling_group_name)
         end
 
-        def ssh_options
-          fetch(:asg_rolling_ssh_options, fetch(:ssh_options))
-        end
-
         def instance_overrides
           fetch(:asg_rolling_instance_overrides)
         end
@@ -60,8 +70,12 @@ module Capistrano
           fetch(:asg_rolling_keep_versions, fetch(:keep_releases))
         end
 
-        def verbose?
-          fetch(:asg_rolling_verbose)
+        def log_verbose?
+          fetch(:asg_rolling_log_verbose)
+        end
+
+        def log_timestamp?
+          fetch(:asg_rolling_log_timestamp)
         end
 
         def rolling_update=(value)
@@ -79,6 +93,22 @@ module Capistrano
         def instance_refresh_polling_interval
           fetch(:asg_instance_refresh_polling_interval, 30)
         end
+
+        def aws_retry_mode
+          fetch(:asg_aws_retry_mode, 'adaptive')
+        end
+
+        def aws_retry_limit
+          fetch(:asg_aws_retry_limit, 10)
+        end
+
+        def ami_wait_delay
+          fetch(:asg_ami_wait_delay, 15)
+        end
+
+        def ami_wait_max_attempts
+          fetch(:asg_ami_wait_max_attempts, 40)
+        end
       end
     end
   end

data/lib/capistrano/asg/rolling/exception.rb

@@ -13,9 +13,14 @@ module Capistrano
       class NoLaunchTemplate < Capistrano::ASG::Rolling::Exception
       end
 
+      # Exception when starting an instance refresh failed.
       class StartInstanceRefreshError < Capistrano::ASG::Rolling::Exception
       end
 
+      # Exception when fetching the instance refresh status failed.
+      class InstanceRefreshStatusError < Capistrano::ASG::Rolling::Exception
+      end
+
       # Exception when the instance refresh failed on one of the ASGs.
       class InstanceRefreshFailed < Capistrano::ASG::Rolling::Exception
         def initialize

data/lib/capistrano/asg/rolling/instances.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'concurrent/array'
+
 module Capistrano
   module ASG
     module Rolling
@@ -8,7 +10,7 @@ module Capistrano
         include Enumerable
 
         def initialize(instances = [])
-          @instances = instances
+          @instances = Concurrent::Array.new(instances)
         end
 
         def <<(instance)
@@ -23,7 +25,7 @@ module Capistrano
           instances.empty?
         end
 
-        def auto_terminate
+        def auto_terminatable
           self.class.new(select(&:auto_terminate?))
         end
 

data/lib/capistrano/asg/rolling/launch_templates.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 module Capistrano
   module ASG
     module Rolling
@@ -29,16 +27,20 @@ module Capistrano
           @templates.empty?
         end
 
+        # For each AMI, find templates still pointing at the old image it was built
+        # from, then create new template versions referencing the new AMI in parallel.
+        #
+        # Returns `LaunchTemplates` containing only the newly created versions.
         def update(amis:, description: nil)
-          updated_templates = []
-
-          amis.each do |ami|
+          template_image_pairs = amis.flat_map do |ami|
             old_image_id = ami.instance.image_id
             new_image_id = ami.id
 
-            with_image(old_image_id).each do |template|
-              updated_templates << template.create_version(image_id: new_image_id, description: description)
-            end
+            with_image(old_image_id).map { |template| [template, new_image_id] }
+          end
+
+          updated_templates = Parallel.run(template_image_pairs) do |template, new_image_id|
+            template.create_version(image_id: new_image_id, description: description)
           end
 
           self.class.new(updated_templates)

data/lib/capistrano/asg/rolling/logger.rb

@@ -3,9 +3,10 @@
 module Capistrano
   module ASG
     module Rolling
-      # Logging support.
+      # Colorized stdout/stderr output with optional timestamps and **bold** formatting.
       class Logger
-        def initialize(verbose: false)
+        def initialize(timestamp: false, verbose: false)
+          @timestamp = timestamp
           @verbose = verbose
         end
 
@@ -28,6 +29,7 @@ module Capistrano
         private
 
         def format_text(text, color: nil)
+          text = "[#{current_time}] #{text}" if @timestamp
           text = colorize_text(text, color) if color
           text.gsub(/\*\*(.+?)\*\*/, bold_text('\\1'))
         end
@@ -43,6 +45,10 @@ module Capistrano
         def _color
           @_color ||= SSHKit::Color.new($stdout)
         end
+
+        def current_time
+          Time.now.strftime('%H:%M:%S')
+        end
       end
     end
   end

data/lib/capistrano/asg/rolling/parallel.rb

@@ -9,18 +9,34 @@ module Capistrano
       module Parallel
         module_function
 
+        # Runs the given block once per element of `work`, in parallel.
+        #
+        # All threads are joined before this method returns, so a failure in one
+        # block does not abandon the other in-flight threads. If any block
+        # raises, the first error is re-raised after all threads have completed;
+        # additional errors are surfaced via `Kernel.warn`.
         def run(work)
-          result = Concurrent::Array.new
+          results = Concurrent::Array.new
+          errors = Concurrent::Array.new
 
           threads = work.map do |w|
             Thread.new do
-              result << yield(w)
+              results << yield(w)
+            rescue StandardError => e
+              errors << e
             end
           end
 
           threads.each(&:join)
 
-          result
+          if errors.any?
+            errors.drop(1).each do |e|
+              Kernel.warn("WARNING: parallel task failed: #{e.class}: #{e.message}")
+            end
+            raise errors.first
+          end
+
+          results
         end
       end
     end

data/lib/capistrano/asg/rolling/plugin.rb

@@ -14,7 +14,8 @@ module Capistrano
         def set_defaults
           set_if_empty :asg_rolling_group_name, ENV.fetch('asg_name', nil)
           set_if_empty :asg_rolling_use_private_ip_address, true
-          set_if_empty :asg_rolling_verbose, true
+          set_if_empty :asg_rolling_log_verbose, true
+          set_if_empty :asg_rolling_log_timestamp, false
           set_if_empty :asg_rolling_update, true
         end
 
@@ -28,6 +29,7 @@ module Capistrano
 
           after 'rolling:update', 'rolling:cleanup'
           after 'rolling:create_ami', 'rolling:cleanup'
+
           after 'rolling:update', 'rolling:instance_refresh_status'
           after 'rolling:trigger_instance_refresh', 'rolling:instance_refresh_status'
 
@@ -41,7 +43,7 @@ module Capistrano
         end
 
         def logger
-          @logger ||= Logger.new(verbose: config.verbose?)
+          @logger ||= Logger.new(timestamp: config.log_timestamp?, verbose: config.log_verbose?)
         end
 
         def config
@@ -59,7 +61,7 @@ module Capistrano
 
         # Make sure any instances that were launched for rolling updates are terminated.
         def cleanup
-          instances = config.instances.auto_terminate
+          instances = config.instances.auto_terminatable
           return if instances.empty?
 
           logger.info 'Terminating instance(s)...'

data/lib/capistrano/asg/rolling/ssh.rb

@@ -5,7 +5,7 @@ require 'time'
 module Capistrano
   module ASG
     module Rolling
-      # Test the SSHKit backend for availability.
+      # Polls an SSHKit backend until its SSH port is open and accepting connections.
       module SSH
         module_function
 

data/lib/capistrano/asg/rolling/version.rb

@@ -3,7 +3,7 @@
 module Capistrano
   module ASG
     module Rolling
-      VERSION = '0.7.0'
+      VERSION = '0.9.0'
     end
   end
 end

data/lib/capistrano/asg/rolling.rb

@@ -6,7 +6,6 @@ require 'capistrano/asg/rolling/aws'
 require 'capistrano/asg/rolling/ami'
 require 'capistrano/asg/rolling/autoscale_group'
 require 'capistrano/asg/rolling/autoscale_groups'
-require 'capistrano/asg/rolling/configuration'
 require 'capistrano/asg/rolling/dsl'
 require 'capistrano/asg/rolling/exception'
 require 'capistrano/asg/rolling/instance'
@@ -15,8 +14,10 @@ require 'capistrano/asg/rolling/launch_template'
 require 'capistrano/asg/rolling/launch_templates'
 require 'capistrano/asg/rolling/logger'
 require 'capistrano/asg/rolling/parallel'
-require 'capistrano/asg/rolling/plugin'
 require 'capistrano/asg/rolling/snapshot'
 require 'capistrano/asg/rolling/ssh'
 require 'capistrano/asg/rolling/tags'
 require 'capistrano/asg/rolling/version'
+
+require 'capistrano/asg/rolling/configuration'
+require 'capistrano/asg/rolling/plugin'

data/lib/capistrano/asg/tasks/rolling.rake

@@ -2,35 +2,50 @@
 
 namespace :rolling do
   desc 'Setup servers to be used for (rolling) deployment'
-  task :setup do
-    config.autoscale_groups.each do |group|
-      if group.rolling?
+  task setup: %w[rolling:prepare rolling:wait_for_ssh]
+
+  desc 'Resolve Auto Scaling Groups, launch rolling instances, and register all servers'
+  task :prepare do
+    rolling_groups = config.autoscale_groups.rolling
+    if rolling_groups.any?
+      rolling_groups.each do |group|
         logger.info "Auto Scaling Group: **#{group.name}**, rolling deployment strategy."
+      end
 
-        # If we've already launched an instance with this image, then skip it.
-        next unless config.instances.with_image(group.launch_template.image_id).empty?
+      launched_instances = Capistrano::ASG::Rolling::Parallel.run(rolling_groups.with_unique_images) do |group|
+        Capistrano::ASG::Rolling::Instance.run(
+          autoscaling_group: group,
+          overrides: config.instance_overrides
+        ).tap { |instance| config.instances << instance }
+      end
 
-        instance = Capistrano::ASG::Rolling::Instance.run(autoscaling_group: group, overrides: config.instance_overrides)
+      launched_instances.each do |instance|
         logger.info "Launched Instance: **#{instance.id}**"
-        config.instances << instance
 
+        group = instance.autoscale_group
         add_instance(instance, group.properties)
-      else
-        logger.info "Auto Scaling Group: **#{group.name}**, standard deployment strategy."
+      end
+    end
 
-        group.instances.each_with_index do |instance, index|
+    standard_groups = config.autoscale_groups.standard
+    standard_groups.each do |group|
+      logger.info "Auto Scaling Group: **#{group.name}**, standard deployment strategy."
+
+      group.instances.each_with_index do |instance, index|
+        server_properties =
           if index.zero? && group.properties.key?(:primary_roles)
-            server_properties = group.properties.dup
-            server_properties[:roles] = server_properties.delete(:primary_roles)
+            group.properties.merge(roles: group.properties[:primary_roles]).except(:primary_roles)
           else
-            server_properties = group.properties
+            group.properties
           end
 
-          add_instance(instance, server_properties)
-        end
+        add_instance(instance, server_properties)
       end
     end
+  end
 
+  desc 'Wait for SSH to become available on launched instances'
+  task :wait_for_ssh do
     unless config.instances.empty?
       logger.info 'Waiting for SSH to be available...'
 
@@ -54,31 +69,22 @@ namespace :rolling do
       updated_templates = launch_templates.update(amis: amis, description: revision_log_message)
 
       logger.info 'Triggering Instance Refresh on Auto Scaling Group(s)...'
-      updated_templates.each do |launch_template|
-        config.autoscale_groups.with_launch_template(launch_template).each do |group|
-          group.start_instance_refresh(launch_template)
+      groups_with_templates = updated_templates.flat_map do |launch_template|
+        config.autoscale_groups.with_launch_template(launch_template).map { |group| [group, launch_template] }
+      end
 
-          logger.verbose "Successfully started Instance Refresh on Auto Scaling Group **#{group.name}**."
-        rescue Capistrano::ASG::Rolling::StartInstanceRefreshError => e
-          logger.info "Failed to start Instance Refresh on Auto Scaling Group **#{group.name}**: #{e.message}"
-        end
+      Capistrano::ASG::Rolling::Parallel.run(groups_with_templates) do |group, launch_template|
+        group.start_instance_refresh(launch_template)
+
+        logger.verbose "Successfully started Instance Refresh on Auto Scaling Group **#{group.name}**."
+      rescue Capistrano::ASG::Rolling::StartInstanceRefreshError => e
+        logger.warning "Failed to start Instance Refresh on Auto Scaling Group **#{group.name}**: #{e.message}"
       end
 
       config.launch_templates.merge(updated_templates)
     end
   end
 
-  desc 'Trigger instance refresh of deployed autoscaling groups'
-  task :trigger_instance_refresh do
-    logger.info 'Triggering Instance Refresh on Auto Scaling Group(s)...'
-    config.autoscale_groups.each do |group|
-      group.start_instance_refresh(group.launch_template)
-      logger.info "Successfully started Instance Refresh on Auto Scaling Group **#{group.name}**."
-    rescue Capistrano::ASG::Rolling::StartInstanceRefreshError => e
-      logger.info "Failed to start Instance Refresh on Auto Scaling Group **#{group.name}**: #{e.message}"
-    end
-  end
-
   desc 'Clean up old Launch Template versions and AMIs and terminate instances'
   task :cleanup do
     unless config.launch_templates.empty?
@@ -114,7 +120,7 @@ namespace :rolling do
       end
     end
 
-    instances = config.instances.auto_terminate
+    instances = config.instances.auto_terminatable
     if instances.any?
       logger.info 'Terminating instance(s)...'
       begin
@@ -176,33 +182,50 @@ namespace :rolling do
 
         logger.info 'Updating Launch Template with the new AMI...'
         launch_template = group.launch_template
-        launch_template.create_version(image_id: ami.id, description: revision_log_message)
+        new_template = launch_template.create_version(image_id: ami.id, description: revision_log_message)
 
-        config.launch_templates << launch_template
+        config.launch_templates << new_template
       else
         logger.error 'Unable to create AMI. No instance with a valid state was found in the Auto Scaling Group.'
       end
     end
   end
 
+  desc 'Trigger instance refresh on all Auto Scaling Groups'
+  task :trigger_instance_refresh do
+    logger.info 'Triggering Instance Refresh on Auto Scaling Group(s)...'
+    Capistrano::ASG::Rolling::Parallel.run(config.autoscale_groups) do |group|
+      group.start_instance_refresh(group.launch_template)
+
+      logger.info "Successfully started Instance Refresh on Auto Scaling Group **#{group.name}**."
+    rescue Capistrano::ASG::Rolling::StartInstanceRefreshError => e
+      logger.warning "Failed to start Instance Refresh on Auto Scaling Group **#{group.name}**: #{e.message}"
+    end
+  end
+
   desc 'Get status of instance refresh'
   task :instance_refresh_status do
     if config.wait_for_instance_refresh?
-      groups = config.autoscale_groups.to_h { |group| [group.name, group] }
-      completed_groups = []
+      groups = config.autoscale_groups.select(&:refresh_id).to_h { |group| [group.name, group] }
+      completed_refreshes = []
 
       while groups.any?
         groups.each do |name, group|
           refresh = group.latest_instance_refresh
           if refresh.nil? || refresh.completed?
-            logger.info "Auto Scaling Group: **#{name}**, completed with status '#{refresh.status}'." if refresh.completed?
-            completed_groups.push groups.delete(name)
-          elsif !refresh.percentage_complete.nil?
+            logger.info "Auto Scaling Group: **#{name}**, completed with status '#{refresh.status}'." if refresh&.completed?
+
+            groups.delete(name)
+            completed_refreshes.push(refresh) if refresh
+          elsif refresh.percentage_complete
             logger.info "Auto Scaling Group: **#{name}**, #{refresh.percentage_complete}% completed, status '#{refresh.status}'."
           else
             logger.info "Auto Scaling Group: **#{name}**, status '#{refresh.status}'."
           end
+        rescue Capistrano::ASG::Rolling::InstanceRefreshStatusError => e
+          logger.warning "Auto Scaling Group: **#{name}**, failed to fetch status: #{e.message} - retrying on next poll."
         end
+
         next if groups.empty?
 
         wait_for = config.instance_refresh_polling_interval
@@ -210,7 +233,7 @@ namespace :rolling do
         sleep wait_for
       end
 
-      failed = completed_groups.any? { |group| group.latest_instance_refresh.failed? }
+      failed = completed_refreshes.any?(&:failed?)
       raise Capistrano::ASG::Rolling::InstanceRefreshFailed if failed
     end
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-asg-rolling
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kentaa
+- iRaiser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-23 00:00:00.000000000 Z
+date: 2026-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +145,7 @@ dependencies:
         version: '1'
 description:
 email:
-- developers@kentaa.nl
+- tech-arnhem@iraiser.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -181,14 +196,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Capistrano plugin for performing rolling updates to AWS Auto Scaling Groups