kitchen-dokken 2.23.8 → 2.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dffedb0556f642eb7b9011de7ce16d3002b7fc94fc4f99e1f0350a3e593865
-  data.tar.gz: 0542043deb31d066f65640e32faaf45f66c62d6c5e77b8efa569d30dbbfa0ecf
+  metadata.gz: 1601bf73b8bb5607d0a279d1d06e3cc5779b581616159b320ee6737210b9bd1d
+  data.tar.gz: 7e92f8c54e09f5746905496fa9388b2fe49f0ec8d7a33f63ac461a0f53c07618
 SHA512:
-  metadata.gz: f0717edbd835bdba7ba34d86f051b19427506871cde23003d7cd11c9ccf2fdc32a876d02b32c66fb0b370382648863053b671046d921e04318d5ebf13af0a580
-  data.tar.gz: 7d99975e0a3532d9c62acd42cf84cc258514bb591621d63de40f53f1b814b090cc8d7eac777b7fbd179d7a6b81e1a38ae461e957db6a551bb91fd7a53c98491a
+  metadata.gz: f6fee7ac1a7586664f3e67047ad994a22c059f6782c99e737a1792dd3758c778f1c8bd3c6f79f6fe1406725dad6f3c1b8d297de1fb9630c4e326d67b23de5d2c
+  data.tar.gz: 1604d52bffac5be374ac62f2a509b584ff43303a5b6c98aed2ed0c1fdcdaa8ec9a8fc8ec17c65a8c56679574ff878452e6ee587ca5bf28e12e8a005f6d845d36

data/kitchen-dokken.gemspec

@@ -19,5 +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 "test-kitchen", ">= 1.15", "< 5"
+  spec.add_dependency "test-kitchen", ">= 3.0", "< 5"
 end

data/lib/kitchen/driver/dokken.rb

@@ -23,6 +23,7 @@ require "docker"
 require "shellwords" unless defined?(Shellwords)
 require "base64" unless defined?(Base64)
 require_relative "../helpers"
+require_relative "dokken_version"
 
 include Dokken::Helpers
 
@@ -42,6 +43,14 @@ module Kitchen
     #
     # @author Sean OMeara <sean@sean.io>
     class Dokken < Kitchen::Driver::Base
+      kitchen_driver_api_version 2
+
+      # kitchen-dokken's own version, not test-kitchen's. `kitchen diagnose`
+      # is the first thing a bug report carries, and it used to report the
+      # test-kitchen version here -- which says nothing about the plugin the
+      # report is actually about.
+      plugin_version Kitchen::Driver::DOKKEN_VERSION
+
       default_config :api_retries, 20
       default_config :binds, []
       default_config :cap_add, nil
@@ -143,8 +152,65 @@ module Kitchen
         dokken_delete_sandbox
       end
 
+      # (see Base#status)
+      #
+      # `kitchen list --live` asks the driver whether the instance is really
+      # there rather than trusting the last recorded action, which is exactly
+      # the question a docker daemon can answer precisely. Without this the
+      # driver inherited Base's "unknown", so a container that was plainly
+      # `Up` still listed as `unknown`.
+      #
+      # The runner *is* the instance. The chef container is a shared volume
+      # and the data container only exists on the remote-daemon path, so
+      # neither says anything about whether this instance is up.
+      #
+      # Deliberately not wrapped in {#with_retries}: this backs a listing, and
+      # a slow answer is worse than an honest "unknown".
+      #
+      # @param _state [Hash] mutable instance state
+      # @return [Hash] normalized status data
+      def status(_state)
+        container_status(::Docker::Container.get(runner_container_name, {}, docker_connection))
+      rescue ::Docker::Error::NotFoundError
+        { live: false, state: "not created", source: "driver" }
+      # Every other failure -- an unreachable daemon most of all -- is an
+      # unknown rather than an exception. Kitchen would catch it either way,
+      # but it would then report the exception class instead of the daemon
+      # url that could not be reached.
+      rescue ::StandardError => e
+        {
+          live: nil,
+          state: "unknown",
+          source: "driver",
+          message: "could not ask the docker daemon at #{config[:docker_host_url]}: #{e.message}",
+        }
+      end
+
       private
 
+      # Translate a container's `State` into kitchen's status shape.
+      #
+      # @param container [::Docker::Container] the runner container
+      # @return [Hash] normalized status data
+      def container_status(container)
+        state = container.info["State"] || {}
+        running = state["Running"] == true
+
+        status = {
+          # Docker's own vocabulary -- created, running, paused, exited,
+          # restarting, dead -- says more than a boolean, and `kitchen list`
+          # prints it verbatim.
+          live: running,
+          state: state["Status"] || (running ? "running" : "stopped"),
+          source: "driver",
+          resource_id: container.info["Id"],
+        }
+
+        error = state["Error"].to_s
+        status[:message] = error unless error.empty?
+        status
+      end
+
       # Attach DNS settings to a network endpoint configuration, in place.
       #
       # @param endpoint_config [Hash] the EndpointsConfig entry to extend

data/lib/kitchen/driver/dokken_version.rb

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

data/lib/kitchen/helpers.rb

@@ -629,8 +629,39 @@ module Kitchen
 
       # Run the verifier against the instance.
       #
-      # Files are only uploaded when the driver built a data container, which
-      # it does exactly when the daemon cannot read the host filesystem.
+      # This replaces Kitchen::Verifier::Base#call outright, so it has to be
+      # read against the upstream version it stands in for. It diverges in
+      # three places, and each divergence is deliberate:
+      #
+      # 1. *The upload is gated on the data container.* Files are only shipped
+      #    when the driver built one, which it does exactly when the daemon
+      #    cannot read the host filesystem. Otherwise the sandboxes are
+      #    bind-mounted and are already in place. `init_command` is gated with
+      #    it because for Busser it clears the verifier root, which in
+      #    bind-mount mode is the host sandbox that was just populated.
+      #
+      # 2. *`cleanup_sandbox` is not called*, and must not be. Upstream can
+      #    `rmtree` its sandbox because a stock one is a throwaway
+      #    `Dir.mktmpdir`. Dokken's is a stable per-instance directory that
+      #    the driver bind-mounts into a long-lived container, and a bind
+      #    mount is bound to an inode rather than to a path: removing the
+      #    directory severs it permanently, and the `mkdir_p` in the next
+      #    `create_sandbox` does not restore it. Verified against Docker --
+      #    after an rmtree and a recreate, the host has the file and the
+      #    container cannot see it, until the container itself is replaced.
+      #    Kitchen::Provisioner::Dokken#cleanup_dokken_sandbox is the shape
+      #    that is safe here: empty the directory, keep the inode.
+      #
+      # 3. *`config[:downloads]` is not honoured.* Upstream downloads files
+      #    off the instance after the run command. That cannot work here yet
+      #    for a second reason as well: Transport::Dokken::Connection does not
+      #    implement `download`, so the base class would raise. Wiring both up
+      #    is worth doing, and is the one divergence here that is a gap rather
+      #    than a decision.
+      #
+      # spec/kitchen/verifier_override_contract_spec.rb pins the upstream
+      # facts this reasoning rests on, so that a test-kitchen release which
+      # invalidates any of them fails loudly rather than silently.
       #
       # @param state [Hash] mutable instance state
       # @return [void]

data/lib/kitchen/provisioner/dokken.rb

@@ -18,6 +18,7 @@
 require "kitchen"
 require "kitchen/provisioner/chef_infra"
 require_relative "../helpers"
+require_relative "../driver/dokken_version"
 
 include Dokken::Helpers
 
@@ -35,7 +36,10 @@ module Kitchen
     class Dokken < Kitchen::Provisioner::ChefInfra
       kitchen_provisioner_api_version 2
 
-      plugin_version Kitchen::VERSION
+      # kitchen-dokken's own version. Kitchen::VERSION is test-kitchen's,
+      # so `kitchen diagnose` reported the framework version as the
+      # plugin version for every dokken plugin.
+      plugin_version Kitchen::Driver::DOKKEN_VERSION
 
       default_config :root_path, "/opt/kitchen"
       default_config :chef_binary do |provisioner|

data/lib/kitchen/transport/dokken.rb

@@ -22,6 +22,7 @@ require "digest/sha1" unless defined?(Digest::SHA1)
 require "open3" unless defined?(Open3)
 require "shellwords" unless defined?(Shellwords)
 require_relative "../helpers"
+require_relative "../driver/dokken_version"
 
 include Dokken::Helpers
 
@@ -45,7 +46,10 @@ module Kitchen
     class Dokken < Kitchen::Transport::Base
       kitchen_transport_api_version 2
 
-      plugin_version Kitchen::VERSION
+      # kitchen-dokken's own version. Kitchen::VERSION is test-kitchen's,
+      # so `kitchen diagnose` reported the framework version as the
+      # plugin version for every dokken plugin.
+      plugin_version Kitchen::Driver::DOKKEN_VERSION
 
       default_config :docker_info do |transport|
         docker_info(transport[:docker_host_url])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.23.8
+  version: 2.24.0
 platform: ruby
 authors:
 - Sean OMeara
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'