knife-ec2 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdaebe8b7719446fee4ccf08e113714a64097e57
-  data.tar.gz: 7dcf7fdc5ac57a4ce35baba78abeb67941d1c5bb
+  metadata.gz: 238f0a88ecd9813d5239ad922e42cb1428acd542
+  data.tar.gz: c6c9b3452ba8d207c85b82aa7bd2e879e2af6eeb
 SHA512:
-  metadata.gz: d1dab754a4f35b7bb25f86a3d26623c0862d054ee242d11aef7fcdfaadc5ef02eb03bd38c7331542c70921c2d211c69c1afed3960b86a96845f71aeb7c8f4335
-  data.tar.gz: 922f6bc7592ca622417475ceab90c54e1f43cfcf5c7797a1bb10708a19aaf8b1efedcc34857d2067bb22bc6b44af9cafba44bb6024eae7a4943c0418ecd4be88
+  metadata.gz: 7558bd27ec67e545fee9fb18c5f1be43aeea4cbeac604d8992daa9dec7359c34a42ca90981575dc1370f4066f4104ee1e43b8e89f846b958de18fff827a77bbc
+  data.tar.gz: d10d4bdb2174a1880814da08469bd279b9da1546778a48f60dde3589c9bf39dd8bb7085f4baad4574f929072a27ad1f0e87dc5e85f9e4d92192b8deeb51efd68

data/.travis.yml

@@ -9,6 +9,6 @@ before_install:
   - rm -f .bundle/config
 
 rvm:
-  - 2.1
-  - 2.2
-script: bundle exec rspec --color --format progress
+  - 2.2.5
+  - 2.3.1
+script: bundle exec rake spec

data/CHANGELOG.md

