diff options
author | Davin Taddeo <davin@chef.io> | 2020-07-23 17:02:55 -0400 |
---|---|---|
committer | Davin Taddeo <davin@chef.io> | 2020-07-23 17:02:55 -0400 |
commit | bb605d3c3903bf45313b64f707e9f0242e2f39cd (patch) | |
tree | 45b28f4b5e5601fd65226bb4a1ed407146d2ee5a | |
parent | d143de5bbbc9410f5086d963be0c1f6367949673 (diff) | |
parent | 187eb2a8a2d03f7b7ace34d33584d45899d2441c (diff) | |
download | chef-bb605d3c3903bf45313b64f707e9f0242e2f39cd.tar.gz |
Merge branch 'master' of github.com:chef/chef into main
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 22 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource_inspector.rb | 8 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
8 files changed, 27 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 59c4310090..879546b6e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 16.3.28 --> -## [v16.3.28](https://github.com/chef/chef/tree/v16.3.28) (2020-07-23) +<!-- latest_release 16.3.29 --> +## [v16.3.29](https://github.com/chef/chef/tree/v16.3.29) (2020-07-23) #### Merged Pull Requests -- Update ruby cleanup omnibus software again [#10196](https://github.com/chef/chef/pull/10196) ([tas50](https://github.com/tas50)) +- Fix chef-resource-inspector to handle classes in equal_to [#10197](https://github.com/chef/chef/pull/10197) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=16.2.73 --> ### Changes not yet released to stable #### Merged Pull Requests +- Fix chef-resource-inspector to handle classes in equal_to [#10197](https://github.com/chef/chef/pull/10197) ([tas50](https://github.com/tas50)) <!-- 16.3.29 --> - Update ruby cleanup omnibus software again [#10196](https://github.com/chef/chef/pull/10196) ([tas50](https://github.com/tas50)) <!-- 16.3.28 --> - Update the ruby-cleanup omnibus-software configs [#10195](https://github.com/chef/chef/pull/10195) ([tas50](https://github.com/tas50)) <!-- 16.3.27 --> - Set log level to :fatal in test to prevent excess logging. [#10188](https://github.com/chef/chef/pull/10188) ([phiggins](https://github.com/phiggins)) <!-- 16.3.26 --> diff --git a/Gemfile.lock b/Gemfile.lock index 585b31d064..ceffba8de0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,12 +28,12 @@ GIT PATH remote: . specs: - chef (16.3.28) + chef (16.3.29) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.3.28) - chef-utils (= 16.3.28) + chef-config (= 16.3.29) + chef-utils (= 16.3.29) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -63,12 +63,12 @@ PATH tty-prompt (~> 0.21) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.3.28-universal-mingw32) + chef (16.3.29-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.3.28) - chef-utils (= 16.3.28) + chef-config (= 16.3.29) + chef-utils (= 16.3.29) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -114,15 +114,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (16.3.28) - chef (= 16.3.28) + chef-bin (16.3.29) + chef (= 16.3.29) PATH remote: chef-config specs: - chef-config (16.3.28) + chef-config (16.3.29) addressable - chef-utils (= 16.3.28) + chef-utils (= 16.3.29) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -131,7 +131,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (16.3.28) + chef-utils (16.3.29) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -16.3.28
\ No newline at end of file +16.3.29
\ 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 e292e1823d..462c6580ea 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.3.28".freeze + VERSION = "16.3.29".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 274d206f7c..9f258183fd 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.3.28".freeze + VERSION = "16.3.29".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 621f344d48..98985848d1 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -15,5 +15,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "16.3.28".freeze + VERSION = "16.3.29".freeze end diff --git a/lib/chef/resource_inspector.rb b/lib/chef/resource_inspector.rb index a12b06fcb2..53c0fbd913 100644 --- a/lib/chef/resource_inspector.rb +++ b/lib/chef/resource_inspector.rb @@ -59,11 +59,17 @@ module ResourceInspector required: opts[:required] || false, default: opts[:default_description] || get_default(opts[:default]), name_property: opts[:name_property] || false, - equal_to: Array(opts[:equal_to]).sort.map(&:inspect) } + equal_to: sort_equal_to(opts[:equal_to]) } end data end + def self.sort_equal_to(equal_to) + Array(equal_to).sort.map(&:inspect) + rescue ArgumentError + Array(equal_to).map(&:inspect) + end + def self.extract_cookbook(path, complete) path = File.expand_path(path) dir, name = File.split(path) diff --git a/lib/chef/version.rb b/lib/chef/version.rb index e50d8f73af..4a05e733e3 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.3.28") + VERSION = Chef::VersionString.new("16.3.29") end # |