moonshot 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2a30d2ed3a9a3f146a0bcf4972f0bfc9baff41
-  data.tar.gz: 0087b7d90297d013cffd9b787f88b720dc357212
+  metadata.gz: 5cbd23bad6cfc674f3d79a842b49c50fe0de46cb
+  data.tar.gz: cbe254ca2d50e6c12e3e916e3d043c054e1a18af
 SHA512:
-  metadata.gz: 6c1e1938bd414ec74f03185c824cf45e4c3f101b7b4acbaabbec46d71f17bf018b56600201eb1445c6b8b9c14c9c81223819c428a4667f4f67e69a90ddde5ba2
-  data.tar.gz: c7262c61bd51cf6febe8f31cee9a8ef64831580aeaacba2b883725b5f36d38389db5337d456ba693c03249c1f24d68df3c29ab9d47cb088930793dd23aa9cfed
+  metadata.gz: 1a12347cc5ce9a357b932ca7772695af0d3bf527a1c7dd44dfa02dd2e2b01b8b70c1256e22a94505633af5378a142954c9ffe3c3f8400884e13ee1734e493aab
+  data.tar.gz: 6edbc749ab02ff73155d7e738b67661d90b2570651f092666a6cfc20e7f893692ebc1e7fa29a6010c83ad4824c02bfde7ea9919c6d2a6b824cb8e1d255a931dd

data/lib/moonshot/command.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require 'optparse'
 
 module Moonshot
   # A Command that is automatically registered with the Moonshot::CommandLine

data/lib/moonshot/deployment_mechanism/code_deploy.rb

@@ -16,6 +16,10 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   # @param asg [Array, String]
   #   The logical name of the AutoScalingGroup to create and manage a Deployment
   #   Group for in CodeDeploy.
+  # @param optional_asg [Array, String]
+  #   The logical name of the AutoScalingGroup to create and manage a Deployment
+  #   Group for in CodeDeploy. This ASG doesn't have to exist. If it does, it
+  #   will be added to the Deployment Group.
   # @param role [String]
   #   IAM role with AWSCodeDeployRole policy. CodeDeployRole is considered as
   #   default role if its not specified.
@@ -29,13 +33,16 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
   # @param config_name [String]
   #   Name of the Deployment Config to use for CodeDeploy,  By default we use
   #   CodeDeployDefault.OneAtATime.
+  # rubocop:disable Metrics/ParameterLists
   def initialize(
       asg: [],
+      optional_asg: [],
       role: 'CodeDeployRole',
       app_name: nil,
       group_name: nil,
       config_name: 'CodeDeployDefault.OneAtATime')
-    @asg_logical_ids = asg.is_a?(Array) ? asg : [asg]
+    @asg_logical_ids = Array(asg)
+    @optional_asg_logical_ids = Array(optional_asg)
     @app_name = app_name
     @group_name = group_name
     @codedeploy_role = role
@@ -181,6 +188,16 @@ class Moonshot::DeploymentMechanism::CodeDeploy # rubocop:disable ClassLength
 
       autoscaling_groups.push(groups.auto_scaling_groups.first)
     end
+    @optional_asg_logical_ids.each do |asg_logical_id|
+      asg_name = stack.physical_id_for(asg_logical_id)
+      next unless asg_name
+      groups = as_client.describe_auto_scaling_groups(
+        auto_scaling_group_names: [asg_name]
+      )
+      unless groups.auto_scaling_groups.empty?
+        autoscaling_groups.push(groups.auto_scaling_groups.first)
+      end
+    end
     autoscaling_groups
   end
 

data/lib/moonshot/shell.rb

@@ -1,3 +1,5 @@
+require 'thor'
+
 # Mixin providing the Thor::Shell methods and other shell execution helpers.
 module Moonshot::Shell
   # Run a command, returning stdout. Stderr is suppressed unless the command

data/lib/moonshot/ssh_command.rb

@@ -14,7 +14,7 @@ module Moonshot
         Moonshot.config.ssh_config.ssh_identity_file = v
       end
 
-      parser.on('-s', '--instance INSTANCE_ID', 'Specific AWS EC2 ID to connect through') do |v|
+      parser.on('-s', '--instance INSTANCE_ID', 'Specific AWS EC2 ID to connect to') do |v|
         Moonshot.config.ssh_instance = v
       end
 

data/lib/moonshot/ssh_target_selector.rb

@@ -11,20 +11,20 @@ module Moonshot
 
       asg = if groups.count == 1
               groups.first
-            elsif asgs.count > 1
+            elsif groups.count > 1
               unless @asg_name
                 raise 'Multiple Auto Scaling Groups found in the stack. Please specify which '\
                       'one to SSH into using the --auto-scaling-group (-g) option.'
               end
-              groups.detect { |x| x.logical_resource_id == @config.ssh_auto_scaling_group_name }
+              groups.detect { |x| x.logical_resource_id == @asg_name }
             end
       raise 'Failed to find the Auto Scaling Group.' unless asg
 
       Aws::AutoScaling::Client.new.describe_auto_scaling_groups(
         auto_scaling_group_names: [asg.physical_resource_id]
       ).auto_scaling_groups.first.instances.map(&:instance_id).first
-    rescue
-      raise 'Failed to find instances in the Auto Scaling Group!'
+    rescue => e
+      raise "Failed to select an instance from the Auto Scaling Group: #{e.message}"
     end
   end
 end

data/lib/moonshot/stack_asg_printer.rb

@@ -111,13 +111,21 @@ module Moonshot
     end
 
     def instance_row(asg_instance, ec2_instance)
+      if ec2_instance
+        ip_address = ec2_instance.public_ip_address || "#{ec2_instance.private_ip_address} (PRV)"
+        uptime = uptime_format(ec2_instance.launch_time)
+      else
+        # We've seen race conditions where ASG tells us about instances that EC2 is no longer
+        # aware of.
+        ip_address = 'unknown'
+        uptime = 'unknown'
+      end
       [
         asg_instance.instance_id,
-        # @todo What about ASGs with only private IPs?
-        ec2_instance.public_ip_address,
+        ip_address,
         lifecycle_color(asg_instance.lifecycle_state),
         health_color(asg_instance.health_status),
-        uptime_format(ec2_instance.launch_time)
+        uptime
       ]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk