kitchen-dokken 2.22.2 → 2.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34899c3cabcc8239f2d11817822a7fd1c29100684c52f4a6887561c9d84a0214
-  data.tar.gz: 896b115bf9b9a93babfbe0e81f4ae54e01cd5c7f453d1bda55e1b8fa208aec85
+  metadata.gz: 2d17cea32434bc8b2b07ab6d5354b1f47462b369a75da4c5f590ea5f5584203f
+  data.tar.gz: d35e888e3d94ec39baae9a00bffb3c2d6fb4ec9ca119cff17f0813925bfedc2e
 SHA512:
-  metadata.gz: '08c0f94232f396629f6fb960c30bd602bb4b298228a8e9655453580805a5de91dc098d63233cd7f04417af4de9b8a039143474c3f817a7f3b4bec4041a6d965d'
-  data.tar.gz: c0660187c2a0c3b4165c4e0269fd4ccee9588363e837896a6f5a42f201eb69390a5e013d364729a36d35b0d488d88402b92109660692319517a6ca3242c0ba38
+  metadata.gz: 4b7537a361c7b640ba5387e7f2b96037f0ca1225e754743d7f15efcbfbb01ee7d437576d8aa739066e8a2b410d2f202c50ab375c50bd27c656399750681ff5ed
+  data.tar.gz: 59ddda252eec17939ef63a3decaaf396fa733eb8021d480d76809033af1480b80eeb681c7f9936fe5b3c0089f78b7fc98cc4e3457c2f57a1303537a119c44c48

data/Gemfile

@@ -7,6 +7,8 @@ group :test do
   gem "csv" # this is a workaround for ruby 3.4 support in inspec-core 6.8.24 and can be removed when a new version of inspec-core is released
   gem "berkshelf"
   gem "kitchen-inspec"
+  gem "minitest"
+  gem "mocha"
   gem "rake", ">= 11.0"
 end
 

data/Rakefile

@@ -1,5 +1,16 @@
 require "bundler/gem_tasks"
 
+require "rake/testtask"
+Rake::TestTask.new(:unit) do |t|
+  t.libs.push "lib"
+  t.test_files = FileList["spec/**/*_spec.rb"]
+  t.verbose = true
+  t.warning = false
+end
+
+desc "Run all unit tests"
+task test: %i{unit}
+
 begin
   require "cookstyle/chefstyle"
   require "rubocop/rake_task"
@@ -10,4 +21,4 @@ rescue LoadError
   puts "cookstyle/chefstyle is not available. (sudo) gem install cookstyle to do style checking."
 end
 
-task default: %i{style}
+task default: %i{style test}

data/kitchen-dokken.gemspec

@@ -19,6 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "docker-api", ">= 1.33", "< 3"
   spec.add_dependency "kitchen-omnibus-chef", ">= 1.0"
-  spec.add_dependency "lockfile", "~> 2.1"
   spec.add_dependency "test-kitchen", ">= 1.15", "< 5"
 end

data/lib/kitchen/driver/dokken.rb

@@ -19,7 +19,6 @@ require "digest" unless defined?(Digest)
 require "kitchen"
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require "docker"
-require "lockfile"
 require "base64" unless defined?(Base64)
 require_relative "../helpers"
 
@@ -39,7 +38,14 @@ module Kitchen
       default_config :cap_add, nil
       default_config :cap_drop, nil
       default_config :cgroupns_host, false
-      default_config :chef_image, "chef/chef"
+      default_config :chef_image do |driver|
+        case driver.instance.provisioner[:product_name]
+        when "cinc"
+          "cincproject/cinc"
+        else
+          "chef/chef"
+        end
+      end
       default_config :chef_version, "latest"
       default_config :data_image, "dokken/kitchen-cache:latest"
       default_config :data_ssh_port, nil
@@ -398,9 +404,7 @@ module Kitchen
       def make_dokken_network
         return unless self[:network_mode] == "dokken"
 
-        lockfile = Lockfile.new "#{home_dir}/.dokken-network.lock"
-        begin
-          lockfile.lock
+        with_file_lock("#{home_dir}/.dokken-network.lock") do
           with_retries { ::Docker::Network.get("dokken", {}, docker_connection) }
         rescue ::Docker::Error::NotFoundError
           begin
