kitchen-dokken 2.8.2 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4fde3054408e1ba8c4dacac012710a0b0b3e29516535e515909855cf7aa46d
-  data.tar.gz: b8032f2ab0eb632fd51ada2077623e5d5f28acea7749a8463d57ce1357a885de
+  metadata.gz: 98524d476ee9044dfb093ab3de13152ac564103fa663d8d50bdf0393d9bfcf32
+  data.tar.gz: 653e8898c6d4cc114edc2dd4d1229744d0fea01745c4a45dfac1e49ada5127e5
 SHA512:
-  metadata.gz: f096464210cc65517835268aaedaa98cd002a91da9b4371e1b6f02d0f724eb18d7ff43af17cf2611662e8ea4048429613d5459fdfb7e805e55db20e90ab6392d
-  data.tar.gz: 45925b398c4a336c0427fb18a5d60f094c9c2e455cc181c871f6bc5f57a7ff7989fbc3ecd2d50ed77afd7a38cfdbe89254ec10b2289d6daada39de8fc79dc8fb
+  metadata.gz: 751bf6a56a04c4eaa040cdc0a527d9a0b9202534107d16563af52986b57285337be29cb89203828135f2bf373afad8e4413580a837398e0964c89eff9c6defed
+  data.tar.gz: 3828997c2805eb7b2f1d433643c32ceef797a82a1a7d20649c6309c8cc760c965a4bc8c9222fc8fa5956c84657b53040cd26ed86bfdd065303dcdd4d3aa0bcb2

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)
@@ -300,6 +301,7 @@ module Kitchen
             'NetworkMode' => self[:network_mode],
             'PortBindings' => port_bindings,
             'Tmpfs' => dokken_tmpfs,
+            'Memory' => self[:memory_limit],
           },
           'NetworkingConfig' => {
             'EndpointsConfig' => {

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.8.2'.freeze
+    DOKKEN_VERSION = '2.11.1'.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

@@ -50,10 +50,12 @@ module Kitchen
         driver = provisioner.instance.driver
         driver[:chef_version]
       end
+      default_config :clean_dokken_sandbox, true
 
       # (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}")
@@ -62,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]
@@ -71,6 +73,7 @@ module Kitchen
       rescue Kitchen::Transport::TransportFailed => ex
         raise ActionFailed, ex.message
       ensure
+        return unless config[:clean_dokken_sandbox]
         cleanup_dokken_sandbox
       end
 
@@ -103,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.8.2
+  version: 2.11.1
 platform: ruby
 authors:
 - Sean OMeara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-10-19 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: []