@@ -4,7 +4,11 @@ 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.13.0 (2016-08-05)
+## Latest Release 0.14.0 (2016-12-02)
+* [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.
+
+## Release 0.13.0 (2016-08-05)
 * [knife-ec2:#438](https://github.com/chef/knife-ec2/pull/438) Specs for ec2 server list
 * [knife-ec2:#437](https://github.com/chef/knife-ec2/pull/437) Fix --aws-credential-file issues
 * [knife-ec2:#436](https://github.com/chef/knife-ec2/pull/436) basic is not a valid setting for winrm_ssl_verify_mode
@@ -40,8 +44,7 @@ prior to release 0.8.0, please visit the [source repository](https://github.com/
 * [knife-ec2:#363](https://github.com/chef/knife-ec2/pull/363) Add ssl config user data for ssl transport, if required append to user\_data script specified by user.
 * [knife-ec2:#319](https://github.com/chef/knife-ec2/pull/319) Pointing docs at itself. This is better then the non-existent chef.io docs.
 
-## Latest Release: 0.12.0 (2015-10-1)
-
+## Release: 0.12.0 (2015-10-1)
 * [knife-ec2:#305](https://github.com/chef/knife-ec2/pull/305) Updates to support standard .aws/credentials file
 * [knife-ec2 #354](https://github.com/chef/knife-ec2/pull/354) knife-windows 1.0.0 dependency, support for validatorless bootstrap, other Chef 12 bootstrap options
 * [knife-ec2 #356](https://github.com/chef/knife-ec2/pull/356) Added --forward-agent option

data/CONTRIBUTIONS.md

@@ -4,7 +4,3 @@ This file is reset every time a new release is done. The contents of this file a
 Example Contribution:
 * **kalistec**: Improved file resource greatly.
 -->
-# knife-ec2 0.13.0:
-
-* **quentindemetz**: Added ability to use `Classic Link`.
-* **eherot**: Added ability to attach `Network Interfaces`.

data/DOC_CHANGES.md

@@ -4,33 +4,14 @@ This file is reset everytime when a new release is done. Contents of this file i
 
 # knife-ec2 doc changes
 
-Documentation changes are given below for **kn9fe-ec2 version 0.13.0**.
-
-## `--aws-config-file` option for all commands
-
-The `--aws-config-file` option allows users to reuse configuration settings from the AWS command line tools so that `knife` can access EC2 resources.
+Documentation changes are given below for **knife-ec2 version 0.14.0**.
 
 ## `knife ec2 server create` subcommand changes
 
-### `--spot-wait-mode` option
-
-The `--spot-wait-mode` option allows knife to respond in different ways when the `server create` subcommand is used to create a spot instance that is not immediately created when the subcommand is executed. Possible options are:
-
-* `wait` -- waits indefinitely for the instance to be created
-* `exit` -- exits if the instance is not yet created (it may be bootstrapped via the `knife bootstrap` command at a later time).
-* `prompt` (default) -- interactively prompts the user for one of the above options.
-
-### `--create-ssl-listener`
-The `--create-ssl-listener` option is applicable only when creating a Windows instance. When specified, the subcommand will create a `WinRM` listener on the new instance that uses the SSL transport, and will attempt to bootstrap the node using that listener. The default behavior is to use the SSL transport, the `--no-create-ssl-listener` option can be used to override the default and instead use a less secure plaintext listener.
-
-### `--attach-network-interface`
-The `--attach-network-interface` option allows the user to specify a list of network interfaces in the form `ENI1,ENI2,...` as additional interfaces to attach to the instance when it is created.
+### `--security-group-id` option
 
-### `--classic-link-vpc-id`
-The `--classic-link-vpc-id` option allows the user to specify a VPC that is [ClassicLink](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html)-enabled by specifying the VPC's ID as an argument. The created instance will be linked to that VPC.
+The `--security-group-id` option allows the user to specify the security group id for server and is required when using VPC. Multiple security groups may be specified by using this option multiple times, e.g. `-g sg-e985168d -g sg-e7f06383 -g sg-ec1b7e88`.
 
-### `--classic-link-vpc-security-groups-ids`
-The `--classic-link-vpc-security-groups-ids` option allows the user to specify AWS security groups for the VPC specified with the `--classic-link-vpc-id` option.
+### `--security-group-ids` option
 
-### `--disable-api-termination`
-The `--disable-api-termination` option allows the user to disable the termination of the instance using the Amazon EC2 console, CLI and API. However, this option won't work for `spot instances` as `termination protection` cannot be enabled for `spot instances`.
+The previous option for specifying security groups, `--security-group-ids` (plural), is deprecated in favor of the `--security-group-id` option which mimics the more standard behavior for supplying multiple arguments across the ecosystem. This option will be removed in future release.

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 gemspec
 
-gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+
-gem 'rb-readline'
+gem 'rb-readline'

data/RELEASE_NOTES.md

@@ -6,31 +6,15 @@ Example Note:
 ## Example Heading
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
-# knife-ec2 0.13.0 release notes:
 
-This release of `knife-ec2` adds feature to bootstrap Windows instances over SSL without the need for users to provide the `user-data`. Also, it adds support for users to pass `AWS config file` option on the `CLI` containing the `AWS configurations` to read the config like `region` information.
+# knife-ec2 0.14.0 release notes:
 
-***Note:*** The bootstrap (over SSL without the `user-data`) feature for Windows is available only for Windows 2012 R2 and above platform.
+This release of `knife-ec2` contains minor bug fixes.
 
+## Features added in knife-ec2 0.14.0
 
-## Features added in knife-ec2 0.13.0
+* Added support to `flavor list` in json format using `--format json` option.
 
-* `--[no-]create-ssl-listener` option to add `ssl listener` on Windows instance to bootstrap the instance through `winrm ssl transport` without the need for users to pass the `user-data`. Default value of this option is `true`.
-* Support for `~/.aws/config` file for reading aws configurations. Use `--aws-config-file` option for the same.
-* Support to read `aws_session_token` from `~/.aws/credentials` file.
-* Support for `ec2 classic link`, options are `--classic-link-vpc-id` and `--classic-link-vpc-security-groups-ids`.
-* Support for `m4`, `d2`, `t2` and `g2` ebs encryption flavors.
-* Use `--format json` option to list the `ec2 servers` in the json format. Default output format is `summary` though.
-* Use `--attach-network-interface` option to attach additional `network interfaces` to the instance.
-* Added `--disable-api-termination` option to allow users to disable the termination of the instance using the Amazon EC2 console, CLI and API. However, this option won't work for `spot instances` as `termination protection` cannot be enabled for `spot instances`.
-* Added `--spot-wait-mode` option to enable users to give their decision on CLI whether to `wait` for the `spot request fulfillment` or to `exit` before the `spot request fulfillment`. Default value for this option is `prompt` which will prompt the user to give their choice.
+* `--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`.
 
-## Acknowledgements
-
-Our thanks go to contributor **Quentin de Metz** for adding
-[knife-ec2:#322](https://github.com/chef/knife-ec2/pull/322). This
-enables the support for `Classic Link` in the `knife ec2 server create` command.
-
-Our thanks go to contributor **Eric Herot** for adding
-[knife-ec2:#375](https://github.com/chef/knife-ec2/pull/375). This
-enables the users to add additional `Network Interfaces` to the instance before the bootstrap process.
+***Note:*** The `--security-group-ids` option will be removed in a future release. Use the new `--security-group-id` option.

data/knife-ec2.gemspec

@@ -1,29 +1,30 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
-require 'knife-ec2/version'
-
-Gem::Specification.new do |s|
-  s.name         = 'knife-ec2'
-  s.version      = Knife::Ec2::VERSION
-  s.authors      = ['Adam Jacob', 'Seth Chisamore']
-  s.email        = ['adam@chef.io', 'schisamo@chef.io']
-  s.homepage     = 'https://github.com/chef/knife-ec2'
-  s.summary      = "EC2 Support for Chef's Knife Command"
-  s.description  = s.summary
-  s.license      = 'Apache-2.0'
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-
-  s.add_dependency 'fog-aws',       '~> 0.7'
-  s.add_dependency 'mime-types'
-  s.add_dependency 'knife-windows', '~> 1.0'
-
-  s.add_development_dependency 'chef',  '~> 12.0', '>= 12.2.1'
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rake',  '~> 10.1'
-  s.add_development_dependency 'sdoc',  '~> 0.3'
-
-  s.require_paths = ['lib']
-end
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'knife-ec2/version'
+
+Gem::Specification.new do |s|
+  s.name         = 'knife-ec2'
+  s.version      = Knife::Ec2::VERSION
+  s.authors      = ['Adam Jacob', 'Seth Chisamore']
+  s.email        = ['adam@chef.io', 'schisamo@chef.io']
+  s.homepage     = 'https://github.com/chef/knife-ec2'
+  s.summary      = "EC2 Support for Chef's Knife Command"
+  s.description  = s.summary
+  s.license      = 'Apache-2.0'
+
+  s.files        = `git ls-files`.split("\n")
+  s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
+  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 'mime-types'
+  s.add_dependency 'knife-windows', '~> 1.0'
+
+  s.add_development_dependency 'chef',  '~> 12.0', '>= 12.2.1'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rake',  '~> 11.0'
+  s.add_development_dependency 'sdoc',  '~> 0.3'
+
+  s.require_paths = ['lib']
+end

data/lib/chef/knife/ec2_flavor_list.rb

@@ -1,53 +1,58 @@
-#
-# Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) 2012-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'
-
-class Chef
-  class Knife
-    class Ec2FlavorList < Knife
-
-      include Knife::Ec2Base
-
-      banner "knife ec2 flavor list (options)"
-
-      def run
-
-        validate!
-
-        flavor_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('Architecture', :bold),
-          ui.color('RAM', :bold),
-          ui.color('Disk', :bold),
-          ui.color('Cores', :bold)
-        ]
-        connection.flavors.sort_by(&:id).each do |flavor|
-          flavor_list << flavor.id.to_s
-          flavor_list << flavor.name
-          flavor_list << "#{flavor.bits.to_s}-bit"
-          flavor_list << "#{flavor.ram.to_s}"
-          flavor_list << "#{flavor.disk.to_s} GB"
-          flavor_list << flavor.cores.to_s
-        end
-        puts ui.list(flavor_list, :columns_across, 6)
-      end
-    end
-  end
-end
+#
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2012-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'
+
+class Chef
+  class Knife
+    class Ec2FlavorList < Knife
+
+      include Knife::Ec2Base
+
+      banner "knife ec2 flavor list (options)"
+
+      def run
+
+        validate!
+
+        flavor_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Architecture', :bold),
+          ui.color('RAM', :bold),
+          ui.color('Disk', :bold),
+          ui.color('Cores', :bold)
+        ]
+        flavors = connection.flavors.sort_by(&:id)
+        if (config[:format] == 'summary')
+          flavors.each do |flavor|
+            flavor_list << flavor.id.to_s
+            flavor_list << flavor.name
+            flavor_list << "#{flavor.bits.to_s}-bit"
+            flavor_list << "#{flavor.ram.to_s}"
+            flavor_list << "#{flavor.disk.to_s} GB"
+            flavor_list << flavor.cores.to_s
+          end
+          puts ui.list(flavor_list, :columns_across, 6)
+	else
+          output(format_for_display(flavors))
+	end
+      end
+    end
+  end
+end

data/lib/chef/knife/ec2_server_create.rb

@@ -67,10 +67,28 @@ class Chef
         :proc => Proc.new { |groups| groups.split(',') }
 
       option :security_group_ids,
-        :short => "-g 'X,Y,Z'",
         :long => "--security-group-ids 'X,Y,Z'",
-        :description => "The security group ids for this server; required when using VPC,Please provide values in format --security-group-ids 'X,Y,Z'",
-        :proc => Proc.new { |security_group_ids| security_group_ids.split(',') }
+        :description => "The security group ids for this server; required when using VPC. Provide values in format --security-group-ids 'X,Y,Z'. [DEPRECATED] This option will be removed in future release. Use the new --security-group-id option. ",
+        :proc => Proc.new { |security_group_ids|
+          ui.warn('[DEPRECATED] This option will be removed in future release. Use the new --security-group-id option multiple times when specifying multiple groups for e.g. -g sg-e985168d -g sg-e7f06383 -g sg-ec1b7e88.')
+          if security_group_ids.gsub(' ', '').split(',').size > 1
+            Chef::Config[:knife][:security_group_ids] = security_group_ids.gsub(' ', '').split(',')
+          else
+            Chef::Config[:knife][:security_group_ids] ||= []
+            Chef::Config[:knife][:security_group_ids].push(security_group_ids)
+            Chef::Config[:knife][:security_group_ids]
+          end
+        }
+
+      option :security_group_id,
+        :short => "-g SECURITY_GROUP_ID",
+        :long => "--security-group-id ID",
+        :description => "The security group id for this server; required when using VPC. Use the --security-group-id option multiple times when specifying multiple groups for e.g. -g sg-e985168d -g sg-e7f06383 -g sg-ec1b7e88.",
+        :proc => Proc.new { |security_group_id|
+          Chef::Config[:knife][:security_group_ids] ||= []
+          Chef::Config[:knife][:security_group_ids].push(security_group_id)
+          Chef::Config[:knife][:security_group_ids]
+        }
 
       option :associate_eip,
         :long => "--associate-eip IP_ADDRESS",
@@ -426,7 +444,6 @@ class Chef
 
       def run
         $stdout.sync = true
-
         validate!
 
         requested_elastic_ip = config[:associate_eip] if config[:associate_eip]
@@ -436,7 +453,7 @@ class Chef
 
         if locate_config_value(:spot_price)
           server_def = create_server_def
-          server_def[:groups] = config[:security_group_ids] if vpc_mode?
+          server_def[:groups] = server_def[:security_group_ids] if vpc_mode?
           spot_request = connection.spot_requests.create(server_def)
           msg_pair("Spot Request ID", spot_request.id)
           msg_pair("Spot Request Type", spot_request.request_type)
@@ -469,7 +486,13 @@ class Chef
           puts("\n")
           @server = connection.servers.get(spot_request.instance_id)
         else
-          @server = connection.servers.create(create_server_def)
+          begin
+            @server = connection.servers.create(create_server_def)
+          rescue => error
+            ui.error error.message
+            Chef::Log.debug("#{error.backtrace.join("\n")}")
+            exit
+          end
         end
 
         hashed_tags={}
@@ -696,7 +719,7 @@ class Chef
         bootstrap.config[:encrypted_data_bag_secret] = s3_secret || locate_config_value(:secret)
         bootstrap.config[:encrypted_data_bag_secret_file] = locate_config_value(:secret_file)
         # retrieving the secret from S3 is unique to knife-ec2, so we need to set "command line secret" to the value fetched from S3
-        # When linux vm is spawned, the chef's secret option proc function sets the value "command line secret" and this value is used by 
+        # When linux vm is spawned, the chef's secret option proc function sets the value "command line secret" and this value is used by
         # chef's code to check if secret option is passed through command line or not
         Chef::Knife::DataBagSecretOptions.set_cl_secret(s3_secret) if locate_config_value(:s3_secret)
         bootstrap.config[:secret] = s3_secret || locate_config_value(:secret)
@@ -852,7 +875,8 @@ class Chef
           exit 1
         end
 
-        if config[:security_group_ids] && config[:security_group_ids].class == String
+        # Validation for security_group_ids passed through knife.rb. It will raise error if values are not provided in Array.
+        if locate_config_value(:security_group_ids) && locate_config_value(:security_group_ids).class == String
           ui.error("Invalid value type for knife[:security_group_ids] in knife configuration file (i.e knife.rb). Type should be array. e.g - knife[:security_group_ids] = ['sgroup1']")
           exit 1
         end
@@ -932,10 +956,10 @@ class Chef
 
       def ssl_config_user_data
       user_related_commands = ""
-      winrm_user = locate_config_value(:winrm_user).split("\\") 
+      winrm_user = locate_config_value(:winrm_user).split("\\")
       if (winrm_user[0] == ".") || (winrm_user[0] == "") ||(winrm_user.length == 1)
         user_related_commands = <<-EOH
-net user /add #{locate_config_value(:winrm_user).delete('.\\')} #{windows_password}; 
+net user /add #{locate_config_value(:winrm_user).delete('.\\')} #{windows_password};
 net localgroup Administrators /add #{locate_config_value(:winrm_user).delete('.\\')};
         EOH
       end
@@ -985,13 +1009,14 @@ EOH
         server_def = {
           :image_id => locate_config_value(:image),
           :groups => config[:security_groups],
-          :security_group_ids => locate_config_value(:security_group_ids),
           :flavor_id => locate_config_value(:flavor),
           :key_name => locate_config_value(:ssh_key_name),
           :availability_zone => locate_config_value(:availability_zone),
           :price => locate_config_value(:spot_price),
           :request_type => locate_config_value(:spot_request_type)
         }
+
+        server_def[:security_group_ids] = locate_config_value(:security_group_ids)
         server_def[:subnet_id] = locate_config_value(:subnet_id) if vpc_mode?
         server_def[:private_ip_address] = locate_config_value(:private_ip_address) if vpc_mode?
         server_def[:placement_group] = locate_config_value(:placement_group)

data/lib/knife-ec2/version.rb

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

data/spec/unit/ec2_flavor_list_spec.rb

@@ -0,0 +1,74 @@
+# 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'
+require 'chef/knife/ec2_flavor_list'
+
+describe Chef::Knife::Ec2FlavorList do
+
+  describe '#run' do
+    let(:knife_flavor_list) { Chef::Knife::Ec2FlavorList.new }
+    let(:ec2_connection) { double(Fog::Compute::AWS) }
+    before do
+      allow(knife_flavor_list).to receive(:connection).and_return(ec2_connection)
+      @flavor1 = double("flavor1", :name => "High-CPU Medium", :architecture => "32-bit-bit", :id => "c1.medium", :bits => "32-bit", :cores => "5", :disk => "1740.8 GB", :ram => "350 GB", :ebs_optimized_available => "false", :instance_store_volumes => "0")
+
+      allow(ec2_connection).to receive(:flavors).and_return([@flavor1])
+
+    end
+
+    it 'invokes validate!' do
+      ec2_flavors = double(:sort_by => [])
+
+      allow(ec2_connection).to receive(:flavors).and_return(ec2_flavors)
+      allow(knife_flavor_list.ui).to receive(:warn)
+      expect(knife_flavor_list).to receive(:validate!)
+      knife_flavor_list.run
+    end
+
+
+    context '--format option' do
+      context 'when format=summary' do
+        before do
+	  @output_s=["ID", "Name", "Architecture", "RAM", "Disk", "Cores", "c1.medium", "High-CPU Medium", "32-bit-bit", "350 GB", "1740.8 GB GB", "5"]
+          knife_flavor_list.config[:format] = 'summary'
+          allow(knife_flavor_list.ui).to receive(:warn)
+          allow(knife_flavor_list).to receive(:validate!)
+        end
+
+        it 'shows the output in summary format' do
+          expect(knife_flavor_list.ui).to receive(:list).with(@output_s,:columns_across,6)
+          knife_flavor_list.run
+        end
+      end
+
+      context 'when format=json' do
+        before do
+          knife_flavor_list.config[:format] = 'json'
+          allow(knife_flavor_list.ui).to receive(:warn)
+        end
+
+        it 'shows the output in json format' do
+          allow(ec2_connection).to receive(:flavors).and_return([])
+          allow(knife_flavor_list).to receive(:validate!)
+          allow(knife_flavor_list).to receive(:format_for_display)
+          expect(knife_flavor_list).to receive(:output)
+          knife_flavor_list.run
+        end
+      end
+    end
+end
+end