@@ -408,8 +412,6 @@ module Kitchen
           rescue ::Docker::Error => e
             debug "driver - error :#{e}:"
           end
-        ensure
-          lockfile.unlock
         end
       end
 
@@ -419,9 +421,7 @@ module Kitchen
       end
 
       def create_chef_container(state)
-        lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
-        begin
-          lockfile.lock
+        with_file_lock("#{home_dir}/.dokken-#{chef_container_name}.lock") do
           with_retries do
             # TEMPORARY FIX - docker-api 2.0.0 has a buggy Docker::Container.get - use .all instead
             # https://github.com/swipely/docker-api/issues/566
@@ -448,8 +448,13 @@ module Kitchen
           rescue ::Docker::Error, StandardError => e
             raise "driver - #{chef_container_name} failed to create #{e}"
           end
-        ensure
-          lockfile.unlock
+        end
+      end
+
+      def with_file_lock(path)
+        File.open(path, File::RDWR | File::CREAT, 0o644) do |f|
+          f.flock(File::LOCK_EX)
+          yield
         end
       end
 
@@ -658,7 +663,8 @@ module Kitchen
       end
 
       def chef_container_name
-        config[:platform] != "" ? "chef-#{chef_version}-" + config[:platform].sub("/", "-") : "chef-#{chef_version}"
+        prefix = instance.provisioner[:product_name] == "cinc" ? "cinc" : "chef"
+        config[:platform] != "" ? "#{prefix}-#{chef_version}-" + config[:platform].sub("/", "-") : "#{prefix}-#{chef_version}"
       end
 
       def chef_image

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.22.2".freeze
+    DOKKEN_VERSION = "2.23.1".freeze
   end
 end

data/lib/kitchen/provisioner/dokken.rb

@@ -30,7 +30,14 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :root_path, "/opt/kitchen"
-      default_config :chef_binary, "/opt/chef/bin/chef-client"
+      default_config :chef_binary do |provisioner|
+        case provisioner[:product_name]
+        when "cinc"
+          "/opt/cinc/bin/cinc-client"
+        else
+          "/opt/chef/bin/chef-client"
+        end
+      end
       default_config :chef_options, " -z"
       default_config :chef_log_level, "warn"
       default_config :chef_output_format, "doc"
@@ -79,6 +86,39 @@ module Kitchen
         cleanup_dokken_sandbox if config[:clean_dokken_sandbox] # rubocop: disable Lint/EnsureReturn
       end
 
+      # Override the parent's check_license to skip the kitchen-omnibus-chef
+      # deprecation warning. That warning concerns the omnibus *download*
+      # mechanism, which dokken does not use — the chef/cinc binary is
+      # mounted from a volume container, not downloaded via omnitruck.
+      #
+      # When the resolved parent is kitchen-cinc's CincInfra (which rebinds
+      # Kitchen::Provisioner::ChefInfra in Cinc Workstation 26+), there is no
+      # omnibus warning to suppress, license_acceptance_id is not defined,
+      # and the LicenseAcceptance constant is not autoloaded — delegate to
+      # super in that case so the parent's own check_license runs. We test
+      # for both because a partial drop-in shim may define
+      # license_acceptance_id without pulling in license-acceptance.
+      def check_license
+        return super unless respond_to?(:license_acceptance_id, true) && defined?(LicenseAcceptance)
+
+        name = license_acceptance_id
+        version = product_version
+        debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}.")
+
+        acceptor = LicenseAcceptance::Acceptor.new(logger: Kitchen.logger, provided: config[:chef_license])
+        return unless acceptor.license_required?(name, version)
+
+        debug("License acceptance required for #{name} version: #{version}. Prompting")
+        license_id = acceptor.id_from_mixlib(name)
+        begin
+          acceptor.check_and_persist(license_id, version.to_s)
+        rescue LicenseAcceptance::LicenseNotAcceptedError => e
+          error("Cannot converge without accepting the #{e.product.pretty_name} License. Set it in your kitchen.yml or using the CHEF_LICENSE environment variable")
+          raise
+        end
+        config[:chef_license] ||= acceptor.acceptance_value
+      end
+
       def validate_config
         # check if we have an space for the user provided options
         # or add it if not to avoid issues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.22.2
+  version: 2.23.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-13 00:00:00.000000000 Z
+date: 2026-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: lockfile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement