chore: Fix tests, remove EOL OSes, fix Ruby 3.4 compatibility warnings

.gitignore

@@ -19,3 +19,5 @@ tmp
 .kitchen.local.yml
 Dockerfile
 .DS_Store
+bin/*
+.idea/*

Gemfile

@@ -5,7 +5,11 @@ gemspec
 group :development do
   # Integration testing gems.
   gem 'kitchen-inspec', '~> 2.0'
+  gem 'inspec', '>= 4.26.2', '< 6.0'
   gem 'train', '>= 2.1', '< 4.0' # validate 4.x when it's released
+  # Silence ruby 3.4.0 standard gem deprecation warnings
+  gem 'csv', '~> 3.3.0'
+  gem 'syslog', '~> 0.1.1'
 end
 
 group :test do

kitchen.yml

@@ -4,31 +4,44 @@
 ---
 driver:
   name: docker
-  provision_command: curl -L https://www.chef.io/chef/install.sh | bash
+  # provision_command: curl -L https://www.chef.io/chef/install.sh | bash
 
 transport:
   name: docker
 
 provisioner:
   name: dummy
 
+verifier:
+  name: inspec
+  inspec_tests:
+    - test/integration/inspec
+
 platforms:
   - name: amazonlinux-2
-  - name: ubuntu-18.04
+  # - name: amazonlinux-2023
   - name: ubuntu-20.04
+  - name: ubuntu-22.04
+  - name: ubuntu-24.04
   - name: fedora-latest
     driver:
       provision_command:
         - yum install libxcrypt-compat -y
         - curl -L https://www.chef.io/chef/install.sh | bash
-  - name: centos-7
+  - name: centos-stream-9
+    driver:
+      image: dokken/centos-stream-9
   - name: oraclelinux-7
-  - name: rockylinux-8
-  - name: debian-11
+  - name: oraclelinux-8
+  - name: oraclelinux-9
+  - name: rockylinux-9
   - name: debian-12
-  - name: opensuse-15
+  - name: opensuse-15.5
+    driver:
+      image: opensuse/leap:15.5
+  - name: opensuse-15.6
     driver:
-      image: opensuse/leap:15
+      image: opensuse/leap:15.6
   - name: dockerfile
     driver:
       username: dockerfile
@@ -42,7 +55,10 @@ suites:
     driver:
       build_context: false
   - name: capabilities
-    includes: [debian-11, ubuntu-18.04, ubuntu-20.04]
+    includes:
+      - ubuntu-20.04
+      - ubuntu-22.04
+      - ubuntu-24.04
     driver:
       provision_command:
         - curl -L https://www.chef.io/chef/install.sh | bash
@@ -58,5 +74,3 @@ suites:
   - name: inspec
     driver:
       provision_command: true
-    verifier:
-      name: inspec

lib/kitchen/docker/helpers/image_helper.rb

@@ -35,6 +35,11 @@ def parse_image_id(output)
               img_id = line.split(/\s+/).last
               return img_id
             end
+            # Docker ~v4.31 support
+            if line =~ /naming to moby-dangling@(sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i
+              img_id = line[/naming to moby-dangling@(sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i, 1]
+              return img_id
+            end
           end
           raise ActionFailed, "Could not parse Docker build output for image ID"
         end

test/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:7
+FROM oraclelinux:7
 RUN yum clean all
 RUN yum install -y sudo openssh-server openssh-clients which curl htop
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key