stemcell 0.2.2 → 0.2.3

data/README.md

@@ -63,8 +63,11 @@ $ ssh unbutu@$IP 'tail -f /var/log/init*'
 
 ### Terminating:
 
-This still needs to be completed. For now, you can kill using the
-amazon cli tools or the web ui.
+To terminate, use the necrosis command and pass a space seperated list of instance ids:
+
+```bash
+$ necrosis i-12345678 i-12345679 i-12345670
+```
 
 ## Automation ##
 

data/bin/necrosis

@@ -2,15 +2,12 @@
 
 # -*- mode: shell -*- 
 
-require_relative '../lib/stemcell'
-
+require 'aws-sdk'
 require 'trollop'
 
 options = Trollop::options do
-  version "stemcell #{Stemcell::VERSION} (c) 2013 Martin Rhoads"
-  banner <<END_OF_BANNER
-  welcome to stemcell
-END_OF_BANNER
+  version "stemcell #{Stemcell::VERSION} (c) Airbnb, Inc."
+  banner  "Necrosis: the killing script"
 
   opt('aws_access_key',
       "aws access key",
@@ -23,39 +20,61 @@ END_OF_BANNER
       :type => String,
       :default => ENV['AWS_SECRET_KEY']
       )
-
-  opt('region',
-      'ec2 region to launch in',
-      :type => String,
-      :default => ENV['REGION'] ? ENV['REGION'] : 'us-east-1',
-      )
-
 end
 
-
 required_parameters = [
                        'aws_access_key',
                        'aws_secret_key',
                       ]
 
-
 required_parameters.each do |arg|
   raise ArgumentError, "--#{arg.gsub('_','-')} needs to be specified on the commandline or set \
 by the #{arg.upcase.gsub('-','_')} environment variable" if
     options[arg].nil? or ! options[arg]
 end
 
-
 raise ArgumentError, "you did not provide any instance ids to kill" if ARGV.size == 0
 
+# a hash from instance_id => [ec2 instance objects]
+instances = ARGV.inject({}) { |h, n| h[n] = []; h }
 
-# create stemcell object
-stemcell = Stemcell::Stemcell.new({
-  'aws_access_key' => options['aws_access_key'],
-  'aws_secret_key' => options['aws_secret_key'],
-  'region'         => options['region'],
-})
-
+ec2 = AWS::EC2.new(:access_key_id => options['aws_access_key'], :secret_access_key => options['aws_secret_key'])
+ec2.regions.each do |region|
+  instances.each do |id, objects|
+    instance = region.instances[id]
+    objects << [instance, region] if instance.exists?
+  end
+end
 
-# launch instance(s)
-stemcell.kill(ARGV)
+# kill the instances
+instances.each do |id, objects|
+  if objects.count == 0
+    puts "No instance #{id} found"
+    next
+  end
+
+  if objects.count > 1
+    puts "Found multiple instances named #{id}"
+    next
+  end
+
+  instance, region = objects[0]
+  if instance.api_termination_disabled?
+    puts "Cannot terminate instance #{id} -- termination protection enabled"
+    next
+  end
+
+  puts "Instance #{id} (#{instance.status} in #{region.name})"
+  puts "\tKey name: #{instance.key_name}"
+  puts "\tLaunched: #{instance.launch_time}"
+  instance.tags.to_h.each do |k, v|
+    puts "\t#{k} : #{v}"
+  end
+
+  puts "Terminate? (y/N)? "
+  confirm = $stdin.gets
+  if confirm && confirm.chomp.downcase == 'y'
+    instance.terminate
+    puts "Instance #{id} terminated"
+  end
+end

data/bin/stemcell

@@ -7,10 +7,8 @@ require_relative '../lib/stemcell'
 require 'trollop'
 
 options = Trollop::options do
-  version "stemcell #{Stemcell::VERSION} (c) 2013 Martin Rhoads"
-  banner <<END_OF_BANNER
-  welcome to stemcell
-END_OF_BANNER
+  version "stemcell #{Stemcell::VERSION} (c) 2013 Airbnb"
+  banner  "Stemcell: get ready to rock"
 
   opt('aws_access_key',
       "aws access key",
@@ -48,10 +46,10 @@ END_OF_BANNER
       :default => ENV['SECURITY_GROUPS'] ? ENV['SECURITY_GROUPS'] : 'default',
       )
 
