knife-ec2 0.5.1

data/LICENSE

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.rdoc

@@ -0,0 +1,83 @@
+= Knife EC2
+
+= DESCRIPTION:
+
+This is the official Opscode Knife plugin for EC2. This plugin gives knife the ability to create, bootstrap, and manage EC2 instances.
+
+= INSTALLATION:
+
+This plugin is distributed as a Ruby Gem. To install it, run:
+
+    gem install knife-ec2
+
+Depending on your system's configuration, you may need to run this command with root privileges.
+
+= CONFIGURATION:
+
+In order to communicate with the Amazon's EC2 API you will have to tell Knife about your AWS Access Key and Secret Access Key.  The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
+
+    knife[:aws_access_key_id]  = "Your AWS Access Key ID"
+    knife[:aws_secret_access_key] = "Your AWS Secret Access Key"
+
+If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables:
+
+    knife[:aws_access_key_id] = "#{ENV['AWS_ACCESS_KEY_ID']}"
+    knife[:aws_secret_access_key] = "#{ENV['AWS_SECRET_ACCESS_KEY']}"
+
+You also have the option of passing your AWS API Key/Secret into the individual knife subcommands using the <tt>-A</tt> (or <tt>--aws-access-key-id</tt>) <tt>-K</tt> (or <tt>--aws-secret-access-key</tt>) command options
+
+    # provision a new m1.small Ubuntu 10.04 webserver
+    knife ec2 server create 'role[webserver]' -i ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
+
+Additionally the following options may be set in your `knife.rb`:
+
+* flavor
+* image
+* availability_zone
+* aws_ssh_key_id
+* region
+* distro
+* template_file
+
+= SUBCOMMANDS:
+
+This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag
+
+== knife ec2 server create
+
+Provisions a new server in the Amazon EC2 and then perform a Chef bootstrap (using the SSH protocol).  The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server.  By default the server is bootstrapped using the {ubuntu10.04-gems}[https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
+
+== knife ec2 server delete
+
+Deletes an existing server in the currently configured AWS account.  <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server.
+
+== knife ec2 server list
+
+Outputs a list of all servers in the currently configured AWS account.  <b>PLEASE NOTE</b> - this shows all instances associated with the account, some of which may not be currently managed by the Chef server.
+
+== knife ec2 instance data
+
+Generates instance metadata in meant to be used with Opscode's custom AMIs. This will read your knife configuration <tt>~/.chef/knife.rb</tt> for the validation certificate and Chef server URL to use and output in JSON format. The subcommand also accepts a list of roles/recipes that will be in the node's initial run list.
+
+<b>PLEASE NOTE</b> - Using Opscode's custom AMIs reflect an older way of launching instances in EC2 for Chef and should be considered DEPRECATED. Leveraging this plugins's <tt>knife ec2 server create</tt> subcommands with a base AMIs directly from your Linux distribution (ie Ubuntu AMIs from Canonical) is much preferred and more flexible.  Although this subcommand will remain, the Opscode custom AMIs are currently out of date.
+
+In-depth usage instructions can be found on the {Chef Wiki}[http://wiki.opscode.com/display/chef/Amazon+EC2+AMIs+with+Chef].
+
+= LICENSE:
+
+Author:: Adam Jacob (<adam@opscode.com>)
+Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
+License:: Apache License, Version 2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+

data/lib/chef/knife/ec2_instance_data.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Knife
+    class Ec2InstanceData < Knife
+
+      banner "knife ec2 instance data [RUN LIST...] (options)"
+
+      option :edit,
+        :short => "-e",
+        :long => "--edit",
+        :description => "Edit the instance data"
+
+      def run
+        data = {
+          "chef_server" => Chef::Config[:chef_server_url],
+          "validation_client_name" => Chef::Config[:validation_client_name],
+          "validation_key" => IO.read(Chef::Config[:validation_key]),
+          "attributes" => { "run_list" => @name_args }
+        }
+        data = edit_data(data) if config[:edit]
+        output(data)
+      end
+    end
+  end
+end
+

data/lib/chef/knife/ec2_server_create.rb

@@ -0,0 +1,325 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'fog'
+require 'socket'
+require 'chef/knife'
+require 'chef/knife/bootstrap'
+require 'chef/json_compat'
+
+class Chef
+  class Knife
+    class Ec2ServerCreate < Knife
+
+      banner "knife ec2 server create (options)"
+
+      attr_accessor :initial_sleep_delay
+
+      option :flavor,
+        :short => "-f FLAVOR",
+        :long => "--flavor FLAVOR",
+        :description => "The flavor of server (m1.small, m1.medium, etc)",
+        :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f },
+        :default => "m1.small"
+
+      option :image,
+        :short => "-I IMAGE",
+        :long => "--image IMAGE",
+        :description => "The AMI for the server",
+        :proc => Proc.new { |i| Chef::Config[:knife][:image] = i }
+
+      option :security_groups,
+        :short => "-G X,Y,Z",
+        :long => "--groups X,Y,Z",
+        :description => "The security groups for this server",
+        :default => ["default"],
+        :proc => Proc.new { |groups| groups.split(',') }
+
+      option :availability_zone,
+        :short => "-Z ZONE",
+        :long => "--availability-zone ZONE",
+        :description => "The Availability Zone",
+        :default => "us-east-1b",
+        :proc => Proc.new { |key| Chef::Config[:knife][:availability_zone] = key }
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The Chef node name for your new node"
+
+      option :ssh_key_name,
+        :short => "-S KEY",
+        :long => "--ssh-key KEY",
+        :description => "The AWS SSH key id",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_ssh_key_id] = key }
+
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME",
+        :description => "The ssh username",
+        :default => "root"
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
+
+      option :identity_file,
+        :short => "-i IDENTITY_FILE",
+        :long => "--identity-file IDENTITY_FILE",
+        :description => "The SSH identity file used for authentication"
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
+
+      option :prerelease,
+        :long => "--prerelease",
+        :description => "Install the pre-release chef gems"
+
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
+      option :distro,
+        :short => "-d DISTRO",
+        :long => "--distro DISTRO",
+        :description => "Bootstrap a distro using a template",
+        :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
+        :default => "ubuntu10.04-gems"
+
+      option :template_file,
+        :long => "--template-file TEMPLATE",
+        :description => "Full path to location of template to use",
+        :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
+        :default => false
+
+      option :ebs_size,
+        :long => "--ebs-size SIZE",
+        :description => "The size of the EBS volume in GB, for EBS-backed instances"
+
+      option :ebs_no_delete_on_term,
+        :long => "--ebs-no-delete-on-term",
+        :description => "Do not delete EBS volumn on instance termination"
+
+      option :run_list,
+        :short => "-r RUN_LIST",
+        :long => "--run-list RUN_LIST",
+        :description => "Comma separated list of roles/recipes to apply",
+        :proc => lambda { |o| o.split(/[\s,]+/) },
+        :default => []
+
+      option :subnet_id,
+        :short => "-s SUBNET-ID",
+        :long => "--subnet SUBNET-ID",
+        :description => "create node in this Virtual Private Cloud Subnet ID (implies VPC mode)",
+        :default => false
+
+      option :no_host_key_verify,
+        :long => "--no-host-key-verify",
+        :description => "Disable host key verification",
+        :boolean => true,
+        :default => false
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def tcp_test_ssh(hostname)
+        tcp_socket = TCPSocket.new(hostname, 22)
+        readable = IO.select([tcp_socket], nil, nil, 5)
+        if readable
+          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          yield
+          true
+        else
+          false
+        end
+      rescue Errno::ETIMEDOUT
+        false
+      rescue Errno::ECONNREFUSED
+        sleep 2
+        false
+      ensure
+        tcp_socket && tcp_socket.close
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        $stdout.sync = true
+
+        connection = Fog::Compute.new(
+          :provider => 'AWS',
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => locate_config_value(:region)
+        )
+
+        ami = connection.images.get(locate_config_value(:image))
+
+        server_def = {
+          :image_id => locate_config_value(:image),
+          :groups => config[:security_groups],
+          :flavor_id => locate_config_value(:flavor),
+          :key_name => Chef::Config[:knife][:aws_ssh_key_id],
+          :availability_zone => Chef::Config[:knife][:availability_zone]
+        }
+        server_def[:subnet_id] = config[:subnet_id] if config[:subnet_id]
+
+      if ami.root_device_type == "ebs"
+        ami_map = ami.block_device_mapping.first
+        ebs_size = begin
+                     if config[:ebs_size]
+                       Integer(config[:ebs_size]).to_s
+                     else
+                       ami_map["volumeSize"].to_s
+                     end
+                   rescue ArgumentError
+                     puts "--ebs-size must be an integer"
+                     msg opt_parser
+                     exit 1
+                   end
+        delete_term = if config[:ebs_no_delete_on_term]
+                        "false"
+                      else
+                        ami_map["deleteOnTermination"]
+                      end
+        server_def[:block_device_mapping] =
+          [{
+             'DeviceName' => ami_map["deviceName"],
+             'Ebs.VolumeSize' => ebs_size,
+             'Ebs.DeleteOnTermination' => delete_term
+           }]
+      end
+        server = connection.servers.create(server_def)
+
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+        puts "#{h.color("Subnet ID", :cyan)}: #{server.subnet_id}" if vpc_mode?
+
+        print "\n#{h.color("Waiting for server", :magenta)}"
+
+        display_name = if vpc_mode?
+          server.private_ip_address
+        else
+          server.dns_name
+        end
+
+        # wait for it to be ready to do stuff
+        server.wait_for { print "."; ready? }
+
+        puts("\n")
+
+        if !vpc_mode?
+          puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+          puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+          puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        end
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+
+        print "\n#{h.color("Waiting for sshd", :magenta)}"
+
+        print(".") until tcp_test_ssh(display_name) {
+          sleep @initial_sleep_delay ||= (vpc_mode? ? 40 : 10)
+          puts("done")
+        }
+
+        bootstrap_for_node(server).run
+
+        puts "\n"
+        puts "#{h.color("Instance ID", :cyan)}: #{server.id}"
+        puts "#{h.color("Flavor", :cyan)}: #{server.flavor_id}"
+        puts "#{h.color("Image", :cyan)}: #{server.image_id}"
+        puts "#{h.color("Availability Zone", :cyan)}: #{server.availability_zone}"
+        puts "#{h.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
+        if vpc_mode?
+          puts "#{h.color("Subnet ID", :cyan)}: #{server.subnet_id}"
+        else
+          puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
+          puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+          puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
+        end
+        puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"
+        puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+        puts "#{h.color("Root Device Type", :cyan)}: #{server.root_device_type}"
+        if server.root_device_type == "ebs"
+          device_map = server.block_device_mapping.first
+          puts "#{h.color("Root Volume ID", :cyan)}: #{device_map['volumeId']}"
+          puts "#{h.color("Root Device Name", :cyan)}: #{device_map['deviceName']}"
+          puts "#{h.color("Root Device Delete on Terminate", :cyan)}: #{device_map['deleteOnTermination']}"
+          if config[:ebs_size]
+            if ami.block_device_mapping.first['volumeSize'].to_i < config[:ebs_size].to_i
+              puts ("#{h.color("Warning", :yellow)}: #{config[:ebs_size]}GB " +
+                    "EBS volume size is larger than size set in AMI of " +
+                    "#{ami.block_device_mapping.first['volumeSize']}GB.\n" +
+                    "Use file system tools to make use of the increased volume size.")
+            end
+          end
+        end
+        puts "#{h.color("Run List", :cyan)}: #{@name_args.join(', ')}"
+      end
+
+      def bootstrap_for_node(server)
+        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap.name_args = [vpc_mode? ? server.private_ip_address : server.dns_name ]
+        bootstrap.config[:run_list] = config[:run_list]
+        bootstrap.config[:ssh_user] = config[:ssh_user]
+        bootstrap.config[:identity_file] = config[:identity_file]
+        bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
+        bootstrap.config[:prerelease] = config[:prerelease]
+        bootstrap.config[:distro] = locate_config_value(:distro)
+        bootstrap.config[:use_sudo] = true
+        bootstrap.config[:template_file] = locate_config_value(:template_file)
+        bootstrap.config[:environment] = config[:environment]
+        # may be needed for vpc_mode
+        bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+        bootstrap
+      end
+
+      def locate_config_value(key)
+        key = key.to_sym
+        Chef::Config[:knife][key] || config[key]
+      end
+
+      def vpc_mode?
+        # Amazon Virtual Private Cloud requires a subnet_id. If
+        # present, do a few things differently
+        !!config[:subnet_id]
+      end
+
+    end
+  end
+end

