Revert "Merge branch 'update-chef-gem' into 'master'"

This reverts merge request !7276

Author: Clemens Beck

Gemfile

@@ -22,7 +22,7 @@ omnibus_gem_version = Gitlab::Version.new('omnibus')
 #      grep "gem 'install " config/software/*
 gem 'omnibus', git: omnibus_gem_version.remote(Gitlab::Version::ALTERNATIVE_SOURCE), tag: omnibus_gem_version.print(false)
 source 'https://packagecloud.io/cinc-project/stable' do
-  gem 'chef', '~> 17.10.95'
+  gem 'chef', '~> 17.10.0'
   gem 'chef-cli', '~> 5.6.1'
   gem 'chef-utils'
   gem 'mixlib-versioning'

Gemfile.lock

@@ -20,34 +20,34 @@ GIT
 GEM
   remote: https://packagecloud.io/cinc-project/stable/
   specs:
-    chef (17.10.95)
+    chef (17.10.0)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.95)
-      chef-utils (= 17.10.95)
+      chef-config (= 17.10.0)
+      chef-utils (= 17.10.0)
       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.15.0)
+      ffi (>= 1.5.0)
       ffi-libarchive (~> 1.0, >= 1.0.3)
       ffi-yajl (~> 2.2)
       iniparse (~> 1.4)
-      inspec-core (>= 4.23)
+      inspec-core (~> 4.23)
       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, < 5.0)
+      net-sftp (>= 2.1.2, < 4.0)
       ohai (~> 17.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
       syslog-logger (~> 1.6)
-      train-core (~> 3.10)
+      train-core (~> 3.2, >= 3.2.28)
       train-winrm (>= 0.2.5)
       uuidtools (>= 2.1.5, < 3.0)
       vault (~> 0.16)
@@ -63,14 +63,14 @@ GEM
       mixlib-shellout (>= 2.0, < 4.0)
       pastel (~> 0.7)
       solve (> 2.0, < 5.0)
-    chef-config (17.10.95)
+    chef-config (17.10.0)
       addressable
-      chef-utils (= 17.10.95)
+      chef-utils (= 17.10.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-utils (17.10.95)
+    chef-utils (17.10.0)
       concurrent-ruby
     chef-zero (15.0.11)
       ffi-yajl (~> 2.2)
@@ -79,27 +79,27 @@ GEM
       rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
       webrick
-    inspec-core (5.22.36)
+    inspec-core (4.56.20)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
-      faraday (>= 1, < 3)
-      faraday-follow_redirects (~> 0.3)
-      hashie (>= 3.4, < 6.0)
+      faraday (>= 0.9.0, < 1.5)
+      faraday_middleware (~> 1.0)
+      hashie (>= 3.4, < 5.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, < 3.0)
+      parslet (>= 1.5, < 2.0)
       pry (~> 0.13)
-      rspec (>= 3.9, <= 3.12)
+      rspec (>= 3.9, <= 3.11)
       rspec-its (~> 1.2)
       rubyzip (>= 1.2.2, < 3.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
-      thor (>= 0.20, < 1.3.0)
+      thor (>= 0.20, < 2.0)
       tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.10)
+      train-core (~> 3.0)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
     mixlib-versioning (1.2.12)
@@ -138,8 +138,8 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-secretsmanager (1.75.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-secretsmanager (1.60.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -150,7 +150,7 @@ GEM
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-vault (4.1.11)
+    chef-vault (4.1.10)
     chefspec (9.3.3)
       chef (>= 15)
       chef-cli
@@ -202,7 +202,7 @@ GEM
       multi_json
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.12.0)
+    erubi (1.11.0)
     erubis (2.7.0)
     excon (0.76.0)
     fantaskspec (1.2.0)
@@ -219,19 +219,19 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-follow_redirects (0.3.0)
-      faraday (>= 1, < 3)
     faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
     fauxhai-ng (8.7.0)
       net-ssh
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    ffi-libarchive (1.1.13)
+    ffi-libarchive (1.1.3)
       ffi (~> 1.0)
     ffi-yajl (2.4.0)
       libyajl2 (>= 1.2)
@@ -334,7 +334,7 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logging (2.3.1)
+    logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     memoist (0.16.2)
@@ -361,8 +361,8 @@ GEM
     nap (1.1.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
-    net-sftp (4.0.0)
-      net-ssh (>= 5.0.0, < 8.0.0)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
@@ -395,7 +395,7 @@ GEM
     parallel (1.19.2)
     parser (3.2.2.1)
       ast (~> 2.4.1)
-    parslet (2.0.0)
+    parslet (1.8.2)
     pastel (0.8.0)
       tty-color (~> 0.5)
     pedump (0.6.6)
@@ -410,7 +410,7 @@ GEM
       parser
       unparser
     proxifier (1.0.3)
-    pry (0.14.2)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
@@ -527,13 +527,13 @@ GEM
     tomlib (0.6.0)
     tomlrb (1.3.0)
     trailblazer-option (0.1.2)
-    train-core (3.11.0)
+    train-core (3.9.2)
       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)
+      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)
@@ -567,7 +567,7 @@ GEM
       diff-lcs (~> 1.3)
       parser (>= 3.2.0)
     uuidtools (2.2.0)
-    vault (0.18.2)
+    vault (0.16.0)
       aws-sigv4
     webrick (1.7.0)
     winrm (2.3.6)
@@ -600,7 +600,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk-ec2
   aws-sdk-marketplacecatalog
-  chef (~> 17.10.95)!
+  chef (~> 17.10.0)!
   chef-cli (~> 5.6.1)!
   chef-utils!
   chefspec

config/patches/chef-gem/Version-17-EOL-detection.patch

@@ -0,0 +1,29 @@
+From bedef6179381d1c8c2b13bf4328e8197c9c49cde Mon Sep 17 00:00:00 2001
+From: Clemens Beck <[email protected]>
+Date: Tue, 2 May 2023 11:04:44 +0200
+Subject: [PATCH] Version 17 EOL detection
+
+---
+ lib/chef/client.rb | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/chef/client.rb b/lib/chef/client.rb
+index 743b5ec473..d65f9fbae3 100644
+--- a/lib/chef/client.rb
++++ b/lib/chef/client.rb
+@@ -343,6 +343,12 @@ class Chef
+       # the year it goes EOL
+       eol_year = 2006 + Gem::Version.new(Chef::VERSION).segments.first
+ 
++      # Increment the EOL year of version 17, as it's support has been extended by one year.
++      # See: https://www.chef.io/blog/announcement-about-change-in-infra-client-17-end-of-life-timeline
++      if Gem::Version.new(Chef::VERSION).segments.first == 17
++        eol_year += 1
++      end
++
+       if Time.now > Time.new(eol_year, 5, 01)
+         logger.warn("This release of #{ChefUtils::Dist::Infra::PRODUCT} became end of life (EOL) on May 1st #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
+       end
+-- 
+2.40.1
+

config/software/chef-bin.rb

@@ -15,8 +15,9 @@
 #
 
 name 'chef-bin'
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
+# The version here should be in agreement with the chef-gem version and
+# /Gemfile.lock so that our rspec testing stays consistent with the package
+# contents.
 default_version '17.10.0'
 
 license 'Apache-2.0'

config/software/chef-gem.rb

@@ -17,9 +17,10 @@
 require 'mixlib/shellout'
 
 name 'chef-gem'
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
-default_version '17.10.95'
+# The version here should be in agreement with the chef-bin/cinc version and
+# /Gemfile.lock so that our rspec testing stays consistent with the package
+# contents.
+default_version '17.10.0'
 
 license 'Apache-2.0'
 license_file 'LICENSE'
@@ -49,6 +50,9 @@
     prefix_path = "#{install_dir}/embedded"
     gem_path = shellout!("#{embedded_bin('ruby')} -e \"puts Gem.path.find { |path| path.start_with?(\'#{prefix_path}\') }\"", env: env).stdout.chomp
 
+    patch source: "Version-17-EOL-detection.patch",
+          target: "#{gem_path}/gems/chef-#{version}/lib/chef/client.rb"
+
     patch source: "utf8-locale-support.patch",
           target: "#{gem_path}/gems/chef-config-#{version}/lib/chef-config/config.rb"
   end