knife-ec2 0.19.10 → 0.19.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210fda04e631953dc8b84274ed591ecac3e227d8d2580b945e67c839c3d74933
-  data.tar.gz: 3d3823d890a88338bd47b26e117429a84fdd3a96573f568a96bf04a19585d62d
+  metadata.gz: 36f36dcc3af7f71e09d9c152c2048afe989a0188b9f3f35eaad1fa4946c63798
+  data.tar.gz: 7f762a705fc5ce0fa0e9c4de6fba412f88305a1f94def855623c0a7de3ae4eb7
 SHA512:
-  metadata.gz: 60e078f29f93de0ac1a3646b0a1753dacb8e0f354a7305d0019fe3a123d4151bc3b20b1ee21e297d4d5c19e353fdd3838d715391a23b1a08d3202c329f79d220
-  data.tar.gz: 52e6175ceb27c8d1e6edc080ee534d1dd6027d47d4c47ef1a92703116b502fd3700f16f4dbf96d5368df7ab7384af1d246404142558bb997e93cd94126f5f6d9
+  metadata.gz: d0805a3da85de1928937634b592eadc256edd91ca5582731e5ad845f86887d3e42663c6521b767992512081d5d56abd0a149daa0a76097f15f8d5d50619dbb02
+  data.tar.gz: 00d912e5b589ad93405ccf625026b7cfae01c157b37393d4f238e9eb11fa8216f2048ea7d04b937fe42b761a2f733c42b9dfb0ab4e133a81c2a94e54878343d8

data/.expeditor/config.yml

@@ -17,6 +17,9 @@ github:
   minor_bump_labels:
     - "Expeditor: Bump Minor Version"
 
+changelog:
+  rollup_header: Changes not yet released to rubygems.org
+
 # These actions are taken, in order they are specified, anytime a Pull Request is merged.
 merge_actions:
   - built_in:bump_version:

data/.travis.yml

@@ -15,6 +15,6 @@ branches:
   only:
   - master
 
-bundler_args: --without docs development
+bundler_args: --jobs 7 --without docs debug
 
 script: bundle exec rake

data/CHANGELOG.md

@@ -4,43 +4,48 @@ 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.19.10 -->
-## [v0.19.10](https://github.com/chef/knife-ec2/tree/v0.19.10) (2018-08-06)
+<!-- latest_release 0.19.12 -->
+## [v0.19.12](https://github.com/chef/knife-ec2/tree/v0.19.12) (2018-11-28)
 
 #### Merged Pull Requests
-- If no keys specified on CLI/config use an AWS credential file if present [#548](https://github.com/chef/knife-ec2/pull/548) ([tas50](https://github.com/tas50))
+- Pass bootstrap template in common config [#560](https://github.com/chef/knife-ec2/pull/560) ([scotthain](https://github.com/scotthain))
 <!-- latest_release -->
 
-<!-- release_rollup since=0.18.2 -->
-### Changes since 0.18.2 release
+<!-- release_rollup since=0.19.10 -->
+### Changes not yet released to rubygems.org
 
 #### Merged Pull Requests
-- If no keys specified on CLI/config use an AWS credential file if present [#548](https://github.com/chef/knife-ec2/pull/548) ([tas50](https://github.com/tas50)) <!-- 0.19.10 -->
-- Remove executables from gemspec and cleanup test files [#549](https://github.com/chef/knife-ec2/pull/549) ([tas50](https://github.com/tas50)) <!-- 0.19.9 -->
-- Remove mime-types dependency [#550](https://github.com/chef/knife-ec2/pull/550) ([tas50](https://github.com/tas50)) <!-- 0.19.8 -->
-- Remove readline dep which we&#39;re not using [#547](https://github.com/chef/knife-ec2/pull/547) ([tas50](https://github.com/tas50)) <!-- 0.19.7 -->
-- Removed deprecated options distro and template_file flags in server create command [#542](https://github.com/chef/knife-ec2/pull/542) ([tas50](https://github.com/tas50)) <!-- 0.19.6 -->
-- Provide a unique console color for us-east-1f availability zone [#541](https://github.com/chef/knife-ec2/pull/541) ([tas50](https://github.com/tas50)) <!-- 0.19.5 -->
-- Improve the AMI missing error and improve the readme example [#543](https://github.com/chef/knife-ec2/pull/543) ([tas50](https://github.com/tas50)) <!-- 0.19.4 -->
-- Lazy load deps and avoid double loading [#544](https://github.com/chef/knife-ec2/pull/544) ([tas50](https://github.com/tas50)) <!-- 0.19.3 -->
-- Allow for fog-aws 1.0 - 3.0 dep to bring in bugfixes and new region support [#545](https://github.com/chef/knife-ec2/pull/545) ([tas50]
-- Clarify which AWS CLI tools we&#39;re talking about [#540](https://github.com/chef/knife-ec2/pull/540) ([tas50](https://github.com/tas50)) <!-- 0.19.2 -->
-- Fix knife ami list --group flag description [#539](https://github.com/chef/knife-ec2/pull/539) ([tas50](https://github.com/tas50)) <!-- 0.19.1 -->
-- Rewrite the credentials section of the readme with new recommendations [#538](https://github.com/chef/knife-ec2/pull/538) ([tas50](https://github.com/tas50)) <!-- 0.19.0 -->
-- Update installation instructions in the readme to push ChefDK [#537](https://github.com/chef/knife-ec2/pull/537) ([tas50](https://github.com/tas50)) <!-- 0.18.7 -->
-- Add codeowners and PR template files [#533](https://github.com/chef/knife-ec2/pull/533) ([tas50](https://github.com/tas50)) <!-- 0.18.6 -->
-- Move contributing docs out of the repo [#535](https://github.com/chef/knife-ec2/pull/535) ([tas50](https://github.com/tas50)) <!-- 0.18.5 -->
-- Bump copyrights &amp; minor readme updates [#532](https://github.com/chef/knife-ec2/pull/532) ([tas50](https://github.com/tas50)) <!-- 0.18.4 -->
-- Drop Ruby 2.2 + Add Chefstyle + align testing with other projects [#530](https://github.com/chef/knife-ec2/pull/530) ([tas50](https://github.com/tas50)) <!-- 0.18.3 -->
+- Pass bootstrap template in common config [#560](https://github.com/chef/knife-ec2/pull/560) ([scotthain](https://github.com/scotthain)) <!-- 0.19.12 -->
+- Misc cleanup to sync with other gems [#552](https://github.com/chef/knife-ec2/pull/552) ([tas50](https://github.com/tas50)) <!-- 0.19.11 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v0.19.10](https://github.com/chef/knife-ec2/tree/v0.19.10) (2018-08-06)
+
+#### Merged Pull Requests
+- Drop Ruby 2.2 + Add Chefstyle + align testing with other projects [#530](https://github.com/chef/knife-ec2/pull/530) ([tas50](https://github.com/tas50))
+- Bump copyrights &amp; minor readme updates [#532](https://github.com/chef/knife-ec2/pull/532) ([tas50](https://github.com/tas50))
+- Move contributing docs out of the repo [#535](https://github.com/chef/knife-ec2/pull/535) ([tas50](https://github.com/tas50))
+- Add codeowners and PR template files [#533](https://github.com/chef/knife-ec2/pull/533) ([tas50](https://github.com/tas50))
+- Update installation instructions in the readme to push ChefDK [#537](https://github.com/chef/knife-ec2/pull/537) ([tas50](https://github.com/tas50))
+- Rewrite the credentials section of the readme with new recommendations [#538](https://github.com/chef/knife-ec2/pull/538) ([tas50](https://github.com/tas50))
+- Fix knife ami list --group flag description [#539](https://github.com/chef/knife-ec2/pull/539) ([tas50](https://github.com/tas50))
+- Clarify which AWS CLI tools we&#39;re talking about [#540](https://github.com/chef/knife-ec2/pull/540) ([tas50](https://github.com/tas50))
+- Lazy load deps and avoid double loading [#544](https://github.com/chef/knife-ec2/pull/544) ([tas50](https://github.com/tas50))
+- Improve the AMI missing error and improve the readme example [#543](https://github.com/chef/knife-ec2/pull/543) ([tas50](https://github.com/tas50))
+- Provide a unique console color for us-east-1f availability zone [#541](https://github.com/chef/knife-ec2/pull/541) ([tas50](https://github.com/tas50))
+- Removed deprecated options distro and template_file flags in server create command [#542](https://github.com/chef/knife-ec2/pull/542) ([tas50](https://github.com/tas50))
+- Remove readline dep which we&#39;re not using [#547](https://github.com/chef/knife-ec2/pull/547) ([tas50](https://github.com/tas50))
+- Remove mime-types dependency [#550](https://github.com/chef/knife-ec2/pull/550) ([tas50](https://github.com/tas50))
+- Remove executables from gemspec and cleanup test files [#549](https://github.com/chef/knife-ec2/pull/549) ([tas50](https://github.com/tas50))
+- If no keys specified on CLI/config use an AWS credential file if present [#548](https://github.com/chef/knife-ec2/pull/548) ([tas50](https://github.com/tas50))
+<!-- latest_stable_release -->
+
 ## [v0.18.2](https://github.com/chef/knife-ec2/tree/v0.18.2) (2018-07-06)
 
 #### Merged Pull Requests
 - [MSYS-824] fix breaking tag changes &amp; deprecation warning [#527](https://github.com/chef/knife-ec2/pull/527) ([dheerajd-msys](https://github.com/dheerajd-msys))
 - MSYS-798 - Fixes for windows administrator password [#524](https://github.com/chef/knife-ec2/pull/524) ([dheerajd-msys](https://github.com/dheerajd-msys))
-<!-- latest_stable_release -->
 
 
 

data/Gemfile

@@ -2,23 +2,23 @@ source "https://rubygems.org"
 
 gemspec
 
-group :docs do
-  gem "yard"
-  gem "redcarpet"
-  gem "github-markup"
+group :debug do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
 end
 
 group :test do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
-  gem "rspec", "~> 3.0"
-  gem "rake"
   gem "chef", ">= 13.0"
+  gem "chefstyle", "= 0.10.0"
+  gem "rake"
+  gem "rspec", "~> 3.0"
 end
 
-group :development do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
+group :docs do
+  gem "github-markup"
+  gem "redcarpet"
+  gem "yard"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]

data/RELEASE_NOTES.md

@@ -7,15 +7,17 @@ Example Note:
 Details about the thing that changed that needs to get included in the Release Notes in markdown.
 -->
 
-# knife-ec2 0.19.X release notes:
+# knife-ec2 0.19.10 release notes:
 
 Support for Ruby 2.2 and Chef 12.X has been removed as both are now end of life. This gem now requires Ruby 2.3 (Chef 13) or later, which ships in all supported releases of Chef-DK.
 
+Credentials handling has been updated to use Amazon's credentials file unless keys are specified in the knife.rb/config.rb or via the command line. This is now the preferred method of authenticating knife-ec2 with AWS as it prevents credential credential sprawl and credentials showing up in shell history. The readme authentication section has been rewritten and expanded to touch on the various methods of authenticating this plugin.
+
 The long ago deprecated `--distro` and `--template_file` flags for `knife ec2 server create` have been removed. These were no longer used by knife bootstrap so this should have zero impact on knife-ec2 users.
 
 The fog-aws gem dependency has been loosened to allow fog-aws 1.0-3.X instead of just 1.X. This adds new instance types to `knife ec2 flavor list` and adds support for additional regions and availability zones previously not supported.
 
-The credentials section fo the readme has been updated to recommend users use Amazon's credentials and configuration files instead of passing keys on the CLI or adding them to the knife.rb file. This is Amazon's recommended method of storing credentials and support for storing credentials in knife.rb may be removed in a future release in order to remove 3rd party credentials from Chef configuration files.
+Remove the dependency on `mime-types` and `readline` gems, which don't appear to actually be used directly.
 
 # knife-ec2 0.18.0 release notes:
 In this release we have added separate features for tagging EC2 instances in AWS and Chef. Option `--aws-tag` is used for tagging the node in AWS and option `--chef-tag` is used for tagging the node in Chef. Subsequently the `--tag-node-in-chef` and `--tags` are now deprecated.

data/Rakefile

@@ -1,27 +1,13 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) 2008-2018 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 "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task default: [:style, :spec]
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
 Bundler::GemHelper.install_tasks
 
@@ -53,3 +39,5 @@ task :console do
   ARGV.clear
   IRB.start
 end
+
+task default: [:style, :spec]

data/VERSION

@@ -1 +1 @@
-0.19.10
+0.19.12

data/lib/chef/knife/ec2_server_create.rb

@@ -774,6 +774,7 @@ class Chef
         bootstrap.config[:bootstrap_vault_file] = locate_config_value(:bootstrap_vault_file)
         bootstrap.config[:bootstrap_vault_json] = locate_config_value(:bootstrap_vault_json)
         bootstrap.config[:bootstrap_vault_item] = locate_config_value(:bootstrap_vault_item)
+        bootstrap.config[:bootstrap_template] = locate_config_value(:bootstrap_template)
         bootstrap.config[:use_sudo_password] = locate_config_value(:use_sudo_password)
         bootstrap.config[:yes] = locate_config_value(:yes)
         # If --chef-tag is provided then it will be set in chef as single value e.g. --chef-tag "myTag"

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "0.19.10".freeze
+    VERSION = "0.19.12".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 0.19.10
+  version: 0.19.12
 platform: ruby
 authors:
 - Adam Jacob
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws