rudimentary chef 18 compatibility by disabling unified_mode

not exactly a fix for #1222 Signed-off-by: Ben Dean <ben.dean@finvi.com>
sous-chefs · May 23, 2023 · 08f7c2b · 08f7c2b
1 parent accded0
commit 08f7c2b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
       pull-requests: write
       statuses: write
       issues: write
-    with:
-      chef_workstation_version: 22.12.1024 # chef 17
 
   integration:
     needs: lint-unit
@@ -62,7 +60,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
-          CHEF_VERSION: 17
+          CHEF_VERSION: latest
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
         with:
@@ -89,7 +87,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
-          CHEF_VERSION: 17
+          CHEF_VERSION: latest
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
         with:
@@ -122,7 +120,7 @@ jobs:
       - name: Dokken
         uses: actionshub/test-kitchen@2.1.0
         env:
-          CHEF_VERSION: 17
+          CHEF_VERSION: latest
           CHEF_LICENSE: accept-no-persist
         with:
           suite: ${{ matrix.suite }}

diff --git a/libraries/docker_installation_package.rb b/libraries/docker_installation_package.rb
@@ -1,5 +1,8 @@
 module DockerCookbook
   class DockerInstallationPackage < DockerBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_installation_package
     provides :docker_installation_package
 

diff --git a/libraries/docker_installation_script.rb b/libraries/docker_installation_script.rb
@@ -1,5 +1,8 @@
 module DockerCookbook
   class DockerInstallationScript < DockerBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_installation_script
     provides :docker_installation_script
 

diff --git a/libraries/docker_installation_tarball.rb b/libraries/docker_installation_tarball.rb
@@ -1,5 +1,8 @@
 module DockerCookbook
   class DockerInstallationTarball < DockerBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_installation_tarball
     provides :docker_installation_tarball
 

diff --git a/libraries/docker_service.rb b/libraries/docker_service.rb
@@ -2,6 +2,9 @@ module DockerCookbook
   require_relative 'docker_service_base'
 
   class DockerService < DockerServiceBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_service
 
     # register with the resource resolution system

diff --git a/libraries/docker_service_manager_execute.rb b/libraries/docker_service_manager_execute.rb
@@ -1,5 +1,8 @@
 module DockerCookbook
   class DockerServiceManagerExecute < DockerServiceBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_service_manager_execute
     provides :docker_service_manager_execute
 

diff --git a/libraries/docker_service_manager_systemd.rb b/libraries/docker_service_manager_systemd.rb
@@ -1,5 +1,8 @@
 module DockerCookbook
   class DockerServiceManagerSystemd < DockerServiceBase
+    # Chef 18 compatibility
+    unified_mode false
+
     resource_name :docker_service_manager_systemd
     provides :docker_service_manager_systemd
 

diff --git a/metadata.rb b/metadata.rb
@@ -6,7 +6,7 @@
 version           '10.4.9'
 source_url        'https://github.com/sous-chefs/docker'
 issues_url        'https://github.com/sous-chefs/docker/issues'
-chef_version      '>= 16.0', '< 18.0'
+chef_version      '>= 16.0', '< 19.0'
 
 supports 'amazon'
 supports 'centos'