capistrano-hivequeen 7.7.0 → 7.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b660b02784362a5c9a2f8a96a3355a3fd18fb399b57d138942488f89b16b10
-  data.tar.gz: da9503dc5137e661476abba23820112d59bd4033d0775dbd015e449a0ee889f2
+  metadata.gz: cbc758d62e2ed6b55d9595a7afc5ffa694e6aa2f76bde859a36d44380960f009
+  data.tar.gz: 6f4ba43b6a19a9f93b950aadcfa39fefdb442ed2455728f1e7277d0cbb3ebff9
 SHA512:
-  metadata.gz: 96e6bb88e860b84984b32501ac7be9135364b4ad16a4a644540e8b3cb9f30e655f20f829b5bdcf085e4fc8ba4ddc54d18cc1f36a9a59bef356de48af5f37080a
-  data.tar.gz: ca952a870f3db6dafbc36701dcb6708a2902d611fd1abf57783be5607bd3fc0b62523f81ebfd2e7c8f19b45741a549ab7704d79b548c56220185392069bcb6ed
+  metadata.gz: 013b9d5bfa2a6e8d923dbe37a1d0b600dbb652aac1c2a3027b1fe17cb884a84af37d1781dfda9c4ad5f123d9b3ad3db087909fb3132e9a247f90e267e4afd281
+  data.tar.gz: 293fe44f13d0c942cd5458f2d45e0c40840bd7cbe1cb06e2eb410db29e906dc9ce7a2f778e12a50e2d13047f23742cd30e2b4737f17f145efdbb96bc4d96d025

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+.ruby-version

data/capistrano-hivequeen.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('aws-sdk-ec2', '~> 1.0')
   s.add_dependency('aws-sdk-ec2instanceconnect', '~> 1.0')
-  s.add_dependency('capistrano', '>= 2.11.0')
+  s.add_dependency('capistrano', '~> 2.11')
   s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('json')
   s.add_dependency('egads', '>= 3.0.0')

data/lib/capistrano/hivequeen/ec2_instance_connect.rb

@@ -4,21 +4,28 @@ class HiveQueen
   end
 
   def self.ec2_instance_connect_client
-    @ec2_instance_connect_client ||= Aws::EC2InstanceConnect::Client.new
+    @ec2_instance_connect_client ||= Aws::EC2InstanceConnect::Client.new(
+      retry_limit:   5,
+      retry_backoff: -> (c) { sleep(5) },
+    )
   end
 
   def self.ec2_instance_connect(*private_dns)
-    # EC2 Instance Connect
+    # Get SSH public key contents
     ssh_public_key = File.read(File.expand_path('~/.ssh/ksr_ed25519.pub'))
-    ec2_params = {
-      filters: [{
-        name:   'network-interface.private-dns-name',
-        values: private_dns
-      }]
-    }
+
+    # Get SSH bastion instance(s) from Name tag
+    ssh_params = { filters: [{ name: 'tag:Name', values: %w[ssh-bastion] }] }
+    logger.trace("ec2:DescribeInstances #{ssh_params.to_json}")
+    bastions = ec2_client.describe_instances(**ssh_params).reservations.map(&:instances).flatten
+
+    # Get EC2 instances from private DNS name
+    ec2_params = { filters: [{ name: 'network-interface.private-dns-name', values: private_dns }] }
     logger.trace("ec2:DescribeInstances #{ec2_params.to_json}")
     instances = ec2_client.describe_instances(**ec2_params).reservations.map(&:instances).flatten
-    threads = instances.map do |instance|
+
+    # Collect EC2 Instance Connect request threads
+    threads = (bastions + instances).map do |instance|
       Thread.new do
         ec2ic_params = {
           availability_zone: instance.placement.availability_zone,
@@ -31,6 +38,7 @@ class HiveQueen
       end
     end
 
+    # Execute EC2 Instance Connect request threads
     threads.each(&:join)
   end
 end

data/lib/capistrano/hivequeen/version.rb

@@ -1,6 +1,6 @@
 class HiveQueen
   class Version
-    @@version = '7.7.0'
+    @@version = '7.7.2'
 
     def self.to_s
       @@version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 7.7.0
+  version: 7.7.2
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -42,16 +42,16 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement