knife-ec2 0.12.0 → 0.13.0

data/lib/chef/knife/ec2_server_delete.rb

@@ -1,140 +1,140 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@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.
-#
-
-require 'chef/knife/ec2_base'
-
-# These two are needed for the '--purge' deletion case
-require 'chef/node'
-require 'chef/api_client'
-
-class Chef
-  class Knife
-    class Ec2ServerDelete < Knife
-
-      include Knife::Ec2Base
-
-      banner "knife ec2 server delete SERVER [SERVER] (options)"
-
-      attr_reader :server
-
-      option :purge,
-        :short => "-P",
-        :long => "--purge",
-        :boolean => true,
-        :default => false,
-        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
-
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
-
-      # Extracted from Chef::Knife.delete_object, because it has a
-      # confirmation step built in... By specifying the '--purge'
-      # flag (and also explicitly confirming the server destruction!)
-      # the user is already making their intent known.  It is not
-      # necessary to make them confirm two more times.
-      def destroy_item(klass, name, type_name)
-        begin
-          object = klass.load(name)
-          object.destroy
-          ui.warn("Deleted #{type_name} #{name}")
-        rescue Net::HTTPServerException
-          ui.warn("Could not find a #{type_name} named #{name} to delete!")
-        end
-      end
-
-      def run
-
-        validate!
-        if @name_args.empty? && config[:chef_node_name]
-          ui.info("no instance id is specific, trying to retrieve it from node name")
-          instance_id = fetch_instance_id(config[:chef_node_name])
-          @name_args << instance_id unless instance_id.nil?
-        end
-
-        @name_args.each do |instance_id|
-
-          begin
-            @server = connection.servers.get(instance_id)
-
-            msg_pair('Instance ID', @server.id)
-            msg_pair('Instance Name', @server.tags['Name'])
-            msg_pair('Flavor', @server.flavor_id)
-            msg_pair('Image', @server.image_id)
-            msg_pair('Region', connection.instance_variable_get(:@region))
-            msg_pair('Availability Zone', @server.availability_zone)
-            msg_pair('Security Groups', @server.groups.join(', '))
-            msg_pair('IAM Profile', iam_name_from_profile(@server.iam_instance_profile)) if @server.iam_instance_profile
-            msg_pair('SSH Key', @server.key_name)
-            msg_pair('Root Device Type', @server.root_device_type)
-            msg_pair('Public DNS Name', @server.dns_name)
-            msg_pair('Public IP Address', @server.public_ip_address)
-            msg_pair('Private DNS Name', @server.private_dns_name)
-            msg_pair('Private IP Address', @server.private_ip_address)
-
-            puts '\n'
-            confirm('Do you really want to delete this server')
-
-            @server.destroy
-
-            ui.warn("Deleted server #{@server.id}")
-
-            if config[:purge]
-              if config[:chef_node_name]
-                thing_to_delete = config[:chef_node_name]
-              else
-                thing_to_delete = fetch_node_name(instance_id)
-              end
-              destroy_item(Chef::Node, thing_to_delete, "node")
-              destroy_item(Chef::ApiClient, thing_to_delete, "client")
-            else
-              ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
-            end
-          rescue NoMethodError
-            ui.error("Could not locate server '#{instance_id}'.  Please verify it was provisioned in the '#{locate_config_value(:region)}' region.")
-          end
-        end
-      end
-
-      def fetch_node_name(instance_id)
-        result = query.search(:node,"ec2_instance_id:#{instance_id}")
-        unless result.first.empty?
-          result.first.first.name
-        else
-          instance_id
-        end
-      end
-
-      def fetch_instance_id(name)
-        result = query.search(:node,"name:#{name}")
-        unless result.first.empty?
-          node = result.first.first
-          if node.attribute?('ec2')
-            node['ec2']['instance_id']
-          end
-        end
-      end
-
-      def query
-        @query ||= Chef::Search::Query.new
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2009-2015 Chef Software, 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/ec2_base'
+
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
+class Chef
+  class Knife
+    class Ec2ServerDelete < Knife
+
+      include Knife::Ec2Base
+
+      banner "knife ec2 server delete SERVER [SERVER] (options)"
+
+      attr_reader :server
+
+      option :purge,
+        :short => "-P",
+        :long => "--purge",
+        :boolean => true,
+        :default => false,
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the EC2 node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+
+      # Extracted from Chef::Knife.delete_object, because it has a
+      # confirmation step built in... By specifying the '--purge'
+      # flag (and also explicitly confirming the server destruction!)
+      # the user is already making their intent known.  It is not
+      # necessary to make them confirm two more times.
+      def destroy_item(klass, name, type_name)
+        begin
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException
+          ui.warn("Could not find a #{type_name} named #{name} to delete!")
+        end
+      end
+
+      def run
+
+        validate!
+        if @name_args.empty? && config[:chef_node_name]
+          ui.info("no instance id is specific, trying to retrieve it from node name")
+          instance_id = fetch_instance_id(config[:chef_node_name])
+          @name_args << instance_id unless instance_id.nil?
+        end
+
+        @name_args.each do |instance_id|
+
+          begin
+            @server = connection.servers.get(instance_id)
+
+            msg_pair('Instance ID', @server.id)
+            msg_pair('Instance Name', @server.tags['Name'])
+            msg_pair('Flavor', @server.flavor_id)
+            msg_pair('Image', @server.image_id)
+            msg_pair('Region', connection.instance_variable_get(:@region))
+            msg_pair('Availability Zone', @server.availability_zone)
+            msg_pair('Security Groups', @server.groups.join(', '))
+            msg_pair('IAM Profile', iam_name_from_profile(@server.iam_instance_profile)) if @server.iam_instance_profile
+            msg_pair('SSH Key', @server.key_name)
+            msg_pair('Root Device Type', @server.root_device_type)
+            msg_pair('Public DNS Name', @server.dns_name)
+            msg_pair('Public IP Address', @server.public_ip_address)
+            msg_pair('Private DNS Name', @server.private_dns_name)
+            msg_pair('Private IP Address', @server.private_ip_address)
+
+            puts '\n'
+            confirm('Do you really want to delete this server')
+
+            @server.destroy
+
+            ui.warn("Deleted server #{@server.id}")
+
+            if config[:purge]
+              if config[:chef_node_name]
+                thing_to_delete = config[:chef_node_name]
+              else
+                thing_to_delete = fetch_node_name(instance_id)
+              end
+              destroy_item(Chef::Node, thing_to_delete, "node")
+              destroy_item(Chef::ApiClient, thing_to_delete, "client")
+            else
+              ui.warn("Corresponding node and client for the #{instance_id} server were not deleted and remain registered with the Chef Server")
+            end
+          rescue NoMethodError
+            ui.error("Could not locate server '#{instance_id}'.  Please verify it was provisioned in the '#{locate_config_value(:region)}' region.")
+          end
+        end
+      end
+
+      def fetch_node_name(instance_id)
+        result = query.search(:node,"ec2_instance_id:#{instance_id}")
+        unless result.first.empty?
+          result.first.first.name
+        else
+          instance_id
+        end
+      end
+
+      def fetch_instance_id(name)
+        result = query.search(:node,"name:#{name}")
+        unless result.first.empty?
+          node = result.first.first
+          if node.attribute?('ec2')
+            node['ec2']['instance_id']
+          end
+        end
+      end
+
+      def query
+        @query ||= Chef::Search::Query.new
+      end
+    end
+  end
+end

data/lib/chef/knife/ec2_server_list.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2010-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,21 +46,6 @@ class Chef
         :long => "--tags TAG1,TAG2",
         :description => "List of tags to output"
 
-      def fcolor(flavor)
-        case flavor
-        when "t1.micro"
-          fcolor = :blue
-        when "m1.small"
-          fcolor = :magenta
-        when "m1.medium"
-          fcolor = :cyan
-        when "m1.large"
-          fcolor = :green
-        when "m1.xlarge"
-          fcolor = :red
-        end
-      end
-
       def azcolor(az)
         case az
         when /a$/
@@ -76,22 +61,6 @@ class Chef
         end
       end
 
-      def groups_with_ids(groups)
-        groups.map{|g| 
-          "#{g} (#{@group_id_hash[g]})"
-        }
-      end
-
-      def vpc_with_name(vpc_id)
-        this_vpc = @vpcs.select{|v| v.id == vpc_id }.first
-        if this_vpc.tags["Name"]
-          vpc_name = this_vpc.tags["Name"]
-          "#{vpc_name} (#{vpc_id})"
-        else
-          vpc_id
-        end
-      end
-
       def run
         $stdout.sync = true
 
@@ -99,7 +68,7 @@ class Chef
 
         server_list = [
           ui.color('Instance ID', :bold),
-        
+
           if config[:name]
             ui.color("Name", :bold)
           end,
@@ -115,72 +84,72 @@ class Chef
           ui.color('Image', :bold),
           ui.color('SSH Key', :bold),
           ui.color('Security Groups', :bold),
-          
+
           if config[:tags]
             config[:tags].split(",").collect do |tag_name|
               ui.color("Tag:#{tag_name}", :bold)
             end
           end,
-          
+
           ui.color('IAM Profile', :bold),
           ui.color('State', :bold)
         ].flatten.compact
-        
+
         output_column_count = server_list.length
-        
-        if !config[:region]
+
+        if !config[:region] && Chef::Config[:knife][:region].nil?
           ui.warn "No region was specified in knife.rb or as an argument. The default region, us-east-1, will be used:"
         end
-        
-        connection.servers.all.each do |server|
-          server_list << server.id.to_s
-          
-          if config[:name]
-            server_list << server.tags["Name"].to_s
-          end
-          
-          server_list << server.public_ip_address.to_s
-          server_list << server.private_ip_address.to_s
-          
-          server_list << ui.color(
-                                  server.flavor_id.to_s,
-                                  fcolor(server.flavor_id.to_s)
+
+        servers = connection.servers
+        if (config[:format] == 'summary')
+          servers.each do |server|
+            server_list << server.id.to_s
+
+            if config[:name]
+              server_list << server.tags["Name"].to_s
+            end
+
+            server_list << server.public_ip_address.to_s
+            server_list << server.private_ip_address.to_s
+            server_list << server.flavor_id.to_s
+
+            if config[:az]
+              server_list << ui.color(
+                                  server.availability_zone.to_s,
+                                  azcolor(server.availability_zone.to_s)
                                 )
+            end
 
-          if config[:az]
-            server_list << ui.color(
-                                server.availability_zone.to_s,
-                                azcolor(server.availability_zone.to_s)
-                              )
-          end
+            server_list << server.image_id.to_s
+            server_list << server.key_name.to_s
+            server_list << server.groups.join(", ")
 
-          server_list << server.image_id.to_s
-          server_list << server.key_name.to_s
-          server_list << server.groups.join(", ")
-          
-          if config[:tags]
-            config[:tags].split(",").each do |tag_name|
-              server_list << server.tags[tag_name].to_s
+            if config[:tags]
+              config[:tags].split(",").each do |tag_name|
+                server_list << server.tags[tag_name].to_s
+              end
             end
-          end
-          
-          server_list << iam_name_from_profile(server.iam_instance_profile)
-
-          server_list << begin
-            state = server.state.to_s.downcase
-            case state
-            when 'shutting-down','terminated','stopping','stopped'
-              ui.color(state, :red)
-            when 'pending'
-              ui.color(state, :yellow)
-            else
-              ui.color(state, :green)
+
+            server_list << iam_name_from_profile(server.iam_instance_profile)
+
+            server_list << begin
+              state = server.state.to_s.downcase
+              case state
+              when 'shutting-down','terminated','stopping','stopped'
+                ui.color(state, :red)
+              when 'pending'
+                ui.color(state, :yellow)
+              else
+                ui.color(state, :green)
+              end
             end
           end
-        end
-
-        puts ui.list(server_list, :uneven_columns_across, output_column_count)
 
+          puts ui.list(server_list, :uneven_columns_across, output_column_count)
+        else
+          output(format_for_display(servers))
+        end
       end
     end
   end