From fe507a064275e533a6984278634f05a706f33aa9 Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Wed, 12 Feb 2025 13:48:47 +0530 Subject: [PATCH 1/7] Updating chef version to 18.6.2 Signed-off-by: jan shahid shaik --- oc-chef-pedant/Gemfile | 2 +- omnibus/files/server-ctl-cookbooks/infra-server/Gemfile | 2 +- omnibus_overrides.rb | 2 +- src/chef-server-ctl/Gemfile | 2 +- src/oc-id/Gemfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oc-chef-pedant/Gemfile b/oc-chef-pedant/Gemfile index fbd5fac4b3..909faecc80 100644 --- a/oc-chef-pedant/Gemfile +++ b/oc-chef-pedant/Gemfile @@ -10,7 +10,7 @@ gem 'rake' # We require chef internally to get the version in # lib/pedant/request.rb. It's really strange code and it should be # revisited. -gem 'chef', "17.10.0" +gem 'chef', "18.6.2" # For "rake chef_zero_spec" #gem 'chef-zero', github: 'chef/chef-zero' diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/Gemfile b/omnibus/files/server-ctl-cookbooks/infra-server/Gemfile index 93e4a0fd19..b26292cac9 100644 --- a/omnibus/files/server-ctl-cookbooks/infra-server/Gemfile +++ b/omnibus/files/server-ctl-cookbooks/infra-server/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' gem 'cookstyle' gem 'chefspec' gem 'veil' -gem 'chef', '< 18' # Do not pull in chef 18 until the build image is updated with > ruby 3.0 +gem 'chef', '< 19' # Do not pull in chef 18 until the build image is updated with > ruby 3.0 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index d26f4576db..dadc28d8f1 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -4,7 +4,7 @@ # override :erlang, version: "24.3.2" override :'omnibus-ctl', version: "main" -override :chef, version: "v18.6.1" +override :chef, version: "v18.6.2" override :ohai, version: "v16.17.0" override :ruby, version: "3.1.6" override :perl, version: "5.34.0" diff --git a/src/chef-server-ctl/Gemfile b/src/chef-server-ctl/Gemfile index 00577cfe2c..f5efd58d7b 100644 --- a/src/chef-server-ctl/Gemfile +++ b/src/chef-server-ctl/Gemfile @@ -2,5 +2,5 @@ source "https://rubygems.org" gemspec -gem "chef", "~> 17.10" +gem "chef", "~> 18.6.2" gem "toml" # for habitat-land diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile index e2dad5fa68..9d5ae4017e 100644 --- a/src/oc-id/Gemfile +++ b/src/oc-id/Gemfile @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 7.0.8.1' -gem 'chef', '17.10.0' +gem 'chef', '18.6.2' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.11' gem 'jquery-rails' From 5e15e485ee2a5c5ddc9d67574e3430c961a03c7b Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Thu, 13 Feb 2025 10:59:57 +0530 Subject: [PATCH 2/7] chef update in plan.sh file Signed-off-by: jan shahid shaik --- src/chef-server-ctl/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chef-server-ctl/habitat/plan.sh b/src/chef-server-ctl/habitat/plan.sh index 23217280f5..09c6e53f60 100644 --- a/src/chef-server-ctl/habitat/plan.sh +++ b/src/chef-server-ctl/habitat/plan.sh @@ -84,7 +84,7 @@ do_install() { cat > Gemfile << EOF source 'https://rubygems.org' -gem 'chef', '~>15.12.22' +gem 'chef', '~>18.6.2' gem 'knife-opc' EOF From 2e0f28b5dea30db10c9bc1e0201c4e5120d781eb Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Sat, 15 Feb 2025 16:28:19 +0530 Subject: [PATCH 3/7] Gemfile.lock updates with omniauth-oauth2 Signed-off-by: jan shahid shaik --- oc-chef-pedant/Gemfile.lock | 346 ++++++++++-------- src/chef-server-ctl/Gemfile.lock | 361 +++++++++++-------- src/oc-id/Gemfile | 5 +- src/oc-id/Gemfile.lock | 600 +++++++++++++++++-------------- 4 files changed, 746 insertions(+), 566 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 29a5640721..e55f0f8b04 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -29,77 +29,104 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) - aws-eventstream (1.2.0) - aws-partitions (1.571.0) - aws-sdk-core (3.130.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.55.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.0) - aws-sdk-core (~> 3, >= 3.127.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + ast (2.4.2) + aws-eventstream (1.3.0) + aws-partitions (1.1050.0) + aws-sdk-core (3.218.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.98.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.180.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.59.0) - aws-sdk-core (~> 3, >= 3.127.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (~> 1.5) + aws-sdk-secretsmanager (1.112.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) - bigdecimal (3.1.6) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) - builder (3.2.4) + bigdecimal (3.1.9) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) + builder (3.3.0) byebug (11.1.3) - chef (17.10.0) + chef (18.6.2) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) - chef-utils (= 17.10.0) + chef-config (= 18.6.2) + chef-utils (= 18.6.2) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) - ffi (>= 1.5.0) + ffi (>= 1.15.5, <= 1.16.3) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 5, < 6) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) - ohai (~> 17.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10, <= 3.12.7) + train-rest (>= 0.4.1) train-winrm (>= 0.2.5) + unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) - vault (~> 0.16) - chef-config (17.10.0) + vault (~> 0.18.2) + chef-config (18.6.2) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.6.2) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-gyoku (1.4.1) + builder (>= 2.1.2) + rexml (~> 3.3) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.6.2) concurrent-ruby - chef-vault (4.1.5) + chef-vault (4.1.11) + chef-winrm (2.3.11) + builder (>= 2.1.2) + chef-gyoku (>= 1.4.1) + erubi (~> 1.8) + gssapi (~> 1.2) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (= 2.7.0) + rexml (~> 3.3) + rubyntlm (~> 0.6.0, >= 0.6.3) + chef-winrm-elevated (1.2.5) + chef-winrm (>= 2.3.11) + chef-winrm-fs (>= 1.3.7) + erubi (~> 1.8) + chef-winrm-fs (1.3.7) + chef-winrm (>= 2.3.11) + erubi (>= 1.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -108,77 +135,70 @@ GEM uuidtools (~> 2.1) webrick coderay (1.1.3) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + cookstyle (7.32.8) + rubocop (= 1.25.1) corefoundation (0.3.13) ffi (>= 1.15.0) - debug_inspector (1.1.0) - diff-lcs (1.5.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - drb (2.2.0) - ruby2_keywords - erubi (1.10.0) + date (3.4.1) + debug_inspector (1.2.0) + diff-lcs (1.5.1) + domain_name (0.6.20240107) + drb (2.2.1) + erubi (1.13.1) 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) - 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) - ffi (1.15.5) - ffi-libarchive (1.1.3) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.16.3) + ffi-libarchive (1.1.14) ffi (~> 1.0) - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) hashie (4.1.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) iniparse (1.5.0) - inspec-core (4.56.19) + inspec-core (5.22.65) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) - faraday (>= 0.9.0, < 1.5) - faraday_middleware (~> 1.0) - hashie (>= 3.4, < 5.0) + cookstyle + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) + hashie (>= 3.4, < 6.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) parallel (~> 1.9) - parslet (>= 1.5, < 2.0) + parslet (>= 1.5, < 3.0) pry (~> 0.13) - rspec (>= 3.9, <= 3.11) + rspec (>= 3.9, <= 3.12) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - thor (>= 0.20, < 2.0) + thor (>= 0.20, < 1.3.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jmespath (1.6.1) - json (2.6.1) + jmespath (1.6.2) + json (2.10.1) libyajl2 (2.1.0) license-acceptance (2.1.13) pastel (~> 0.7) @@ -186,37 +206,48 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.0) + logger (1.6.5) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - method_source (1.0.0) - mime-types (3.4.1) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitest (5.22.2) + mime-types-data (3.2025.0204) + minitest (5.25.4) mixlib-archive (1.1.7) mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-log (3.0.9) - mixlib-shellout (3.2.7) + mixlib-log (3.2.0) + ffi (~> 1.9, <= 1.17.0) + mixlib-shellout (3.3.6) chef-utils multi_json (1.15.0) - multipart-post (2.1.1) - mutex_m (0.2.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + net-ftp (0.3.8) + net-protocol + time + net-http (0.6.0) + uri net-http-spy (0.2.1) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-ssh (6.1.0) + net-protocol (0.2.2) + timeout + net-scp (4.1.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.3.0) netrc (0.11.0) - nori (2.6.0) - ohai (17.9.0) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + nori (2.7.0) + bigdecimal + ohai (18.2.4) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -227,13 +258,16 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - parallel (1.22.1) - parslet (1.8.2) + parallel (1.26.3) + parser (3.3.7.1) + ast (~> 2.4.1) + racc + parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) - plist (3.6.0) - proxifier (1.0.3) - pry (0.14.1) + plist (3.7.2) + proxifier2 (1.1.0) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) @@ -242,38 +276,54 @@ GEM pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - public_suffix (5.0.0) - rack (2.2.6.3) + public_suffix (6.0.1) + racc (1.8.1) + rack (2.2.11) + rainbow (3.1.1) rake (13.2.1) + regexp_parser (2.10.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rexml (3.4.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.3) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.4) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-its (1.3.0) + rspec-support (~> 3.12.0) + rspec-its (1.3.1) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.11.0) + rspec-mocks (3.12.7) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) + rspec-support (~> 3.12.0) rspec-rerun (1.1.0) rspec (~> 3.0) - rspec-support (3.11.1) + rspec-support (3.12.2) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - ruby2_keywords (0.0.5) - rubyntlm (0.6.3) - rubyzip (2.3.2) - semverse (3.0.0) + rubocop (1.25.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.15.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.38.0) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) + rubyntlm (0.6.5) + base64 + rubyzip (2.4.1) + semverse (3.0.2) sslshake (1.3.1) strings (0.2.1) strings-ansi (~> 0.2) @@ -281,19 +331,26 @@ GEM unicode_utils (~> 1.4) strings-ansi (0.2.0) syslog-logger (1.6.8) - thor (1.2.1) + thor (1.2.2) + time (0.4.1) + date + timeout (0.4.3) tomlrb (1.3.0) - train-core (3.8.9) + train-core (3.12.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 4.0) - net-ssh (>= 2.9, < 7.0) - train-winrm (0.2.13) - winrm (>= 2.3.6, < 3.0) - winrm-elevated (~> 1.2.2) - winrm-fs (~> 1.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) + train-winrm (0.2.17) + chef-winrm (>= 2.3.11) + chef-winrm-elevated (>= 1.2.5) + chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) pastel (~> 0.8) strings (~> 0.2.0) @@ -307,48 +364,29 @@ GEM tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) - unicode-display_width (2.1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.6.0) unicode_utils (1.4.0) + uri (1.0.2) uuidtools (2.2.0) - vault (0.16.0) + vault (0.18.2) aws-sigv4 - webrick (1.7.0) - winrm (2.3.6) - builder (>= 2.1.2) - erubi (~> 1.8) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.3) - winrm-elevated (1.2.3) - erubi (~> 1.8) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.5) - erubi (~> 1.8) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 2.0) - winrm (~> 2.0) + webrick (1.9.1) wisper (2.0.1) - wmi-lite (1.0.5) + wmi-lite (1.0.7) PLATFORMS ruby DEPENDENCIES - chef (= 17.10.0) + chef (= 18.6.2) oc-chef-pedant! pry pry-byebug diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index 5a43454795..cb9af375c9 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -24,91 +24,135 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + activesupport (7.0.8.7) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.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.651.0) - aws-sdk-core (3.165.1) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-eventstream (1.3.0) + aws-partitions (1.1050.0) + aws-sdk-core (3.218.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.59.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.98.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.180.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.67.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.5) + aws-sdk-secretsmanager (1.112.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.18) - bcrypt_pbkdf (1.1.0) - berkshelf (8.0.5) - chef (>= 15.7.32) + base64 (0.2.0) + bcrypt (3.1.20) + bcrypt_pbkdf (1.1.1) + berkshelf (8.0.15) + chef (>= 18.0.0) + chef-cleanroom (~> 1.0) chef-config - cleanroom (~> 1.0) concurrent-ruby (~> 1.0) - minitar (>= 0.6) + ffi (~> 1.9, < 1.16.0) + minitar (~> 1.0) mixlib-archive (>= 1.1.4, < 2.0) mixlib-config (>= 2.2.5) mixlib-shellout (>= 2.0, < 4.0) - octokit (~> 4.0) + octokit (>= 4.0, < 6.0) retryable (>= 2.0, < 4.0) solve (~> 4.0) - thor (>= 0.20) - builder (3.2.4) - chef (17.10.0) + thor (>= 0.20, < 1.3.0) + bigdecimal (3.1.9) + builder (3.3.0) + chef (18.6.2) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) - chef-utils (= 17.10.0) + chef-config (= 18.6.2) + chef-utils (= 18.6.2) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) - ffi (>= 1.5.0) + ffi (>= 1.15.5, <= 1.16.3) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 5, < 6) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) - ohai (~> 17.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10, <= 3.12.7) + train-rest (>= 0.4.1) train-winrm (>= 0.2.5) + unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) - vault (~> 0.16) - chef-config (17.10.0) + vault (~> 0.18.2) + chef-bin (18.6.2) + chef (= 18.6.2) + chef-cleanroom (1.0.5) + chef-config (18.6.2) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.6.2) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-gyoku (1.4.1) + builder (>= 2.1.2) + rexml (~> 3.3) + chef-licensing (1.0.4) + activesupport (~> 7.0, < 7.1) + chef-config (>= 15) + faraday (>= 1, < 3) + faraday-http-cache + tty-prompt (~> 0.23) + tty-spinner (~> 0.9.3) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.6.2) concurrent-ruby - chef-vault (4.1.10) + chef-vault (4.1.11) + chef-winrm (2.3.11) + builder (>= 2.1.2) + chef-gyoku (>= 1.4.1) + erubi (~> 1.8) + gssapi (~> 1.2) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (= 2.7.0) + rexml (~> 3.3) + rubyntlm (~> 0.6.0, >= 0.6.3) + chef-winrm-elevated (1.2.5) + chef-winrm (>= 2.3.11) + chef-winrm-fs (>= 1.3.7) + erubi (~> 1.8) + chef-winrm-fs (1.3.7) + chef-winrm (>= 2.3.11) + erubi (>= 1.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -131,44 +175,52 @@ GEM veil chefstyle (2.2.3) rubocop (= 1.25.1) - cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + cookstyle (7.32.8) + rubocop (= 1.25.1) corefoundation (0.3.13) ffi (>= 1.15.0) - diff-lcs (1.5.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - erubi (1.11.0) + date (3.4.1) + diff-lcs (1.5.1) + domain_name (0.6.20240107) + erubi (1.13.1) erubis (2.7.0) - faraday (1.3.1) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-net_http (1.0.1) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-http-cache (2.5.1) + faraday (>= 0.8) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.15.5) - ffi-libarchive (1.1.3) + ffi-libarchive (1.1.14) ffi (~> 1.0) - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.4.0) - builder (>= 2.1.2) - rexml (~> 3.0) hashie (4.1.0) - highline (2.0.3) + highline (2.1.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) + i18n (1.14.7) + concurrent-ruby (~> 1.0) iniparse (1.5.0) - inspec-core (4.24.32) + inspec-core (5.22.65) addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0, < 1.4) - hashie (>= 3.4, < 5.0) + chef-telemetry (~> 1.0, >= 1.0.8) + cookstyle + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) + hashie (>= 3.4, < 6.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) @@ -176,24 +228,26 @@ GEM parallel (~> 1.9) parslet (>= 1.5, < 3.0) pry (~> 0.13) - rspec (~> 3.10) + rspec (>= 3.9, <= 3.12) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - thor (>= 0.20, < 2.0) + thor (>= 0.20, < 1.3.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jmespath (1.6.1) - json (2.6.2) - knife (17.10.0) + jmespath (1.6.2) + json (2.10.1) + knife (18.6.13) bcrypt_pbkdf (~> 1.1) - chef (>= 17) - chef-config (>= 17) - chef-utils (>= 17) + chef (~> 18.6) + chef-bin (~> 18.6) + chef-config (~> 18.6) + chef-licensing (~> 1.0) + chef-utils (~> 18.6) chef-vault erubis (~> 2.7) ffi (>= 1.15) @@ -202,11 +256,12 @@ GEM license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-cli (>= 2.1.1, < 3.0) - net-ssh (>= 5.1, < 7) + net-ssh (>= 5.1, < 8) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 17.0) + ohai (~> 18.0) pastel - train-core (~> 3.2, >= 3.2.28) + proxifier2 (~> 1.1) + train-core (~> 3.10) train-winrm (>= 0.2.5) tty-prompt (~> 0.21) tty-screen (~> 0.6) @@ -226,14 +281,17 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.1) + logger (1.6.5) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - method_source (1.0.0) - mime-types (3.4.1) + method_source (1.1.0) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - minitar (0.9) + mime-types-data (3.2025.0204) + minitar (1.0.2) + minitest (5.25.4) mixlib-archive (1.1.7) mixlib-log mixlib-authentication (3.0.10) @@ -244,31 +302,40 @@ GEM mixlib-shellout mixlib-versioning thor - mixlib-log (3.0.9) - mixlib-shellout (3.2.7) + mixlib-log (3.2.0) + ffi (~> 1.9, <= 1.17.0) + mixlib-shellout (3.3.6) chef-utils mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.2.3) - net-scp (4.0.0) + multipart-post (2.4.1) + net-ftp (0.3.8) + net-protocol + time + net-http (0.6.0) + uri + net-protocol (0.2.2) + timeout + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-ssh (6.1.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-ssh (7.3.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) netrc (0.11.0) - nori (2.6.0) - octokit (4.25.1) + nori (2.7.0) + bigdecimal + octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - ohai (17.9.0) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + ohai (18.2.4) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -281,50 +348,53 @@ GEM wmi-lite (~> 1.0) omnibus-ctl (0.6.10) chef-utils (>= 16.5.54) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.7.1) ast (~> 2.4.1) racc - parslet (1.8.2) + parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) pbkdf2 (0.1.0) - pg (1.4.6) - plist (3.6.0) - proxifier (1.0.3) - pry (0.14.1) + pg (1.5.9) + plist (3.7.2) + proxifier2 (1.1.0) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.0) - racc (1.7.3) - rack (2.2.6.4) + public_suffix (6.0.1) + racc (1.8.1) + rack (2.2.11) rainbow (3.1.1) - rake (13.2.0) - redis (4.7.1) - regexp_parser (2.8.2) + rake (13.2.1) + redis (5.3.0) + redis-client (>= 0.22.0) + redis-client (0.23.2) + connection_pool + regexp_parser (2.10.0) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retryable (3.0.5) - rexml (3.3.9) + rexml (3.4.0) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) + rspec-core (3.12.3) rspec-support (~> 3.12.0) - rspec-expectations (3.12.0) + rspec-expectations (3.12.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-its (1.3.0) + rspec-its (1.3.1) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.0) + rspec-mocks (3.12.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (3.12.2) rubocop (1.25.1) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -334,17 +404,18 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.38.0) + parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - rubyntlm (0.6.3) - rubyzip (2.3.2) + rubyntlm (0.6.5) + base64 + rubyzip (2.4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) semverse (3.0.2) - sequel (5.61.0) + sequel (5.89.0) + bigdecimal solve (4.0.4) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) @@ -355,21 +426,28 @@ GEM unicode_utils (~> 1.4) strings-ansi (0.2.0) syslog-logger (1.6.8) - thor (1.3.1) + thor (1.2.2) + time (0.4.1) + date + timeout (0.4.3) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tomlrb (1.3.0) - train-core (3.10.7) + train-core (3.12.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 5.0) net-ssh (>= 2.9, < 8.0) - train-winrm (0.2.13) - winrm (>= 2.3.6, < 3.0) - winrm-elevated (~> 1.2.2) - winrm-fs (~> 1.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) + train-winrm (0.2.17) + chef-winrm (>= 2.3.11) + chef-winrm-elevated (>= 1.2.5) + chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) pastel (~> 0.8) strings (~> 0.2.0) @@ -383,41 +461,26 @@ GEM tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) - tty-screen (0.8.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) tty-screen (~> 0.8) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.5.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.6.0) unicode_utils (1.4.0) + uri (1.0.2) uuidtools (2.2.0) - vault (0.17.0) + vault (0.18.2) aws-sigv4 veil (0.3.11) bcrypt (~> 3.1) pbkdf2 - webrick (1.7.0) - winrm (2.3.6) - builder (>= 2.1.2) - erubi (~> 1.8) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.3) - winrm-elevated (1.2.3) - erubi (~> 1.8) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.5) - erubi (~> 1.8) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 2.0) - winrm (~> 2.0) + webrick (1.9.1) wisper (2.0.1) wmi-lite (1.0.7) @@ -426,7 +489,7 @@ PLATFORMS DEPENDENCIES berkshelf - chef (~> 17.10) + chef (~> 18.6.2) chef-server-ctl! chefstyle rake diff --git a/src/oc-id/Gemfile b/src/oc-id/Gemfile index 9d5ae4017e..ab81879bba 100644 --- a/src/oc-id/Gemfile +++ b/src/oc-id/Gemfile @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 7.0.8.1' -gem 'chef', '18.6.2' +gem 'chef', '~> 18.6.2' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.11' gem 'jquery-rails' @@ -22,7 +22,8 @@ gem "sprockets-rails", ">= 3.4.2" gem 'bigdecimal', '3.1.3' gem 'veil', '~> 0.3.11' -gem 'omniauth-chef', '~> 0.4' +# gem 'omniauth-chef', '~> 0.4' +gem 'omniauth-chef-oauth2', '~> 1.1' gem 'tzinfo-data' diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index 200d171709..0ffed2671a 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -1,155 +1,183 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + actioncable (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailbox (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.1) - actionpack (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailer (7.0.8.7) + actionpack (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activesupport (= 7.0.8.7) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.7) + actionview (= 7.0.8.7) + activesupport (= 7.0.8.7) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.1) - actionpack (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actiontext (7.0.8.7) + actionpack (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.7) + activesupport (= 7.0.8.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.7) + activesupport (= 7.0.8.7) globalid (>= 0.3.6) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) - activestorage (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activesupport (= 7.0.8.1) + activemodel (7.0.8.7) + activesupport (= 7.0.8.7) + activerecord (7.0.8.7) + activemodel (= 7.0.8.7) + activesupport (= 7.0.8.7) + activestorage (7.0.8.7) + actionpack (= 7.0.8.7) + activejob (= 7.0.8.7) + activerecord (= 7.0.8.7) + activesupport (= 7.0.8.7) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.1) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - aws-eventstream (1.2.0) - aws-partitions (1.755.0) - aws-sdk-core (3.171.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + ast (2.4.2) + aws-eventstream (1.3.1) + aws-partitions (1.1050.0) + aws-sdk-core (3.218.1) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.98.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.181.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.74.0) - aws-sdk-core (~> 3, >= 3.165.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.5) + aws-sdk-secretsmanager (1.112.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.18) - better_errors (2.9.1) - coderay (>= 1.0.0) + base64 (0.2.0) + bcrypt (3.1.20) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) + rouge (>= 1.0.0) bigdecimal (3.1.3) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) builder (3.3.0) byebug (11.1.3) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - chef (17.10.0) + chef (18.6.2) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.0) - chef-utils (= 17.10.0) + chef-config (= 18.6.2) + chef-utils (= 18.6.2) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) erubis (~> 2.7) - ffi (>= 1.5.0) + ffi (>= 1.15.5, <= 1.16.3) ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (>= 5, < 6) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) mixlib-shellout (>= 3.1.1, < 4.0) - net-sftp (>= 2.1.2, < 4.0) - ohai (~> 17.0) + net-ftp + net-sftp (>= 2.1.2, < 5.0) + ohai (~> 18.0) plist (~> 3.2) - proxifier (~> 1.0) + proxifier2 (~> 1.1) syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) + train-core (~> 3.10, <= 3.12.7) + train-rest (>= 0.4.1) train-winrm (>= 0.2.5) + unf_ext (~> 0.0.8.2) uuidtools (>= 2.1.5, < 3.0) - vault (~> 0.16) - chef-config (17.10.0) + vault (~> 0.18.2) + chef-config (18.6.2) addressable - chef-utils (= 17.10.0) + chef-utils (= 18.6.2) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) + chef-gyoku (1.4.1) + builder (>= 2.1.2) + rexml (~> 3.3) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (17.10.0) + chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) + chef-winrm (2.3.11) + builder (>= 2.1.2) + chef-gyoku (>= 1.4.1) + erubi (~> 1.8) + gssapi (~> 1.2) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (= 2.7.0) + rexml (~> 3.3) + rubyntlm (~> 0.6.0, >= 0.6.3) + chef-winrm-elevated (1.2.5) + chef-winrm (>= 2.3.11) + chef-winrm-fs (>= 1.3.7) + erubi (~> 1.8) + chef-winrm-fs (1.3.7) + chef-winrm (>= 2.3.11) + erubi (>= 1.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) chef-zero (15.0.11) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) @@ -165,93 +193,103 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.3) - config (4.1.0) + concurrent-ruby (1.3.5) + config (4.2.1) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) + cookstyle (7.32.8) + rubocop (= 1.25.1) corefoundation (0.3.13) ffi (>= 1.15.0) crass (1.0.6) daemons (1.4.1) - date (3.3.3) - debug_inspector (1.1.0) + date (3.4.1) + debug_inspector (1.2.0) deep_merge (1.2.2) - diff-lcs (1.5.0) - doorkeeper (5.6.6) + diff-lcs (1.5.1) + domain_name (0.6.20240107) + doorkeeper (5.8.1) railties (>= 5) - dry-configurable (1.0.1) - dry-core (~> 1.0, < 2) + dry-configurable (1.3.0) + dry-core (~> 1.1) zeitwerk (~> 2.6) - dry-core (1.0.0) + dry-core (1.1.0) concurrent-ruby (~> 1.0) + logger zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) + dry-inflector (1.2.0) + dry-initializer (3.2.0) + dry-logic (1.6.0) + bigdecimal concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) + dry-core (~> 1.1) zeitwerk (~> 2.6) - dry-schema (1.13.1) + dry-schema (1.14.0) concurrent-ruby (~> 1.0) dry-configurable (~> 1.0, >= 1.0.1) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-logic (>= 1.4, < 2) - dry-types (>= 1.7, < 2) + dry-core (~> 1.1) + dry-initializer (~> 3.2) + dry-logic (~> 1.5) + dry-types (~> 1.8) zeitwerk (~> 2.6) - dry-types (1.7.1) + dry-types (1.8.2) + bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0) dry-inflector (~> 1.0) dry-logic (~> 1.4) zeitwerk (~> 2.6) - dry-validation (1.10.0) + dry-validation (1.11.1) concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-schema (>= 1.12, < 2) + dry-core (~> 1.1) + dry-initializer (~> 3.2) + dry-schema (~> 1.14) zeitwerk (~> 2.6) - erubi (1.13.0) + erubi (1.13.1) erubis (2.7.0) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.10.0) factory_girl (4.9.0) activesupport (>= 3.0.0) factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - faraday (1.3.1) - faraday-net_http (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-net_http (1.0.1) - ffi (1.15.5) - ffi-libarchive (1.1.3) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + faye-websocket (0.11.3) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + ffi (1.16.3) + ffi-libarchive (1.1.14) ffi (~> 1.0) - ffi-yajl (2.4.0) + ffi-yajl (2.6.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.4.0) - builder (>= 2.1.2) - rexml (~> 3.0) - haml (6.1.1) - temple (>= 0.8.2) - thor - tilt hashie (4.1.0) + http-accept (1.7.0) + http-cookie (1.0.8) + domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.7) concurrent-ruby (~> 1.0) iniparse (1.5.0) - inspec-core (4.24.32) + inspec-core (5.22.65) addressable (~> 2.4) - chef-telemetry (~> 1.0) - faraday (>= 0.9.0, < 1.4) - hashie (>= 3.4, < 5.0) + chef-telemetry (~> 1.0, >= 1.0.8) + cookstyle + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) + hashie (>= 3.4, < 6.0) license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) @@ -259,27 +297,28 @@ GEM parallel (~> 1.9) parslet (>= 1.5, < 3.0) pry (~> 0.13) - rspec (~> 3.10) + rspec (>= 3.9, <= 3.12) rspec-its (~> 1.2) rubyzip (>= 1.2.2, < 3.0) semverse (~> 3.0) sslshake (~> 1.2) - thor (>= 0.20, < 2.0) + thor (>= 0.20, < 1.3.0) tomlrb (>= 1.2, < 2.1) - train-core (~> 3.0) + train-core (~> 3.10) tty-prompt (~> 0.17) tty-table (~> 0.10) ipaddress (0.8.3) - jbuilder (2.11.5) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) - jwt (2.7.0) + json (2.10.1) + jwt (2.10.1) + base64 kgio (2.11.4) libyajl2 (2.1.0) license-acceptance (2.1.13) @@ -288,10 +327,11 @@ GEM tty-box (~> 0.6) tty-prompt (~> 0.20) little-plugger (1.1.4) - logging (2.3.1) + logger (1.6.6) + logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.22.0) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -299,57 +339,77 @@ GEM net-imap net-pop net-smtp - mailcatcher (0.2.4) - eventmachine - haml - i18n - json - mail - sinatra - skinny (>= 0.1.2) - sqlite3-ruby - thin - marcel (1.0.2) + mailcatcher (0.10.0) + eventmachine (~> 1.0) + faye-websocket (~> 0.11.1) + mail (~> 2.3) + net-smtp + rack (~> 2.2) + sinatra (~> 3.2) + sqlite3 (~> 1.3) + thin (~> 1.8) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) + method_source (1.1.0) + mime-types (3.6.0) + logger + mime-types-data (~> 3.2015) + mime-types-data (3.2025.0204) mini_mime (1.1.5) - mini_portile2 (2.8.7) - minitest (5.24.1) + mini_portile2 (2.8.8) + minitest (5.25.4) mixlib-archive (1.1.7) mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) tomlrb - mixlib-log (3.0.9) - mixlib-shellout (3.2.7) + mixlib-log (3.2.0) + ffi (~> 1.9, <= 1.17.0) + mixlib-shellout (3.3.6) chef-utils multi_json (1.15.0) - multipart-post (2.3.0) - mustermann (3.0.0) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + multipart-post (2.4.1) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - net-imap (0.3.4) + net-ftp (0.3.8) + net-protocol + time + net-http (0.6.0) + uri + net-imap (0.5.6) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-scp (4.0.0) + net-scp (4.1.0) net-ssh (>= 2.6.5, < 8.0.0) - net-sftp (3.0.0) - net-ssh (>= 5.0.0, < 7.0.0) - net-smtp (0.3.3) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-smtp (0.5.1) net-protocol - net-ssh (6.1.0) - nio4r (2.5.9) + net-ssh (7.3.0) + netrc (0.11.0) + nio4r (2.7.4) nokogiri (1.15.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nori (2.6.0) - ohai (17.9.1) - chef-config (>= 14.12, < 18) - chef-utils (>= 16.0, < 18) + nori (2.7.0) + bigdecimal + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + ohai (18.2.4) + chef-config (>= 14.12, < 19) + chef-utils (>= 16.0, < 19) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -360,50 +420,58 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - omniauth (2.1.1) + omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) rack-protection - omniauth-chef (0.4.1) - chef (~> 17) - omniauth (~> 2.0, >= 2.0.4) - parallel (1.23.0) + omniauth-chef-oauth2 (1.1.0) + omniauth (>= 1.9, < 3) + omniauth-oauth2 (~> 1.0) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) + parallel (1.26.3) + parser (3.3.7.1) + ast (~> 2.4.1) + racc parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) pbkdf2 (0.1.0) - pg (1.5.2) - plist (3.7.0) - proxifier (1.0.3) + pg (1.5.9) + plist (3.7.2) + proxifier2 (1.1.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - psych (5.1.0) + psych (5.2.3) + date stringio - public_suffix (5.0.3) + public_suffix (6.0.1) racc (1.8.1) - rack (2.2.9) - rack-protection (3.0.6) - rack - rack-test (2.1.0) + rack (2.2.11) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rack-test (2.2.0) rack (>= 1.3) - rails (7.0.8.1) - actioncable (= 7.0.8.1) - actionmailbox (= 7.0.8.1) - actionmailer (= 7.0.8.1) - actionpack (= 7.0.8.1) - actiontext (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activemodel (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + rails (7.0.8.7) + actioncable (= 7.0.8.7) + actionmailbox (= 7.0.8.7) + actionmailer (= 7.0.8.7) + actionpack (= 7.0.8.7) + actiontext (= 7.0.8.7) + actionview (= 7.0.8.7) + activejob (= 7.0.8.7) + activemodel (= 7.0.8.7) + activerecord (= 7.0.8.7) + activestorage (= 7.0.8.7) + activesupport (= 7.0.8.7) bundler (>= 1.15.0) - railties (= 7.0.8.1) + railties (= 7.0.8.7) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -415,50 +483,70 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.7) + actionpack (= 7.0.8.7) + activesupport (= 7.0.8.7) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) + rainbow (3.1.1) raindrops (0.20.1) - rake (13.0.6) + rake (13.2.1) rb-readline (0.5.5) - rdoc (6.3.4.1) + rdoc (6.12.0) psych (>= 4.0.0) - regexp_parser (2.8.1) - responders (3.1.0) + regexp_parser (2.10.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.9) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rexml (3.4.0) + rouge (4.5.1) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) + rspec-core (3.12.3) rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-expectations (3.12.4) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-its (1.3.0) + rspec-its (1.3.1) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.5) + rspec-mocks (3.12.7) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.2) + rubocop (1.25.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.15.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.38.0) + parser (>= 3.3.1.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyntlm (0.6.3) - rubyzip (2.3.2) + rubyntlm (0.6.5) + base64 + rubyzip (2.4.1) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -476,56 +564,60 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semverse (3.0.2) - sinatra (3.0.6) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) + rack-protection (= 3.2.0) tilt (~> 2.0) - skinny (0.2.2) - eventmachine (~> 1.0) - thin - spring (4.1.1) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) + spring (4.2.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) - sqlite3 (1.6.2) - sqlite3-ruby (1.3.3) - sqlite3 (>= 1.3.3) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) sslshake (1.3.1) - stringio (3.0.6) + stringio (3.1.3) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) syslog-logger (1.6.8) - temple (0.10.0) thin (1.8.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.1) - tilt (2.1.0) - timecop (0.9.6) - timeout (0.3.2) + thor (1.2.2) + tilt (2.6.0) + time (0.4.1) + date + timecop (0.9.10) + timeout (0.4.3) tomlrb (1.3.0) - train-core (3.10.7) + train-core (3.12.7) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 5.0) net-ssh (>= 2.9, < 8.0) - train-winrm (0.2.13) - winrm (>= 2.3.6, < 3.0) - winrm-elevated (~> 1.2.2) - winrm-fs (~> 1.0) + train-rest (0.5.0) + aws-sigv4 (~> 1.5) + rest-client (~> 2.1) + train-core (~> 3.0) + train-winrm (0.2.17) + chef-winrm (>= 2.3.11) + chef-winrm-elevated (>= 1.2.5) + chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) pastel (~> 0.8) strings (~> 0.2.0) @@ -539,7 +631,7 @@ GEM tty-cursor (~> 0.7) tty-screen (~> 0.8) wisper (~> 2.0) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-table (0.12.0) pastel (~> 0.8) strings (~> 0.2.0) @@ -549,11 +641,12 @@ GEM turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) + tzinfo-data (1.2025.1) tzinfo (>= 1.0.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - unicode-display_width (2.4.2) + unf_ext (0.0.8.2) + unicode-display_width (2.6.0) unicode_utils (1.4.0) unicorn (6.1.0) kgio (~> 2.6) @@ -561,40 +654,25 @@ GEM unicorn-rails (2.2.1) rack unicorn + uri (1.0.2) uuidtools (2.2.0) - vault (0.17.0) + vault (0.18.2) aws-sigv4 veil (0.3.11) bcrypt (~> 3.1) pbkdf2 - webrick (1.8.1) - websocket (1.2.9) - websocket-driver (0.7.5) + version_gem (1.1.4) + webrick (1.9.1) + websocket (1.2.11) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - winrm (2.3.6) - builder (>= 2.1.2) - erubi (~> 1.8) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.3) - winrm-elevated (1.2.3) - erubi (~> 1.8) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.5) - erubi (~> 1.8) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 2.0) - winrm (~> 2.0) wisper (2.0.1) wmi-lite (1.0.7) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.17) + zeitwerk (2.6.18) PLATFORMS ruby @@ -604,7 +682,7 @@ DEPENDENCIES bigdecimal (= 3.1.3) binding_of_caller capybara (~> 3.39) - chef (= 17.10.0) + chef (~> 18.6.2) coffee-rails (~> 5.0) config (~> 4.1) doorkeeper (~> 5.0) @@ -615,7 +693,7 @@ DEPENDENCIES mailcatcher mixlib-authentication (>= 2.1, < 4) nokogiri (= 1.15.6) - omniauth-chef (~> 0.4) + omniauth-chef-oauth2 (~> 1.1) pg (>= 0.18, < 2.0) pry-byebug rails (~> 7.0.8.1) From e291cc7b6280789564cb5a922d4fe9cf6fdb96e1 Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Sat, 15 Feb 2025 16:54:14 +0530 Subject: [PATCH 4/7] Ohai pinned to 18.1.18 Signed-off-by: jan shahid shaik --- oc-chef-pedant/Gemfile.lock | 2 +- src/chef-server-ctl/Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index e55f0f8b04..21319cbbcf 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -245,7 +245,7 @@ GEM netrc (0.11.0) nori (2.7.0) bigdecimal - ohai (18.2.4) + ohai (18.1.18) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index cb9af375c9..9c359c2580 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -333,7 +333,7 @@ GEM octokit (5.6.1) faraday (>= 1, < 3) sawyer (~> 0.9) - ohai (18.2.4) + ohai (18.1.18) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) From ce380ed7a18c439469566d0d1204fbbb1568af5f Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Mon, 17 Feb 2025 11:16:49 +0530 Subject: [PATCH 5/7] bundler update in gemfile.lock Signed-off-by: jan shahid shaik --- oc-chef-pedant/Gemfile.lock | 2 +- src/chef-server-ctl/Gemfile.lock | 2 +- src/oc_erchef/Gemfile_habitat.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 21319cbbcf..1a81845d6c 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -394,4 +394,4 @@ DEPENDENCIES rake BUNDLED WITH - 2.2.19 + 2.3.7 diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index 9c359c2580..a8709e39d1 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -497,4 +497,4 @@ DEPENDENCIES toml BUNDLED WITH - 2.1.4 + 2.3.7 \ No newline at end of file diff --git a/src/oc_erchef/Gemfile_habitat.lock b/src/oc_erchef/Gemfile_habitat.lock index 2d6ceac14d..d312cec1c7 100644 --- a/src/oc_erchef/Gemfile_habitat.lock +++ b/src/oc_erchef/Gemfile_habitat.lock @@ -30,4 +30,4 @@ DEPENDENCIES rest-client (~> 2.1.0) BUNDLED WITH - 2.2.19 + 2.3.7 From 2041f5bd15c462d8c1a2327d2ca020f78d6d263c Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Mon, 17 Feb 2025 12:52:14 +0530 Subject: [PATCH 6/7] chef-winrm (>= 2.3.10) Signed-off-by: jan shahid shaik --- oc-chef-pedant/Gemfile.lock | 8 ++++---- src/chef-server-ctl/Gemfile.lock | 8 ++++---- src/oc-id/Gemfile.lock | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 1a81845d6c..52d5c9fe67 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -108,7 +108,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.11) + chef-winrm (2.3.10) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -119,11 +119,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -348,7 +348,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index a8709e39d1..1b47afa300 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -134,7 +134,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.11) + chef-winrm (2.3.10) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -145,11 +145,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -445,7 +445,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index 0ffed2671a..5eb9ed0567 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -159,7 +159,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.11) + chef-winrm (2.3.10) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -170,11 +170,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -615,7 +615,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.11) + chef-winrm (>= 2.3.10) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) From 76c2e1a8063a880ab7edff67c0913f7f0daf40c1 Mon Sep 17 00:00:00 2001 From: jan shahid shaik Date: Mon, 17 Feb 2025 14:29:49 +0530 Subject: [PATCH 7/7] Revert " chef-winrm (>= 2.3.10)" This reverts commit 2041f5bd15c462d8c1a2327d2ca020f78d6d263c. --- oc-chef-pedant/Gemfile.lock | 8 ++++---- src/chef-server-ctl/Gemfile.lock | 8 ++++---- src/oc-id/Gemfile.lock | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock index 52d5c9fe67..1a81845d6c 100644 --- a/oc-chef-pedant/Gemfile.lock +++ b/oc-chef-pedant/Gemfile.lock @@ -108,7 +108,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.10) + chef-winrm (2.3.11) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -119,11 +119,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -348,7 +348,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock index 1b47afa300..a8709e39d1 100644 --- a/src/chef-server-ctl/Gemfile.lock +++ b/src/chef-server-ctl/Gemfile.lock @@ -134,7 +134,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.10) + chef-winrm (2.3.11) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -145,11 +145,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -445,7 +445,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index 5eb9ed0567..0ffed2671a 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -159,7 +159,7 @@ GEM chef-utils (18.6.2) concurrent-ruby chef-vault (4.1.11) - chef-winrm (2.3.10) + chef-winrm (2.3.11) builder (>= 2.1.2) chef-gyoku (>= 1.4.1) erubi (~> 1.8) @@ -170,11 +170,11 @@ GEM rexml (~> 3.3) rubyntlm (~> 0.6.0, >= 0.6.3) chef-winrm-elevated (1.2.5) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-fs (>= 1.3.7) erubi (~> 1.8) chef-winrm-fs (1.3.7) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) erubi (>= 1.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) @@ -615,7 +615,7 @@ GEM rest-client (~> 2.1) train-core (~> 3.0) train-winrm (0.2.17) - chef-winrm (>= 2.3.10) + chef-winrm (>= 2.3.11) chef-winrm-elevated (>= 1.2.5) chef-winrm-fs (>= 1.3.7) tty-box (0.7.0)