From 81b56782ea1e1829be5919d57eb23afa6ade37e3 Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Fri, 24 Oct 2025 11:04:45 +0530 Subject: [PATCH 1/3] Updated http-accept 2.1.1. Signed-off-by: sreepuramsudheer --- oc-chef-pedant/Gemfile.lock | 4 ++-- omnibus/Gemfile.lock | 4 ++-- src/chef-server-ctl/Gemfile.lock | 4 ++-- src/oc-id/Gemfile.lock | 4 ++-- src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 09168dc818..0cfc0a5631 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -173,7 +173,7 @@ GEM gssapi (1.3.1) ffi (>= 1.0.1) hashie (5.0.0) - http-accept (1.7.0) + http-accept (2.1.1) http-cookie (1.1.0) domain_name (~> 0.5) httpclient (2.9.0) @@ -297,7 +297,7 @@ GEM rake (13.3.0) regexp_parser (2.11.3) rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + http-accept (~> 2.1.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cd36018613..c47118d66d 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -224,7 +224,7 @@ GEM builder (>= 2.1.2) rexml (~> 3.0) hashie (5.0.0) - http-accept (1.7.0) + http-accept (2.1.1) http-cookie (1.1.0) domain_name (~> 0.5) httpclient (2.9.0) @@ -378,7 +378,7 @@ GEM reline (0.6.2) io-console (~> 0.5) rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + http-accept (~> 2.1.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index b3da8eee10..72fa190000 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -215,7 +215,7 @@ GEM ffi (>= 1.0.1) hashie (5.0.0) highline (2.1.0) - http-accept (1.7.0) + http-accept (2.1.1) http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.9.0) @@ -386,7 +386,7 @@ GEM connection_pool regexp_parser (2.11.2) rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + http-accept (~> 2.1.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index bf86984ce9..4927b6064f 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -331,7 +331,7 @@ GEM thor tilt hashie (5.0.0) - http-accept (1.7.0) + http-accept (2.1.1) http-cookie (1.1.0) domain_name (~> 0.5) httpclient (2.9.0) @@ -565,7 +565,7 @@ GEM actionpack (>= 7.0) railties (>= 7.0) rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + http-accept (~> 2.1.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) diff --git a/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock b/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock index 15c1852a1e..1d8b13727b 100644 --- a/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock +++ b/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock @@ -22,7 +22,7 @@ GEM concurrent-ruby (1.3.5) diff-lcs (1.6.2) domain_name (0.6.20240107) - http-accept (1.7.0) + http-accept (2.1.1) http-cookie (1.0.8) domain_name (~> 0.5) i18n (1.14.7) @@ -39,7 +39,7 @@ GEM netrc (0.11.0) pbkdf2 (0.1.0) rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) + http-accept (~> 2.1.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) From 4c33bc061dc5ea44790a633851ae81fddbe2f3f2 Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Fri, 24 Oct 2025 13:07:36 +0530 Subject: [PATCH 2/3] Pointing rest-client to alternative source. Signed-off-by: sreepuramsudheer --- oc-chef-pedant/Gemfile | 1 + omnibus/Gemfile | 2 ++ src/chef-server-ctl/Gemfile | 2 ++ src/oc-id/Gemfile | 1 + src/oc_bifrost/oc-bifrost-pedant/Gemfile | 1 + 5 files changed, 7 insertions(+) diff --git a/oc-chef-pedant/Gemfile b/oc-chef-pedant/Gemfile index 528debc875..aa35326948 100644 --- a/oc-chef-pedant/Gemfile +++ b/oc-chef-pedant/Gemfile @@ -6,6 +6,7 @@ gem "pry" gem "pry-byebug" gem "pry-stack_explorer" gem "rake" +gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" # We require chef internally to get the version in # lib/pedant/request.rb. It's really strange code and it should be diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 0519797cf7..6300927674 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -6,6 +6,7 @@ group :omnibus do gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") gem 'artifactory' gem 'license_scout', git: "https://github.com/chef/license_scout.git", branch: "1-stable" + gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" end group :test do @@ -14,4 +15,5 @@ group :test do gem 'archive-tar-minitar' # required by berkshelf for packaging gem 'chef', '~> 18.8.46' gem 'rake' + gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" end diff --git a/src/chef-server-ctl/Gemfile b/src/chef-server-ctl/Gemfile index d0fd4e15bc..f3b0bb1ca4 100644 --- a/src/chef-server-ctl/Gemfile +++ b/src/chef-server-ctl/Gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" gemspec +gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" + gem "chef", "~> 18.8.46" gem "toml" # for habitat-land diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile index e7e79f0eca..835ddda485 100644 --- a/src/oc-id/Gemfile +++ b/src/oc-id/Gemfile @@ -3,6 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '7.1.5.2' +gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" gem 'chef', '~> 18.8.46' gem 'jbuilder', '~> 2.11' gem 'jquery-rails' diff --git a/src/oc_bifrost/oc-bifrost-pedant/Gemfile b/src/oc_bifrost/oc-bifrost-pedant/Gemfile index 99e56f5858..3bbabfa378 100644 --- a/src/oc_bifrost/oc-bifrost-pedant/Gemfile +++ b/src/oc_bifrost/oc-bifrost-pedant/Gemfile @@ -5,3 +5,4 @@ gemspec # TODO(ssd) 2017-03-15: This in in this gemfile because bifrost # expects it to be in the path gem 'veil' +gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" \ No newline at end of file From fbf7df14c962804ef853ccbcae03b7df10a9bcfc Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Fri, 24 Oct 2025 08:10:00 +0000 Subject: [PATCH 3/3] rest-client update. Signed-off-by: sreepuramsudheer --- oc-chef-pedant/Gemfile.lock | 20 +++++++++++---- omnibus/Gemfile.lock | 20 +++++++++++---- src/chef-server-ctl/Gemfile.lock | 24 ++++++++++++------ src/oc-id/Gemfile.lock | 20 +++++++++++---- src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock | 25 +++++++++++++------ 5 files changed, 80 insertions(+), 29 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 0cfc0a5631..d81001e462 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/chef/rest-client + revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799 + branch: jfm/ucrt_update1 + specs: + rest-client (2.1.0) + base64 + fiddle + http-accept (~> 2.1.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + PATH remote: . specs: @@ -169,6 +182,7 @@ GEM ffi (~> 1.0) ffi-yajl (2.6.0) libyajl2 (>= 1.2) + fiddle (1.1.8) fuzzyurl (0.9.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -296,11 +310,6 @@ GEM rainbow (3.1.1) rake (13.3.0) regexp_parser (2.11.3) - rest-client (2.1.0) - http-accept (~> 2.1.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rexml (3.4.4) rspec (3.13.2) rspec-core (~> 3.13.0) @@ -412,6 +421,7 @@ DEPENDENCIES pry-byebug pry-stack_explorer rake + rest-client! BUNDLED WITH 2.6.9 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index c47118d66d..01d698e713 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -36,6 +36,19 @@ GIT ruby-progressbar (~> 1.7) thor (>= 0.18, < 2.0) +GIT + remote: https://github.com/chef/rest-client + revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799 + branch: jfm/ucrt_update1 + specs: + rest-client (2.1.0) + base64 + fiddle + http-accept (~> 2.1.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + GEM remote: https://rubygems.org/ specs: @@ -217,6 +230,7 @@ GEM ffi (~> 1.0) ffi-yajl (2.6.0) libyajl2 (>= 1.2) + fiddle (1.1.8) fuzzyurl (0.9.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -377,11 +391,6 @@ GEM regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) - rest-client (2.1.0) - http-accept (~> 2.1.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) retryable (3.0.5) rexml (3.4.1) rspec (3.13.2) @@ -543,6 +552,7 @@ DEPENDENCIES omnibus! omnibus-software! rake + rest-client! test-kitchen BUNDLED WITH diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index 72fa190000..50a8bef999 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/chef/rest-client + revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799 + branch: jfm/ucrt_update1 + specs: + rest-client (2.1.0) + base64 + fiddle + http-accept (~> 2.1.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + PATH remote: . specs: @@ -210,13 +223,14 @@ GEM ffi (~> 1.0) ffi-yajl (2.6.0) libyajl2 (>= 1.2) + fiddle (1.1.8) fuzzyurl (0.9.0) gssapi (1.3.1) ffi (>= 1.0.1) hashie (5.0.0) highline (2.1.0) http-accept (2.1.1) - http-cookie (1.0.8) + http-cookie (1.1.0) domain_name (~> 0.5) httpclient (2.9.0) mutex_m @@ -298,7 +312,7 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0812) + mime-types-data (3.2025.0924) minitar (1.0.2) minitest (5.25.5) mixlib-archive (1.1.7) @@ -385,11 +399,6 @@ GEM redis-client (0.25.2) connection_pool regexp_parser (2.11.2) - rest-client (2.1.0) - http-accept (~> 2.1.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) retryable (3.0.5) rexml (3.4.1) rspec (3.13.1) @@ -512,6 +521,7 @@ DEPENDENCIES knife (~> 18.8.13) knife-ec-backup (~> 3.0.5) rake + rest-client! rspec toml diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index 4927b6064f..9d27fc6bc9 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/chef/rest-client + revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799 + branch: jfm/ucrt_update1 + specs: + rest-client (2.1.0) + base64 + fiddle + http-accept (~> 2.1.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + GIT remote: https://github.com/talktovikas/chef_secrets.git revision: 98c1eea7e8ec67ff10ee9c3057af1e881aa6dd13 @@ -321,6 +334,7 @@ GEM ffi (~> 1.0) ffi-yajl (2.6.0) libyajl2 (>= 1.2) + fiddle (1.1.8) fuzzyurl (0.9.0) globalid (1.3.0) activesupport (>= 6.1) @@ -564,11 +578,6 @@ GEM responders (3.2.0) actionpack (>= 7.0) railties (>= 7.0) - rest-client (2.1.0) - http-accept (~> 2.1.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rexml (3.4.1) rouge (4.6.0) rspec (3.13.2) @@ -774,6 +783,7 @@ DEPENDENCIES rails-controller-testing rb-readline (~> 0.5.2) responders (~> 3.0, >= 3.0.1) + rest-client! rspec-rails (~> 6.0) sass-rails (>= 4.0.3) sdoc diff --git a/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock b/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock index 1d8b13727b..d628221137 100644 --- a/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock +++ b/src/oc_bifrost/oc-bifrost-pedant/Gemfile.lock @@ -1,3 +1,16 @@ +GIT + remote: https://github.com/chef/rest-client + revision: 5b3bb34ea536e5207388b84c5dd6360ea3fc2799 + branch: jfm/ucrt_update1 + specs: + rest-client (2.1.0) + base64 + fiddle + http-accept (~> 2.1.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + PATH remote: . specs: @@ -18,12 +31,14 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) + base64 (0.3.0) bcrypt (3.1.20) concurrent-ruby (1.3.5) diff-lcs (1.6.2) domain_name (0.6.20240107) + fiddle (1.1.8) http-accept (2.1.1) - http-cookie (1.0.8) + http-cookie (1.1.0) domain_name (~> 0.5) i18n (1.14.7) concurrent-ruby (~> 1.0) @@ -31,18 +46,13 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0729) + mime-types-data (3.2025.0924) minitest (5.25.5) mixlib-config (3.0.27) tomlrb net-http-spy (0.2.1) netrc (0.11.0) pbkdf2 (0.1.0) - rest-client (2.1.0) - http-accept (~> 2.1.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -68,6 +78,7 @@ PLATFORMS DEPENDENCIES oc-bifrost-pedant! + rest-client! veil BUNDLED WITH