data/lib/chef/knife/ec2_server_delete.rb

@@ -0,0 +1,95 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Knife
+    class Ec2ServerDelete < Knife
+
+      banner "knife ec2 server delete SERVER [SERVER] (options)"
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
+
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        connection = Fog::Compute.new(
+          :provider => 'AWS',
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => Chef::Config[:knife][:region] || config[:region]
+        )
+
+        @name_args.each do |instance_id|
+          server = connection.servers.get(instance_id)
+
+          msg("Instance ID", server.id)
+          msg("Flavor", server.flavor_id)
+          msg("Image", server.image_id)
+          msg("Availability Zone", server.availability_zone)
+          msg("Security Groups", server.groups.join(", "))
+          msg("SSH Key", server.key_name)
+          msg("Public DNS Name", server.dns_name)
+          msg("Public IP Address", server.ip_address)
+          msg("Private DNS Name", server.private_dns_name)
+          msg("Private IP Address", server.private_ip_address)
+
+          puts "\n"
+          confirm("Do you really want to delete this server")
+
+          server.destroy
+
+          Chef::Log.warn("Deleted server #{server.id}")
+        end
+      end
+
+      def msg(label, value)
+        if value && !value.empty?
+          puts "#{h.color(label, :cyan)}: #{value}"
+        end
+      end
+
+    end
+  end
+end
+

