kitchen-dokken 2.9.0 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d4ff0b315649f0f9df9cd54cd86419b487d63ea5d71826a0a0962502ca34ca
-  data.tar.gz: d8710f925f0cfb62f2a00aedaa1fe85d68fa6976a469a469e123ec1ce8e9bcd9
+  metadata.gz: ef0d3aea1c2839a2674ed7986dba589c8e672a19a600bdf9173689d286414160
+  data.tar.gz: ad29a7651abca534ff753140b67408adfa5e7a8c44252b810925a68f1ac2ca88
 SHA512:
-  metadata.gz: 3619800e7157549da3b19081924d00926280d21a4cd61999117f194d228c2cbc0d674fe4d2cecf390a7f0fb6ac7731917ee55ea11c7a982a639b988427ee93fe
-  data.tar.gz: e920198f9c34c893971996c03bcce43abf36d7bac808193b26602e0b6e57c04acab9964fa8533e9d2f8898f1a0cad27996bb873ea402b6e614844871694d9131
+  metadata.gz: e5056e47e61cd05b666a4058a0eaee09a4fa4907d331088f92ff783c41bd455cc33424ca25ac885b278270c4f8d8ebdc80cf5734d3b7363da6c4d34e1f2e74de
+  data.tar.gz: 50bec0744f44a44603dc887c99b3c73009eebe9c02f2832c10aecfa02bc46cea55c19d591d3d08efc409907a80139626bbf356aafbf73017872e607d65c857c9

data/lib/kitchen/driver/dokken.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'digest'
+require 'digest' unless defined?(Digest)
 require 'kitchen'
-require 'tmpdir'
+require 'tmpdir' unless defined?(Dir.mktmpdir)
 require 'docker'
 require 'lockfile'
 require_relative '../helpers'
@@ -61,6 +61,7 @@ module Kitchen
       default_config :userns_host, false
       default_config :pull_platform_image, true
       default_config :pull_chef_image, true
+      default_config :memory_limit, 0
 
       # (see Base#create)
       def create(state)
@@ -152,9 +153,9 @@ module Kitchen
         rescue Docker::Error::UnexpectedResponseError => e
           msg = 'work_image build failed: '
           msg += JSON.parse(e.to_s.split("\r\n").last)['error'].to_s
-          msg += '. The common scenerios are incorrect intermediate'
+          msg += '. The common scenarios are incorrect intermediate '
           msg += 'instructions such as not including `-y` on an `apt-get` '
-          msg += 'or similar. The other common scenerio is a transient '
+          msg += 'or similar. The other common scenario is a transient '
           msg += 'error such as an unresponsive mirror.'
           raise msg
         # fallback rescue above should catch most of the errors
@@ -300,6 +301,7 @@ module Kitchen
             'NetworkMode' => self[:network_mode],
             'PortBindings' => port_bindings,
             'Tmpfs' => dokken_tmpfs,
