From e68c891d7a22bf7f880daede45f75b32f5c79ad7 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Sun, 9 Apr 2023 15:10:09 +0000 Subject: Bump addressable to 2.8.4 This pull request was triggered automatically via Expeditor when addressable 2.8.4 was promoted to Rubygems. This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required. --- Gemfile.lock | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dd73f48c0c..b81f4b3377 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,14 +136,14 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) appbundler (0.13.4) mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.737.0) + aws-partitions (1.743.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -152,7 +152,7 @@ GEM aws-sdk-kms (1.63.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.119.2) + aws-sdk-s3 (1.120.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -184,7 +184,7 @@ GEM chef-zero (>= 14.0) net-ssh coderay (1.1.3) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) corefoundation (0.3.13) ffi (>= 1.15.0) crack (0.4.5) @@ -194,21 +194,12 @@ GEM ed25519 (1.3.0) erubi (1.12.0) erubis (2.7.0) - faraday (1.4.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday_middleware (1.2.0) - faraday (~> 1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.0.2) fauxhai-ng (9.3.0) net-ssh ffi (1.15.5) @@ -230,11 +221,11 @@ GEM hashie (4.1.0) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (5.18.14) + inspec-core (5.21.29) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) - faraday (>= 0.9.0, < 1.5) - faraday_middleware (~> 1.0) + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) hashie (>= 3.4, < 5.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) @@ -253,8 +244,8 @@ GEM train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (5.18.14) - inspec-core (= 5.18.14) + inspec-core-bin (5.21.29) + inspec-core (= 5.21.29) ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.6.2) @@ -292,10 +283,10 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-ssh (7.0.1) + net-ssh (7.1.0) nori (2.6.0) parallel (1.22.1) - parser (3.2.1.0) + parser (3.2.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -312,7 +303,7 @@ GEM binding_of_caller (~> 1.0) pry (~> 0.13) public_suffix (5.0.1) - rack (2.2.6.2) + rack (2.2.6.4) rainbow (3.1.1) rake (13.0.6) rb-readline (0.5.5) @@ -343,9 +334,9 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.26.0) + rubocop-ast (1.28.0) parser (>= 3.2.1.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) -- cgit v1.2.1 From dd131f30e12a17a83f46137066d6babff0f60710 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 11 Apr 2023 20:57:40 +0000 Subject: Bump version to 17.10.38 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 24 ++++++++++++------------ VERSION | 2 +- chef-bin/lib/chef-bin/version.rb | 2 +- chef-config/lib/chef-config/version.rb | 2 +- chef-utils/lib/chef-utils/version.rb | 2 +- knife/lib/chef/knife/version.rb | 2 +- lib/chef/version.rb | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 343ae03de8..245c465b4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ 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/). - -## [v17.10.37](https://github.com/chef/chef/tree/v17.10.37) (2023-03-30) + +## [v17.10.38](https://github.com/chef/chef/tree/v17.10.38) (2023-04-11) #### Merged Pull Requests -- [Chef-17] Update ssl cert used in kitchen tests [#13660](https://github.com/chef/chef/pull/13660) ([neha-p6](https://github.com/neha-p6)) +- Bump addressable to 2.8.4 [#13674](https://github.com/chef/chef/pull/13674) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) ### Changes not yet released to stable #### Merged Pull Requests +- Bump addressable to 2.8.4 [#13674](https://github.com/chef/chef/pull/13674) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - [Chef-17] Update ssl cert used in kitchen tests [#13660](https://github.com/chef/chef/pull/13660) ([neha-p6](https://github.com/neha-p6)) - [chef-17] INFC-303 - Backport changes from v18 to v17 for documentation and mis… [#13254](https://github.com/chef/chef/pull/13254) ([Stromweld](https://github.com/Stromweld)) - Fix rubygem tests for 17 [#13615](https://github.com/chef/chef/pull/13615) ([jaymzh](https://github.com/jaymzh)) diff --git a/Gemfile.lock b/Gemfile.lock index b81f4b3377..6834dac238 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.10.37) + chef (17.10.38) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.37) - chef-utils (= 17.10.37) + chef-config (= 17.10.38) + chef-utils (= 17.10.38) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,13 +66,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.10.37-universal-mingw32) + chef (17.10.38-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.37) + chef-config (= 17.10.38) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.37) + chef-utils (= 17.10.38) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -113,15 +113,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.10.37) - chef (= 17.10.37) + chef-bin (17.10.38) + chef (= 17.10.38) PATH remote: chef-config specs: - chef-config (17.10.37) + chef-config (17.10.38) addressable - chef-utils (= 17.10.37) + chef-utils (= 17.10.38) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -130,7 +130,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.10.37) + chef-utils (17.10.38) concurrent-ruby GEM @@ -143,7 +143,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.743.0) + aws-partitions (1.744.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) diff --git a/VERSION b/VERSION index b68195817a..d13781a6ee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.37 \ No newline at end of file +17.10.38 \ 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 92cbc18453..e5c3eeee37 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.10.37".freeze + VERSION = "17.10.38".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 5d9280cbe3..8b468e845f 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.10.37".freeze + VERSION = "17.10.38".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 3427ef7886..374003964b 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.10.37" + VERSION = "17.10.38" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 58e3a6238f..78cba85061 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.10.37".freeze + VERSION = "17.10.38".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 0e446c45b3..df71dee82d 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.10.37") + VERSION = Chef::VersionString.new("17.10.38") end # -- cgit v1.2.1 From 34d438dc4a4131ad85aff7817e54c689249ef0b7 Mon Sep 17 00:00:00 2001 From: Thomas Powell <104777878+tpowell-progress@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:39:32 -0700 Subject: Fix berkshelf on chef 17 (#13679) Signed-off-by: Thomas Powell --- .expeditor/verify.pipeline.yml | 2 +- kitchen-tests/Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 4e9abe2b59..dcd8d5cc85 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -361,7 +361,7 @@ steps: - apt-get install -y graphviz - bundle config set --local without omnibus_package - bundle install --jobs=3 --retry=3 - - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake + - bundle exec tasks/bin/run_external_test chef/berkshelf main rake expeditor: executor: docker: diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 0a2fa1cee1..70f9506c23 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -4,7 +4,7 @@ gem "rake" # required to build some native extensions gem "chef", path: ".." gem "knife", path: "../knife" gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-stable" # avoids failures when we bump chef major -gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "main" +gem "berkshelf", git: "https://github.com/chef/berkshelf.git", branch: "main" gem "kitchen-dokken", ">= 2.0" gem "kitchen-vagrant", ">= 1.0" gem "kitchen-inspec" -- cgit v1.2.1 From b599fe2162a4393d796ef092597f9179395132f3 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Wed, 12 Apr 2023 16:42:14 +0000 Subject: Bump version to 17.10.39 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 24 ++++++++++++------------ VERSION | 2 +- chef-bin/lib/chef-bin/version.rb | 2 +- chef-config/lib/chef-config/version.rb | 2 +- chef-utils/lib/chef-utils/version.rb | 2 +- knife/lib/chef/knife/version.rb | 2 +- lib/chef/version.rb | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 245c465b4e..c671c92e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ 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/). - -## [v17.10.38](https://github.com/chef/chef/tree/v17.10.38) (2023-04-11) + +## [v17.10.39](https://github.com/chef/chef/tree/v17.10.39) (2023-04-12) #### Merged Pull Requests -- Bump addressable to 2.8.4 [#13674](https://github.com/chef/chef/pull/13674) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) +- Fix berkshelf on chef 17 [#13679](https://github.com/chef/chef/pull/13679) ([tpowell-progress](https://github.com/tpowell-progress)) ### Changes not yet released to stable #### Merged Pull Requests +- Fix berkshelf on chef 17 [#13679](https://github.com/chef/chef/pull/13679) ([tpowell-progress](https://github.com/tpowell-progress)) - Bump addressable to 2.8.4 [#13674](https://github.com/chef/chef/pull/13674) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - [Chef-17] Update ssl cert used in kitchen tests [#13660](https://github.com/chef/chef/pull/13660) ([neha-p6](https://github.com/neha-p6)) - [chef-17] INFC-303 - Backport changes from v18 to v17 for documentation and mis… [#13254](https://github.com/chef/chef/pull/13254) ([Stromweld](https://github.com/Stromweld)) diff --git a/Gemfile.lock b/Gemfile.lock index 6834dac238..744f844234 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.10.38) + chef (17.10.39) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.38) - chef-utils (= 17.10.38) + chef-config (= 17.10.39) + chef-utils (= 17.10.39) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,13 +66,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.10.38-universal-mingw32) + chef (17.10.39-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.38) + chef-config (= 17.10.39) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.38) + chef-utils (= 17.10.39) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -113,15 +113,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.10.38) - chef (= 17.10.38) + chef-bin (17.10.39) + chef (= 17.10.39) PATH remote: chef-config specs: - chef-config (17.10.38) + chef-config (17.10.39) addressable - chef-utils (= 17.10.38) + chef-utils (= 17.10.39) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -130,7 +130,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.10.38) + chef-utils (17.10.39) concurrent-ruby GEM @@ -143,7 +143,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.744.0) + aws-partitions (1.745.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) diff --git a/VERSION b/VERSION index d13781a6ee..89ddd051f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.38 \ No newline at end of file +17.10.39 \ 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 e5c3eeee37..a6ccb07283 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.10.38".freeze + VERSION = "17.10.39".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 8b468e845f..351b785c27 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.10.38".freeze + VERSION = "17.10.39".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 374003964b..b999efe44d 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.10.38" + VERSION = "17.10.39" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 78cba85061..1f3fdf8e4a 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.10.38".freeze + VERSION = "17.10.39".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index df71dee82d..2f3da46302 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.10.38") + VERSION = Chef::VersionString.new("17.10.39") end # -- cgit v1.2.1