diff options
| author | Tim Smith <tsmith@chef.io> | 2021-12-29 18:23:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 18:23:26 -0500 |
| commit | 3653ece7f0fe82c02825edc0d154a040b23f3a4d (patch) | |
| tree | bee203f6563ec559a37e09dc32d9f4bc7275e921 | |
| parent | 50a0001bae754c66feb69c84b64cb305a03a34d2 (diff) | |
| parent | 80f6059295c6f978b298af1b38cf5f54d5204130 (diff) | |
| download | chef-3653ece7f0fe82c02825edc0d154a040b23f3a4d.tar.gz | |
Merge pull request #12418 from jweyer8/fix_full
homebrew_tap: Fix failures due to missing `full` property
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_homebrew_tap.rb | 5 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 1 | ||||
| -rw-r--r-- | lib/chef/resource/homebrew_tap.rb | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_homebrew_tap.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_homebrew_tap.rb new file mode 100644 index 0000000000..16600a92a0 --- /dev/null +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_homebrew_tap.rb @@ -0,0 +1,5 @@ +homebrew_tap "chef/chef" + +homebrew_tap "chef/chef" do + action :untap +end
\ No newline at end of file diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index b83eb74506..213ef2d516 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -109,3 +109,4 @@ include_recipe "::_macos_userdefaults" include_recipe "::_ohai_hint" include_recipe "::_openssl" include_recipe "::_chef_gem" +include_recipe "::_homebrew_tap" diff --git a/lib/chef/resource/homebrew_tap.rb b/lib/chef/resource/homebrew_tap.rb index b728d447c8..a150210951 100644 --- a/lib/chef/resource/homebrew_tap.rb +++ b/lib/chef/resource/homebrew_tap.rb @@ -53,7 +53,7 @@ class Chef action :tap, description: "Add a Homebrew tap." do unless tapped?(new_resource.tap_name) converge_by("tap #{new_resource.tap_name}") do - shell_out!("#{new_resource.homebrew_path} tap #{new_resource.full ? "--full" : ""} #{new_resource.tap_name} #{new_resource.url || ""}", + shell_out!("#{new_resource.homebrew_path} tap #{new_resource.tap_name} #{new_resource.url || ""}", user: new_resource.owner, env: { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner }, cwd: ::Dir.home(new_resource.owner)) |