From fb919eacd769af3e502f1bfe3d615b8158d901f1 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 27 Jan 2025 14:41:20 +0530 Subject: [PATCH 01/12] testing chef-cli with updated diff-lcs version Signed-off-by: nikhil2611 --- Gemfile | 2 +- components/gems/Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index d2fef698f..0018eaa87 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development do gem "chefstyle" gem "rake" # enable tests for the verification behavior in omnibus/verification - gem "chef-cli" + gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" gem "rspec" gem "simplecov", require: false diff --git a/components/gems/Gemfile b/components/gems/Gemfile index d126387e1..de9b20b5b 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -101,7 +101,7 @@ group(:omnibus_package) do # ed25519 ssh key support done here as it's a native gem we can't put in train gem "ed25519" gem "bcrypt_pbkdf", ">= 1.1.0.rc1" - gem "chef-cli", ">= 5.3.1" + gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" gem "chef-apply", ">= 0.4.16" # chef-telemetry previously pulled in an unecessary library (http) From b82c19bd98849849b78d7d90aea91fb74c1b79ab Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 27 Jan 2025 15:27:03 +0530 Subject: [PATCH 02/12] updated lock file Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 60 ++++++++++++++++++++---------------- omnibus/Gemfile.lock | 29 ++++++++--------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 1be152b08..4062952a3 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -1,3 +1,21 @@ +GIT + remote: https://github.com/chef/chef-cli + revision: 142fab46e2d5c6f3bea4ec2900b0879bcd325ea9 + branch: nikhil/update-diff-lcs + specs: + chef-cli (5.6.16) + addressable (>= 2.3.5, < 2.9) + chef (~> 18.0) + cookbook-omnifetch (~> 0.5) + diff-lcs (~> 1.5) + ffi-yajl (>= 1.0, < 3.0) + license-acceptance (>= 1.0.11, < 3) + minitar (~> 0.6) + mixlib-cli (>= 1.7, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + pastel (~> 0.7) + solve (> 2.0, < 5.0) + GIT remote: https://github.com/chef/ruby-shadow revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c @@ -294,7 +312,7 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20) - bigdecimal (3.1.8) + bigdecimal (3.1.9) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) bson (4.15.0) @@ -397,18 +415,6 @@ GEM tty-spinner chef-bin (18.6.2) chef (= 18.6.2) - chef-cli (5.6.16) - addressable (>= 2.3.5, < 2.9) - chef (~> 18.0) - cookbook-omnifetch (~> 0.5) - diff-lcs (>= 1.0, < 1.4) - ffi-yajl (>= 1.0, < 3.0) - license-acceptance (>= 1.0.11, < 3) - minitar (~> 0.6) - mixlib-cli (>= 1.7, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - pastel (~> 0.7) - solve (> 2.0, < 5.0) chef-config (18.6.2) addressable chef-utils (= 18.6.2) @@ -416,9 +422,6 @@ GEM mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-powershell (18.1.0) - ffi (~> 1.15) - ffi-yajl (~> 2.4) chef-licensing (1.0.4) activesupport (~> 7.0, < 7.1) chef-config (>= 15) @@ -426,6 +429,9 @@ GEM faraday-http-cache tty-prompt (~> 0.23) tty-spinner (~> 0.9.3) + chef-powershell (18.1.0) + ffi (~> 1.15) + ffi-yajl (~> 2.4) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) @@ -459,7 +465,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.4.1) cookbook-omnifetch (0.12.2) mixlib-archive (>= 0.4, < 2.0) @@ -476,7 +482,7 @@ GEM ffi (~> 1.9) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.3) + diff-lcs (1.5.1) docker-api (2.4.0) excon (>= 0.64.0) multi_json @@ -512,7 +518,7 @@ GEM dry-logic (~> 1.4) zeitwerk (~> 2.6) ed25519 (1.3.0) - erubi (1.13.0) + erubi (1.13.1) erubis (2.7.0) excon (0.112.0) faraday (1.10.4) @@ -861,14 +867,14 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.4) + mixlib-shellout (3.3.6) chef-utils - mixlib-shellout (3.2.8-universal-mingw32) + mixlib-shellout (3.3.6-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.2.8-x64-mingw-ucrt) + mixlib-shellout (3.3.6-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) @@ -905,7 +911,7 @@ GEM net-ping (2.0.8) 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 (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) @@ -1030,7 +1036,7 @@ GEM netrc (~> 0.8) retriable (3.1.2) 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) @@ -1062,7 +1068,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.5) base64 - rubyzip (2.3.2) + rubyzip (2.4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -1089,7 +1095,7 @@ GEM strscan (3.1.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.6.0) + test-kitchen (3.7.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -1367,7 +1373,7 @@ DEPENDENCIES chef (>= 18.2) chef-apply (>= 0.4.16) chef-bin (>= 18.2) - chef-cli (>= 5.3.1) + chef-cli (>= 5.3.1)! chef-telemetry (>= 1.0.8) chef-utils (>= 18.2) chef_deprecations (>= 0.1.2) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 625ffe724..25d9f003c 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -69,7 +69,7 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20, < 1.3.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) builder (3.3.0) chef (18.6.2) addressable @@ -178,7 +178,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) contracts (0.16.1) cookstyle (7.32.8) rubocop (= 1.25.1) @@ -188,7 +188,7 @@ GEM diff-lcs (1.5.1) domain_name (0.6.20240107) ed25519 (1.3.0) - erubi (1.13.0) + erubi (1.13.1) erubis (2.7.0) faraday (2.12.2) faraday-net_http (>= 2.0, < 3.5) @@ -198,10 +198,10 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.4.0) net-http (>= 0.5.0) - ffi (1.16.3) - ffi (1.16.3-x64-mingw-ucrt) - ffi (1.16.3-x64-mingw32) - ffi (1.16.3-x86-mingw32) + ffi (1.15.5) + ffi (1.15.5-x64-mingw-ucrt) + ffi (1.15.5-x64-mingw32) + ffi (1.15.5-x86-mingw32) ffi-libarchive (1.1.14) ffi (~> 1.0) ffi-win32-extensions (1.0.4) @@ -286,14 +286,14 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.4) + mixlib-shellout (3.3.6) chef-utils - mixlib-shellout (3.3.4-universal-mingw32) + mixlib-shellout (3.3.6-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.3.4-x64-mingw-ucrt) + mixlib-shellout (3.3.6-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) @@ -309,7 +309,7 @@ GEM uri 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 (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) @@ -376,7 +376,7 @@ GEM 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) @@ -407,7 +407,7 @@ GEM ruby-progressbar (1.13.0) rubyntlm (0.6.5) base64 - rubyzip (2.3.2) + rubyzip (2.4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -423,7 +423,7 @@ GEM strings-ansi (0.2.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.6.0) + test-kitchen (3.7.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -487,6 +487,7 @@ GEM aws-sigv4 webrick (1.9.1) win32-api (1.10.1-universal-mingw32) + win32-api (1.10.1) win32-certstore (0.6.16) chef-powershell ffi From 2da83ff8151e00ffd4d0d18d9e3acd21532e8443 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 27 Jan 2025 19:53:23 +0530 Subject: [PATCH 03/12] reverted back chef-cli from root Gemfile Signed-off-by: nikhil2611 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0018eaa87..d2fef698f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development do gem "chefstyle" gem "rake" # enable tests for the verification behavior in omnibus/verification - gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" + gem "chef-cli" gem "rspec" gem "simplecov", require: false From 35cfaf1458c9eb29d7fcd0dda97acd3e7d1a4c75 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 27 Jan 2025 23:58:19 +0530 Subject: [PATCH 04/12] fixing win build Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 6 +++--- omnibus/Gemfile.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 4062952a3..999db3df0 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -867,14 +867,14 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.6) + mixlib-shellout (3.3.4) chef-utils - mixlib-shellout (3.3.6-universal-mingw32) + mixlib-shellout (3.2.8-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.3.6-x64-mingw-ucrt) + mixlib-shellout (3.2.8-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 25d9f003c..553df1c74 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -286,14 +286,14 @@ GEM thor mixlib-log (3.1.1) ffi (< 1.17.0) - mixlib-shellout (3.3.6) + mixlib-shellout (3.3.4) chef-utils - mixlib-shellout (3.3.6-universal-mingw32) + mixlib-shellout (3.3.4-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.3.6-x64-mingw-ucrt) + mixlib-shellout (3.3.4-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) From fca212c4813710f4028dffcd61394e3bf020f3ed Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 28 Jan 2025 16:33:19 +0530 Subject: [PATCH 05/12] fixing win pipeline Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 12 ++++++------ omnibus/Gemfile.lock | 20 ++++++++++---------- omnibus_overrides.rb | 1 + 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 999db3df0..589b40b67 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -312,7 +312,7 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20) - bigdecimal (3.1.9) + bigdecimal (3.1.8) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) bson (4.15.0) @@ -465,7 +465,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cookbook-omnifetch (0.12.2) mixlib-archive (>= 0.4, < 2.0) @@ -518,7 +518,7 @@ GEM dry-logic (~> 1.4) zeitwerk (~> 2.6) ed25519 (1.3.0) - erubi (1.13.1) + erubi (1.13.0) erubis (2.7.0) excon (0.112.0) faraday (1.10.4) @@ -911,7 +911,7 @@ GEM net-ping (2.0.8) net-protocol (0.2.2) timeout - net-scp (4.1.0) + net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) @@ -1036,7 +1036,7 @@ GEM netrc (~> 0.8) retriable (3.1.2) retryable (3.0.5) - rexml (3.4.0) + rexml (3.3.9) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -1068,7 +1068,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.5) base64 - rubyzip (2.4.1) + rubyzip (2.3.2) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 553df1c74..fc1194c64 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -69,7 +69,7 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20, < 1.3.0) - bigdecimal (3.1.9) + bigdecimal (3.1.8) builder (3.3.0) chef (18.6.2) addressable @@ -178,7 +178,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.3) - concurrent-ruby (1.3.5) + concurrent-ruby (1.3.4) contracts (0.16.1) cookstyle (7.32.8) rubocop (= 1.25.1) @@ -188,7 +188,7 @@ GEM diff-lcs (1.5.1) domain_name (0.6.20240107) ed25519 (1.3.0) - erubi (1.13.1) + erubi (1.13.0) erubis (2.7.0) faraday (2.12.2) faraday-net_http (>= 2.0, < 3.5) @@ -198,10 +198,10 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.4.0) net-http (>= 0.5.0) - ffi (1.15.5) - ffi (1.15.5-x64-mingw-ucrt) - ffi (1.15.5-x64-mingw32) - ffi (1.15.5-x86-mingw32) + ffi (1.16.3) + ffi (1.16.3-x64-mingw-ucrt) + ffi (1.16.3-x64-mingw32) + ffi (1.16.3-x86-mingw32) ffi-libarchive (1.1.14) ffi (~> 1.0) ffi-win32-extensions (1.0.4) @@ -309,7 +309,7 @@ GEM uri net-protocol (0.2.2) timeout - net-scp (4.1.0) + net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) @@ -376,7 +376,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retryable (3.0.5) - rexml (3.4.0) + rexml (3.3.9) rspec (3.12.0) rspec-core (~> 3.12.0) rspec-expectations (~> 3.12.0) @@ -407,7 +407,7 @@ GEM ruby-progressbar (1.13.0) rubyntlm (0.6.5) base64 - rubyzip (2.4.1) + rubyzip (2.3.2) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 498076eff..a1e74374c 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -26,3 +26,4 @@ override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" override "zlib", version: "1.3.1" +override "expat", version: "2.6.4" From 76c9af78e1d7c7a428d16ce9c8e09fe4ed0736f4 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 28 Jan 2025 20:12:03 +0530 Subject: [PATCH 06/12] trying to use chef-apply latest version Signed-off-by: nikhil2611 --- Gemfile | 2 +- components/gems/Gemfile | 2 +- components/gems/Gemfile.lock | 38 +++++++++++++++++++++--------------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index d2fef698f..0018eaa87 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development do gem "chefstyle" gem "rake" # enable tests for the verification behavior in omnibus/verification - gem "chef-cli" + gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" gem "rspec" gem "simplecov", require: false diff --git a/components/gems/Gemfile b/components/gems/Gemfile index de9b20b5b..a5c2ae595 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -102,7 +102,7 @@ group(:omnibus_package) do gem "ed25519" gem "bcrypt_pbkdf", ">= 1.1.0.rc1" gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" - gem "chef-apply", ">= 0.4.16" + gem "chef-apply", ">= 0.4.16", git: "https://github.com/chef/chef-apply", branch: "nikhil/updating-chef-cli-version" # chef-telemetry previously pulled in an unecessary library (http) gem "chef-telemetry", ">= 1.0.8" diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 589b40b67..f2cb81d98 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -1,3 +1,24 @@ +GIT + remote: https://github.com/chef/chef-apply + revision: 1d26c98e41e3b87deaf6aadc5345feeffed8bc4e + branch: nikhil/updating-chef-cli-version + specs: + chef-apply (0.9.6) + chef (>= 16.0) + chef-cli (~> 5.6) + chef-telemetry (>= 1.0.2) + license-acceptance (>= 1.0.11, < 3) + mixlib-cli + mixlib-config (>= 3.0.5) + mixlib-install + mixlib-log + pastel + r18n-desktop + toml-rb + train-core (~> 3.0) + train-winrm + tty-spinner + GIT remote: https://github.com/chef/chef-cli revision: 142fab46e2d5c6f3bea4ec2900b0879bcd325ea9 @@ -398,21 +419,6 @@ GEM win32-service (>= 2.1.5, < 3.0) win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) - chef-apply (0.9.6) - chef (>= 16.0) - chef-cli (>= 2.0.10) - chef-telemetry (>= 1.0.2) - license-acceptance (>= 1.0.11, < 3) - mixlib-cli - mixlib-config (>= 3.0.5) - mixlib-install - mixlib-log - pastel - r18n-desktop - toml-rb - train-core (~> 3.0) - train-winrm - tty-spinner chef-bin (18.6.2) chef (= 18.6.2) chef-config (18.6.2) @@ -1371,7 +1377,7 @@ DEPENDENCIES bcrypt_pbkdf (>= 1.1.0.rc1) berkshelf (>= 8.0) chef (>= 18.2) - chef-apply (>= 0.4.16) + chef-apply (>= 0.4.16)! chef-bin (>= 18.2) chef-cli (>= 5.3.1)! chef-telemetry (>= 1.0.8) From 35591090903f360acdc50d9843c702920e328aba Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 28 Jan 2025 20:58:21 +0530 Subject: [PATCH 07/12] updated omnibus-software to latest Signed-off-by: nikhil2611 --- omnibus/Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index fc1194c64..cb618e767 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: b97bb4e3e1319ca1c06b1a06f1f6354d3514ff51 + revision: fec97fbcad50c339d4f538ca5b74cc123f627e61 branch: main specs: omnibus-software (24.6.323) @@ -35,23 +35,23 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.1023.0) - aws-sdk-core (3.214.0) + aws-partitions (1.1043.0) + aws-sdk-core (3.217.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.97.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) aws-sdk-s3 (1.116.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.110.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-secretsmanager (1.111.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.1) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt_pbkdf (1.1.1) From 40dc9010a12534c5984b2bc33c35eb69bf18442c Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 30 Jan 2025 00:08:56 +0530 Subject: [PATCH 08/12] trying to add updated mixlib-shellout Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index f2cb81d98..5964ba7f8 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -875,12 +875,12 @@ GEM ffi (< 1.17.0) mixlib-shellout (3.3.4) chef-utils - mixlib-shellout (3.2.8-universal-mingw32) + mixlib-shellout (3.3.4-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.2.8-x64-mingw-ucrt) + mixlib-shellout (3.3.4-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) From 430996fd5fddb3fb812102f49c72120e6b28c887 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 30 Jan 2025 12:05:29 +0530 Subject: [PATCH 09/12] Updated knife version Signed-off-by: nikhil2611 --- components/gems/Gemfile.lock | 143 ++++++++++++++++------------------- 1 file changed, 66 insertions(+), 77 deletions(-) diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 5964ba7f8..2bb9e2460 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -1,42 +1,3 @@ -GIT - remote: https://github.com/chef/chef-apply - revision: 1d26c98e41e3b87deaf6aadc5345feeffed8bc4e - branch: nikhil/updating-chef-cli-version - specs: - chef-apply (0.9.6) - chef (>= 16.0) - chef-cli (~> 5.6) - chef-telemetry (>= 1.0.2) - license-acceptance (>= 1.0.11, < 3) - mixlib-cli - mixlib-config (>= 3.0.5) - mixlib-install - mixlib-log - pastel - r18n-desktop - toml-rb - train-core (~> 3.0) - train-winrm - tty-spinner - -GIT - remote: https://github.com/chef/chef-cli - revision: 142fab46e2d5c6f3bea4ec2900b0879bcd325ea9 - branch: nikhil/update-diff-lcs - specs: - chef-cli (5.6.16) - addressable (>= 2.3.5, < 2.9) - chef (~> 18.0) - cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.5) - ffi-yajl (>= 1.0, < 3.0) - license-acceptance (>= 1.0.11, < 3) - minitar (~> 0.6) - mixlib-cli (>= 1.7, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - pastel (~> 0.7) - solve (> 2.0, < 5.0) - GIT remote: https://github.com/chef/ruby-shadow revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c @@ -60,7 +21,7 @@ GEM artifactory (3.0.17) ast (2.4.2) aws-eventstream (1.3.0) - aws-partitions (1.1023.0) + aws-partitions (1.1043.0) aws-sdk-account (1.35.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.1) @@ -133,7 +94,7 @@ GEM aws-sdk-configservice (1.123.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.214.0) + aws-sdk-core (3.217.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -204,8 +165,8 @@ GEM aws-sdk-kinesis (1.71.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-kms (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.97.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) aws-sdk-lambda (1.144.0) aws-sdk-core (~> 3, >= 3.210.0) @@ -240,8 +201,8 @@ GEM aws-sdk-route53resolver (1.74.0) aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.176.1) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-s3 (1.179.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sdk-s3control (1.43.0) @@ -293,7 +254,7 @@ GEM aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.2.0) - aws-sigv4 (1.10.1) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -333,7 +294,7 @@ GEM retryable (>= 2.0, < 4.0) solve (~> 4.0) thor (>= 0.20) - bigdecimal (3.1.8) + bigdecimal (3.1.9) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) bson (4.15.0) @@ -419,8 +380,35 @@ GEM win32-service (>= 2.1.5, < 3.0) win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) + chef-apply (0.9.6) + chef (>= 16.0) + chef-cli (>= 2.0.10) + chef-telemetry (>= 1.0.2) + license-acceptance (>= 1.0.11, < 3) + mixlib-cli + mixlib-config (>= 3.0.5) + mixlib-install + mixlib-log + pastel + r18n-desktop + toml-rb + train-core (~> 3.0) + train-winrm + tty-spinner chef-bin (18.6.2) chef (= 18.6.2) + chef-cli (5.6.16) + addressable (>= 2.3.5, < 2.9) + chef (~> 18.0) + cookbook-omnifetch (~> 0.5) + diff-lcs (>= 1.0, < 1.4) + ffi-yajl (>= 1.0, < 3.0) + license-acceptance (>= 1.0.11, < 3) + minitar (~> 0.6) + mixlib-cli (>= 1.7, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + pastel (~> 0.7) + solve (> 2.0, < 5.0) chef-config (18.6.2) addressable chef-utils (= 18.6.2) @@ -471,7 +459,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) connection_pool (2.4.1) cookbook-omnifetch (0.12.2) mixlib-archive (>= 0.4, < 2.0) @@ -488,7 +476,7 @@ GEM ffi (~> 1.9) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.5.1) + diff-lcs (1.3) docker-api (2.4.0) excon (>= 0.64.0) multi_json @@ -524,7 +512,7 @@ GEM dry-logic (~> 1.4) zeitwerk (~> 2.6) ed25519 (1.3.0) - erubi (1.13.0) + erubi (1.13.1) erubis (2.7.0) excon (0.112.0) faraday (1.10.4) @@ -550,8 +538,8 @@ GEM faraday-http-cache (2.5.1) faraday (>= 0.8) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -646,7 +634,7 @@ GEM http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) ice_nine (0.11.2) inifile (3.0.0) @@ -691,7 +679,7 @@ GEM ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.6.2) - json (2.9.0) + json (2.9.1) jsonpath (1.1.5) multi_json jwt (2.9.3) @@ -753,12 +741,13 @@ GEM rack (>= 1.6, < 4.0) test-kitchen vmware-vra (~> 3.0, >= 3.2.0) - knife (18.6.2) + knife (18.6.13) bcrypt_pbkdf (~> 1.1) - chef (>= 18) - chef-config (>= 18) + chef (~> 18.6) + chef-bin (~> 18.6) + chef-config (~> 18.6) chef-licensing (~> 1.0) - chef-utils (>= 18) + chef-utils (~> 18.6) chef-vault erubis (~> 2.7) ffi (>= 1.15) @@ -854,7 +843,7 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1203) + mime-types-data (3.2025.0107) mini_mime (1.1.5) mini_portile2 (2.8.8) minitar (0.12.1) @@ -871,16 +860,16 @@ GEM mixlib-shellout mixlib-versioning thor - mixlib-log (3.1.1) - ffi (< 1.17.0) - mixlib-shellout (3.3.4) + mixlib-log (3.2.0) + ffi (~> 1.9, <= 1.17.0) + mixlib-shellout (3.3.6) chef-utils - mixlib-shellout (3.3.4-universal-mingw32) + mixlib-shellout (3.3.6-universal-mingw32) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.3.4-x64-mingw-ucrt) + mixlib-shellout (3.3.6-x64-mingw-ucrt) chef-utils ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) @@ -917,7 +906,7 @@ GEM net-ping (2.0.8) 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 (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) @@ -963,14 +952,14 @@ GEM options (2.3.2) os (1.1.4) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc parslet (2.0.0) passwordmasker (1.2.0) pastel (0.8.0) tty-color (~> 0.5) - plist (3.7.1) + plist (3.7.2) progress_bar (1.3.4) highline (>= 1.6) options (~> 2.3.0) @@ -1016,7 +1005,7 @@ GEM rdoc (6.4.1.1) psych (>= 4.0.0) recursive-open-struct (1.1.3) - regexp_parser (2.9.3) + regexp_parser (2.10.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) @@ -1042,7 +1031,7 @@ GEM netrc (~> 0.8) retriable (3.1.2) 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) @@ -1068,13 +1057,13 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.37.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) rubyntlm (0.6.5) base64 - rubyzip (2.3.2) + rubyzip (2.4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -1101,7 +1090,7 @@ GEM strscan (3.1.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.7.0) + test-kitchen (3.6.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -1120,7 +1109,7 @@ GEM time (0.4.1) date timeliness (0.3.10) - timeout (0.4.2) + timeout (0.4.3) toml-rb (3.0.1) citrus (~> 3.0, > 3.0) racc (~> 1.7) @@ -1308,8 +1297,8 @@ GEM webrick (1.9.1) win32-api (1.10.1) win32-api (1.10.1-universal-mingw32) - win32-certstore (0.6.15) - chef-powershell (>= 1.0.12) + win32-certstore (0.6.16) + chef-powershell ffi win32-dir (0.7.2) ffi (>= 1.0.0) @@ -1377,9 +1366,9 @@ DEPENDENCIES bcrypt_pbkdf (>= 1.1.0.rc1) berkshelf (>= 8.0) chef (>= 18.2) - chef-apply (>= 0.4.16)! + chef-apply (>= 0.4.16) chef-bin (>= 18.2) - chef-cli (>= 5.3.1)! + chef-cli (>= 5.3.1) chef-telemetry (>= 1.0.8) chef-utils (>= 18.2) chef_deprecations (>= 0.1.2) From 8de69041f6a4f0261b1b9af0aec609fbc1929949 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 30 Jan 2025 12:06:41 +0530 Subject: [PATCH 10/12] removed the branch pick of chef-cli and chef-apply Signed-off-by: nikhil2611 --- Gemfile | 2 +- components/gems/Gemfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0018eaa87..d2fef698f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ group :development do gem "chefstyle" gem "rake" # enable tests for the verification behavior in omnibus/verification - gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" + gem "chef-cli" gem "rspec" gem "simplecov", require: false diff --git a/components/gems/Gemfile b/components/gems/Gemfile index a5c2ae595..c13e69cbb 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -101,8 +101,8 @@ group(:omnibus_package) do # ed25519 ssh key support done here as it's a native gem we can't put in train gem "ed25519" gem "bcrypt_pbkdf", ">= 1.1.0.rc1" - gem "chef-cli", ">= 5.3.1", git: "https://github.com/chef/chef-cli", branch: "nikhil/update-diff-lcs" - gem "chef-apply", ">= 0.4.16", git: "https://github.com/chef/chef-apply", branch: "nikhil/updating-chef-cli-version" + gem "chef-cli" + gem "chef-apply", ">= 0.4.16" # chef-telemetry previously pulled in an unecessary library (http) gem "chef-telemetry", ">= 1.0.8" From 387adffd80afd7edff1be39ebb38094660ac3165 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 30 Jan 2025 12:09:50 +0530 Subject: [PATCH 11/12] few other fixes Signed-off-by: nikhil2611 --- components/gems/Gemfile | 2 +- omnibus/Gemfile.lock | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/gems/Gemfile b/components/gems/Gemfile index c13e69cbb..d126387e1 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -101,7 +101,7 @@ group(:omnibus_package) do # ed25519 ssh key support done here as it's a native gem we can't put in train gem "ed25519" gem "bcrypt_pbkdf", ">= 1.1.0.rc1" - gem "chef-cli" + gem "chef-cli", ">= 5.3.1" gem "chef-apply", ">= 0.4.16" # chef-telemetry previously pulled in an unecessary library (http) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cb618e767..0739ebc44 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -423,7 +423,7 @@ GEM strings-ansi (0.2.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.7.0) + test-kitchen (3.6.0) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) @@ -487,7 +487,6 @@ GEM aws-sigv4 webrick (1.9.1) win32-api (1.10.1-universal-mingw32) - win32-api (1.10.1) win32-certstore (0.6.16) chef-powershell ffi From a2172ef54ef25cb697b097c034cb33887ccfc5db Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 30 Jan 2025 18:48:06 +0530 Subject: [PATCH 12/12] updating hab version to latest Signed-off-by: nikhil2611 --- omnibus/config/software/habitat.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/omnibus/config/software/habitat.rb b/omnibus/config/software/habitat.rb index 1109fcf95..c849010ec 100644 --- a/omnibus/config/software/habitat.rb +++ b/omnibus/config/software/habitat.rb @@ -21,11 +21,11 @@ # DO NOT MODIFY: default_version and checksums are populated by # workstation/.expeditor/update_habitat.sh -default_version "1.6.1041" -linux_sha = "4bd03393c0d6d71f3a915fa0f79556d3e4ab79aa3ba314c376475024436ac77e" -darwin_sha = "2dbde6139a47341d63e696014262b37958461fdaed7cfafe5e72f534bc66e40e" -darwin_m1_sha = "8d93176945a1a9094ea33ef4fd1b8f0a3a7f82c80de88bca7c3fe70c7110d16d" -windows_sha = "5e22c646eaaab1b1d6c59c99e7fbb11c63d2b6b7d825768937151e2ee38bb617" +default_version "1.6.1243" +linux_sha = "c603cc40c2d0e58b3cbb89e355669a6b54cdd109483ad3440cb00f4aad3e3684" +darwin_sha = "3b8054ee87fa08c12348bb6c661ef140dad100857f0682e84f92a6500edb3add" +darwin_m1_sha = "cf16143aab4c11e869f5f3a9d956fd2bc1e59b9094fd61e78e840235e0ab7503" +windows_sha = "56843f452dfc4d2df42404b4722c184f549e3ad8e66dc69aad1da41bfdccd209" # END DO NOT MODIFY if windows?