+            'Memory' => self[:memory_limit],
           },
           'NetworkingConfig' => {
             'EndpointsConfig' => {
@@ -366,8 +368,16 @@ module Kitchen
         lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
         begin
           lockfile.lock
-          with_retries { ::Docker::Container.get(chef_container_name, {}, docker_connection) }
+          with_retries {
+            # TEMPORARY FIX - docker-api 2.0.0 has a buggy Docker::Container.get - use .all instead
+            # https://github.com/swipely/docker-api/issues/566
+            # ::Docker::Container.get(chef_container_name, {}, docker_connection)
+            found = ::Docker::Container.all({all: true}, docker_connection).select { |c| c.info["Names"].include?("/#{chef_container_name}") }
+            raise ::Docker::Error::NotFoundError.new(chef_container_name) if found.empty?
+            debug "Chef container already exists, continuing"
+          }
         rescue ::Docker::Error::NotFoundError
+          debug "Chef container does not exist, creating a new Chef container"
           with_retries do
             begin
               debug "driver - creating volume container #{chef_container_name} from #{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.9.0'.freeze
+    DOKKEN_VERSION = '2.11.2'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -1,8 +1,8 @@
 module Dokken
   module Helpers
     # https://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
-    require 'socket'
-    require 'timeout'
+    require 'socket' unless defined?(Socket)
+    require 'timeout' unless defined?(Timeout)
 
     def port_open?(ip, port)
       begin
@@ -11,7 +11,7 @@ module Dokken
             s = TCPSocket.new(ip, port)
             s.close
             return true
-          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN
             return false
           end
         end
@@ -243,7 +243,7 @@ VOLUME /opt/verifier
 
     def remote_docker_host?
       return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
-      return true if config[:docker_host_url] =~ /^tcp:/
+      return true if /^tcp:/.match?(config[:docker_host_url])
       false
     end
 

data/lib/kitchen/provisioner/dokken.rb

@@ -55,6 +55,7 @@ module Kitchen
       # (see Base#call)
       def call(state)
         create_sandbox
+        write_run_command(run_command)
         instance.transport.connection(state) do |conn|
           if remote_docker_host?
             info("Transferring files to #{instance.to_str}")
@@ -63,7 +64,7 @@ module Kitchen
 
           conn.execute(prepare_command)
           conn.execute_with_retry(
-            run_command,
+            "sh #{config[:root_path]}/run_command",
             config[:retry_on_exit_code],
             config[:max_retries],
             config[:wait_for_retry]
@@ -105,6 +106,12 @@ module Kitchen
         cmd << " -F #{config[:chef_output_format]}"
         cmd << ' -c /opt/kitchen/client.rb'
         cmd << ' -j /opt/kitchen/dna.json'
+
+        chef_cmd(cmd)
+      end
+
+      def write_run_command(command)
+        File.write("#{dokken_kitchen_sandbox}/run_command", command)
       end
 
       def runner_container_name

data/lib/kitchen/transport/dokken.rb

@@ -17,8 +17,8 @@
 
 require 'kitchen'
 require 'net/scp'
-require 'tmpdir'
-require 'digest/sha1'
+require 'tmpdir' unless defined?(Dir.mktmpdir)
+require 'digest/sha1' unless defined?(Digest::SHA1)
 require_relative '../helpers'
 
 include Dokken::Helpers
@@ -82,7 +82,7 @@ module Kitchen
             ssh_ip = options[:host_ip_override]
             ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
 
-          elsif options[:docker_host_url] =~ /unix:/
+          elsif /unix:/.match?(options[:docker_host_url])
             if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] == '0.0.0.0'
               ssh_ip = options[:data_container][:NetworkSettings][:IPAddress]
               ssh_port = '22'
@@ -92,16 +92,16 @@ module Kitchen
               ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
             end
 
-          elsif options[:docker_host_url] =~ /tcp:/
+          elsif /tcp:/.match?(options[:docker_host_url])
             name = options[:data_container][:Name]
 
             # DOCKER_HOST
             docker_host_url_ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
 
             # mapped IP of data container
-            candidate_ip = ::Docker::Container.all.select do |x|
+            candidate_ip = ::Docker::Container.all.find do |x|
               x.info['Names'][0].eql?(name)
-            end.first.info['NetworkSettings']['Networks']['dokken']['IPAddress']
+            end.info['NetworkSettings']['Networks']['dokken']['IPAddress']
 
             # mapped port
             candidate_ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.2
 platform: ruby
 authors:
 - Sean OMeara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.33'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +64,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-description: A Test Kitchen Driver for Dokken
+description: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
+  using Chef Infra docker images
 email:
 - sean@sean.io
 executables: []
@@ -75,7 +82,7 @@ homepage: https://github.com/someara/kitchen-dokken
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
-summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes
-  to produce sparse container images
+summary: A Test Kitchen Driver for Docker & Chef Infra optimized for rapid testing
+  using Chef Infra docker images
 test_files: []