knife-ec2 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e33ffae143dd991452c5c1dc7fce4ec921053cae8072accf212d57acc3f964cf
-  data.tar.gz: 9a81e3780a4a27e79dded1ed55a7da645220847577fab770c91279485eed53d7
+  metadata.gz: 7f0efb7449ec88881f143653d3bb282ca3d0e4e682773487cd17c4943e6631b9
+  data.tar.gz: c89dfbbbb331f2258af0797273a58e77f13a321d62b17ec58346f07139fb27a9
 SHA512:
-  metadata.gz: 4d83c87ad3197f86932377a362e7edd615608f24cbd2a00935b1587810b39e1273bacd49ec7707ccac3c5b7e7fd25d77425acfd7b07c1077d7c43182245a7526
-  data.tar.gz: 5142010c2db7c748237c9d1dfcc9a8d21f27ca81ead0afa098742c3a1b248eef6d22d027f1140b02c4be0313356f0a862cf85268887ebb2aba6b6e36afd1465d
+  metadata.gz: 19f0cfcf4ced0fadfc2763cab088c15faa743f932f334fd8ffdd869c011284b32e281576cfaa3195e1a6b4fd97f7cf28bd29f1142b5983e8fba33ad7ed707830
+  data.tar.gz: ba73cea8ba3d9baed0553ed7dca881e3b4756b8324015a99672937e0cbb7ba4dc0c00412200ffb21db61a15ec1090dbc5b9d1d9d49a197289c9dfcaef58585ba

data/lib/chef/knife/ec2_base.rb

@@ -1,3 +1,4 @@
+
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
 # Copyright:: Copyright (c) 2011-2019 Chef Software, Inc.
@@ -67,8 +68,7 @@ class Chef
           option :region,
             long: "--region REGION",
             description: "Your AWS region",
-            proc: Proc.new { |key| Chef::Config[:knife][:region] = key },
-            default: "us-east-1"
+            proc: Proc.new { |key| Chef::Config[:knife][:region] = key }
 
           option :use_iam_profile,
             long: "--use-iam-profile",
@@ -81,8 +81,8 @@ class Chef
 
       def connection_string
         conn = {}
-        conn[:region] = locate_config_value(:region)
-        Chef::Log.debug "Using AWS region #{locate_config_value(:region)}"
+        conn[:region] = locate_config_value(:region) || "us-east-1"
+        Chef::Log.debug "Using AWS region #{conn[:region]}"
         conn[:credentials] =
           if locate_config_value(:use_iam_profile)
             Chef::Log.debug "Using iam profile for authentication as use_iam_profile set"
@@ -145,7 +145,6 @@ class Chef
         %w{ebs_optimized image_id instance_id instance_type key_name platform public_dns_name public_ip_address private_dns_name private_ip_address root_device_type}.each do |id|
           server_data[id] = server_obj.instances[0].send(id)
         end
-
         server_data["availability_zone"] = server_obj.instances[0].placement.availability_zone
         server_data["groups"] = server_obj.groups.map(&:name)
         server_data["iam_instance_profile"] = ( server_obj.instances[0].iam_instance_profile.nil? ? nil : server_obj.instances[0].iam_instance_profile.arn[%r{instance-profile/(.*)}] )
@@ -204,7 +203,6 @@ class Chef
         errors = [] # track all errors so we report on all of them
 
         validate_aws_config_file! if locate_config_value(:aws_config_file)
-
         unless locate_config_value(:use_iam_profile) # skip config file / key validation if we're using iam profile
           # validate the creds file if:
           #   aws keys have not been passed in config / CLI and the default cred file location does exist
@@ -331,7 +329,6 @@ class Chef
       profile = locate_config_value(:aws_profile)
 
       Chef::Log.debug "Using AWS profile #{profile}"
-
       entries = if aws_creds.values.first.key?("AWSAccessKeyId")
                   aws_creds.values.first
                 else

data/lib/knife-ec2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec2
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef