chef 18.3.0 → 18.4.12

data/spec/unit/resource/chef_client_systemd_timer_spec.rb

@@ -102,7 +102,7 @@ describe Chef::Resource::ChefClientSystemdTimer do
 
     it "sets CPUQuota if cpu_quota property is set" do
       resource.cpu_quota 50
-      expect(provider.service_content["Service"]["CPUQuota"]).to eq(50)
+      expect(provider.service_content["Service"]["CPUQuota"]).to eq("50%")
     end
   end
 end

data/spec/unit/resource/chocolatey_installer_spec.rb

@@ -0,0 +1,151 @@
+#
+# Copyright:: Copyright (c) Chef 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::Resource::ChocolateyInstaller do
+  include RecipeDSLHelper
+
+  let(:resource) { Chef::Resource::ChocolateyInstaller.new("fakey_fakerton") }
+  let(:config) do
+    <<-CONFIG
+      <?xml version="1.0" encoding="utf-8"?>
+      <chocolatey xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <config>
+          <add key="containsLegacyPackageInstalls" value="true" description="Install has packages installed prior to 0.9.9 series." />
+        </config>
+        <sources>
+          <source id="chocolatey" value="https://chocolatey.org/api/v2/" disabled="false" bypassProxy="false" selfService="false" adminOnly="false" priority="0" />
+        </sources>
+        <features>
+          <feature name="checksumFiles" enabled="true" setExplicitly="false" description="Checksum files when pulled in from internet (based on package)." />
+        </features>
+        <apiKeys />
+      </chocolatey>
+    CONFIG
+  end
+
+  # we save off the ENV and set ALLUSERSPROFILE so these specs will work on *nix and non-C drive Windows installs
+  before(:each) do
+    @original_env = ENV.to_hash
+    ENV["ALLUSERSPROFILE"] = "C:\\ProgramData"
+  end
+
+  after(:each) do
+    ENV.clear
+    ENV.update(@original_env)
+  end
+
+  describe "Basic Resource Settings" do
+    context "on windows", :windows_only do
+      it "supports :install, :uninstall, :upgrade actions" do
+        expect { resource.action :install }.not_to raise_error
+        expect { resource.action :uninstall }.not_to raise_error
+        expect { resource.action :upgrade }.not_to raise_error
+      end
+    end
+  end
+
+  describe "Basic chocolatey settings" do
+    context "on windows", :windows_only do
+      it "has a resource name of :chocolatey_installer" do
+        expect(resource.resource_name).to eql(:chocolatey_installer)
+      end
+
+      it "sets the default action as :install" do
+        expect(resource.action).to eql([:install])
+      end
+
+      it "supports :install and :uninstall actions" do
+        expect { resource.action :install }.not_to raise_error
+        expect { resource.action :uninstall }.not_to raise_error
+      end
+
+      it "does not support bologna install options" do
+        expect { resource.action :foo }.to raise_error(Chef::Exceptions::ValidationFailed)
+      end
+    end
+  end
+
+  describe "Installing chocolatey" do
+    context "on windows", :windows_only do
+      it "can install Chocolatey with parameters" do
+        resource.chocolatey_version = "1.4.0"
+        expect { resource.action :install }.not_to raise_error
+      end
+
+      it "logs a warning if a chocolatey install cannot be found" do
+        allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\bin\choco.exe').and_return(false)
+        expect { Chef::Log.warn("Chocolatey is already uninstalled.") }.not_to output.to_stderr
+      end
+    end
+  end
+
+  describe "Chocolatey is idempotent because" do
+    context "on windows", :windows_only do
+      it "it does not install choco again if it is already installed" do
+        install_choco
+        chocolatey_installer "install" do
+          action :install
+        end.should_not_be_updated
+      end
+    end
+  end
+
+  describe "upgrading choco versions" do
+
+    context "on windows", :windows_only do
+      describe "when the versions do not match" do
+        it "upgrades if the proposed version is newer" do
+          allow(resource).to receive(:get_choco_version).and_return(Gem::Version.new("1.2.2"))
+          allow(resource).to receive(:chocolatey_version).and_return(Gem::Version.new("4.2.2"))
+          expect { resource.action :upgrade }.not_to raise_error
+          allow(resource).to receive(:get_choco_version).and_return(Gem::Version.new("4.2.2"))
+          expect(resource.get_choco_version).to eql(Gem::Version.new("4.2.2"))
+        end
+      end
+      describe "when the versions match" do
+        it "does not upgrade if the old version is identical" do
+          allow(resource).to receive(:get_choco_version).and_return(Gem::Version.new("2.2.2"))
+          allow(resource).to receive(:chocolatey_version).and_return(Gem::Version.new("2.2.2"))
+          expect { resource.action :upgrade }.not_to raise_error
+          expect(resource).not_to be_updated
+        end
+      end
+    end
+  end
+
+  describe "Uninstalling chocolatey" do
+    context "on windows", :windows_only do
+      it "doesn't error out uninstalling chocolatey if chocolatey is not installed" do
+        allow(::File).to receive(:exist?).with('C:\ProgramData\chocolatey\bin\choco.exe').and_return(false)
+        expect { resource.action :uninstall }.not_to raise_error
+      end
+    end
+  end
+
+  def install_choco
+    require "chef-powershell"
+    include ChefPowerShell::ChefPowerShellModule::PowerShellExec
+    powershell_code = <<-CODE
+      Set-ExecutionPolicy Bypass -Scope Process -Force;
+      [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
+      iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+    CODE
+    powershell_exec(powershell_code)
+  end
+end

data/spec/unit/resource/macos_pkg_spec.rb

@@ -0,0 +1,38 @@
+#
+# Copyright:: Copyright (c) Chef 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::Resource::MacosPkg do
+  let(:resource) { Chef::Resource::MacosPkg.new("fakey_fakerton") }
+
+  it "has a resource name of :macos_pkg" do
+    expect(resource.resource_name).to eql(:macos_pkg)
+  end
+
+  it "sets the default action as :install" do
+    expect(resource.action).to eql([:install])
+  end
+
+  it "supports :install action" do
+    expect { resource.action :install }.not_to raise_error
+  end
+
+  it "target property defaults to /" do
+    expect(resource.target).to eql("/")
+  end
+end

data/spec/unit/resource/powershell_script_spec.rb

@@ -47,9 +47,9 @@ describe Chef::Resource::PowershellScript do
     expect(resource.convert_boolean_return).to eq(false)
   end
 
-  it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, :umask, :architecture, :elevated, :interpreter, :login properties from a parent resource class" do
+  it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, :umask, :architecture, :elevated, :interpreter, :login, :use_inline_powershell properties from a parent resource class" do
     inherited_difference = Chef::Resource::PowershellScript.guard_inherited_attributes -
-      %i{cwd domain environment group password path user umask architecture elevated interpreter login}
+      %i{cwd domain environment group password path user umask architecture elevated interpreter login use_inline_powershell}
 
     expect(inherited_difference).to eq([])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.3.0
+  version: 18.4.12
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.3.0
+        version: 18.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.3.0
+        version: 18.4.12
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.3.0
+        version: 18.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.3.0
+        version: 18.4.12
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +221,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -228,6 +231,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -458,14 +464,14 @@ dependencies:
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8.2
 - !ruby/object:Gem::Dependency
@@ -871,6 +877,7 @@ files:
 - lib/chef/node/mixin/immutablize_hash.rb
 - lib/chef/node/mixin/mashy_array.rb
 - lib/chef/node/mixin/state_tracking.rb
+- lib/chef/node/mixin/state_tracking_array.rb
 - lib/chef/node_map.rb
 - lib/chef/null_logger.rb
 - lib/chef/org.rb
@@ -1056,6 +1063,7 @@ files:
 - lib/chef/resource/chef_vault_secret.rb
 - lib/chef/resource/chocolatey_config.rb
 - lib/chef/resource/chocolatey_feature.rb
+- lib/chef/resource/chocolatey_installer.rb
 - lib/chef/resource/chocolatey_package.rb
 - lib/chef/resource/chocolatey_source.rb
 - lib/chef/resource/conditional.rb
@@ -1109,6 +1117,7 @@ files:
 - lib/chef/resource/locale.rb
 - lib/chef/resource/log.rb
 - lib/chef/resource/lwrp_base.rb
+- lib/chef/resource/macos_pkg.rb
 - lib/chef/resource/macos_userdefaults.rb
 - lib/chef/resource/macosx_service.rb
 - lib/chef/resource/macports_package.rb
@@ -1988,6 +1997,7 @@ files:
 - spec/unit/decorator/lazy_array_spec.rb
 - spec/unit/decorator/lazy_spec.rb
 - spec/unit/decorator_spec.rb
+- spec/unit/delayed_evaluator_spec.rb
 - spec/unit/deprecated_spec.rb
 - spec/unit/deprecation_spec.rb
 - spec/unit/digester_spec.rb
@@ -2233,6 +2243,7 @@ files:
 - spec/unit/resource/chef_vault_secret_spec.rb
 - spec/unit/resource/chocolatey_config_spec.rb
 - spec/unit/resource/chocolatey_feature_spec.rb
+- spec/unit/resource/chocolatey_installer_spec.rb
 - spec/unit/resource/chocolatey_package_spec.rb
 - spec/unit/resource/chocolatey_source_spec.rb
 - spec/unit/resource/conditional_action_not_nothing_spec.rb
@@ -2275,6 +2286,7 @@ files:
 - spec/unit/resource/link_spec.rb
 - spec/unit/resource/locale_spec.rb
 - spec/unit/resource/log_spec.rb
+- spec/unit/resource/macos_pkg_spec.rb
 - spec/unit/resource/macos_user_defaults_spec.rb
 - spec/unit/resource/macosx_service.rb
 - spec/unit/resource/macports_package_spec.rb
@@ -2459,14 +2471,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.0.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration