knife-ec2 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 238f0a88ecd9813d5239ad922e42cb1428acd542
-  data.tar.gz: c6c9b3452ba8d207c85b82aa7bd2e879e2af6eeb
+  metadata.gz: 889db53ef2c074e00e6f39d699546e1c559aa8aa
+  data.tar.gz: 9295959d153ee997e857113dde66c746435502a3
 SHA512:
-  metadata.gz: 7558bd27ec67e545fee9fb18c5f1be43aeea4cbeac604d8992daa9dec7359c34a42ca90981575dc1370f4066f4104ee1e43b8e89f846b958de18fff827a77bbc
-  data.tar.gz: d10d4bdb2174a1880814da08469bd279b9da1546778a48f60dde3589c9bf39dd8bb7085f4baad4574f929072a27ad1f0e87dc5e85f9e4d92192b8deeb51efd68
+  metadata.gz: f7921659633817867c17ddfcde5f256128761e8b5c9c1a675786099a4244d5d134aed0df8b8c2f6bb915df8fe1de24ef1ced5fdfab98981ad27635a8b4b1935a
+  data.tar.gz: 713004b60d245461dc9bede11abac218cc29b77fc898207abc2388d0d5bf45b1fb4fd59575328e00a38d3f56d22252f6f3cc812389a54289f12a905ea27bbcb3

data/CHANGELOG.md

