capistrano-hivequeen 7.7.0 → 7.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b660b02784362a5c9a2f8a96a3355a3fd18fb399b57d138942488f89b16b10
-  data.tar.gz: da9503dc5137e661476abba23820112d59bd4033d0775dbd015e449a0ee889f2
+  metadata.gz: 8ca77135ec2da064aa528ee926c64e0ff2cf97615aed3a8aa1d72813b3a8fb70
+  data.tar.gz: b456eb78e4f914da4fc6a5eaa3a99f0902336c2951b26437d4bf403f44f7bcae
 SHA512:
-  metadata.gz: 96e6bb88e860b84984b32501ac7be9135364b4ad16a4a644540e8b3cb9f30e655f20f829b5bdcf085e4fc8ba4ddc54d18cc1f36a9a59bef356de48af5f37080a
-  data.tar.gz: ca952a870f3db6dafbc36701dcb6708a2902d611fd1abf57783be5607bd3fc0b62523f81ebfd2e7c8f19b45741a549ab7704d79b548c56220185392069bcb6ed
+  metadata.gz: 1efcaa3895d677e108d881d3843b3d7a83343218e0d5d3868db439c85d33f0bf038d6ea0f2a31d0e22e5fcd707b23a99c1016d502b0244715ec785c923d6a64f
+  data.tar.gz: 97a8ea9475a996d9bb820c0c99bd55fbf7af635b30803e1f7a92ad3c64902bba5153560f49d9fa64486ecf0b6495985b31ae050ed14d19655bcc5c3105219d91

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

@@ -8,17 +8,21 @@ class HiveQueen
   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 +35,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.1'
 
     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.1
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-08-01 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
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 2
 summary: Capistrano extensions for interacting with HiveQueen