kitchen-dokken 2.8.1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16a7be68b37633b6960b822d0faadb6630824ec39e929937cd6acd4dff951f7a
-  data.tar.gz: cd58e3b78f3b375ac97575040d708f41052d51f52308f70bb6b244d351d89908
+  metadata.gz: f9838e52a3dafe9888e01c141655f444b364ffc9721589a4524cc87286dc4110
+  data.tar.gz: 69f9de9936b22eddb8a71786011fafc9c5be00e487a6316264f46dfdd3d66ecc
 SHA512:
-  metadata.gz: 835ba81cc21ec44b242b270ab61f4fc5355a38996d3eb8c48cf62c120eacbbb5c5c8ecd78729149e41defb0b6e8cf7fccd41c34ea63c883bd2b6aa0e0c1dd6dd
-  data.tar.gz: f255e47fd5d2661288e929b74cbb7e9b365b18aaaaba6836ab51de334efd10b6014156f35f33705e195a272e731d5bf8f7ba7bab3c4512ad3e9f992738145f0e
+  metadata.gz: 99ce50d234ff2cb2cee7a68282aa89f52072d598673c227663ea965a060863308637f2a22717c70bc521f56fd590f78b23822803e8c1f35797f07d2e12114d60
+  data.tar.gz: 349f2ecbea46e70af465d2bf0fd87c6b04d24458ed607e28d014993f2230143bb0fda20d7b11a13ce410ddcd3ae6d481dc5399541cd339b1966bf24f98ef67aa

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.1'.freeze
+    DOKKEN_VERSION = '2.11.0'.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
@@ -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

@@ -30,7 +30,7 @@ module Kitchen
       plugin_version Kitchen::VERSION
 
       default_config :root_path, '/opt/kitchen'
-      default_config :chef_binary, '/opt/chef/embedded/bin/chef-client'
+      default_config :chef_binary, '/opt/chef/bin/chef-client'
       default_config :chef_options, ' -z'
       default_config :chef_log_level, 'warn'
       default_config :chef_output_format, 'doc'
@@ -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.1
+  version: 2.11.0
 platform: ruby
 authors:
 - Sean OMeara
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-09-14 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.0.3
-signing_key: 
+rubygems_version: 3.1.2
+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: []