knife-cloud 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14967b2a6c892d13a80954bb92d7e1b8b11483841f652dac47c15083ecb8fa9a
-  data.tar.gz: 77f8e21894cade4f427f36edc31eedfe356d191cdcf08e937103dbeb50195699
+  metadata.gz: ab894f4c13f8b1a6d3c12528fdaab52966a1a7190a0ac2d513c03b8c868f9721
+  data.tar.gz: dedf79aebeee5a7d3c55d8363850891b1f0821a2d98569ec40f63abe5632673f
 SHA512:
-  metadata.gz: 93ff890440681e628563a8c38c326d9f5a1038109a4a0dc1d70af00bef148f5bbcb480767b525395e8037a1356db323606558c9359c85a5610cb4378b023138e
-  data.tar.gz: c6e0dafb2549647989171894755263651630808bd1dcb5b63c18da0ef434ad32cea99f2546861ba0f410dd49551a4f81f649d4b626422555dc63e669bcb30e90
+  metadata.gz: 12d02e53f211b9824c5dbb0e8bc0bec8630437cc9d6de8d88842fba4bb3e5f6c227e4bedd9894a8d6e959f85d03aa9281b480935f57e98e640df80b11545ccf9
+  data.tar.gz: 2363fdea3d79b36750aa598a79cdff9ee3b8f1e59899af2f0ff916aeedcae992ecb6d3d2982ca86ebd97b59f8dde2c23ece4af61c930305dfebf90f9360b9243

data/lib/chef/knife/cloud/chefbootstrap/ssh_bootstrap_protocol.rb

@@ -32,12 +32,12 @@ class Chef
         end
 
         def init_bootstrap_options
-          bootstrap.config[:connection_user] = @config[:connection_user]
-          bootstrap.config[:connection_password] = @config[:connection_password]
+          bootstrap.config[:connection_user] = config[:connection_user]
+          bootstrap.config[:connection_password] = config[:connection_password]
           bootstrap.config[:connection_port] = config[:connection_port]
-          bootstrap.config[:ssh_identity_file] = @config[:ssh_identity_file]
-          bootstrap.config[:ssh_verify_host_key] = @config[:ssh_verify_host_key]
-          bootstrap.config[:use_sudo] = true unless @config[:connection_user] == "root"
+          bootstrap.config[:ssh_identity_file] = config[:ssh_identity_file]
+          bootstrap.config[:ssh_verify_host_key] = config[:ssh_verify_host_key]
+          bootstrap.config[:use_sudo] = true unless config[:connection_user] == "root"
           bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
           bootstrap.config[:forward_agent] = config[:forward_agent]
           bootstrap.config[:use_sudo_password] = config[:use_sudo_password]
@@ -45,19 +45,19 @@ class Chef
         end
 
         def wait_for_server_ready
-          print "\n#{ui.color("Waiting for sshd to host (#{@config[:bootstrap_ip_address]})", :magenta)}"
+          print "\n#{ui.color("Waiting for sshd to host (#{config[:bootstrap_ip_address]})", :magenta)}"
 
-          ssh_gateway = get_ssh_gateway_for(@config[:bootstrap_ip_address])
+          ssh_gateway = get_ssh_gateway_for(config[:bootstrap_ip_address])
 
           # The ssh_gateway & subnet_id are currently supported only in EC2.
           if ssh_gateway
-            print(".") until tunnel_test_ssh(ssh_gateway, @config[:bootstrap_ip_address]) do
+            print(".") until tunnel_test_ssh(ssh_gateway, config[:bootstrap_ip_address]) do
               @initial_sleep_delay = !!config[:subnet_id] ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
             end
           else
-            print(".") until tcp_test_ssh(@config[:bootstrap_ip_address], config[:connection_port] || config[:ssh_port] ) do
+            print(".") until tcp_test_ssh(config[:bootstrap_ip_address], config[:connection_port] || config[:ssh_port] ) do
               @initial_sleep_delay = !!config[:subnet_id] ? 40 : 10
               sleep @initial_sleep_delay
               puts("done")
@@ -130,7 +130,8 @@ class Chef
         def tunnel_test_ssh(ssh_gateway, hostname, &block)
           status = false
           gateway = configure_ssh_gateway(ssh_gateway)
-          gateway.open(hostname, config[:ssh_port]) do |local_tunnel_port|
+          remote_ssh_port = config[:connection_port] || config[:ssh_port] || 22
+          gateway.open(hostname, remote_ssh_port) do |local_tunnel_port|
             status = tcp_test_ssh("localhost", local_tunnel_port, &block)
           end
           status

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "4.0.0".freeze
+    VERSION = "4.0.2".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.2
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef