From 090aaae3fc5a55fc5caf437f7499838873da1225 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Wed, 20 May 2026 21:50:43 +0100
Subject: [PATCH] Use cinc-auditor-bin<7 to not require resource packs

inspec 7.0.95 introduced resource packs for resources docker_*, podman_* etc.

It doesn't look like kitchen-inspec yet supports resource packs and some of our tests requiring above inspec resources fail due to messing resource packs.
---
 .kitchen.yml |  1 -
 Gemfile      |  2 +-
 Gemfile.lock | 64 ++++++++++++++++++++--------------------------------
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index b29c9aaf4..1bc0324a5 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,7 +30,6 @@ provisioner:
 
 verifier:
   name: inspec
-  root_path: /opt/verifier
   sudo: false
 
 platforms:
diff --git a/Gemfile b/Gemfile
index 13d7f164b..772c0e492 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "cinc-auditor-bin", :source => "https://rubygems.cinc.sh"
+gem "cinc-auditor-bin", "< 7.0.0", :source => "https://rubygems.cinc.sh"
 gem "cookstyle"
 gem "kitchen-dokken", ">= 2.23.0"
 gem "kitchen-inspec"
diff --git a/Gemfile.lock b/Gemfile.lock
index fc2b8b586..8e68cd692 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,32 +1,30 @@
 GEM
   remote: https://rubygems.cinc.sh/
   specs:
-    cinc-auditor-bin (7.1.7)
-      inspec (= 7.1.7)
-    inspec (7.1.7)
-      faraday_middleware (~> 1.2, >= 1.2.1)
-      inspec-core (= 7.1.7)
+    cinc-auditor-bin (5.23.6)
+      inspec (= 5.23.6)
+    inspec (5.23.6)
+      faraday_middleware (>= 0.12.2, < 1.3)
+      inspec-core (= 5.23.6)
+      mongo (= 2.21.3)
       progress_bar (~> 1.3.3)
-      rake (>= 12.3.3)
-      train (~> 3.16, >= 3.16.1)
+      rake
+      train (~> 3.13, >= 3.13.4)
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
-      train-kubernetes (>= 0.3.1)
+      train-kubernetes (< 0.3.1)
       train-winrm (~> 0.4.0)
-    inspec-core (7.1.7)
-      addressable (~> 2.9)
-      chef-licensing (>= 1.2.0)
+    inspec-core (5.23.6)
+      addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       cookstyle
-      csv (~> 3.0)
       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)
+      mixlib-log (~> 3.0, < 3.2)
       multipart-post (~> 2.0)
-      ostruct (>= 0.1, < 0.7)
       parallel (~> 1.9)
       parslet (>= 1.5, < 3.0)
       pry (~> 0.13)
@@ -35,10 +33,9 @@ GEM
       rubyzip (>= 1.2.2, < 4.0)
       semverse (~> 3.0)
       sslshake (~> 1.2)
-      syslog (~> 0.1)
       thor (>= 0.20, < 1.5.0)
-      tomlrb (>= 1.3, < 2.1)
-      train-core (~> 3.16, >= 3.16.1)
+      tomlrb (>= 1.2, < 2.1)
+      train-core (~> 3.13, >= 3.13.4)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
 
@@ -324,10 +321,11 @@ GEM
     bcrypt_pbkdf (1.1.2-x86_64-darwin)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
+    bson (5.2.0)
     builder (3.3.0)
-    chef-config (19.2.110)
+    chef-config (19.3.14)
       addressable
-      chef-utils (= 19.2.110)
+      chef-utils (= 19.3.14)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -336,19 +334,10 @@ GEM
     chef-gyoku (1.5.0)
       builder (>= 2.1.2)
       rexml (~> 3.4)
-    chef-licensing (1.4.1)
-      chef-config (>= 15)
-      faraday (>= 1, < 3)
-      faraday-http-cache
-      mixlib-log (~> 3.0)
-      ostruct (~> 0.6.0)
-      pstore (~> 0.1.1)
-      tty-prompt (~> 0.23)
-      tty-spinner (~> 0.9.3)
     chef-telemetry (1.1.1)
       chef-config
       concurrent-ruby (~> 1.0)
-    chef-utils (19.2.110)
+    chef-utils (19.3.14)
       concurrent-ruby
     chef-winrm (2.5.0)
       builder (>= 2.1.2)
@@ -434,8 +423,6 @@ GEM
     faraday-excon (1.1.0)
     faraday-follow_redirects (0.5.0)
       faraday (>= 1, < 3)
-    faraday-http-cache (2.7.0)
-      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
@@ -559,11 +546,13 @@ GEM
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (3.2.3)
-      ffi (>= 1.15.5)
+    mixlib-log (3.0.9)
     mixlib-shellout (3.4.10)
       chef-utils
     mixlib-versioning (1.2.12)
+    mongo (2.21.3)
+      base64
+      bson (>= 4.14.1, < 6.0.0)
     ms_rest (0.7.6)
       concurrent-ruby (~> 1.0)
       faraday (>= 0.9, < 2.0.0)
@@ -604,7 +593,6 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       reline (>= 0.6.0)
-    pstore (0.1.4)
     psych (5.3.1)
       date
       stringio
@@ -809,8 +797,8 @@ GEM
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 2.9, < 8.0)
     train-habitat (0.2.22)
-    train-kubernetes (0.3.1)
-      k8s-ruby (>= 0.17.2)
+    train-kubernetes (0.1.7)
+      k8s-ruby (~> 0.10)
       train (~> 3.0)
     train-winrm (0.4.3)
       chef-winrm (>= 2.4.4, < 3.0)
@@ -832,8 +820,6 @@ GEM
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     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)
@@ -862,7 +848,7 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  cinc-auditor-bin!
+  cinc-auditor-bin (< 7.0.0)!
   cookstyle
   kitchen-dokken (>= 2.23.0)
   kitchen-inspec
-- 
2.47.3