capistrano-hivequeen 7.4.0 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 67f903743b80936b84b7805fb2696cc374f8cce0
-  data.tar.gz: 236886bf3acf2d21c448110b8dd199fd9ce7ff10
+SHA256:
+  metadata.gz: 72b660b02784362a5c9a2f8a96a3355a3fd18fb399b57d138942488f89b16b10
+  data.tar.gz: da9503dc5137e661476abba23820112d59bd4033d0775dbd015e449a0ee889f2
 SHA512:
-  metadata.gz: 2dbeb44a087ed1cf83309119aa99720c06c098093f37af06b101f0886a2d63cef9ccb50a766418917ecff474cf113cb678bd6a8802111ada46acc7c8dbbf9ad0
-  data.tar.gz: a5e4df1174d6c591143ee1451caa23d713b9f0cdfe28771c3c7bfba78f4cc620ec6cd25f31163e6f00c04244dc38f6a37edda16da276a164100b61b7c8b4f1fb
+  metadata.gz: 96e6bb88e860b84984b32501ac7be9135364b4ad16a4a644540e8b3cb9f30e655f20f829b5bdcf085e4fc8ba4ddc54d18cc1f36a9a59bef356de48af5f37080a
+  data.tar.gz: ca952a870f3db6dafbc36701dcb6708a2902d611fd1abf57783be5607bd3fc0b62523f81ebfd2e7c8f19b45741a549ab7704d79b548c56220185392069bcb6ed

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,6 +38,8 @@ 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('aws-sdk-ec2', '~> 1.0')
+  s.add_dependency('aws-sdk-ec2instanceconnect', '~> 1.0')
   s.add_dependency('capistrano', '>= 2.11.0')
   s.add_dependency('activesupport', '>= 3.0.0')
   s.add_dependency('json')

data/lib/capistrano/hivequeen/capistrano_configuration.rb

@@ -15,6 +15,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   # From the command line, use -s override=true to force a deployment
   set :override, false
 
+  # Don't mark deployments as canary deployments by default
+  set :canary, false
+
   # Command to get the changes being deployed
   set :changelog_command do
     `git log #{current_commit}...#{real_revision} --pretty="%n%h %an: %s (%ar)" --stat --no-color`
@@ -75,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
@@ -94,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
@@ -111,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/deploy.rb

@@ -7,6 +7,8 @@ Capistrano::Configuration.instance.load do
   before "deploy:stage", "hivequeen:start"
   before 'hivequeen:start', 'hivequeen:check_commit'
   on :start, "hivequeen:require_environment", :except => HiveQueen.environment_names
+  on :start, "hivequeen:ensure_canary_specifies_hosts"
+
   namespace :hivequeen do
 
     desc "[internal] abort if no environment specified"
@@ -14,6 +16,14 @@ Capistrano::Configuration.instance.load do
       abort "No environment specified." if !exists?(:environment)
     end
 
+    desc "[internal] abort if we're trying to do a canary deploy but HOSTS hasn't been defined"
+    task :ensure_canary_specifies_hosts do
+      # TODO: I suppose we could randomly select instance(s) in this case
+      if canary && !ENV.key?('HOSTS')
+        abort "You asked to do a canary deployment but didn't specify any hosts! \nPlease invoke like `cap HOSTS=foo.com deploy -s canary=true'"
+      end
+    end
+
     desc "[internal] Start a deployment in hivequeen"
     task :start do
       # TODO: is there a better way to determine what cap tasks are running?
@@ -22,7 +32,8 @@ Capistrano::Configuration.instance.load do
       params = {
         :task => tasks.join(' '),
         :commit => real_revision,
-        :override => override
+        :override => override,
+        :canary => canary,
       }
 
       if current_commit
@@ -44,7 +55,7 @@ Capistrano::Configuration.instance.load do
 
     desc "[internal] Prompt if deploying the currently running commit, or if tests haven't passed"
     task :check_commit do
-      if environment.to_s == 'production' && !override
+      if environment.to_s == 'production' && !override && !canary
         if current_commit == real_revision
           banner = %q{
  ______                   _     _                          _    ___

data/lib/capistrano/hivequeen/ec2_instance_connect.rb

@@ -0,0 +1,36 @@
+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)
+    # EC2 Instance Connect
+    ssh_public_key = File.read(File.expand_path('~/.ssh/ksr_ed25519.pub'))
+    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|
+      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
+
+    threads.each(&:join)
+  end
+end

data/lib/capistrano/hivequeen/version.rb

@@ -1,6 +1,6 @@
 class HiveQueen
   class Version
-    @@version = '7.4.0'
+    @@version = '7.7.0'
 
     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,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-hivequeen
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.7.0
 platform: ruby
 authors:
 - Aaron Suggs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2022-07-28 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
@@ -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.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 2
 summary: Capistrano extensions for interacting with HiveQueen
 test_files: []