chef 18.5.0 → 18.6.2

data/spec/unit/mixin/homebrew_spec.rb

@@ -0,0 +1,118 @@
+#
+# Author:: Joshua Timberman (<joshua@chef.io>)
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+#
+# 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::Mixin::Homebrew do
+  let(:homebrew) { Class.new { include Chef::Mixin::Homebrew }.new }
+  let(:uid) { 1001 }
+  let(:username) { "foobar" }
+  let(:alt_brew_path) { "/foo" }
+
+  describe "#find_homebrew_uid" do
+    it "returns the provided UID when an integer is given" do
+      expect(File).to receive(:exist?).exactly(0).times
+      expect(homebrew.find_homebrew_uid(uid)).to eq(uid)
+    end
+
+    it "returns the provided UID when username is given" do
+      expect(File).to receive(:exist?).exactly(0).times
+      allow(Etc).to receive(:getpwnam).with(username).and_return(OpenStruct.new(uid: uid))
+      expect(homebrew.find_homebrew_uid(username)).to eq(uid)
+    end
+
+    it "raises an error when the brew executable is not found" do
+      allow(homebrew).to receive(:homebrew_bin_path).and_raise(Chef::Exceptions::CannotDetermineHomebrewPath)
+      expect { homebrew.find_homebrew_uid }.to raise_error(Chef::Exceptions::CannotDetermineHomebrewPath)
+    end
+
+    it "returns the UID of the owner based on the brew executable" do
+      allow(homebrew).to receive(:homebrew_bin_path).and_return(alt_brew_path)
+      allow(File).to receive(:stat).with(alt_brew_path).and_return(OpenStruct.new(uid: uid))
+      allow(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      expect(homebrew.find_homebrew_uid).to eq(uid)
+    end
+  end
+
+  describe "#find_homebrew_username" do
+    it "returns the username for the provided UID" do
+      allow(homebrew).to receive(:find_homebrew_uid).and_return(uid)
+      allow(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      expect(homebrew.find_homebrew_username(uid)).to eq(username)
+    end
+  end
+
+  describe "#homebrew_bin_path" do
+    it "returns the correct path when a valid path is provided" do
+      allow(File).to receive(:exist?).with(alt_brew_path).and_return(true)
+      expect(homebrew.homebrew_bin_path(alt_brew_path)).to eq(alt_brew_path)
+    end
+
+    it "raises an error when the brew executable is not found" do
+      allow(homebrew).to receive(:which).and_return(false)
+      expect { homebrew.homebrew_bin_path }.to raise_error(Chef::Exceptions::CannotDetermineHomebrewPath)
+    end
+  end
+
+  shared_examples "successfully find executable" do
+    let(:default_brew_path) { "/usr/local/bin/brew" }
+    let(:default_brew_path_arm) { "/opt/homebrew/bin/brew" }
+    let(:default_brew_path_linux) { "/home/linuxbrew/.linuxbrew/bin/brew" }
+
+    context "debug statement prints owner name" do
+
+      before do
+        expect(Etc).to receive(:getpwuid).with(uid).and_return(OpenStruct.new(name: username))
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for x86_64 machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path)
+        allow(File).to receive(:stat).with(default_brew_path).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for arm machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path_arm)
+        allow(File).to receive(:stat).with(default_brew_path_arm).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for linux machines" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(default_brew_path_linux)
+        allow(File).to receive(:stat).with(default_brew_path_linux).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+
+      it "returns the owner of the brew executable when it is not at a default location" do
+        allow(homebrew).to receive(:homebrew_bin_path).and_return(alt_brew_path)
+        allow(File).to receive(:stat).with(alt_brew_path).and_return(OpenStruct.new(uid: uid))
+        expect(homebrew.find_homebrew_uid).to eq(uid)
+      end
+    end
+  end
+
+  describe "#When the homebrew user is not provided" do
+
+    include_examples "successfully find executable"
+
+    context "the executable is owned by root" do
+      include_examples "successfully find executable" do
+        let(:uid) { 0 }
+      end
+    end
+  end
+end

data/spec/unit/provider/apt_repository_spec.rb

@@ -230,7 +230,7 @@ C5986B4F1257FFA86632CBA746181433FBB75451
     it "gets a key" do
       simples = double("HTTP")
       allow(simples).to receive(:get).and_return("\"#{key}\"")
-      expect(Chef::HTTP::Simple).to receive(:new).with(url, {}).and_return(simples)
+      expect(Chef::HTTP::Simple).to receive(:new).with(url).and_return(simples)
       expect(provider).to receive(:install_key_from_keyserver).with(key, "keyserver.ubuntu.com")
       provider.install_ppa_key("chef", "main")
     end

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

@@ -92,7 +92,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
 
   describe "choco searches change with the version" do
     it "Choco V1 uses List" do
-      allow(provider).to receive(:powershell_exec!).with("Get-ItemProperty #{choco_exe} | select-object -expandproperty versioninfo | select-object -expandproperty productversion").and_return(double(result: "1.4.0"))
+      allow(provider).to receive(:powershell_exec!).with("Get-ItemProperty #{choco_exe} | select-object -expandproperty versioninfo | select-object -expandproperty productversion").and_return(double(result: "1.3.0"))
       expect(provider.query_command).to eql("list")
     end
 

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

@@ -19,6 +19,7 @@
 require "spec_helper"
 
 describe Chef::Provider::Package::Homebrew do
+  let(:default_brew_path) { "/usr/local/bin/brew" }
   let(:node) { Chef::Node.new }
   let(:new_resource) { Chef::Resource::HomebrewPackage.new(%w{emacs vim}) }
   let(:current_resource) { Chef::Resource::HomebrewPackage.new("emacs, vim") }
@@ -30,7 +31,6 @@ describe Chef::Provider::Package::Homebrew do
   end
 
   let(:homebrew_uid) { 1001 }
-
   let(:brew_cmd_output_data) { '[{"name":"emacs","full_name":"emacs","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"GNU Emacs text editor","homepage":"https://www.gnu.org/software/emacs/","versions":{"stable":"26.3","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.catalina.bottle.tar.gz","sha256":"9ab33f4386ca5f7326a8c28da1324556ec990f682a7ca88641203da0b42dbdae"},"mojave":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.mojave.bottle.tar.gz","sha256":"8162a26246de7db44c53ea0d0ef0a806140318d19c69e8e5e33aa88ce7e823a8"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.high_sierra.bottle.tar.gz","sha256":"6a2629b6deddf99f81abb1990ecd6c87f0242a0eecbb6b6c2e4c3540e421d4c4"},"sierra":{"url":"https://homebrew.bintray.com/bottles/emacs-26.3.sierra.bottle.tar.gz","sha256":"2a47477e71766d7dd6b16c29ad5ba71817ed80d06212e3261ef3c776e7e9f5a2"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":["pkg-config"],"dependencies":["gnutls"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["libxml2","ncurses"],"requirements":[],"conflicts_with":[],"caveats":null,"installed":[],"linked_keg":null,"pinned":false,"outdated":false},{"name":"vim","full_name":"vim","oldname":null,"aliases":[],"versioned_formulae":[],"desc":"Vi \'workalike\' with many additional features","homepage":"https://www.vim.org/","versions":{"stable":"8.2.0550","devel":null,"head":"HEAD","bottle":true},"urls":{"stable":{"url":"https://github.com/vim/vim/archive/v8.2.0550.tar.gz","tag":null,"revision":null}},"revision":0,"version_scheme":0,"bottle":{"stable":{"rebuild":0,"cellar":"/usr/local/Cellar","prefix":"/usr/local","root_url":"https://homebrew.bintray.com/bottles","files":{"catalina":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.catalina.bottle.tar.gz","sha256":"8f9252500775aa85d8f826af30ca9e1118a56145fc2f961c37abed48bf78cf6b"},"mojave":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.mojave.bottle.tar.gz","sha256":"7566c83b770f3e8c4d4b462a39e5eb26609b37a8f8db6690a2560a3e22ded6b6"},"high_sierra":{"url":"https://homebrew.bintray.com/bottles/vim-8.2.0550.high_sierra.bottle.tar.gz","sha256":"a76e517fc69bf67b6903cb82295bc085c5eb4b46b4659f034c694dd97d2ee2d9"}}}},"keg_only":false,"bottle_disabled":false,"options":[],"build_dependencies":[],"dependencies":["gettext","lua","perl","python","ruby"],"recommended_dependencies":[],"optional_dependencies":[],"uses_from_macos":["ncurses"],"requirements":[],"conflicts_with":["ex-vi","macvim"],"caveats":null,"installed":[{"version":"8.2.0550","used_options":[],"built_as_bottle":true,"poured_from_bottle":true,"runtime_dependencies":[{"full_name":"gettext","version":"0.20.1"},{"full_name":"lua","version":"5.3.5"},{"full_name":"perl","version":"5.30.2"},{"full_name":"gdbm","version":"1.18.1"},{"full_name":"openssl@1.1","version":"1.1.1f"},{"full_name":"readline","version":"8.0.4"},{"full_name":"sqlite","version":"3.31.1"},{"full_name":"xz","version":"5.2.5"},{"full_name":"python","version":"3.7.7"},{"full_name":"libyaml","version":"0.2.2"},{"full_name":"ruby","version":"2.7.1"}],"installed_as_dependency":false,"installed_on_request":true}],"linked_keg":"8.2.0550","pinned":false,"outdated":false}]' }
 
   let(:brew_info_data) do
@@ -297,11 +297,13 @@ describe Chef::Provider::Package::Homebrew do
 
     it "passes a single pkg to the brew command and return stdout" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
+      allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
       expect(provider.brew_cmd_output).to eql("zombo")
     end
 
     it "takes multiple arguments as an array" do
       allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "homestarrunner"))
+      allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
       expect(provider.brew_cmd_output("info", "opts", "bananas")).to eql("homestarrunner")
     end
 
@@ -310,6 +312,7 @@ describe Chef::Provider::Package::Homebrew do
 
       it "does not try to read homebrew_user from Package, which does not have it" do
         allow(provider).to receive(:shell_out!).and_return(OpenStruct.new(stdout: "zombo"))
+        allow(provider).to receive(:homebrew_bin_path).and_return(default_brew_path)
         expect(provider.brew_cmd_output).to eql("zombo")
       end
     end

data/spec/unit/provider/route_spec.rb

@@ -117,7 +117,7 @@ describe Chef::Provider::Route do
       @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
-      expect(File).to receive(:open).and_yield(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @resource_add = Chef::Resource::Route.new("192.168.1.0/24 via 192.168.0.1")
       @run_context.resource_collection << @resource_add
       allow(@provider).to receive(:shell_out!).and_return(true)
@@ -225,7 +225,7 @@ describe Chef::Provider::Route do
         @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
-        expect(File).to receive(:open).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
+        expect(File).to receive(:new).with("/etc/sysconfig/network-scripts/route-eth0", "w").and_return(route_file)
         @run_context.resource_collection << @new_resource
         @provider.generate_config
       end
@@ -234,10 +234,8 @@ describe Chef::Provider::Route do
         @node.automatic_attrs[:platform_family] = platform_family
 
         route_file = StringIO.new
-        allow(File).to receive(:exist?).and_call_original
-        allow(File).to receive(:open).and_call_original
         allow(File).to receive(:exist?).with("/etc/sysconfig/network").and_return(false)
-        expect(File).to receive(:open).with("/etc/sysconfig/network", "w").and_yield(route_file)
+        expect(File).to receive(:new).with("/etc/sysconfig/network", "w").and_return(route_file)
         @run_context.resource_collection << @default_resource
         @default_provider.generate_config
         expect(route_file.string).to match(/GATEWAY=10\.0\.0\.9/)
@@ -248,7 +246,7 @@ describe Chef::Provider::Route do
       @node.automatic_attrs[:platform_family] = "rhel"
 
       route_file = StringIO.new
-      expect(File).to receive(:open).and_yield(route_file)
+      expect(File).to receive(:new).and_return(route_file)
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.1.0/24 via 192.168.0.1")
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.2.0/24 via 192.168.0.1")
       @run_context.resource_collection << Chef::Resource::Route.new("192.168.3.0/24 via 192.168.0.1")

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

@@ -158,6 +158,7 @@ describe Chef::Provider::User::Windows do
 
   describe "when removing the user" do
     it "should call @net_user.delete" do
+      allow(Chef::ReservedNames::Win32::Security).to receive(:clear_account_rights)
       expect(@net_user).to receive(:delete)
       @provider.remove_user
     end

data/spec/unit/resource/rhsm_repo_spec.rb

@@ -46,7 +46,6 @@ describe Chef::Resource::RhsmRepo do
     before do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
     end
 

data/spec/unit/resource/rhsm_subscription_spec.rb

@@ -92,7 +92,6 @@ describe Chef::Resource::RhsmSubscription do
     before do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
     end
 
@@ -128,7 +127,6 @@ describe Chef::Resource::RhsmSubscription do
     it "parses the output correctly" do
       allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
       allow(cmd).to receive(:run_command)
-      allow(cmd).to receive(:live_stream).and_return(output)
       allow(cmd).to receive(:stdout).and_return(output)
 
       expect(provider.serials_by_pool["pool1"]).to eq("serial1")

data/spec/unit/resource_inspector_spec.rb

@@ -17,6 +17,20 @@
 require "spec_helper"
 require "chef/resource_inspector"
 
+COMBINED_RESOURCE_TEXT = <<~EOF.freeze
+  class Dummy1 < Chef::Resource::LWRPBase
+    resource_name :dummy1
+    description "A dummy resource"
+    property :first, String, description: "My First Property", introduced: "14.0"
+  end
+
+  class Dummy2 < Chef::Resource::LWRPBase
+    resource_name :dummy2
+    description "Another dummy resource"
+    property :second, String, description: "My Second Property", introduced: "14.0"
+  end
+EOF
+
 class DummyResource < Chef::Resource
   resource_name :dummy
   description "A dummy resource"
@@ -62,4 +76,26 @@ describe Chef::ResourceInspector do
       end
     end
   end
+
+  describe "inspecting a multi-resource file" do
+    # Call the inspector with a fake file containing two resources, and ensure that we get
+    # both of them back!
+    subject {
+      Chef::ResourceInspector.load_from_resources([
+        { "full_path" => "/cookbooks/fake_cookbook/resources/big_resource.rb" },
+      ], false)
+    }
+    it "has elephants" do
+      allow(File).to receive(:file?).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(true)
+      allow(File).to receive(:readable?).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(true)
+      allow(IO).to receive(:read).with("/cookbooks/fake_cookbook/resources/big_resource.rb").and_return(COMBINED_RESOURCE_TEXT)
+      expect(subject.keys.count).to be 2
+      expect(subject.keys.sort).to eq(%i{dummy1 dummy2})
+      # This is correct - because they're not fully realised resources at this point, sensitive and friends are not added yet.
+      expect(subject[:dummy1][:properties].count).to be 1
+      expect(subject[:dummy2][:properties].count).to be 1
+      expect(subject[:dummy1][:properties][0][:description]).to eq "My First Property"
+      expect(subject[:dummy2][:properties][0][:description]).to eq "My Second Property"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.5.0
+  version: 18.6.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-12-13 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.5.0
+        version: 18.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.5.0
+        version: 18.6.2
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.5.0
+        version: 18.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.5.0
+        version: 18.6.2
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.12.7
 - !ruby/object:Gem::Dependency
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +247,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -248,6 +257,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.5
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.16.3
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
   requirement: !ruby/object:Gem::Requirement
@@ -774,7 +786,6 @@ files:
 - lib/chef/file_content_management/deploy/cp.rb
 - lib/chef/file_content_management/deploy/mv_unix.rb
 - lib/chef/file_content_management/deploy/mv_windows.rb
-- lib/chef/file_content_management/deploy/target_io.rb
 - lib/chef/file_content_management/tempfile.rb
 - lib/chef/formatters/base.rb
 - lib/chef/formatters/doc.rb
@@ -837,7 +848,7 @@ files:
 - lib/chef/mixin/file_class.rb
 - lib/chef/mixin/from_file.rb
 - lib/chef/mixin/get_source_from_package.rb
-- lib/chef/mixin/homebrew_user.rb
+- lib/chef/mixin/homebrew.rb
 - lib/chef/mixin/lazy_module_include.rb
 - lib/chef/mixin/notifying_block.rb
 - lib/chef/mixin/openssl_helper.rb
@@ -898,7 +909,6 @@ files:
 - lib/chef/policy_builder/policyfile.rb
 - lib/chef/property.rb
 - lib/chef/provider.rb
-- lib/chef/provider/.gitkeep
 - lib/chef/provider/batch.rb
 - lib/chef/provider/cookbook_file.rb
 - lib/chef/provider/cookbook_file/content.rb
@@ -966,7 +976,6 @@ files:
 - lib/chef/provider/package/rubygems.rb
 - lib/chef/provider/package/smartos.rb
 - lib/chef/provider/package/snap.rb
-- lib/chef/provider/package/snap_tm.rb
 - lib/chef/provider/package/solaris.rb
 - lib/chef/provider/package/windows.rb
 - lib/chef/provider/package/windows/exe.rb
@@ -1040,7 +1049,6 @@ files:
 - lib/chef/request_id.rb
 - lib/chef/reserved_names.rb
 - lib/chef/resource.rb
-- lib/chef/resource/.gitkeep
 - lib/chef/resource/_rest_resource.rb
 - lib/chef/resource/action_class.rb
 - lib/chef/resource/alternatives.rb
@@ -1284,22 +1292,6 @@ files:
 - lib/chef/shell/ext.rb
 - lib/chef/shell/model_wrapper.rb
 - lib/chef/shell/shell_session.rb
-- lib/chef/target_io.rb
-- lib/chef/target_io/dir.rb
-- lib/chef/target_io/etc.rb
-- lib/chef/target_io/file.rb
-- lib/chef/target_io/fileutils.rb
-- lib/chef/target_io/http.rb
-- lib/chef/target_io/io.rb
-- lib/chef/target_io/shadow.rb
-- lib/chef/target_io/train/dir.rb
-- lib/chef/target_io/train/etc.rb
-- lib/chef/target_io/train/file.rb
-- lib/chef/target_io/train/fileutils.rb
-- lib/chef/target_io/train/http.rb
-- lib/chef/target_io/train/io.rb
-- lib/chef/target_io/train/shadow.rb
-- lib/chef/target_io/train_compat.rb
 - lib/chef/train_transport.rb
 - lib/chef/user.rb
 - lib/chef/user_v1.rb
@@ -2080,7 +2072,7 @@ files:
 - spec/unit/mixin/default_paths_spec.rb
 - spec/unit/mixin/deprecation_spec.rb
 - spec/unit/mixin/enforce_ownership_and_permissions_spec.rb
-- spec/unit/mixin/homebrew_user_spec.rb
+- spec/unit/mixin/homebrew_spec.rb
 - spec/unit/mixin/lazy_module_include.rb
 - spec/unit/mixin/openssl_helper_spec.rb
 - spec/unit/mixin/params_validate_spec.rb

data/lib/chef/file_content_management/deploy/target_io.rb

@@ -1,29 +0,0 @@
-module TargetIO
-  class Deploy
-    def create(file)
-      Chef::Log.trace("Touching #{file} to create it")
-      TargetIO::FileUtils.touch(file)
-    end
-
-    def deploy(src, dst)
-      Chef::Log.trace("Reading modes from remote file #{dst}")
-      stat = ::TargetIO::File.stat(dst)
-      mode = stat.mode & 07777
-      uid  = stat.uid
-      gid  = stat.gid
-
-      # TODO: Switch to TargetIO::File.open as soon as writing is implemented
-      Chef::Log.trace("Uploading local temporary file #{src} as remote file #{dst}")
-      connection = Chef.run_context&.transport_connection
-      connection.upload(src, dst)
-
-      Chef::Log.trace("Applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{dst}")
-      ::TargetIO::File.chown(uid, nil, dst)
-      ::TargetIO::File.chown(nil, gid, dst)
-      ::TargetIO::File.chmod(mode, dst)
-
-      # Local clean up
-      File.delete(src)
-    end
-  end
-end

data/lib/chef/provider/package/snap_tm.rb

@@ -1,79 +0,0 @@
-#
-# Author:: T.Heinen (<thomas.heinen@gmail.com>)
-# 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_relative "snap"
-
-class Chef
-  class Provider
-    class Package
-      class SnapTM < Chef::Provider::Package::Snap
-        provides :snap_package, target_mode: true
-
-        def install_package(names, versions)
-          if new_resource.source
-            install_snap_from_source(names, new_resource.source)
-          else
-            Array(names).each do |snap|
-              snap_options = new_resource.options
-
-              snapctl([
-                "install",
-                "--channel=#{new_resource.channel}",
-                snap_options&.map { |opt| "--#{opt}" },
-                snap,
-              ].flatten.compact)
-            end
-          end
-        end
-
-        def remove_package(names, versions)
-          Array(names).each do |snap|
-            snapctl([
-              "remove",
-              snap,
-            ])
-          end
-        end
-
-        def snapctl(*args)
-          # Deferred execution can result in exit code 10
-          shell_out!("snap", *args, returns: [0, 10])
-        end
-
-        def get_latest_package_version(name, channel)
-          cmd = shell_out("snap info #{name}")
-          latest = cmd.stdout.lines.detect { |l| l.start_with? "  latest/#{new_resource.channel}:" }
-          return unless latest
-
-          latest.split.at(1)
-        end
-
-        def get_installed_package_by_name(name)
-          cmd = shell_out("snap info #{name}")
-          installed = cmd.stdout.lines.detect { |l| l.start_with? "installed:" }
-          return {} unless installed
-
-          {
-            "name" => name,
-            "version" => installed.split.at(1),
-          }
-        end
-      end
-    end
-  end
-end

data/lib/chef/target_io/dir.rb

@@ -1,12 +0,0 @@
-module TargetIO
-  class Dir
-    class << self
-      def method_missing(m, *args, **kwargs, &block)
-        Chef::Log.debug format("Dir::%s(%s)", m.to_s, args.join(", "))
-
-        backend = ChefConfig::Config.target_mode? ? TrainCompat::Dir : ::Dir
-        backend.send(m, *args, **kwargs, &block)
-      end
-    end
-  end
-end

data/lib/chef/target_io/etc.rb

@@ -1,16 +0,0 @@
-module TargetIO
-  class Etc
-    class << self
-      def method_missing(m, *args, **kwargs, &block)
-        Chef::Log.debug format("Etc::%s(%s)", m.to_s, args.join(", "))
-
-        if ChefConfig::Config.target_mode? && !Chef.run_context.transport_connection.os.unix?
-          raise "Etc support only on Unix, this is " + Chef.run_context.transport_connection.platform.title
-        end
-
-        backend = ChefConfig::Config.target_mode? ? TrainCompat::Etc : ::Etc
-        backend.send(m, *args, **kwargs, &block)
-      end
-    end
-  end
-end

data/lib/chef/target_io/file.rb

@@ -1,12 +0,0 @@
-module TargetIO
-  class File
-    class << self
-      def method_missing(m, *args, **kwargs, &block)
-        Chef::Log.debug format("File::%s(%s)", m.to_s, args.join(", "))
-
-        backend = ChefConfig::Config.target_mode? ? TrainCompat::File : ::File
-        backend.send(m, *args, **kwargs, &block)
-      end
-    end
-  end
-end

data/lib/chef/target_io/fileutils.rb

@@ -1,12 +0,0 @@
-module TargetIO
-  class FileUtils
-    class << self
-      def method_missing(m, *args, **kwargs, &block)
-        Chef::Log.debug format("FileUtils::%s(%s)", m.to_s, args.join(", "))
-
-        backend = ChefConfig::Config.target_mode? ? TrainCompat::FileUtils : ::FileUtils
-        backend.send(m, *args, **kwargs, &block)
-      end
-    end
-  end
-end

data/lib/chef/target_io/http.rb

@@ -1,22 +0,0 @@
-require "forwardable" unless defined?(Forwardable)
-
-require_relative "../http/simple"
-require_relative "train/http"
-
-module TargetIO
-  class HTTP
-    extend Forwardable
-    def_delegators :@http_class, :get, :head, :patch, :post, :put, :delete
-
-    # Only for Chef::Provider::RemoteFile::HTTP
-    def_delegators :@http_class, :streaming_request, :streaming_request_with_progress, :last_response
-
-    def initialize(url, http_client_opts = {})
-      if ::ChefConfig::Config.target_mode?
-        @http_class = TargetIO::TrainCompat::HTTP.new(url, http_client_opts)
-      else
-        @http_class = Chef::HTTP::Simple.new(url, http_client_opts)
-      end
-    end
-  end
-end