capistrano-hivequeen 7.5.0 → 7.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b66d4218316f1fa5e21db271700c8c3f1b6e69312912eb106d04cecef5aa704
-  data.tar.gz: c2d33bdb0f6f09d376f0e5cb49f3c230507b4562fac6ce75def53f5aeb7ebe3a
+  metadata.gz: 8ca77135ec2da064aa528ee926c64e0ff2cf97615aed3a8aa1d72813b3a8fb70
+  data.tar.gz: b456eb78e4f914da4fc6a5eaa3a99f0902336c2951b26437d4bf403f44f7bcae
 SHA512:
-  metadata.gz: daf7410d13f08728bdc618bc95f79e7bf40e75af00658379e48e063970c8151ba94e0b4a16dc525e6f89bac31e991ba6858b1652a72c6d83eef1c654db00e261
-  data.tar.gz: cb2806cab76537e07daa39d6cdf6d3ec40d991c3eca37f6e806615fb8d4ac51d8f76744d81ea48628247899471c4e20fe4d0dd89ed492aee1a1cdaf1a2258cfd
+  metadata.gz: 1efcaa3895d677e108d881d3843b3d7a83343218e0d5d3868db439c85d33f0bf038d6ea0f2a31d0e22e5fcd707b23a99c1016d502b0244715ec785c923d6a64f
+  data.tar.gz: 97a8ea9475a996d9bb820c0c99bd55fbf7af635b30803e1f7a92ad3c64902bba5153560f49d9fa64486ecf0b6495985b31ae050ed14d19655bcc5c3105219d91

data/.gitignore

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

data/README.rdoc

@@ -27,6 +27,12 @@ And in your config/deploy.rb:
 
     cap staging deploy -s branch=some_feature
 
+=== Releasing a new version
+  First, bump the version in lib/capistrano/hivequeen/version.rb. Then:
+
+    gem build capistrano-hivequeen.gemspec
+    gem push capistrano-hivequeen-$VERSION.gem
+
 == License
 
 @copy; Copyright Kickstarter, PBC.

data/capistrano-hivequeen.gemspec

@@ -38,7 +38,9 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('capistrano', '>= 2.11.0')
+  s.add_dependency('aws-sdk-ec2', '~> 1.0')
+  s.add_dependency('aws-sdk-ec2instanceconnect', '~> 1.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/capistrano_configuration.rb

@@ -78,7 +78,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         if exists?(:az)
           servers = servers.select {|s| s['availability_zone'] == az}
         end
-        role(role_name.to_sym) { servers.map {|s| s['public_dns']} }
+        role(role_name.to_sym) { servers.map {|s| s['public_dns'] || s['private_dns']} }
       end
 
       # Ensure some server designated as db server
@@ -97,14 +97,18 @@ Capistrano::Configuration.instance(:must_exist).load do
         command_format = "ssh -t -A -l %s %s"
         env['roles'].keys.each do |role_name|
           task role_name do
-            cmd = command_format % [user, roles[role_name.to_sym].servers.first]
+            server = roles[role_name.to_sym].servers.sample
+            HiveQueen.ec2_instance_connect(server.host)
+            cmd = command_format % [user, server]
             puts "Executing #{cmd}"
             exec cmd
           end
         end
 
         task :default do
-          cmd = command_format % [user, roles.values.sample.servers.sample]
+          server = roles.values.sample.servers.sample
+          HiveQueen.ec2_instance_connect(server.host)
+          cmd = command_format % [user, server]
           puts "Executing #{cmd}"
           exec cmd
         end
@@ -114,14 +118,18 @@ Capistrano::Configuration.instance(:must_exist).load do
         command_format = "ssh -t -A -l %s %s 'source /etc/profile; cd /apps/#{HiveQueen.project}/current && bundle exec rails console'"
         env['roles'].keys.each do |role_name|
           task role_name do
+            server = roles[role_name.to_sym].servers.sample
+            HiveQueen.ec2_instance_connect(server.host)
             puts "Opening console"
-            exec command_format % [user, roles[role_name.to_sym].servers.first]
+            exec command_format % [user, server]
           end
         end
 
         task :default do
+          server = roles.values.sample.servers.sample
+          HiveQueen.ec2_instance_connect(server.host)
           puts "Opening console"
-          exec command_format % [user, roles.values.sample.servers.sample]
+          exec command_format % [user, server]
         end
       end
     end

data/lib/capistrano/hivequeen/ec2_instance_connect.rb

@@ -0,0 +1,41 @@
+class HiveQueen
+  def self.ec2_client
+    @ec2_client ||= Aws::EC2::Client.new
+  end
+
+  def self.ec2_instance_connect_client
+    @ec2_instance_connect_client ||= Aws::EC2InstanceConnect::Client.new
+  end
+
+  def self.ec2_instance_connect(*private_dns)
+    # Get SSH public key contents
+    ssh_public_key = File.read(File.expand_path('~/.ssh/ksr_ed25519.pub'))
+
+    # 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
+
+    # Collect EC2 Instance Connect request threads
+    threads = (bastions + instances).map do |instance|
+      Thread.new do
+        ec2ic_params = {
+          availability_zone: instance.placement.availability_zone,
+          instance_id:       instance.instance_id,
+          instance_os_user:  'ksr',
+          ssh_public_key:    ssh_public_key,
+        }
+        logger.trace("ec2-instance-connect:SendSSHPublicKey #{ec2ic_params.to_json}")
+        ec2_instance_connect_client.send_ssh_public_key(**ec2ic_params)
+      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.5.0'
+    @@version = '7.7.1'
 
     def self.to_s
       @@version

data/lib/capistrano/hivequeen.rb

@@ -1,12 +1,17 @@
 # HTTP Client for Hive Queen environment configuration
+require 'base64'
+require 'fileutils'
 require 'json'
+
 require 'active_support'
 require 'active_support/core_ext'
-require 'fileutils'
+require 'aws-sdk-ec2'
+require 'aws-sdk-ec2instanceconnect'
 require 'excon'
-require 'base64'
+
 require 'capistrano/hivequeen/version'
 require 'capistrano/hivequeen/multiio'
+require 'capistrano/hivequeen/ec2_instance_connect'
 
 # Special cases:
 # - environment not found
@@ -135,4 +140,3 @@ class HiveQueen
 end
 
 require "capistrano/hivequeen/capistrano_configuration"
-

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.7.1
 platform: ruby
 authors:
 - Aaron Suggs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2instanceconnect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   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
@@ -93,6 +121,7 @@ files:
 - lib/capistrano/hivequeen.rb
 - lib/capistrano/hivequeen/capistrano_configuration.rb
 - lib/capistrano/hivequeen/deploy.rb
+- lib/capistrano/hivequeen/ec2_instance_connect.rb
 - lib/capistrano/hivequeen/multiio.rb
 - lib/capistrano/hivequeen/setup.rb
 - lib/capistrano/hivequeen/version.rb
@@ -100,7 +129,7 @@ homepage: http://github.com/kickstarter/capistrano-hivequeen
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -116,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 2
 summary: Capistrano extensions for interacting with HiveQueen
 test_files: []