data/lib/chef/knife/ec2_server_list.rb

@@ -0,0 +1,90 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Knife
+    class Ec2ServerList < Knife
+
+      banner "knife ec2 server list [RUN LIST...] (options)"
+
+      option :aws_access_key_id,
+        :short => "-A ID",
+        :long => "--aws-access-key-id KEY",
+        :description => "Your AWS Access Key ID",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_access_key_id] = key }
+
+      option :aws_secret_access_key,
+        :short => "-K SECRET",
+        :long => "--aws-secret-access-key SECRET",
+        :description => "Your AWS API Secret Access Key",
+        :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
+
+      option :region,
+        :long => "--region REGION",
+        :description => "Your AWS region",
+        :default => "us-east-1",
+        :proc => Proc.new { |key| Chef::Config[:knife][:region] = key }
+
+      def h
+        @highline ||= HighLine.new
+      end
+
+      def run
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+
+        $stdout.sync = true
+
+        connection = Fog::Compute.new(
+          :provider => 'AWS',
+          :aws_access_key_id => Chef::Config[:knife][:aws_access_key_id],
+          :aws_secret_access_key => Chef::Config[:knife][:aws_secret_access_key],
+          :region => Chef::Config[:knife][:region] || config[:region]
+        )
+
+        server_list = [
+          h.color('Instance ID', :bold),
+          h.color('Public IP', :bold),
+          h.color('Private IP', :bold),
+          h.color('Flavor', :bold),
+          h.color('Image', :bold),
+          h.color('Security Groups', :bold),
+          h.color('State', :bold)
+        ]
+        connection.servers.all.each do |server|
+          server_list << server.id.to_s
+          server_list << (server.ip_address == nil ? "" : server.public_ip_address)
+          server_list << (server.private_ip_address == nil ? "" : server.private_ip_address)
+          server_list << (server.flavor_id == nil ? "" : server.flavor_id)
+          server_list << (server.image_id == nil ? "" : server.image_id)
+          server_list << server.groups.join(", ")
+          server_list << server.state
+        end
+        puts h.list(server_list, :columns_across, 7)
+
+      end
+    end
+  end
+end
+
+

data/lib/knife-ec2/version.rb

@@ -0,0 +1,4 @@
+module KnifeEC2
+  VERSION = "0.5.1"
+end
+

metadata

@@ -0,0 +1,117 @@
+--- !ruby/object:Gem::Specification 
+name: knife-ec2
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.5.1
+platform: ruby
+authors: 
+- Adam Jacob
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-03-29 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: chef
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.14
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fog
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: net-ssh
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.3
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: net-ssh-multi
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.1
+  type: :runtime
+  version_requirements: *id005
+description: EC2 Support for Chef's Knife Command
+email: adam@opscode.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.rdoc
+- LICENSE
+files: 
+- LICENSE
+- README.rdoc
+- lib/chef/knife/ec2_instance_data.rb
+- lib/chef/knife/ec2_server_create.rb
+- lib/chef/knife/ec2_server_delete.rb
+- lib/chef/knife/ec2_server_list.rb
+- lib/knife-ec2/version.rb
+has_rdoc: true
+homepage: http://wiki.opscode.com/display/chef
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.6.2
+signing_key: 
+specification_version: 3
+summary: EC2 Support for Chef's Knife Command
+test_files: []
+