chef 15.0.298-universal-mingw32 → 15.0.300-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c10389685690b3412374156b687dd8a87ff02bb495f32570a0fa33ef25dc9bdf
-  data.tar.gz: 729b33c025af44c37f7f9f6091c8a5ca03904b45a654307c89590d9d7a75fc03
+  metadata.gz: 5ac1355fd1d581480c9d391d2d42d7540de2cf59d6fe333c05c3c5c69f04989d
+  data.tar.gz: 386c6ced23a3d12ab56632dc78058bd48b92e673beb107fd84f45489d4fdcf5d
 SHA512:
-  metadata.gz: c2f72876a8a9d4e554eca0aa39722d06bf64906530a9c662129a1c6ec8877ec1bab3c1af68e4c898da854eb07194198eb3cf88846599008759ba3af99da80ee9
-  data.tar.gz: 93eefee2050f499f0c9c51744a95e40014f7c271171508905ca7441548995f147254f88e542607637a20a1dee71a8ac3df711bdf01f1e99e69bf3977bf5cec50
+  metadata.gz: 4ff6557d77f8f6eaffa1da837b4ca8d40f6437da864486f1f242f34d19ee410b8e51d76c9a2e71bcf24c05a21eb18b72684529bad7e671d2da4e9e0d07d8fc04
+  data.tar.gz: 98879492b6a65dc1d8d766c5f2ee04f55618a6a1ea6aca6b0e7f4dae16135fc3f26483e29e585e1e94b013e331a22d2ccdb96994b7f16e5d3378e08417709b5f

data/lib/chef/application/apply.rb

@@ -27,8 +27,10 @@ require "tempfile"
 require_relative "../providers"
 require_relative "../resources"
 require_relative "../dist"
+require "license_acceptance/cli_flags/mixlib_cli"
 
 class Chef::Application::Apply < Chef::Application
+  include LicenseAcceptance::CLIFlags::MixlibCLI
 
   banner "Usage: chef-apply [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]"
 

data/lib/chef/application/solo.rb

@@ -30,10 +30,12 @@ require "pathname"
 require "chef-config/mixin/dot_d"
 require "mixlib/archive"
 require_relative "../dist"
+require "license_acceptance/cli_flags/mixlib_cli"
 
 class Chef::Application::Solo < Chef::Application
   include Chef::Mixin::ShellOut
   include ChefConfig::Mixin::DotD
+  include LicenseAcceptance::CLIFlags::MixlibCLI
 
   option :config_file,
     short: "-c CONFIG",

data/lib/chef/knife/bootstrap.rb

@@ -865,6 +865,7 @@ class Chef
       def ssh_opts
         opts = {}
         return opts if winrm?
+        opts[:pty] = true # ensure we can talk to systems with requiretty set true in sshd config
         opts[:non_interactive] = true # Prevent password prompts from underlying net/ssh
         opts[:forward_agent] = (config_value(:ssh_forward_agent) === true)
         opts[:connection_timeout] = session_timeout

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("15.0.298")
+  VERSION = Chef::VersionString.new("15.0.300")
 end
 
 #

data/spec/unit/knife/bootstrap_spec.rb

@@ -1015,6 +1015,7 @@ describe Chef::Knife::Bootstrap do
                 verify_host_key: false,
                 port: 9999,
                 non_interactive: true,
+                pty: true,
               }
             end
 
@@ -1069,6 +1070,7 @@ describe Chef::Knife::Bootstrap do
                 verify_host_key: false, # Config
                 port: 12, # cli
                 non_interactive: true,
+                pty: true,
               }
             end
 
@@ -1120,6 +1122,7 @@ describe Chef::Knife::Bootstrap do
                 sudo_password: "blah",
                 verify_host_key: true,
                 non_interactive: true,
+                pty: true,
               }
             end
             it "generates a config hash using the CLI options and pulling nothing from Chef::Config" do
@@ -1143,6 +1146,7 @@ describe Chef::Knife::Bootstrap do
               sudo: false,
               verify_host_key: "always",
               non_interactive: true,
+              pty: true,
               connection_timeout: 60,
             }
           end
@@ -1491,33 +1495,38 @@ describe Chef::Knife::Bootstrap do
 
     context "for ssh" do
       let(:connection_protocol) { "ssh" }
+      let(:default_opts) do
+        {
+          non_interactive: true,
+          pty: true,
+          forward_agent: false,
+          connection_timeout: 60,
+        }
+      end
+
+      context "by default" do
+        it "returns a configuration hash with appropriate defaults" do
+          expect(knife.ssh_opts).to eq default_opts
+        end
+      end
+
       context "when ssh_forward_agent has a value" do
         before do
           knife.config[:ssh_forward_agent] = true
         end
-        it "returns a configuration hash with forward_agent set to true. non-interactive is always true" do
-          expect(knife.ssh_opts).to eq({ forward_agent: true, non_interactive: true, connection_timeout: 60 })
-        end
-      end
-      context "when ssh_forward_agent is not set" do
-        it "returns a configuration hash with forward_agent set to false. non-interactive is always true" do
-          expect(knife.ssh_opts).to eq({ forward_agent: false, non_interactive: true, connection_timeout: 60 })
+        it "returns a default configuration hash with forward_agent set to true" do
+          expect(knife.ssh_opts).to eq(default_opts.merge(forward_agent: true))
         end
       end
       context "when session_timeout has a value" do
         before do
           knife.config[:session_timeout] = 120
         end
-        it "returns a configuration hash with connection_timeout value." do
-          expect(knife.ssh_opts).to eq({ forward_agent: false, non_interactive: true, connection_timeout: 120 })
+        it "returns a default configuration hash with updated timeout value." do
+          expect(knife.ssh_opts).to eq(default_opts.merge(connection_timeout: 120))
         end
       end
 
-      context "when session_timeout is not set" do
-        it "returns a configuration hash with connection_timeout default value." do
-          expect(knife.ssh_opts).to eq({ forward_agent: false, non_interactive: true, connection_timeout: 60 })
-        end
-      end
     end
 
     context "for winrm" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 15.0.298
+  version: 15.0.300
 platform: universal-mingw32
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.0.298
+        version: 15.0.300
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 15.0.298
+        version: 15.0.300
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement