chef 15.0.298 → 15.0.300

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b293f2dac872896fb4ac6d2dc09560081d1006de026029e49c6606221705ffdd
-  data.tar.gz: 5f7d52f20ee3cc309e7cfd39d0c56dae508932ee5bc09adc715c302add02f9c5
+  metadata.gz: e4b36b19afe184d6706720584f6729c6a3b46f2a32e8ed67eeca373415b48690
+  data.tar.gz: e77a1e46552fdbe8b14d679aa492c66214681d61c72af1a4831ab8212ec5bfb4
 SHA512:
-  metadata.gz: 44f5de263c381eae657200dec44bc46076b512ab16697e34a35932b02cdd2ea61e68a98c4ec46e52413959b7ed05b6305cd1770d79ddf5f5f2a0b7ada48ef683
-  data.tar.gz: 754dcd27ab528570a747ee28de3578274d1531044953b18f05aec2cd440281e88660958f2be91d5c04ef59ea46d50a7df315dcd215c333c1389d6f0f99209cb8
+  metadata.gz: ea0e6d34fa26f682f679b4a2c5028fb079c06c0ea6c81439ae884101b592699151a8ef78fcf082ebb77143d3a80f7ac26f3092dbe403cfeedb5c92deb55ba961
+  data.tar.gz: c35e472b0853dd9d850fd5aa5b1a3858073d3306f4186913e8914270376cbce52e68830b4e5bdd709e6ff3be22e8aa6ca4b89fce361c2f2a5126848de19c0b17

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: ruby
 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