@@ -4,7 +4,20 @@ Note: this log contains only changes from knife-ec2 release 0.8.0 and later
 -- it does not contain the changes from prior releases. To view change history
 prior to release 0.8.0, please visit the [source repository](https://github.com/chef/knife-ec2/commits).
 
+
+## Latest Release 0.15.0 (2017-02-15)
+* [knife-ec2:#484](https://github.com/chef/knife-ec2/pull/484) sleep for collecting windows password
+* [knife-ec2:#481](https://github.com/chef/knife-ec2/pull/481) Updated readme for EC2 AMI list
+* [knife-ec2:#482](https://github.com/chef/knife-ec2/pull/482) Allow search for EC2 AMIs
+* [knife-ec2:#471](https://github.com/chef/knife-ec2/pull/471) Added support to include ec2 server id in the node name using `-N "www-server-%s" or  --chef-node-name "-www-server-%s"`
+* [knife-ec2:#478](https://github.com/chef/knife-ec2/pull/478) Allow for hosts without public ip addresses
+* [knife-ec2:#476](https://github.com/chef/knife-ec2/pull/476) Tag node in chef
+* [knife-ec2:#458](https://github.com/chef/knife-ec2/pull/458) Fix where yes option wasn’t being passed to bootstrap
+* [knife-ec2:#468](https://github.com/chef/knife-ec2/pull/468) In VPC mode use private IP when public IP and DNS not available 
+* [knife-ec2:#464](https://github.com/chef/knife-ec2/pull/464) default value and desription is changed for --ebs-volume-type 
+
 ## Latest Release 0.14.0 (2016-12-02)
+* `knife-ec2` requires `chef-client 12.14` or newer.
 * [knife-ec2:#442](https://github.com/chef/knife-ec2/pull/442) Added support to show flavor list in json format.
 * [knife-ec2:#439](https://github.com/chef/knife-ec2/pull/439) Allow to accept multiple security group ids using --security-group-id option multiple times and added deprecated message for comma seprated --security-group-ids option.
 

data/README.md

@@ -203,6 +203,10 @@ knife ec2 server create -I ami-173d747e -x ubuntu --server-connect-attribute pub
 
 View additional information on configuring Windows images for bootstrap in the documentation for [knife-windows](https://docs.chef.io/plugin_knife_windows.html).
 
+#### Adding server_id to the node name
+
+Users can also include the ec2 server id in the node name by placing `%s` in the string passed to the `--chef-node-name` option. The %s is replaced by the ec2 server id dynamically. 
+e.g. `-N "www-server-%s" or  --chef-node-name "www-server-%s"`
 
 #### Bootstrap Windows (2012 R2 and above platform) instance without user-data through winrm ssl transport
 
@@ -230,13 +234,39 @@ The `knife ec2 server create` command also supports the following options for bo
 :kerberos_realm                The Kerberos realm used for authentication
 :kerberos_service              The Kerberos service used for authentication
 ```
+### `knife ec2 ami list`
+This command provides the feature to list all EC2 AMIs. It also provides the feature to filter the AMIs based on owner and platform.
 
-### `knife ec2 server delete`
-Deletes an existing server in the currently configured AWS account. **By default, this does not delete the associated node and client objects from the Chef server. To do so, add the `--purge` flag**
+```
+knife ec2 ami list
+```
+
+#### Options for AMIs list
+- **Owner:**
+  By default owner is aws-marketplace but you can specify following owner with the help of -o or --owner:
+
+  **command:** knife ec2 ami list -o (options)
+
+  ```
+  :self                         Displays the list of AMIs created by the user.
+  :aws-marketplace              Displays all AMIs form trusted vendors like Ubuntu, Microsoft, SAP, Zend as well as many open source offering.
+  :micosoft                     Displays only Microsoft vendor AMIs.
+  ```
+- **Platform:**
+  By default all platform AMIs are displayed, but you can filter your response by specifying the platform using -p or --platform:
+
+  **command:** knife ec2 ami list -p (options)
+
+  ```
+  :Allowed platform             windows, ubuntu, debian, centos, fedora, rhel, nginx, turnkey, jumpbox, coreos, cisco, amazon, nessus
+  ```  
 
 ### `knife ec2 server list`
 Outputs a list of all servers in the currently configured AWS account. **Note, this shows all instances associated with the account, some of which may not be currently managed by the Chef server.**
 
+### `knife ec2 server delete`
+Deletes an existing server in the currently configured AWS account. **By default, this does not delete the associated node and client objects from the Chef server. To do so, add the `--purge` flag**
+
 ## License and Authors
 - Author:: Adam Jacob ([adam@chef.io](mailto:adam@chef.io))
 

data/RELEASE_NOTES.md

@@ -7,14 +7,26 @@ Example Note:
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
 
-# knife-ec2 0.14.0 release notes:
+# knife-ec2 0.15.0 release notes:
+In this release we have added a command to list EC2 AMIs. Also added a feature to append server_id to the chef-node-name. There are a couple of bug fixes as well.
 
-This release of `knife-ec2` contains minor bug fixes.
+## Features added in knife-ec2 0.15.0
 
-## Features added in knife-ec2 0.14.0
+* Added command to list EC2 AMIs using `knife ec2 ami list` PR: [482](https://github.com/chef/knife-ec2/pull/482)
 
-* Added support to `flavor list` in json format using `--format json` option.
+* Added support to insert ec2 server id into node name using -N "<Node Name>%s" PR: [471](https://github.com/chef/knife-ec2/pull/471)
 
-* `--security-group-id` option to specify security groups for the server. This opiton can be used multiple times when specifying multiple security groups. e.g. `-g sg-e985168d -g sg-e7f06383 -g sg-ec1b7e88`.
+* Changed source of vm name to allow for hosts without public ip addresses PR: [478](https://github.com/chef/knife-ec2/pull/478)
 
-***Note:*** The `--security-group-ids` option will be removed in a future release. Use the new `--security-group-id` option.
+* Automatically pass tags to Chef as well as EC2 PR: [476](https://github.com/chef/knife-ec2/pull/476)
+
+
+## Fixed issue in knife-ec2 0.15.0
+
+* Wait for Windows Admin password to be available PR: [484](https://github.com/chef/knife-ec2/pull/484), issue: [479](https://github.com/chef/knife-ec2/issues/479), issue: [453](https://github.com/chef/knife-ec2/issues/453)
+
+* Fix where `--yes` option was not being passed to bootstrap PR: [458](https://github.com/chef/knife-ec2/pull/458)
+
+* In VPC mode use private IP when public IP and DNS are not available PR: [468](https://github.com/chef/knife-ec2/pull/468), issue: [344](https://github.com/chef/knife-ec2/issues/344)
+
+* Default value and description improved for `--ebs-volume-type` improved for clarity PR: [464](https://github.com/chef/knife-ec2/pull/464), issue: [450](https://github.com/chef/knife-ec2/issues/450), issue [451](https://github.com/chef/knife-ec2/issues/451)

data/knife-ec2.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency 'fog-aws',       '~> 0.7'
+  s.add_dependency 'fog-aws',       '~> 1.0'
   s.add_dependency 'mime-types'
   s.add_dependency 'knife-windows', '~> 1.0'
 

data/lib/chef/knife/ec2_ami_list.rb

@@ -0,0 +1,101 @@
+#
+# Author:: Piyush Awasthi (<piyush.awasthi@msystechnologies.com>)
+# Copyright:: Copyright (c) 2017 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"
+
+class Chef
+  class Knife
+    class Ec2AmiList < Knife
+
+      # == Overview
+      #
+      # This file provides the facility to display AMI list.
+      #
+      # == Owner
+      # By default owner is aws-marketplace but you can specify following owner with the help of -o or --owner
+      #   * self => Displays the list of AMIs created by the user
+      #   * aws-marketplace => Displays all AMIs form trusted vendors like Ubuntu, Microsoft, SAP, Zend as well as many open source offering
+      #   * micosoft => Displays only Microsoft vendor AMIs
+      # 
+      # == Platform
+      # By default all platform AMI's will display but you can filter your response
+      # by specify the platform using -p or --platform
+      #  * Valid Platform => ubuntu, debian, centos, fedora, rhel, nginx, turnkey, jumpbox, coreos, cisco
+      #
+      # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeImages.html]
+
+      include Knife::Ec2Base
+
+      banner "knife ec2 ami list (options)"
+
+      option :platform,
+        :short => "-p PLATFORM",
+        :long => "--platform PLATFORM",
+        :description => "Platform of the server. Allowed values are ubuntu, debian, centos, fedora, rhel, nginx, turnkey, jumpbox, coreos, cisco, amazon, nessus"
+
+       option :owner,
+        :short => "-o OWNER",
+        :long => "--owner OWNER",
+        :description => "The server owner (self, aws-marketplace, microsoft). Default is aws-marketplace"
+
+      def run
+        $stdout.sync = true
+
+        validate!
+        custom_warnings!
+
+        server_list = [
+          ui.color("AMI ID", :bold),
+          ui.color("Platform", :bold),
+          ui.color("Architecture", :bold),
+          ui.color("Size", :bold),
+          ui.color("Name", :bold)
+        ].flatten.compact
+
+        output_column_count = server_list.length
+        begin
+          owner = locate_config_value(:owner) || "aws-marketplace"
+          servers = connection.describe_images({"Owner"=>"#{owner}"}) # aws-marketplace, microsoft
+        rescue Exception => api_error
+          raise api_error
+        end
+        servers.body["imagesSet"].each do |server|
+          server_name = server["name"]
+          server["platform"] = find_server_platform(server_name) unless server["platform"]
+
+          if locate_config_value(:platform)
+            if server["platform"] == locate_config_value(:platform)
+              server_list << server["imageId"]
+              server_list << server["platform"]
+              server_list << server["architecture"]
+              server_list << server["blockDeviceMapping"].first["volumeSize"].to_s
+              server_list << server_name.split(/\W+/).first
+            end
+          else
+            server_list << server["imageId"]
+            server_list << server["platform"]
+            server_list << server["architecture"]
+            server_list << server["blockDeviceMapping"].first["volumeSize"].to_s
+            server_list << server_name.split(/\W+/).first
+          end
+        end
+        puts ui.list(server_list, :uneven_columns_across, output_column_count)
+      end
+    end
+  end
+end

data/lib/chef/knife/ec2_base.rb

@@ -106,7 +106,7 @@ class Chef
 
       def msg_pair(label, value, color=:cyan)
         if value && !value.to_s.empty?
-          puts "#{ui.color(label, color)}: #{value}"
+          ui.info("#{ui.color(label, color)}: #{value}")
         end
       end
 
@@ -177,6 +177,18 @@ class Chef
             exit 1
           end
         end
+
+        if locate_config_value(:platform)
+          unless valid_platforms.include? (locate_config_value(:platform))
+            raise ArgumentError, "Invalid platform: #{locate_config_value(:platform)}. Allowed platforms are: #{valid_platforms.join(", ")}."
+          end
+        end
+
+        if locate_config_value(:owner)
+          unless ["self", "aws-marketplace", "microsoft"].include? (locate_config_value(:owner))
+            raise ArgumentError, "Invalid owner: #{locate_config_value(:owner)}. Allowed owners are self, aws-marketplace or microsoft."
+          end
+        end
       end
 
     end
@@ -207,5 +219,25 @@ class Chef
       end
       map
     end
+
+    # All valid platforms
+    def valid_platforms
+      ["ubuntu", "debian", "centos", "fedora", "rhel", "nginx", "turnkey", "jumpbox", "coreos", "cisco", "amazon", "nessus"]
+    end
+
+    # Get the platform from server name
+    def find_server_platform(server_name)
+      available_platforms = valid_platforms
+      get_platform = available_platforms.select { |name| server_name.downcase.include?(name) }
+      return get_platform.first
+    end
+
+
+    # Custom Warning
+    def custom_warnings!
+      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
+    end
   end
 end

data/lib/chef/knife/ec2_server_create.rb

@@ -254,7 +254,7 @@ class Chef
 
       option :fqdn,
         :long => "--fqdn FQDN",
-        :description => "Pre-defined FQDN",
+        :description => "Pre-defined FQDN. This is used for Kerberos Authentication purpose only",
         :proc => Proc.new { |key| Chef::Config[:knife][:fqdn] = key },
         :default => nil
 
@@ -294,9 +294,9 @@ class Chef
 
       option :ebs_volume_type,
         :long => "--ebs-volume-type TYPE",
-        :description => "Standard or Provisioned (io1) IOPS or General Purpose (gp2)",
+        :description => "Possible values are standard (magnetic) | io1 | gp2 | sc1 | st1. Default is gp2",
         :proc => Proc.new { |key| Chef::Config[:knife][:ebs_volume_type] = key },
-        :default => "standard"
+        :default => "gp2"
 
       option :ebs_provisioned_iops,
         :long => "--provisioned-iops IOPS",
@@ -500,7 +500,11 @@ class Chef
 
         # Always set the Name tag
         unless hashed_tags.keys.include? "Name"
-          hashed_tags["Name"] = locate_config_value(:chef_node_name) || @server.id
+          if locate_config_value(:chef_node_name)
+            hashed_tags["Name"] = evaluate_node_name(locate_config_value(:chef_node_name))
+          else
+            hashed_tags["Name"] = server.id
+          end
         end
 
         printed_tags = hashed_tags.map{ |tag, val| "#{tag}: #{val}" }.join(", ")
@@ -735,6 +739,7 @@ class Chef
         bootstrap.config[:bootstrap_vault_json] = locate_config_value(:bootstrap_vault_json)
         bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item)
         bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
+        bootstrap.config[:yes] = locate_config_value(:yes)
         # Modify global configuration state to ensure hint gets set by
         # knife-bootstrap
         Chef::Config[:knife][:hints] ||= {}
@@ -780,7 +785,12 @@ class Chef
         bootstrap.config[:msi_url] = locate_config_value(:msi_url)
         bootstrap.config[:install_as_service] = locate_config_value(:install_as_service)
         bootstrap.config[:session_timeout] = locate_config_value(:session_timeout)
-        bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
+        bootstrap.config[:tags] = config[:tags]
+        if locate_config_value(:chef_node_name)
+          bootstrap.config[:chef_node_name] = evaluate_node_name(locate_config_value(:chef_node_name))
+        else
+          bootstrap.config[:chef_node_name] = server.id
+        end
         bootstrap_common_params(bootstrap)
       end
 
@@ -792,7 +802,12 @@ class Chef
         bootstrap.config[:ssh_port] = config[:ssh_port]
         bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
         bootstrap.config[:identity_file] = config[:identity_file]
-        bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name) || server.id
+        bootstrap.config[:tags] = config[:tags]
+        if locate_config_value(:chef_node_name)
+          bootstrap.config[:chef_node_name] = evaluate_node_name(locate_config_value(:chef_node_name))
+        else
+          bootstrap.config[:chef_node_name] = server.id
+        end
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         # may be needed for vpc_mode
         bootstrap.config[:host_key_verify] = config[:host_key_verify]
@@ -972,6 +987,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1216,18 +1234,22 @@ EOH
         }
       end
 
+      def subnet_public_ip_on_launch?
+        connection.subnets.get(server.subnet_id).map_public_ip_on_launch
+      end
+
       def ssh_connect_host
         unless @ssh_connect_host
           if config[:server_connect_attribute]
             connect_attribute = config[:server_connect_attribute]
+            server.send(config[:server_connect_attribute])
+          elsif vpc_mode? && !(subnet_public_ip_on_launch? || config[:associate_public_ip] || config[:associate_eip])
+            connect_attribute = "private_ip_address"
+            server.private_ip_address
           else
-            if vpc_mode? && !(config[:associate_public_ip] || config[:associate_eip])
-              connect_attribute = "private_ip_address"
-            else
-              connect_attribute = server.dns_name ? "dns_name" : "public_ip_address"
-            end
+            connect_attribute = server.dns_name ? "dns_name" : "public_ip_address"
+            server.send(connect_attribute)
           end
-
           @ssh_connect_host = server.send(connect_attribute)
         end
 
@@ -1381,6 +1403,7 @@ EOH
       end
 
       def check_windows_password_available(server_id)
+        sleep 10
         response = connection.get_password_data(server_id)
         if not response.body["passwordData"]
           return false
@@ -1393,7 +1416,6 @@ EOH
           if locate_config_value(:identity_file)
             print "\n#{ui.color("Waiting for Windows Admin password to be available", :magenta)}"
             print(".") until check_windows_password_available(@server.id) {
-              sleep 1000 #typically is available after 30 mins
               puts("done")
             }
             response = connection.get_password_data(@server.id)
@@ -1415,6 +1437,13 @@ EOH
         require 'chef/knife/bootstrap_windows_ssh'
         require 'chef/knife/core/windows_bootstrap_context'
       end
+
+      #Returns the name of node after evaluation of server id if %s is present.
+      #Eg: "Test-%s" will return "Test-i-12345"  in case the instance id is i-12345
+      def evaluate_node_name(node_name)
+        return node_name%server.id
+      end
+
     end
   end
 end

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,19 @@
-$:.unshift File.expand_path('../../lib', __FILE__)
-require 'chef'
-require 'chef/knife/winrm_base'
-require 'chef/knife/ec2_server_create'
-require 'chef/knife/ec2_server_delete'
-require 'chef/knife/ec2_server_list'
-
-# Clear config between each example
-# to avoid dependencies between examples
-RSpec.configure do |c|
-  c.raise_errors_for_deprecations!
-  c.filter_run_excluding :exclude => true
-  c.before(:each) do
-    Chef::Config.reset
-    Chef::Config[:knife] ={}
-  end
-end
-
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'chef'
+require 'chef/knife/winrm_base'
+require 'chef/knife/ec2_server_create'
+require 'chef/knife/ec2_server_delete'
+require 'chef/knife/ec2_server_list'
+require 'chef/knife/ec2_ami_list'
+
+# Clear config between each example
+# to avoid dependencies between examples
+RSpec.configure do |c|
+  c.raise_errors_for_deprecations!
+  c.filter_run_excluding :exclude => true
+  c.before(:each) do
+    Chef::Config.reset
+    Chef::Config[:knife] ={}
+  end
+end
+

data/spec/unit/ec2_ami_list_spec.rb

@@ -0,0 +1,273 @@
+  # 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 File.expand_path('../../spec_helper', __FILE__)
+  require 'fog/aws'
+
+  describe Chef::Knife::Ec2AmiList do
+
+    describe '#run' do
+      let(:knife_ec2_ami_list) { Chef::Knife::Ec2AmiList.new }
+      let(:ec2_connection) { double(Fog::Compute::AWS) }
+      before (:each) do
+        allow(knife_ec2_ami_list).to receive(:connection).and_return(ec2_connection)
+        @describe_images_format = double("describe_image_output", :body => { 
+              'imagesSet'    => [{
+              'architecture'        => "x86_64",
+              'blockDeviceMapping'  => [{"deviceName"=>"/dev/sda1",
+                                         "snapshotId"=>"snap-f7e645f4",
+                                         "volumeSize"=>30,
+                                         "deleteOnTermination"=>"true",
+                                         "volumeType"=>"standard",
+                                         "encrypted"=>"false"}],
+              'description'         => "DC for Quan",
+              'hypervisor'          => "xen",
+              'imageId'             => "ami-4ace6d23",
+              'imageLocation'       => "microsoft/Windows_Server-2008-R2-SP1-English-64Bit-WebMatrix_Hosting-2012.06.12",
+              'imageOwnerAlias'     => "microsoft",
+              'name'                => "Windows_Server-2008-R2-SP1-English-64Bit-Windows_Media_Services_4.1-2012.06.12",
+              'imageOwnerId'        => "461346954234",
+              'imageState'          => "available",
+              'imageType'           => "machine",
+              'isPublic'            => true,
+              'platform'            => "windows",
+              'productCodes'        => [],
+              'rootDeviceName'      => "/dev/sda1",
+              'rootDeviceType'      => "ebs",
+              'stateReason'         => {},
+              'tagSet'              => {},
+              'virtualizationType'  => "hvm"
+            }, {
+              'architecture'        => "i386",
+              'blockDeviceMapping'  => [{"deviceName"=>"/dev/sda1",
+                                         "snapshotId"=>"snap-f7e645f4",
+                                         "volumeSize"=>10,
+                                         "deleteOnTermination"=>"true",
+                                         "volumeType"=>"standard",
+                                         "encrypted"=>"false"}],
+              'description'         => "DC for Quan",
+              'hypervisor'          => "xen",
+              'imageId'             => "ami-4ace6d21",
+              'imageOwnerAlias'     => "aws-marketplace",
+              'name'                => "ubuntu i386",
+              'imageOwnerId'        => "461346954235",
+              'imageState'          => "available",
+              'imageType'           => "machine",
+              'isPublic'            => true,
+              'productCodes'        => [],
+              'rootDeviceName'      => "/dev/sda1",
+              'rootDeviceType'      => "ebs",
+              'stateReason'         => {},
+              'tagSet'              => {},
+              'virtualizationType'  => "hvm"
+            }, {
+              'architecture'        => "x86_64",
+              'blockDeviceMapping'  => [{"deviceName"=>"/dev/sda1",
+                                         "snapshotId"=>"snap-f7e645f4",
+                                         "volumeSize"=>8,
+                                         "deleteOnTermination"=>"true",
+                                         "volumeType"=>"standard",
+                                         "encrypted"=>"false"}],
+              'description'         => "DC for Quan",
+              'hypervisor'          => "xen",
+              'imageId'             => "ami-4ace6d29",
+              'imageOwnerAlias'     => "aws-marketplace",
+              'name'                => "fedora i64",
+              'imageOwnerId'        => "461346954234",
+              'imageState'          => "available",
+              'imageType'           => "machine",
+              'isPublic'            => true,
+              'productCodes'        => [],
+              'rootDeviceName'      => "/dev/sda1",
+              'rootDeviceType'      => "ebs",
+              'stateReason'         => {},
+              'tagSet'              => {},
+              'virtualizationType'  => "hvm"
+            }],
+          'requestId'     => "ba38c315-f1b4-4822-b336-6309bed6d50c"
+          }
+        )
+      end
+
+      it 'invokes validate!' do
+        allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+        allow(knife_ec2_ami_list.ui).to receive(:warn)
+        expect(knife_ec2_ami_list).to receive(:validate!)
+        knife_ec2_ami_list.run
+      end
+
+      context 'when region is not specified' do
+        it 'shows warning that default region will be will be used' do
+          knife_ec2_ami_list.config.delete(:region)
+          Chef::Config[:knife].delete(:region)
+          ec2_servers = double()
+          allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+          allow(knife_ec2_ami_list).to receive(:validate!)
+          expect(knife_ec2_ami_list.ui).to receive(:warn).with("No region was specified in knife.rb or as an argument. The default region, us-east-1, will be used:")
+          knife_ec2_ami_list.run
+        end
+      end
+
+      context 'when --owner is passed' do
+        before do
+          allow(knife_ec2_ami_list.ui).to receive(:warn)
+          allow(knife_ec2_ami_list).to receive(:custom_warnings!)
+          knife_ec2_ami_list.config[:use_iam_profile] = true
+        end
+
+        context 'When value for owner is nil' do
+          it 'shows the available AMIs List' do
+            knife_ec2_ami_list.config[:owner] = nil
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            expect(knife_ec2_ami_list).to receive(:validate!)
+            images = ec2_connection.describe_images.body['imagesSet']
+            output_column = ["AMI ID", "Platform", "Architecture", "Size", "Name"]
+            output_column_count = output_column.length
+            images.each do |image|
+              output_column << image["imageId"].to_s
+              output_column << (image["platform"] ?  image["platform"] : image["name"].split(/\W+/).first)
+              output_column << image["architecture"].to_s
+              output_column << image["blockDeviceMapping"].first["volumeSize"].to_s
+              output_column << image["name"].split(/\W+/).first
+            end
+            expect(knife_ec2_ami_list.ui).to receive(:list).with(output_column,:uneven_columns_across, output_column_count)
+            knife_ec2_ami_list.run
+          end
+        end
+
+        context 'When value for owner is self' do
+          it 'does not raise any error' do
+            knife_ec2_ami_list.config[:owner] = 'self'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            expect{ knife_ec2_ami_list.validate! }.not_to raise_error
+          end
+        end
+
+        context 'When value for owner is microsoft' do
+          it 'does not raise any error' do
+            knife_ec2_ami_list.config[:owner] = 'microsoft'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            expect{ knife_ec2_ami_list.validate! }.not_to raise_error
+          end
+        end
+
+        context 'When value for owner is aws-marketplace' do
+          it 'does not raise any error' do
+            knife_ec2_ami_list.config[:owner] = 'aws-marketplace'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            expect{ knife_ec2_ami_list.validate! }.not_to raise_error
+          end
+        end
+
+        context 'When owner is invalid' do
+          it 'raises error' do
+            knife_ec2_ami_list.config[:owner] = 'xyz'
+            knife_ec2_ami_list.config[:use_iam_profile] = true
+            expect{ knife_ec2_ami_list.validate! }.to raise_error "Invalid owner: #{knife_ec2_ami_list.config[:owner]}. Allowed owners are self, aws-marketplace or microsoft."
+          end
+        end
+      end
+
+      context 'when --platform is passed' do
+        before do
+          allow(knife_ec2_ami_list.ui).to receive(:warn)
+          allow(knife_ec2_ami_list).to receive(:custom_warnings!)
+        end
+
+        context 'When platform is nil' do
+          it 'shows all the AMIs List' do
+            knife_ec2_ami_list.config[:platform] = nil
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            images = ec2_connection.describe_images.body['imagesSet']
+            expect(knife_ec2_ami_list).to receive(:validate!)
+            output_column = ["AMI ID", "Platform", "Architecture", "Size", "Name"]
+            output_column_count = output_column.length
+            images.each do |image|
+              output_column << image["imageId"].to_s
+              output_column << (image["platform"] ?  image["platform"] : image["name"].split(/\W+/).first)
+              output_column << image["architecture"].to_s
+              output_column << image["blockDeviceMapping"].first["volumeSize"].to_s
+              output_column << image["name"].split(/\W+/).first
+            end
+            expect(knife_ec2_ami_list.ui).to receive(:list).with(output_column,:uneven_columns_across, output_column_count)
+            knife_ec2_ami_list.run
+          end
+        end
+
+        context 'When platform is windows' do
+          it 'shows only windows AMIs List' do
+            knife_ec2_ami_list.config[:platform] = 'windows'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            window_image = ec2_connection.describe_images.body['imagesSet'].first
+            expect(knife_ec2_ami_list).to receive(:validate!)
+            output_column = ["AMI ID", "Platform", "Architecture", "Size", "Name"]
+            output_column_count = output_column.length
+            output_column << window_image["imageId"]
+            output_column << window_image["platform"]
+            output_column << window_image["architecture"]
+            output_column << window_image["blockDeviceMapping"].first["volumeSize"].to_s
+            output_column << window_image["name"].split(/\W+/).first
+            expect(knife_ec2_ami_list.ui).to receive(:list).with(output_column,:uneven_columns_across, output_column_count)
+            knife_ec2_ami_list.run
+          end
+        end
+
+        context 'When platform is ubuntu' do
+          it 'shows only ubuntu AMIs List' do
+            knife_ec2_ami_list.config[:platform] = 'ubuntu'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            ubuntu_image = ec2_connection.describe_images.body['imagesSet'][1]
+            expect(knife_ec2_ami_list).to receive(:validate!)
+            output_column = ["AMI ID", "Platform", "Architecture", "Size", "Name"]
+            output_column_count = output_column.length
+            output_column << ubuntu_image["imageId"]
+            output_column << ubuntu_image["name"].split(/\W+/).first
+            output_column << ubuntu_image["architecture"]
+            output_column << ubuntu_image["blockDeviceMapping"].first["volumeSize"].to_s
+            output_column << ubuntu_image["name"].split(/\W+/).first
+            expect(knife_ec2_ami_list.ui).to receive(:list).with(output_column,:uneven_columns_across, output_column_count)
+            knife_ec2_ami_list.run
+          end
+        end
+
+        context 'When platform is fedora' do
+          it 'shows only fedora AMIs List' do
+            knife_ec2_ami_list.config[:platform] = 'fedora'
+            allow(ec2_connection).to receive(:describe_images).and_return(@describe_images_format)
+            expect(knife_ec2_ami_list).to receive(:validate!)
+            fedora_image = ec2_connection.describe_images.body['imagesSet'].last
+            output_column = ["AMI ID", "Platform", "Architecture", "Size", "Name"]
+            output_column_count = output_column.length
+            output_column << fedora_image["imageId"]
+            output_column << fedora_image["name"].split(/\W+/).first
+            output_column << fedora_image["architecture"]
+            output_column << fedora_image["blockDeviceMapping"].first["volumeSize"].to_s
+            output_column << fedora_image["name"].split(/\W+/).first
+            expect(knife_ec2_ami_list.ui).to receive(:list).with(output_column,:uneven_columns_across, output_column_count)
+            knife_ec2_ami_list.run
+          end
+        end
+
+        context 'When platform is invalid' do
+          it 'raises error' do
+            knife_ec2_ami_list.config[:platform] = 'xyz'
+            knife_ec2_ami_list.config[:use_iam_profile] = true
+            knife_ec2_ami_list.config[:owner] = true
+            expect{ knife_ec2_ami_list.validate! }.to raise_error "Invalid platform: #{knife_ec2_ami_list.config[:platform]}. Allowed platforms are: ubuntu, debian, centos, fedora, rhel, nginx, turnkey, jumpbox, coreos, cisco, amazon, nessus."
+          end
+        end
+      end
+    end
+  end

data/spec/unit/ec2_server_create_spec.rb

@@ -48,6 +48,8 @@ describe Chef::Knife::Ec2ServerCreate do
                            :private_ip_address => '10.251.75.20',
                            :root_device_type => 'not_ebs' } }
 
+  let (:server) { double(:id => "i-123" ) }
+
   let(:spot_request_attribs) { { :id => 'test_spot_request_id',
                            :price => 0.001,
                            :request_type => 'persistent',
@@ -630,6 +632,7 @@ describe Chef::Knife::Ec2ServerCreate do
 
   describe "when configuring the bootstrap process" do
     before do
+      allow(knife_ec2_create).to receive(:evaluate_node_name).and_return('blarf')
       knife_ec2_create.config[:ssh_user] = "ubuntu"
       knife_ec2_create.config[:identity_file] = "~/.ssh/aws-key.pem"
       knife_ec2_create.config[:ssh_port] = 22
@@ -740,6 +743,7 @@ describe Chef::Knife::Ec2ServerCreate do
   describe "when configuring the winrm bootstrap process for windows" do
     before do
       allow(knife_ec2_create).to receive(:fetch_server_fqdn).and_return("SERVERNAME")
+      allow(knife_ec2_create).to receive(:evaluate_node_name).and_return(server)
       knife_ec2_create.config[:winrm_user] = "Administrator"
       knife_ec2_create.config[:winrm_password] = "password"
       knife_ec2_create.config[:winrm_port] = 12345
@@ -1379,15 +1383,39 @@ describe Chef::Knife::Ec2ServerCreate do
 
   end
 
+  describe "#subnet_public_ip_on_launch?" do
+    before do
+      allow(new_ec2_server).to receive_messages(:subnet_id => 'subnet-1a2b3c4d')
+      allow(knife_ec2_create).to receive_messages(:server => new_ec2_server)
+      allow(Fog::Compute::AWS).to receive(:new).and_return(ec2_connection)
+    end
+
+    context "when auto_assign_public_ip is enabled" do
+      it "returns true" do
+        allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => true )
+        expect(knife_ec2_create.subnet_public_ip_on_launch?).to eq(true)
+      end
+    end
+
+    context "when auto_assign_public_ip is disabled" do
+      it "returns false" do
+        allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => false )
+        expect(knife_ec2_create.subnet_public_ip_on_launch?).to eq(false)
+      end
+    end
+  end
+
   describe "ssh_connect_host" do
     before(:each) do
       allow(new_ec2_server).to receive_messages(
         :dns_name => 'public.example.org',
         :private_ip_address => '192.168.1.100',
         :custom => 'custom',
-        :public_ip_address => '111.111.111.111'
+        :public_ip_address => '111.111.111.111',
+        :subnet_id => 'subnet-1a2b3c4d'
       )
       allow(knife_ec2_create).to receive_messages(:server => new_ec2_server)
+      allow(Fog::Compute::AWS).to receive(:new).and_return(ec2_connection)
     end
 
     describe "by default" do
@@ -1408,9 +1436,18 @@ describe Chef::Knife::Ec2ServerCreate do
         allow(knife_ec2_create).to receive_messages(:vpc_mode? => true)
       end
 
+      context "subnet_public_ip_on_launch? is true" do
+        it "uses the dns_name or public_ip_address" do
+          allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => true )
+          expect(knife_ec2_create.subnet_public_ip_on_launch?).to eq(true)
+          expect(knife_ec2_create.ssh_connect_host).to eq('public.example.org')
+        end
+      end
+
       context "--associate-public-ip is specified" do
         it "uses the dns_name or public_ip_address" do
           knife_ec2_create.config[:associate_public_ip] = true
+          allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => false )
           expect(knife_ec2_create.ssh_connect_host).to eq('public.example.org')
         end
       end
@@ -1418,12 +1455,14 @@ describe Chef::Knife::Ec2ServerCreate do
       context "--associate-eip is specified" do
         it "uses the dns_name or public_ip_address" do
           knife_ec2_create.config[:associate_eip] = '111.111.111.111'
+          allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => false )
           expect(knife_ec2_create.ssh_connect_host).to eq('public.example.org')
         end
       end
 
       context "with no other ip flags" do
         it 'uses private_ip_address' do
+          allow(ec2_connection).to receive_message_chain(:subnets, :get).and_return double( :map_public_ip_on_launch => false )
           expect(knife_ec2_create.ssh_connect_host).to eq('192.168.1.100')
         end
       end
@@ -1546,6 +1585,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1575,6 +1617,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1632,6 +1677,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1696,6 +1744,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1743,6 +1794,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1783,6 +1837,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1805,6 +1862,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1889,6 +1949,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -1930,6 +1993,9 @@ If (winrm e winrm/config/listener | Select-String -Pattern " Transport = HTTP\\b
   winrm delete winrm/config/listener?Address=*+Transport=HTTP
 }
 $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/public-ipv4
+If (-Not $vm_name) {
+  $vm_name = invoke-restmethod -uri http://169.254.169.254/latest/meta-data/local-ipv4
+}
 New-SelfSignedCertificate -certstorelocation cert:\\localmachine\\my -dnsname $vm_name
 $thumbprint = (Get-ChildItem -Path cert:\\localmachine\\my | Where-Object {$_.Subject -match "$vm_name"}).Thumbprint;
 $create_listener_cmd = "winrm create winrm/config/Listener?Address=*+Transport=HTTPS '@{Hostname=`"$vm_name`";CertificateThumbprint=`"$thumbprint`"}'"
@@ -2245,4 +2311,23 @@ netstat > c:\\netstat_data.txt
       end
     end
   end
+
+  describe 'evaluate_node_name' do
+    before do
+      knife_ec2_create.instance_variable_set(:@server, server)
+    end
+
+    context 'when ec2 server attributes are not passed in node name' do
+      it 'returns the node name unchanged' do
+        expect(knife_ec2_create.evaluate_node_name("Test")).to eq("Test")
+      end
+    end
+
+     context 'when %s is passed in the node name' do
+      it 'returns evaluated node name' do
+        expect(knife_ec2_create.evaluate_node_name("Test-%s")).to eq("Test-i-123")
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - RELEASE_NOTES.md
 - Rakefile
 - knife-ec2.gemspec
+- lib/chef/knife/ec2_ami_list.rb
 - lib/chef/knife/ec2_base.rb
 - lib/chef/knife/ec2_flavor_list.rb
 - lib/chef/knife/ec2_server_create.rb
@@ -143,6 +144,7 @@ files:
 - lib/chef/knife/s3_source.rb
 - lib/knife-ec2/version.rb
 - spec/spec_helper.rb
+- spec/unit/ec2_ami_list_spec.rb
 - spec/unit/ec2_flavor_list_spec.rb
 - spec/unit/ec2_server_create_spec.rb
 - spec/unit/ec2_server_delete_spec.rb
@@ -169,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: EC2 Support for Chef's Knife Command