summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md15
-rw-r--r--Gemfile.lock40
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/_homebrew_tap.rb5
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/macos.rb1
-rw-r--r--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/resource/homebrew_tap.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock4
12 files changed, 48 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b5327dfd1..f6d361b013 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
-<!-- latest_release -->
+<!-- latest_release 17.9.20 -->
+## [v17.9.20](https://github.com/chef/chef/tree/v17.9.20) (2022-01-04)
+
+#### Merged Pull Requests
+- Bump omnibus-software from `4707275` to `b6dd27a` in /omnibus [#12425](https://github.com/chef/chef/pull/12425) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump chef/chefstyle to c72bbc6a79ab0859755981f99d76635cd5bc275a [#12420](https://github.com/chef/chef/pull/12420) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=17.9.18 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Bump omnibus-software from `4707275` to `b6dd27a` in /omnibus [#12425](https://github.com/chef/chef/pull/12425) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.9.20 -->
+- Bump chef/chefstyle to c72bbc6a79ab0859755981f99d76635cd5bc275a [#12420](https://github.com/chef/chef/pull/12420) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.9.19 -->
+- homebrew_tap: Fix failures due to missing `full` property [#12418](https://github.com/chef/chef/pull/12418) ([jweyer8](https://github.com/jweyer8)) <!-- 17.9.19 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b1a09470e..2867ffbadf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 8b945f7083df2459718f023304116b8404a83a7d
+ revision: d3050865f4c7b4be668397007d9964ce2d54e6ee
branch: main
specs:
- chefstyle (2.1.3)
- rubocop (= 1.23.0)
+ chefstyle (2.2.0)
+ rubocop (= 1.24.1)
GIT
remote: https://github.com/chef/ohai.git
- revision: 795c6f0bac2c47dd94ea1e7bf55b1a906d2a14dd
+ revision: e86d186661a599703fe929497b33c5f7a3257d49
branch: main
specs:
- ohai (17.9.0)
+ ohai (17.9.1)
chef-config (>= 14.12, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
@@ -35,12 +35,12 @@ GIT
PATH
remote: .
specs:
- chef (17.9.18)
+ chef (17.9.20)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.9.18)
- chef-utils (= 17.9.18)
+ chef-config (= 17.9.20)
+ chef-utils (= 17.9.20)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -66,12 +66,12 @@ PATH
train-winrm (>= 0.2.5)
uuidtools (>= 2.1.5, < 3.0)
vault (~> 0.16)
- chef (17.9.18-universal-mingw32)
+ chef (17.9.20-universal-mingw32)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.9.18)
- chef-utils (= 17.9.18)
+ chef-config (= 17.9.20)
+ chef-utils (= 17.9.20)
chef-vault
chef-zero (>= 14.0.11)
corefoundation (~> 0.3.4)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (17.9.18)
- chef (= 17.9.18)
+ chef-bin (17.9.20)
+ chef (= 17.9.20)
PATH
remote: chef-config
specs:
- chef-config (17.9.18)
+ chef-config (17.9.20)
addressable
- chef-utils (= 17.9.18)
+ chef-utils (= 17.9.20)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (17.9.18)
+ chef-utils (17.9.20)
concurrent-ruby
GEM
@@ -142,7 +142,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.543.0)
+ aws-partitions (1.544.0)
aws-sdk-core (3.125.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
@@ -329,16 +329,16 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
- rubocop (1.23.0)
+ rubocop (1.24.1)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
- rubocop-ast (>= 1.12.0, < 2.0)
+ rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.15.0)
+ rubocop-ast (1.15.1)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
diff --git a/VERSION b/VERSION
index 1f677817ff..657ff1006d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.9.18 \ No newline at end of file
+17.9.20 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 954a419613..c9182a453a 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("..", __dir__)
- VERSION = "17.9.18".freeze
+ VERSION = "17.9.20".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7593d77449..4bb040cd64 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
- VERSION = "17.9.18".freeze
+ VERSION = "17.9.20".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index b3979e81db..52929b247d 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "17.9.18"
+ VERSION = "17.9.20"
end
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/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 12504241cd..631864fe19 100644
--- a/knife/lib/chef/knife/version.rb
+++ b/knife/lib/chef/knife/version.rb
@@ -17,7 +17,7 @@
class Chef
class Knife
KNIFE_ROOT = File.expand_path("../..", __dir__)
- VERSION = "17.9.18".freeze
+ VERSION = "17.9.20".freeze
end
end
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))
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a3b3300291..b30249d8b8 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("..", __dir__)
- VERSION = Chef::VersionString.new("17.9.18")
+ VERSION = Chef::VersionString.new("17.9.20")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b3dca6cab1..bc892b1569 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 4707275bb5cac7643938972738e83723e8fd5621
+ revision: b6dd27a6456aa6a19bb81e2dd65c8438067b46e9
branch: main
specs:
omnibus-software (4.0.0)
@@ -33,7 +33,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
- aws-partitions (1.543.0)
+ aws-partitions (1.544.0)
aws-sdk-core (3.125.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
View Lorry Controller Status