Merge branch 'chef:main' into patch-1

11 files changed, 59 insertions, 27 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1679b05ba8..f2dd2358c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,20 @@
 <!-- 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 18.0.136 -->
-## [v18.0.136](https://github.com/chef/chef/tree/v18.0.136) (2022-07-26)
+<!-- latest_release 18.0.139 -->
+## [v18.0.139](https://github.com/chef/chef/tree/v18.0.139) (2022-08-02)
 
 #### Merged Pull Requests
-- Require etc library [#13068](https://github.com/chef/chef/pull/13068) ([curzonj](https://github.com/curzonj))
+- add url for principal names [#13104](https://github.com/chef/chef/pull/13104) ([Stromweld](https://github.com/Stromweld))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.9.26 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- add url for principal names [#13104](https://github.com/chef/chef/pull/13104) ([Stromweld](https://github.com/Stromweld)) <!-- 18.0.139 -->
+- Added how to doc with details about documentation for infra client resources [#13046](https://github.com/chef/chef/pull/13046) ([neha-p6](https://github.com/neha-p6)) <!-- 18.0.138 -->
+- Wording change in error for missing recipe dependency (&quot;Obvious Fix&quot;) [#13061](https://github.com/chef/chef/pull/13061) ([c-drive](https://github.com/c-drive)) <!-- 18.0.137 -->
 - Require etc library [#13068](https://github.com/chef/chef/pull/13068) ([curzonj](https://github.com/curzonj)) <!-- 18.0.136 -->
 - Bump omnibus-software from `a9b13a0` to `1d540dc` in /omnibus [#13089](https://github.com/chef/chef/pull/13089) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 18.0.135 -->
 - Re add: Use new msys2 based devkit for windows&quot;&quot; [#13097](https://github.com/chef/chef/pull/13097) ([neha-p6](https://github.com/neha-p6)) <!-- 18.0.134 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cd1e8ffee6..cfd5df7f9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,12 +42,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (18.0.136)
+    chef (18.0.139)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.136)
-      chef-utils (= 18.0.136)
+      chef-config (= 18.0.139)
+      chef-utils (= 18.0.139)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -76,13 +76,13 @@ PATH
       unf_ext (< 0.0.8.1)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
-    chef (18.0.136-universal-mingw32)
+    chef (18.0.139-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 18.0.136)
+      chef-config (= 18.0.139)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 18.0.136)
+      chef-utils (= 18.0.139)
       chef-vault
       chef-zero (>= 14.0.11)
       corefoundation (~> 0.3.4)
@@ -126,15 +126,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (18.0.136)
-      chef (= 18.0.136)
+    chef-bin (18.0.139)
+      chef (= 18.0.139)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (18.0.136)
+    chef-config (18.0.139)
       addressable
-      chef-utils (= 18.0.136)
+      chef-utils (= 18.0.139)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -143,7 +143,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (18.0.136)
+    chef-utils (18.0.139)
       concurrent-ruby
 
 GEM
@@ -156,8 +156,8 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.610.0)
-    aws-sdk-core (3.131.3)
+    aws-partitions (1.613.0)
+    aws-sdk-core (3.131.5)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -208,7 +208,7 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
-    erubi (1.10.0)
+    erubi (1.11.0)
     erubis (2.7.0)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
diff --git a/VERSION b/VERSION
index 75cfdf3d8c..62b9f40619 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0.136
\ No newline at end of file
+18.0.139
\ 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 7ceb31e306..c64f94d547 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 = "18.0.136".freeze
+  VERSION = "18.0.139".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index a62c860485..924c3f36ab 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 = "18.0.136".freeze
+  VERSION = "18.0.139".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 0c380ec18f..3b95a5a99e 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 = "18.0.136"
+  VERSION = "18.0.139"
 end
diff --git a/docs/dev/how_to/adding_documentation_to_infra_resources.md b/docs/dev/how_to/adding_documentation_to_infra_resources.md
new file mode 100644
index 0000000000..7a333fa35f
--- /dev/null
+++ b/docs/dev/how_to/adding_documentation_to_infra_resources.md
@@ -0,0 +1,29 @@
+# Adding documentation to resources:
+The documentation for Infra Client resources resides at [chef-wed-docs repository](https://github.com/chef/chef-web-docs/).
+Currently in order to reflect the documentation added to Infra Client resources on the [website](https://docs.chef.io/) we need to follow some manual steps.
+
+# Prerequisite:
+Clone [chef-wed-docs repository](https://github.com/chef/chef-web-docs/). Install Hugo, npm, go.
+
+`brew tap go-swagger/go-swagger && brew install go-swagger hugo node go jq`
+
+# Generating YAML files:
+The YAML data is generated using a [rake](https://github.com/chef/chef/blob/main/tasks/docs.rb) task in the `chef/chef` repository.
+
+`rake docs_site:resources`
+
+The YAML files will be created under `docs_site` directory. Copy the corresponding file(s) for the resource(s) for which documentation is updated to [chef-web-docs/data/infra/resources](https://github.com/chef/chef-web-docs/tree/main/data/infra/resources).
+(NOTE: The data file(.yaml) should be verified and edited manually to remove any inaccuracies.)
+
+# Generating mark down(.md) files:
+Go to the [chef-web-docs](https://github.com/chef/chef-web-docs/) repository, where we copied the YAML file(s).
+Using the YAML file(s) create corresponding markdown(.md) file(s).
+
+`hugo new -k resource content/resources/RESOURCE_NAME.md`
+
+# Verifying changes locally:
+Run server locally and verify the changes in your browser at http://localhost:1313
+
+`make serve`
+
+Once changes are verified, create a PR at [chef-web-docs](https://github.com/chef/chef-web-docs/) repository.
\ No newline at end of file
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 19ae0078a4..d94e413e96 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 = "18.0.136".freeze
+    VERSION = "18.0.139".freeze
   end
 end
 
diff --git a/lib/chef/resource/windows_user_privilege.rb b/lib/chef/resource/windows_user_privilege.rb
index e4679f50b9..251382e46f 100644
--- a/lib/chef/resource/windows_user_privilege.rb
+++ b/lib/chef/resource/windows_user_privilege.rb
@@ -23,7 +23,7 @@ class Chef
     class WindowsUserPrivilege < Chef::Resource
 
       provides :windows_user_privilege
-      description "The windows_user_privilege resource allows to add and set principal (User/Group) to the specified privilege.\n Ref: https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/user-rights-assignment"
+      description "The windows_user_privilege resource allows to add and set principal (User/Group) to the specified privilege.\n Ref: https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/user-rights-assignment\n For list of principals to use with :add action Ref: https://docs.microsoft.com/en-us/windows/security/identity-protection/access-control/special-identities"
 
       introduced "16.0"
 
diff --git a/lib/chef/run_context.rb b/lib/chef/run_context.rb
index ce4d545aa4..be7b787fcc 100644
--- a/lib/chef/run_context.rb
+++ b/lib/chef/run_context.rb
@@ -413,9 +413,9 @@ class Chef
         logger.warn(<<~ERROR_MESSAGE)
           MissingCookbookDependency:
           Recipe `#{recipe_name}` is not in the run_list, and cookbook '#{cookbook_name}'
-          is not a dependency of any cookbook in the run_list.  To load this recipe,
-          first add a dependency on cookbook '#{cookbook_name}' in the cookbook you're
-          including it from in that cookbook's metadata.
+          is not a dependency of any cookbook in the run_list. To load this recipe,
+          first add a dependency of the cookbook '#{cookbook_name}' into the metadata 
+		  of the cookbook which depends on '#{cookbook_name}'.
         ERROR_MESSAGE
       end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 83891d81be..579772365f 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("18.0.136")
+  VERSION = Chef::VersionString.new("18.0.139")
 end
 
 #