diff options
21 files changed, 67 insertions, 33 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index 3f0c1fe335..8c4a26f505 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -41,7 +41,7 @@ builder-to-testers-map: mac_os_x-10.14-x86_64: - mac_os_x-10.14-x86_64 - mac_os_x-10.15-x86_64 - - mac_os_x-11.0-x86_64 + - mac_os_x-11-x86_64 mac_os_x-11-arm64: - mac_os_x-11-arm64 sles-12-s390x: diff --git a/CHANGELOG.md b/CHANGELOG.md index 514c141d2d..641475bb82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,17 +2,22 @@ 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 16.13.9 --> -## [v16.13.9](https://github.com/chef/chef/tree/v16.13.9) (2021-04-07) +<!-- latest_release 16.13.14 --> +## [v16.13.14](https://github.com/chef/chef/tree/v16.13.14) (2021-04-08) #### Merged Pull Requests -- Bump inspec-core-bin to 4.31.0 [#11324](https://github.com/chef/chef/pull/11324) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) +- Update Ohai to 16.13 [#11335](https://github.com/chef/chef/pull/11335) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=16.12.3 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update Ohai to 16.13 [#11335](https://github.com/chef/chef/pull/11335) ([tas50](https://github.com/tas50)) <!-- 16.13.14 --> +- fix powershell exec segfaults on DSC_Resource [#11334](https://github.com/chef/chef/pull/11334) ([tas50](https://github.com/tas50)) <!-- 16.13.13 --> +- Update name of macos 11 in expeditor config [#11333](https://github.com/chef/chef/pull/11333) ([tas50](https://github.com/tas50)) <!-- 16.13.12 --> +- Fix failing Fauxhai related specs [#11332](https://github.com/chef/chef/pull/11332) ([tas50](https://github.com/tas50)) <!-- 16.13.11 --> +- Chef 16: Add centos_stream_platform? helper [#11331](https://github.com/chef/chef/pull/11331) ([ramereth](https://github.com/ramereth)) <!-- 16.13.10 --> - Bump inspec-core-bin to 4.31.0 [#11324](https://github.com/chef/chef/pull/11324) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.13.9 --> - Bump omnibus-software from `ef7b496` to `56f6321` in /omnibus [#11322](https://github.com/chef/chef/pull/11322) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 16.13.8 --> - Bump ffi-yajl to 2.4.0 [#11316](https://github.com/chef/chef/pull/11316) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 16.13.7 --> diff --git a/Gemfile.lock b/Gemfile.lock index 75706e4d5a..2560cfd36a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/ohai.git - revision: 056f23b05f5f820bbc1da1bb0d21f96065abaea5 + revision: 0804257d21af21e96a0e00bc7ea3cce9174dd013 branch: 16-stable specs: - ohai (16.12.3) + ohai (16.13.0) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) @@ -20,12 +20,12 @@ GIT PATH remote: . specs: - chef (16.13.9) + chef (16.13.14) addressable bcrypt_pbkdf (~> 1.1) bundler (>= 1.10) - chef-config (= 16.13.9) - chef-utils (= 16.13.9) + chef-config (= 16.13.14) + chef-utils (= 16.13.14) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -57,12 +57,12 @@ PATH tty-screen (~> 0.6) tty-table (~> 0.11) uuidtools (>= 2.1.5, < 3.0) - chef (16.13.9-universal-mingw32) + chef (16.13.14-universal-mingw32) addressable bcrypt_pbkdf (~> 1.1) bundler (>= 1.10) - chef-config (= 16.13.9) - chef-utils (= 16.13.9) + chef-config (= 16.13.14) + chef-utils (= 16.13.14) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -109,15 +109,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (16.13.9) - chef (= 16.13.9) + chef-bin (16.13.14) + chef (= 16.13.14) PATH remote: chef-config specs: - chef-config (16.13.9) + chef-config (16.13.14) addressable - chef-utils (= 16.13.9) + chef-utils (= 16.13.14) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -126,7 +126,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (16.13.9) + chef-utils (16.13.14) GEM remote: https://rubygems.org/ @@ -176,7 +176,7 @@ GEM faraday-net_http (1.0.1) faraday_middleware (1.0.0) faraday (~> 1.0) - fauxhai-ng (8.7.1) + fauxhai-ng (9.0.0) net-ssh ffi (1.15.0) ffi (1.15.0-x64-mingw32) @@ -273,12 +273,12 @@ GEM tty-color (~> 0.5) plist (3.6.0) proxifier (1.0.3) - pry (0.13.1) + pry (0.14.0) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.8.0) byebug (~> 11.0) - pry (~> 0.13.0) + pry (~> 0.10) pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) @@ -1 +1 @@ -16.13.9
\ No newline at end of file +16.13.14
\ 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 fadf74562e..c355423f36 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 = "16.13.9".freeze + VERSION = "16.13.14".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index bd546733bf..ed2b132f2b 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 = "16.13.9".freeze + VERSION = "16.13.14".freeze end diff --git a/chef-utils/lib/chef-utils/dsl/platform.rb b/chef-utils/lib/chef-utils/dsl/platform.rb index f44cb811bb..047c742dc8 100644 --- a/chef-utils/lib/chef-utils/dsl/platform.rb +++ b/chef-utils/lib/chef-utils/dsl/platform.rb @@ -123,6 +123,21 @@ module ChefUtils # chef-sugar backcompat method alias_method :centos?, :centos_platform? + # Determine if the current node is CentOS Stream. + # + # @param [Chef::Node] node the node to check + # @since 16.13 + # + # @return [Boolean] + # + def centos_stream_platform?(node = __getnode) + if node["os_release"] + node.dig("os_release", "name") == "CentOS Stream" + else + node.dig("lsb", "id") == "CentOSStream" + end + end + # Determine if the current node is Oracle Linux. # # @param [Chef::Node] node the node to check diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index a21cae04dc..7e4273cb59 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 = "16.13.9" + VERSION = "16.13.14" end diff --git a/chef-utils/spec/unit/dsl/platform_family_spec.rb b/chef-utils/spec/unit/dsl/platform_family_spec.rb index fdf4584afd..714a9f0a45 100644 --- a/chef-utils/spec/unit/dsl/platform_family_spec.rb +++ b/chef-utils/spec/unit/dsl/platform_family_spec.rb @@ -90,13 +90,13 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do end context "on centos6" do - let(:options) { { platform: "centos", version: "6.10" } } + let(:options) { { platform: "centos", version: "6" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?) end context "on centos7" do - let(:options) { { platform: "centos", version: "7.7.1908" } } + let(:options) { { platform: "centos", version: "7" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?) end @@ -108,7 +108,7 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do end context "on clearos7" do - let(:options) { { platform: "clearos", version: "7.4" } } + let(:options) { { platform: "clearos", version: "7" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?) end @@ -156,25 +156,25 @@ RSpec.describe ChefUtils::DSL::PlatformFamily do end context "on oracle6" do - let(:options) { { platform: "oracle", version: "6.10" } } + let(:options) { { platform: "oracle", version: "6" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?) end context "on oracle7" do - let(:options) { { platform: "oracle", version: "7.6" } } + let(:options) { { platform: "oracle", version: "7" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?) end context "on redhat6" do - let(:options) { { platform: "redhat", version: "6.10" } } + let(:options) { { platform: "redhat", version: "6" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?) end context "on redhat7" do - let(:options) { { platform: "redhat", version: "7.6" } } + let(:options) { { platform: "redhat", version: "7" } } pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?) end diff --git a/chef-utils/spec/unit/dsl/platform_spec.rb b/chef-utils/spec/unit/dsl/platform_spec.rb index 216e15f112..8ebdcbae8f 100644 --- a/chef-utils/spec/unit/dsl/platform_spec.rb +++ b/chef-utils/spec/unit/dsl/platform_spec.rb @@ -145,6 +145,20 @@ RSpec.describe ChefUtils::DSL::Platform do platform_reports_true_for(:centos?, :centos_platform?) end + context "on centos stream w/o os_release" do + let(:options) { { platform: "centos" } } + let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "lsb" => { "id" => "CentOSStream" }, "os_release" => nil } } + + platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?) + end + + context "on centos stream w/ os_release" do + let(:options) { { platform: "centos" } } + let(:node) { { "platform" => "centos", "platform_version" => "8", "platform_family" => "rhel", "os" => "linux", "os_release" => { "name" => "CentOS Stream" } } } + + platform_reports_true_for(:centos?, :centos_platform?, :centos_stream_platform?) + end + context "on clearos" do let(:options) { { platform: "clearos" } } diff --git a/distro/ruby_bin_folder/AMD64/Chef.PowerShell.Wrapper.dll b/distro/ruby_bin_folder/AMD64/Chef.PowerShell.Wrapper.dll Binary files differindex f7af9321a0..cfe7078d38 100644 --- a/distro/ruby_bin_folder/AMD64/Chef.PowerShell.Wrapper.dll +++ b/distro/ruby_bin_folder/AMD64/Chef.PowerShell.Wrapper.dll diff --git a/distro/ruby_bin_folder/AMD64/Chef.PowerShell.dll b/distro/ruby_bin_folder/AMD64/Chef.PowerShell.dll Binary files differindex 472665913c..dbffc87ece 100644 --- a/distro/ruby_bin_folder/AMD64/Chef.PowerShell.dll +++ b/distro/ruby_bin_folder/AMD64/Chef.PowerShell.dll diff --git a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll Binary files differindex 604fb35960..7b1c4d14d6 100644 --- a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll +++ b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll diff --git a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll Binary files differindex 933985ef8a..44ba78d3fa 100644 --- a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll +++ b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll diff --git a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb Binary files differindex 673f95412d..d3bf195294 100644 --- a/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb +++ b/distro/ruby_bin_folder/AMD64/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb diff --git a/distro/ruby_bin_folder/x86/Chef.PowerShell.dll b/distro/ruby_bin_folder/x86/Chef.PowerShell.dll Binary files differindex 37e6ad5015..558ac94224 100644 --- a/distro/ruby_bin_folder/x86/Chef.PowerShell.dll +++ b/distro/ruby_bin_folder/x86/Chef.PowerShell.dll diff --git a/distro/ruby_bin_folder/x86/Chef.Powershell.Wrapper.dll b/distro/ruby_bin_folder/x86/Chef.Powershell.Wrapper.dll Binary files differindex 9dba14db62..0153bcec03 100644 --- a/distro/ruby_bin_folder/x86/Chef.Powershell.Wrapper.dll +++ b/distro/ruby_bin_folder/x86/Chef.Powershell.Wrapper.dll diff --git a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll Binary files differindex f18cf74970..9a85c84155 100644 --- a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll +++ b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll diff --git a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll Binary files differindex 7971e77a6f..3945bf7ab4 100644 --- a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll +++ b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.dll diff --git a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb Binary files differindex b2a0e1ef22..d98811d840 100644 --- a/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb +++ b/distro/ruby_bin_folder/x86/shared/Microsoft.NETCore.App/5.0.0/Chef.Powershell.Core.pdb diff --git a/lib/chef/version.rb b/lib/chef/version.rb index f2db660006..793c76f750 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("16.13.9") + VERSION = Chef::VersionString.new("16.13.14") end # |