-  opt('availability-zone',
+  opt('availability_zone',
       'zone in which to launch instances',
       :type => String,
-      :default => ENV['AVAILABILITY-ZONE'],
+      :default => ENV['AVAILABILITY_ZONE'],
       )
 
   opt('tags',
@@ -154,7 +152,8 @@ stemcell = Stemcell::Stemcell.new({
 
 # launch instance(s)
 stemcell.launch({
-  'instance_type'         => options['instance_type'],
+  'availability_zone'    => options['availability_zone'],
+  'instance_type'        => options['instance_type'],
   'image_id'             => options['image_id'],
   'security_groups'      => options['security_groups'],
   'chef_role'            => options['chef_role'],
@@ -164,5 +163,6 @@ stemcell.launch({
   'git_key'              => options['git_key'],
   'git_origin'           => options['git_origin'],
   'key_name'             => options['key_name'],
+  'tags'                 => options['tags'],
   'count'                => options['count'],
 })

data/lib/stemcell.rb

@@ -25,7 +25,6 @@ module Stemcell
 
       AWS.config({:access_key_id => @aws_access_key, :secret_access_key => @aws_secret_key})
       @ec2 = AWS::EC2.new(:ec2_endpoint => @ec2_url)
-      @ec2_region = @ec2.regions[@region]
     end
 
 
@@ -48,7 +47,7 @@ module Stemcell
       opts['git_key'] = try_file(opts['git_key'])
       opts['chef_data_bag_secret'] = try_file(opts['chef_data_bag_secret'])
 
-      # generate tags and merge in any that were specefied as in inputs
+      # generate tags and merge in any that were specefied as inputs
       tags = {
         'Name' => "#{opts['chef_role']}-#{opts['chef_environment']}",
         'Group' => "#{opts['chef_role']}-#{opts['chef_environment']}",
@@ -57,10 +56,7 @@ module Stemcell
       }
       tags.merge!(opts['tags']) if opts['tags']
 
-      # generate user data script to boot strap instance based on the
-      # opts that we were passed.
-      user_data = render_template(opts)
-
+      # generate launch options
       launch_options = {
         :image_id => opts['image_id'],
         :security_groups => opts['security_groups'],
@@ -68,9 +64,13 @@ module Stemcell
         :instance_type => opts['instance_type'],
         :key_name => opts['key_name'],
         :count => opts['count'],
-        :user_data => user_data,
       }
-      launch_options.merge({:availability_zone => opts['availability_zone']}) if opts['availability_zone']
+
+      # specify availability zone (optional)
+      launch_options[:availability_zone] = opts['availability_zone'] if opts['availability_zone']
+
+      # generate user data script to bootstrap instance, include in launch optsions
+      launch_options[:user_data] = render_template(opts)
 
       # launch instances
       instances = do_launch(launch_options)
@@ -86,12 +86,15 @@ module Stemcell
       return instances
     end
 
-    def kill(instance_list=[])
-      @log.info "killing instances #{instance_list}"
-      instances = instance_list.map {|id| @ec2.instances[id]}
+    def find_instance(id)
+      return @ec2.instances[id]
+    end
+
+    def kill(instances)
+      return if instances.nil?
       instances.each do |instance|
+        log.warn "Terminating instance #{instance.instance_id}"
         instance.terminate
-        @log.info "killed instance #{instance.id}"
       end
     end
 
@@ -113,7 +116,7 @@ module Stemcell
       while true
         sleep 5
         if Time.now - @start_time > @timeout
-          bail(instances)
+          kill(instances)
           raise TimeoutError, "exceded timeout of #{@timeout}"
         end
 
@@ -136,7 +139,7 @@ module Stemcell
     def do_launch(opts={})
       @log.debug "about to launch instance(s) with options #{opts}"
       @log.info "launching instances"
-      instances = @ec2_region.instances.create(opts)
+      instances = @ec2.instances.create(opts)
       instances = [instances] unless instances.class == Array
       instances.each do |instance|
         @log.info "launched instance #{instance.instance_id}"
@@ -162,14 +165,6 @@ module Stemcell
       return generated_template
     end
 
-    def bail(instances)
-      return if instances.nil?
-      instances.each do |instance|
-        log.warn "Terminating instance #{instance.instance_id}"
-        instance.delete
-      end
-    end
-
     # attempt to accept keys as file paths
     def try_file(opt="")
       begin

data/lib/stemcell/version.rb

@@ -1,3 +1,3 @@
 module Stemcell
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stemcell
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop