knife-ec2 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6444d46c88ab7fe3b303af2b9cb993633791d89d98a53690658ca5932825d29
-  data.tar.gz: 00321d501e212ec768eb08357645d740f33abea1cd0b63c31e6fc2e9f7ab80dd
+  metadata.gz: 2a3fdcffedb74d76729664d669caf940e0db52d409d1446a59ecab5a99f7e964
+  data.tar.gz: 772b31f6f5fbe26aa79df7901800a70a0df966bb79c4d12424404d004a8d0c20
 SHA512:
-  metadata.gz: 703b96ddffb5e8a282d37b6e730dbea8872d2fa9792d097e1315f6cfffea42ef14c6b87cda9b06089263f5a184f22f509c3e68783e30906cdc2fe74ac7c28279
-  data.tar.gz: 278c42337c36b0dd30e3d5a7bfcd7a9976573545a6673bdea928197f1b27513f77a8e06d893492217c5f36ea05e8fd8d913f763a8b2d0ad38d40b404491fda63
+  metadata.gz: f10320284eb70e6bd330e2ae6d2a5c34a6fdbae7ebf44fd96b30b18dee17fb760f7bdb6e73bd5e18f180230172fd646a49aad70ab617192f447e656081fdd5e2
+  data.tar.gz: 446c213c86fb0109072137940c064c309f1b60b6cd2eab7c2470dd3f0ed3fc72a5fc98132810b1ffacb9e71d3eda89d4ccf1b483210e3644388d9727efaba41a

data/lib/chef/knife/ec2_base.rb

@@ -328,7 +328,7 @@ class Chef
 
       aws_creds = ini_parse(File.read(aws_cred_file_location))
       profile = locate_config_value(:aws_profile)
-
+      profile = "profile #{profile}" if profile != "default"
       Chef::Log.debug "Using AWS profile #{profile}"
       entries = if aws_creds.values.first.key?("AWSAccessKeyId")
                   aws_creds.values.first

data/lib/chef/knife/ec2_server_create.rb

@@ -391,7 +391,7 @@ class Chef
           Chef::Config[:validation_key] = validation_key_path
         end
 
-        config[:connection_protocol] ||= connection_protocol
+        config[:connection_protocol] ||= connection_protocol_ec2
         config[:connection_port] ||= connection_port
 
         # Check if Server is Windows or Linux
@@ -1369,7 +1369,7 @@ class Chef
 
       # TODO: connection_protocol and connection_port used to choose winrm/ssh or 5985/22 based on the image chosen
       def connection_port
-        port = config_value(:connection_port, knife_key_for_protocol(connection_protocol, :port))
+        port = config_value(:connection_port, knife_key_for_protocol(connection_protocol_ec2, :port))
         return port if port
 
         assign_default_port
@@ -1388,19 +1388,19 @@ class Chef
 
       # url values override CLI flags, if you provide both
       # we'll use the one that you gave in the URL.
-      def connection_protocol
-        return @connection_protocol if @connection_protocol
+      def connection_protocol_ec2
+        return @connection_protocol_ec2 if @connection_protocol_ec2
 
         default_protocol = is_image_windows? ? "winrm" : "ssh"
 
         from_url = host_descriptor =~ %r{^(.*)://} ? $1 : nil
         from_cli = config[:connection_protocol]
         from_knife = Chef::Config[:knife][:connection_protocol]
-        @connection_protocol = from_url || from_cli || from_knife || default_protocol
+        @connection_protocol_ec2 = from_url || from_cli || from_knife || default_protocol
       end
 
       def connection_user
-        @connection_user ||= config_value(:connection_user, knife_key_for_protocol(connection_protocol, :user))
+        @connection_user ||= config_value(:connection_user, knife_key_for_protocol(connection_protocol_ec2, :user))
       end
 
       def server_name

data/lib/knife-ec2/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ec2
-    VERSION = "1.0.20".freeze
+    VERSION = "1.0.21".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.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef