chef 18.3.0 → 18.4.12

data/lib/chef/resources.rb

@@ -39,6 +39,7 @@ require_relative "resource/chef_sleep"
 require_relative "resource/chef_vault_secret"
 require_relative "resource/chocolatey_config"
 require_relative "resource/chocolatey_feature"
+require_relative "resource/chocolatey_installer"
 require_relative "resource/chocolatey_package"
 require_relative "resource/chocolatey_source"
 require_relative "resource/cron/cron"
@@ -83,6 +84,7 @@ require_relative "resource/link"
 require_relative "resource/locale"
 require_relative "resource/log"
 require_relative "resource/macports_package"
+require_relative "resource/macos_pkg"
 require_relative "resource/macos_userdefaults"
 require_relative "resource/mdadm"
 require_relative "resource/mount"

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.3.0")
+  VERSION = Chef::VersionString.new("18.4.12")
 end
 
 #

data/spec/data/trusted_certs/example.crt

@@ -1,22 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIDkjCCAnoCCQDihI8kxGYTFTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRAwDgYDVQQKEwdZb3VD
-b3JwMRMwEQYDVQQLEwpPcGVyYXRpb25zMRYwFAYDVQQDEw1leGFtcGxlLmxvY2Fs
-MR0wGwYJKoZIhvcNAQkBFg5tZUBleGFtcGxlLmNvbTAeFw0xMzEwMTcxODAxMzVa
-Fw0yMzEwMTUxODAxMzVaMIGKMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAO
-BgNVBAcTB1NlYXR0bGUxEDAOBgNVBAoTB1lvdUNvcnAxEzARBgNVBAsTCk9wZXJh
-dGlvbnMxFjAUBgNVBAMTDWV4YW1wbGUubG9jYWwxHTAbBgkqhkiG9w0BCQEWDm1l
-QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyKBo
-U+Bdni0xZK/NCzdLdi2X+TyW5eahbYMx+r1GDcVqCICvrthBCVLVFsQ8rvOHwTPi
-AxQJGxb9TLSXRgXQSlH6FLjIUceuOtpan3qYVJ1v7AxY4DgNvYBpbtJz5MQedJnT
-g2F+rXzkwaD6CWBqWHeGU0oP3r7bq1AMD6XEsK2w2/zHtG7TEnL45ARv1PsyrU5M
-ZAW/XyoMyq1k2Lpv7YR5kAvTq1+4RSt/it2RFE7R0AVbaQ0MeAnllfySiHHHlaOT
-FVd/qPSiGISxsUmmzA3Z08+0sfJwkrnJXbLscCBYndd7gMGgtczGjJtul0Ch3GFa
-/Pn5McjwF272+usJ1wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCzPePWifWNECsG
-nL8on1AtFMkczE1/pdRS4YUl/Tc926MpezptSja8rL31+4Bom37/wYPG7HygtAQl
-R4FHpAtuqJKPOfjUmDNsIXRFnytrnflTpctDu/Nbj4PDCy01k/sTDUQt+s+lEBL8
-M8ArmfLZ8PCfAwnXmJQ5rggDFKqegjt6z1RsSglbMiASE7+KkpBnzaqH6fET6IQz
-WgAjv6WdRfwgfJjOTSX4XMpCSet9KaWmXExKrxiVng2Uu6E+ShVAyKaGMuc1B7VA
-oxnnVaVapFv5lOWucQr4KkC7EgaUZnyt8duOc8+Yvd+y3Xd2dcHUnmegRxly4jRV
-/lXbFAUb
+MIIFPTCCAyWgAwIBAgIUPv2sKSZA+KW0a4LxgUhiZG48AkswDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMZXhhbXBsZS4uY29tMB4XDTIzMTAxNjE2MzM1M1oXDTMz
+MTAxMzE2MzM1M1owFzEVMBMGA1UEAwwMZXhhbXBsZS4uY29tMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA1NKZJQY7B8xGnaERMX4laepq3u00q1nSDS6j
+03qd1zZkW+ofMFlH5plBvULNO1jdAH9WwyMAwLu87R1QOx9fEz06J81Wtu7jheOU
+EHzn6NwWkUaX+j1oaIHIXrYnrUn5sW8w2wFEky82gPEG5SiZ6otKV2whX1ckSa3W
+ReFihEO/2/zxOEA0QzfIxFDW92wyAMDNM2/O/AMQB2jVxtWhYiqePXVUfQrIrLW1
+ytNmIWl7hoIHfVPgEoGLRe7kbT/QMTCd/lNrzF/rxUo+Aohq3WmVOdUCL4KdDnKS
+tlQFf8L4+9t19KiM9xX4GRMk9WWONk8rHln842ziv00bgD0rB3yZHlHJfGpkLdKv
+VZgcMHp31ZqVFzHapqHmXBVyEqxRIZSkZX4PN5bEdigz3Exf/vys+NAZKyJw35tn
+kF0+V/+vLlbvqZz98DDj+/KGgy7vaF3tBYBAC4px5yvnicDlBZS0GlrF1fufWQRQ
+94n8LVcG47XjaEOufpzj5Xm6ZzTYDyiqO1+mszU6BQH8W8N+sZ+q7hPBkgRZ/WJF
+gXzNh5KPeDv47oXadYXOqNzXR7wkC11H5hmgQFrDCjuc0zTi/y7Iq+NxpkuQJIDD
+/4yNVTHM6GZSeBDH7rpkjL6coShU6fu2QxSofltpz4QxNtbquRtt3A2Se7obhC9g
+OeZfIqsCAwEAAaOBgDB+MB0GA1UdDgQWBBQ8JrC+u1bsL4QTJuIkH4MyZ2+ZWzAf
+BgNVHSMEGDAWgBQ8JrC+u1bsL4QTJuIkH4MyZ2+ZWzAPBgNVHRMBAf8EBTADAQH/
+MCsGA1UdEQQkMCKCC2V4YW1wbGUuY29tgg0qLmV4YW1wbGUuY29thwQKAAABMA0G
+CSqGSIb3DQEBCwUAA4ICAQAVFkQdpfoxzNu2VyhCtrCT8a1PA7Ko+ziPR0GWBxag
+kB3NRGzCVXENuX8OjLAsBRrYDTeUwIZJD2MWLqkhqs+8Bw08c9jdyezeWmgAL0I8
+aTiPET3CwVME78JPvxAJjmdayYFanniAbE3GMk+Bf2pvFTdPI8etY6Brv+uqBbyb
+9pFspp2U05KRqTukVW2YJnWKfMR4VIBzOEA1maGwVMgnC3YPm3qsYqxXqr/jLDCg
+/EFoozne5/mNmvhSKWOUB1gsuv+3wiUOL6aZETY7RJPQADpHhJntCSeapb5DWhyr
+ZzUPGHbAyWqbfwmt7b9Pga4fQOihxi4Nf2ZnnMy32HQVqz2sOU7Fo/5rfejEQfGP
+jxt9b69Hydc3MQJF+eQVYS+NzaZyCX05kLqcGmIP4WKhjx3BkMaZVwjmYfE9WgKR
+Lcwq0aoz4Guh7Q0yICUc0PvxWLAkiXYFhthg05ZplTd+HgY3XCdO4DyG7lgL4b9t
+T6oqZv/7ivJbwTrvQXr6gGPhVq+120/mEw2qsdaQAp8v1ac5UgdCTViDkT45Ivox
+dS8VaqlVymvnLWAXtN92kQeb7bAhRmMZMNpFicFm8VS+alfijQDwhW5kOGpqtCrO
+f3QWYOehrqmHIuKw4ZhCYIy/OWkHR2j5iiZl8RFN2KhHZwLcmQTyxLaBk3SX1kCl
+qA==
 -----END CERTIFICATE-----

data/spec/data/trusted_certs/example_no_cn.crt

@@ -1,36 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
-oYdVLVWSjyoA2l4Xb4LdexAgCg==
+MIIFkzCCA3ugAwIBAgIUFwXNNBdNYJ9+hvGdKqTqEF+XwiMwDQYJKoZIhvcNAQEL
+BQAwQjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkZMMRQwEgYDVQQKDAtFeGFtcGxl
+IENvbTEQMA4GA1UECwwHVW5rbm93bjAeFw0yMzEwMTYxNjQ1NTlaFw0zMzEwMTMx
+NjQ1NTlaMEIxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJGTDEUMBIGA1UECgwLRXhh
+bXBsZSBDb20xEDAOBgNVBAsMB1Vua25vd24wggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQC+Hzs1xpvg7sPFIry6LO0IIvERaP2ncmQd3lPhQ1nRHqAv2Tkq
+dSNxJ0kadXw015Ze6n7+L5o8PXqPwFooaFLHqJv/iBWQvEBBCoaRoKF1mNMaaQ7c
+dD22bSeG5R01Silnewzt6fG2TdQ3hVjLMsApLEzYCUpqWXvYy/+Aqixfg9nTN+sH
+3xHTibNS69LDD+xDQ3q1IDAqLxvF7zBir5UQ7XbK2D2QrgEQ+OM5rXbkcM3KFIh0
+bGKN7NyP202drGwcTy3DDq5ojfyC9fIRT2YuAAAZO6UFRmc9Dr59F1ukGe6m4lxq
+4u4Pj0LlLdB8ufbCb5wr7bRXuGCWfwGAQrK9z5YlTxoCb9wmA80spM7xSQRewAb6
+ibJB9FwdjItwZf2YkMmSy3lt63HunN62DvlfvHzQBd5sfNSOX09i/VCxuy2xget2
+F2ToOyWpjLt/+Vqni8S8ZiD9M8X0lWApwtkDWDxFMFPSAPlerqCcQANhGN3PKSMj
+jHxU20oNxs6LkxQJPLJZCkBz2Y2ND6dXY0B9UuxM5HsFQb6CdYhsdWUPYUXMf1Jy
+zlXHb6j6XCFvrx9Wf5WVw1ubEWMVBZEqHpLsR4p0gnHwcZFGa0PcQj2LncevRglt
+qTWfHnupxlzAjkZefahG9Lp0WJgG3y2kMiTIL2sSsJGvybbatAvw83RBrwIDAQAB
+o4GAMH4wHQYDVR0OBBYEFEhnFG/xXEKQa/jFbs4EZKh2r1vCMB8GA1UdIwQYMBaA
+FEhnFG/xXEKQa/jFbs4EZKh2r1vCMA8GA1UdEwEB/wQFMAMBAf8wKwYDVR0RBCQw
+IoILZXhhbXBsZS5jb22CDSouZXhhbXBsZS5jb22HBAoAAAEwDQYJKoZIhvcNAQEL
+BQADggIBAFItDIIoQLS377pgmAcTMADW4b4T5SL7cqhukgvg81l0hAJLzE5cCdqu
+8UTR3N+uvwVq0SnP5fuNoyBfcL52NeCaQZMO8N4IEd1VDjwu1XXxav+AbWwaT4Yo
+OPDWIGGjkCtf2xZsXWFQ0xW+68bZvD6hN9yKp+W2bu1UFqcKCiY/Klhol+2t3eLX
+xP/fM4nMo6iMZhY4FQCWI/NKbuFPwzHLtrrBURCoX50+fvekOdfRHq771mJvzZKE
+AAIKAvYoYdFfeuaX5N9/UNjMhZ92mw1IIsdbmsCxvHrWsrczmXeP3u1lvxQnkjWL
+vg3Zpdv2a0vpYx6nSunko0XA7qnoE+0gdP/uRhMaGiE9QCu3KdZji62gKHuxgc+u
+/i23kmyqOTC36o/a725eb6fMnGFVSxQ0DXlPSPQnJ2tsGMAM37fxoPfF9IamrmdD
+Q0Usia+XzBckD0sSG8j50x2of9NS3vFFgWM1Cas55XWzlkDGbIJMlrKOj01bUYNq
+ltmMfavmpMPA86p8QHRmWlQhtgu+OK/8RxmGtQdtBi8Gdk3mNMkokSQCVcDWvNhX
+pVFCGya51orBgbWqxbAsIeiv7Pl85edXm8KolJ389xkXqFvX31hme5KnyBhCcRrv
+EZbXRhY3O58t7SlKWVCnx/JmEkJcRJtZaEReF1LbBayExYNnj/sD
 -----END CERTIFICATE-----

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
   let(:package_name) { "test-A" }
   let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
   let(:package_list) do
-    if Chef::Provider::Package::Chocolatey.query_command == "list"
+    if provider.query_command == "list"
       # using result of query_command because that indicates which "search" command to use
       # which coincides with the package list output
       proc { shell_out!("choco search -lo #{Array(package_name).join(" ")}").stdout.chomp }
@@ -63,7 +63,7 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
   end
 
   after(:each) do
-    described_class.instance_variable_set(:@get_choco_version, nil)
+    provider.instance_variable_set(:@get_choco_version, nil)
   end
 
   context "installing a package" do

data/spec/functional/resource/zypper_package_spec.rb

@@ -189,6 +189,15 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
         expect(zypper_package.updated_by_last_action?).to be true
         expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
       end
+
+      context "Package doesn't exist" do
+        let(:package_name) { "nonexistent_repo" }
+        it "does nothing if the package is not installed" do
+          zypper_package.run_action(:remove)
+          expect(zypper_package.updated_by_last_action?).to be false
+        end
+
+      end
     end
 
     context "with no available version" do
@@ -259,6 +268,7 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       expect(shell_out("zypper locks | grep chef_rpm_provides").stdout.chomp).not_to match("chef_rpm_provides")
     end
   end
+
   def remove_package
     pkg_to_remove = Chef::Resource::ZypperPackage.new(package_name, run_context)
     pkg_to_remove.run_action(:remove)

data/spec/unit/compliance/reporter/chef_server_automate_spec.rb

@@ -170,7 +170,7 @@ describe Chef::Compliance::Reporter::ChefServerAutomate do
           "X-Ops-Userid" => "spec-node",
           "X-Remote-Request-Id" => /.+/,
         }
-      ).to_return(status: 200)
+      ).to_return(status: 200, body: "OK")
 
     expect(reporter.send_report(inspec_report)).to eq(true)
 

data/spec/unit/delayed_evaluator_spec.rb

@@ -0,0 +1,35 @@
+#
+# Copyright:: Copyright (c) Progress Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::DelayedEvaluator do
+  let(:magic) { "This is magic!" }
+  let(:de) { Chef::DelayedEvaluator.new { magic } }
+
+  describe "#inspect" do
+    it "inspects the result rather than the Proc" do
+      expect(de.inspect).to eq("lazy { (evaluates to) #{magic.inspect} }")
+    end
+  end
+
+  describe "#call" do
+    it "evaluates correctly" do
+      expect(de.call).to eq(magic)
+    end
+  end
+end

data/spec/unit/node_spec.rb

@@ -303,6 +303,12 @@ describe Chef::Node do
         expect(node["tags"]).to eq(%w{one two three four})
       end
 
+      it "should let you use untag as a convince method for the tags attribute" do
+        node.normal["tags"] = %w{one two three four}
+        node.untag("three", "four")
+        expect(node["tags"]).to eq(%w{one two})
+      end
+
       it "normal_unless sets a value even if default or override attrs are set" do
         node.default[:decontamination] = true
         node.override[:decontamination] = false

data/spec/unit/provider/package/apt_spec.rb

@@ -63,11 +63,16 @@ describe Chef::Provider::Package::Apt do
     allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "eq", "1.1.0").and_return(so2)
   end
 
+  def get_pkg_name_str(name)
+    # Package name with or without anchors attached to it based on the flag.
+    @new_resource.anchor_package_regex ? "^#{name}$" : name
+  end
+
   describe "when loading current resource" do
 
     it "should create a current resource with the name of the new_resource" do
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", @new_resource.package_name,
+        "apt-cache", "policy", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(@shell_out)
@@ -107,7 +112,7 @@ describe Chef::Provider::Package::Apt do
       POLICY_STDOUT
       policy = double(stdout: policy_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "conic-smarms",
+        "apt-cache", "policy", get_pkg_name_str("conic-smarms"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(policy)
@@ -116,7 +121,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "conic-smarms",
+        "apt-cache", "showpkg", get_pkg_name_str("conic-smarms"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -135,7 +140,7 @@ describe Chef::Provider::Package::Apt do
       VPKG_STDOUT
       virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient15-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient15-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(virtual_package)
@@ -159,7 +164,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "libmysqlclient15-dev",
+        "apt-cache", "showpkg", get_pkg_name_str("libmysqlclient15-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -178,7 +183,7 @@ describe Chef::Provider::Package::Apt do
       RPKG_STDOUT
       real_package = double(stdout: real_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(real_package)
@@ -195,7 +200,7 @@ describe Chef::Provider::Package::Apt do
       VPKG_STDOUT
       virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "mp3-decoder",
+        "apt-cache", "policy", get_pkg_name_str("mp3-decoder"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(virtual_package)
@@ -222,7 +227,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "mp3-decoder",
+        "apt-cache", "showpkg", get_pkg_name_str("mp3-decoder"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -236,7 +241,7 @@ describe Chef::Provider::Package::Apt do
       @new_resource.default_release("lenny-backports")
       @new_resource.provider(nil)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "-o", "APT::Default-Release=lenny-backports", "policy", "irssi",
+        "apt-cache", "-o", "APT::Default-Release=lenny-backports", "policy", get_pkg_name_str("irssi"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(@shell_out)
@@ -246,7 +251,7 @@ describe Chef::Provider::Package::Apt do
     it "raises an exception if a source is specified (CHEF-5113)" do
       @new_resource.source "pluto"
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", @new_resource.package_name,
+        "apt-cache", "policy", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
         timeout: @timeout
       ).and_return(@shell_out)
@@ -277,7 +282,7 @@ describe Chef::Provider::Package::Apt do
       RPKG_STDOUT
       real_package = double(stdout: real_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(real_package)
@@ -307,12 +312,12 @@ describe Chef::Provider::Package::Apt do
       RPKG_STDOUT
       real_package = double(stdout: real_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", @new_resource.package_name,
+        "apt-cache", "policy", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
         timeout: @timeout
       ).and_return(real_package)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", @new_resource.package_name,
+        "apt-cache", "showpkg", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
         timeout: @timeout
       ).and_return(real_package)

data/spec/unit/provider/package/chocolatey_spec.rb

@@ -47,13 +47,20 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     allow(provider).to receive(:choco_exe).and_return(choco_exe)
     local_list_obj = double(stdout: local_list_stdout)
     allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-l", "-r", { returns: [0, 2], timeout: timeout }).and_return(local_list_obj)
+    allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "2.1.0"))
+    # Mock the local file system choco queries
+    allow(provider).to receive(:get_local_pkg_dirs).and_return(%w{chocolatey ConEmu})
+    allow(provider).to receive(:fetch_package_versions_local).and_return({ "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" })
   end
 
   after(:each) do
-    described_class.instance_variable_set(:@get_choco_version, nil)
+    provider.instance_variable_set(:@get_choco_version, nil)
   end
 
   def allow_remote_list(package_names, args = nil)
+    # Ensure that when we set this, we invalidate any cache since we're changing
+    # the returned data on purpose
+    provider.invalidate_cache
     remote_list_stdout = <<~EOF
       Chocolatey v0.9.9.11
       chocolatey|0.9.9.11
@@ -63,12 +70,10 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       munin-node|1.6.1.20130823
     EOF
     remote_list_obj = double(stdout: remote_list_stdout)
-    package_names.each do |pkg|
-      if args
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, described_class.query_command, "-r", pkg, *args, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
-      else
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, described_class.query_command, "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
-      end
+    if args
+      allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", *(package_names.sort + args), { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+    else
+      allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", *(package_names.sort), { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
     end
   end
 
@@ -84,16 +89,23 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
 
   describe "choco searches change with the version" do
     it "Choco V1 uses List" do
-      allow(described_class).to receive(:get_choco_version).and_return("1.4.0")
+      allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "1.4.0"))
       expect(provider.query_command).to eql("list")
     end
 
     it "Choco V2 uses Search" do
-      allow(described_class).to receive(:get_choco_version).and_return("2.1.0")
+      allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "2.1.0"))
       expect(provider.query_command).to eql("search")
     end
   end
 
+  describe "bulk_query changes the search behaviour" do
+    it "should respect bulk_query when getting working out what to search" do
+      new_resource.bulk_query(true)
+      expect(provider.collect_package_requests).to eql(["*"])
+    end
+  end
+
   describe "#candidate_version" do
     it "should set the candidate_version to the latest version when not pinning" do
       allow_remote_list(["git"])
@@ -137,6 +149,13 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     end
   end
 
+  describe "the query cache should be invalidated if the config is clean" do
+    it "should return false to cache_is_valid? by default" do
+      provider.invalidate_cache
+      expect(provider.cache_is_valid?).to eql(false)
+    end
+  end
+
   describe "#load_current_resource" do
     it "should return a current_resource" do
       expect(provider.load_current_resource).to be_kind_of(Chef::Resource::ChocolateyPackage)
@@ -147,7 +166,16 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       expect(provider.current_resource.package_name).to eql(["git"])
     end
 
-    it "should load and downcase names in the installed_packages hash" do
+    it "should load and downcase names in the installed_packages hash (with disk provider)" do
+      new_resource.use_choco_list(false)
+      provider.load_current_resource
+      expect(provider.send(:installed_packages)).to eql(
+        { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" }
+      )
+    end
+
+    it "should load and downcase names in the installed_packages hash (with choco list provider)" do
+      new_resource.use_choco_list(true)
       provider.load_current_resource
       expect(provider.send(:installed_packages)).to eql(
         { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" }
@@ -166,7 +194,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       new_resource.package_name("package-does-not-exist")
       new_resource.returns([0])
       allow(provider).to receive(:shell_out_compacted!)
-        .with(choco_exe, described_class.query_command, "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
+        .with(choco_exe, provider.query_command, "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
         .and_raise(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
       expect { provider.send(:available_packages) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
     end
@@ -524,7 +552,7 @@ describe "behavior when Chocolatey is not installed" do
   end
 
   let(:error_regex) do
-    /Could not locate.*install.*cookbook.*PowerShell.*GetEnvironmentVariable/m
+    /Could not locate.*installer.*resource.*PowerShell.*GetEnvironmentVariable/m
   end
 
   context "#choco_exe" do

data/spec/unit/provider/powershell_script_spec.rb

@@ -17,10 +17,14 @@
 #
 
 require "spec_helper"
-describe Chef::Provider::PowershellScript, "action_run" do
+describe Chef::Provider::PowershellScript, "action_run", windows_only: true do
   let(:events) { Chef::EventDispatch::Dispatcher.new }
 
-  let(:run_context) { Chef::RunContext.new(Chef::Node.new, {}, events) }
+  let(:run_context) {
+    @node = Chef::Node.new
+    @node.consume_external_attrs(OHAI_SYSTEM.data.dup, {})
+    Chef::RunContext.new(@node, {}, events)
+  }
 
   let(:new_resource) do
     Chef::Resource::PowershellScript.new("run some powershell code", run_context)
@@ -44,7 +48,7 @@ describe Chef::Provider::PowershellScript, "action_run" do
         "C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\powershell.exe" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat None -InputFormat Fabulous -File "C:\\Temp\\Script.ps1"
       CMD
 
-      expect(provider.command).to eq(expected)
+      expect(provider.send(:command)).to eq(expected)
     end
 
     it "uses pwsh when given the pwsh interpreter" do
@@ -55,7 +59,99 @@ describe Chef::Provider::PowershellScript, "action_run" do
         "pwsh" -NoLogo -NonInteractive -NoProfile -ExecutionPolicy Bypass -InputFormat None  -File "C:\\Temp\\Script.ps1"
       CMD
 
-      expect(provider.command).to eq(expected)
+      expect(provider.send(:command)).to eq(expected)
+    end
+
+    it "returns the script specific to the inline interpreter when using use_inline_interpreter" do
+      new_resource.code = "test script"
+      new_resource.use_inline_powershell = true
+      # This is a string that is ONLY in the use_inline_interpreter version of this
+      expect(provider.send(:powershell_wrapper_script)).to include("$interpolatedexitcode = $")
+    end
+
+    it "returns the script specific to the normal interpreter when not using use_inline_interpreter" do
+      new_resource.code = "test script"
+      new_resource.use_inline_powershell = false
+      # This is a string that is ONLY in the non use_inline_interpreter version of this
+      expect(provider.send(:powershell_wrapper_script)).to include("new-variable -name interpolatedexitcode -visibility private")
+    end
+
+    it "Correctly returns for $True for regular powershell" do
+      new_resource.code = "$True"
+      new_resource.use_inline_powershell = false
+      new_resource.convert_boolean_return = true
+      expect(provider.run_action(:run)).to eq(nil)
+    end
+
+    it "Correctly returns for $True for inline powershell with convert_boolean_return" do
+      new_resource.code = "$True"
+      new_resource.use_inline_powershell = true
+      new_resource.convert_boolean_return = true
+      expect(provider.run_action(:run)).to eq(nil)
+    end
+
+    it "Correctly throws exception for $False for regular powershell" do
+      new_resource.code = "$False"
+      new_resource.use_inline_powershell = false
+      new_resource.convert_boolean_return = true
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(Mixlib::ShellOut::ShellCommandFailed))
+    end
+
+    it "Correctly throws exception for $False for inline powershell" do
+      new_resource.code = "$False"
+      new_resource.use_inline_powershell = true
+      new_resource.convert_boolean_return = true
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed))
+    end
+
+    it "return 1 fails correctly for non-inline" do
+      new_resource.code = "return 1"
+      new_resource.use_inline_powershell = false
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(Mixlib::ShellOut::ShellCommandFailed))
+    end
+
+    it "return 1 fails correctly for inline" do
+      new_resource.code = "return 1"
+      new_resource.use_inline_powershell = true
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed))
+    end
+
+    it "return 1 is valid when returns includes 1 for non-inline" do
+      new_resource.code = "return 1"
+      new_resource.use_inline_powershell = false
+      new_resource.returns = [1]
+      expect(provider.run_action(:run)).to eq(nil)
+    end
+    it "return 1 is valid when returns includes 1 for inline" do
+      new_resource.code = "return 1"
+      new_resource.use_inline_powershell = true
+      new_resource.returns = [1]
+      expect(provider.run_action(:run)).to eq(nil)
+    end
+
+    it "bad powershell exceptions for non-inline" do
+      new_resource.code = "xyzzy"
+      new_resource.use_inline_powershell = false
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(Mixlib::ShellOut::ShellCommandFailed))
+    end
+
+    it "bad powershell exceptions for inline" do
+      new_resource.code = "xyzzy"
+      new_resource.use_inline_powershell = true
+      expect { provider.run_action(:run) }.to raise_error(an_instance_of(ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed))
+    end
+
+    it "uses powershell for inline by default" do
+      new_resource.code = "$host.version.major -lt 7"
+      new_resource.use_inline_powershell = true
+      expect(provider.run_action(:run)).to eq(nil)
+    end
+
+    it "uses pwsh for inline when asked" do
+      new_resource.code = "$host.version.major -ge 7"
+      new_resource.use_inline_powershell = true
+      new_resource.interpreter = "pwsh"
+      expect(provider.run_action(:run)).to eq(nil)
     end
   end
 end

data/spec/unit/provider/service/systemd_service_spec.rb

@@ -56,6 +56,7 @@ describe Chef::Provider::Service::Systemd do
       allow(provider).to receive(:is_active?).and_return(false)
       allow(provider).to receive(:is_enabled?).and_return(false)
       allow(provider).to receive(:is_masked?).and_return(false)
+      allow(provider).to receive(:is_static?).and_return(false)
       allow(provider).to receive(:is_indirect?).and_return(false)
     end
 

data/spec/unit/provider/user/linux_spec.rb

@@ -136,6 +136,7 @@ describe Chef::Provider::User::Linux, linux_only: true do
         "home" => ["/home/notarealuser", "/Users/notarealuser"],
         "shell" => ["/usr/bin/zsh", "/bin/bash"],
         "password" => %w{abcd 12345},
+        "sensitive" => [true],
       }
     end
 
@@ -147,6 +148,15 @@ describe Chef::Provider::User::Linux, linux_only: true do
       end
     end
 
+    it "should show a blank for password if sensitive set to true" do
+      @new_resource.password mapping["password"][0]
+      @current_resource.password mapping["password"][1]
+      @new_resource.sensitive true
+      @current_resource.sensitive true
+      provider.compare_user
+      expect(provider.change_desc).to eql(["change password from ******** to ********"])
+    end
+
     %w{uid gid}.each do |property|
       it "should return false if string #{property} matches fixnum" do
         @new_resource.send(property, "100")