kitchen-dokken 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c96c48b219e98045ac11e51e56610767eaba3b5
-  data.tar.gz: f3bdb6494d7c029ce6144d27a8ffa1448940309b
+  metadata.gz: 5cb3ca939dbea3ff17317f0e2dc84221cbafab95
+  data.tar.gz: a0e116039de06714f0f0968be5742499b76534a1
 SHA512:
-  metadata.gz: 2c452fb897d7a6cfa9a537e403b205556578f079592eee2746418b79a2069b7956c250638e887cc2f1ca0b8784785783c3bdb6b5ded4c7991e48d698fa090914
-  data.tar.gz: ec2525c3c9baae58bb5aeaa4ef206d586e1f5ab6672c1633a9e9bbf0f3ca4957e1f4004b5887d99e620adc67922008c2b4849de073a5b0819d7057f64af9cc2b
+  metadata.gz: 13b58476cfb34012b99105568d87ce7fd165467e0bc3abcae79978f838612707ab00fabd8335eca7cbeb487a232feec29018f629aba49825b691bdcc69d9d886
+  data.tar.gz: 17c563f9084e427b20de70820bc25a91e0c1f9628cf30ab23691306a3e99b0219439b87eb174005062e6531da96d24a0c64add832595bbbd96f96fcc819a36a1

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Dokken Changelog
 
+# 2.5.0
+- Adding support for exposing ports.
+- Port systax matches docker-compose
+
+   ```
+   driver:
+     hostname: www.computers.biz
+     port "1234"
+   ```
+...or something like
+
+   ```
+   driver:
+     hostname: www.computers.biz
+     ports:
+       - '1234'
+       - '4321:4321/udp'
+   ```
+
 # 2.4.3
 - Using better paths for lockfiles
 

data/lib/kitchen/driver/dokken.rb

@@ -42,9 +42,8 @@ module Kitchen
       default_config :data_image, 'dokken/kitchen-cache:latest'
       default_config :dns, nil
       default_config :dns_search, nil
-      # default_config :docker_info, docker_info
+      default_config :ports, nil
       default_config :docker_host_url, default_docker_host
-      default_config :forward, nil
       default_config :hostname, 'dokken'
       default_config :image_prefix, nil
       default_config :links, nil
@@ -57,7 +56,7 @@ module Kitchen
       default_config :write_timeout, 3600
 
       # (see Base#create)
-      def create(state)        
+      def create(state)
         # image to config
         pull_platform_image
 
@@ -100,6 +99,12 @@ module Kitchen
 
       private
 
+      class PartialHash < Hash
+        def ==(other)
+          other.is_a?(Hash) && all? { |key, val| other.key?(key) && other[key] == val }
+        end
+      end
+
       def api_retries
         config[:api_retries]
       end
@@ -195,12 +200,6 @@ module Kitchen
         instance_name
       end
 
-      class PartialHash < Hash
-        def ==(other)
-          other.is_a?(Hash) && all? { |key, val| other.key?(key) && other[key] == val }
-        end
-      end
-
       def dokken_binds
         ret = []
         ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil? || remote_docker_host?
@@ -248,7 +247,7 @@ module Kitchen
           'Cmd' => Shellwords.shellwords(self[:pid_one_command]),
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
           'Hostname' => self[:hostname],
-          'ExposedPorts' => exposed_ports({}, self[:forward]),
+          'ExposedPorts' => exposed_ports,
           'Volumes' => dokken_volumes,
           'HostConfig' => {
             'Privileged' => self[:privileged],
@@ -261,7 +260,7 @@ module Kitchen
             'CapDrop' => Array(self[:cap_drop]),
             'SecurityOpt' => Array(self[:security_opt]),
             'NetworkMode' => self[:network_mode],
-            'PortBindings' => port_forwards({}, self[:forward]),
+            'PortBindings' => port_bindings,
           },
           'NetworkingConfig' => {
             'EndpointsConfig' => {
@@ -281,7 +280,7 @@ module Kitchen
           'name' => data_container_name,
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
           'HostConfig' => {
-            'PortBindings' => port_forwards({}, '22'),
+            'PortBindings' => port_bindings,
             'PublishAllPorts' => true,
             'NetworkMode' => 'bridge',
           },
@@ -487,24 +486,6 @@ module Kitchen
         release ? [platform, release].join(':') : platform
       end
 
-      def exposed_ports(config, rules)
-        Array(rules).each do |prt_string|
-          guest, _host = prt_string.to_s.split(':').reverse
-          config["#{guest}/tcp"] = {}
-        end
-        config
-      end
-
-      def port_forwards(config, rules)
-        Array(rules).each do |prt_string|
-          guest, host = prt_string.to_s.split(':').reverse
-          config["#{guest}/tcp"] = [{
-            HostPort: host || '',
-          }]
-        end
-        config
-      end
-
       def pull_if_missing(image)
         return if ::Docker::Image.exist?("#{repo(image)}:#{tag(image)}", {}, docker_connection)
         pull_image image

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.4.3'.freeze
+    DOKKEN_VERSION = '2.5.0'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -168,6 +168,78 @@ EOF
       "#{prefix}-#{instance.name}"
     end
 
+    def exposed_ports
+      coerce_exposed_ports(config[:ports])
+    end
+
+    def port_bindings
+      coerce_port_bindings(config[:ports])
+    end
+
+    def coerce_exposed_ports(v)
+      case v
+      when Hash, nil
+        v
+      else
+        x = Array(v).map { |a| parse_port(a) }
+        x.flatten!
+        x.each_with_object({}) do |y, h|
+          h[y['container_port']] = {}
+        end
+      end
+    end
+
+    def coerce_port_bindings(v)
+      case v
+      when Hash, nil
+        v
+      else
+        x = Array(v).map { |a| parse_port(a) }
+        x.flatten!
+        x.each_with_object({}) do |y, h|
+          h[y['container_port']] = [] unless h[y['container_port']]
+          h[y['container_port']] << {
+            'HostIp' => y['host_ip'],
+            'HostPort' => y['host_port'],
+          }
+        end
+      end
+    end
+
+    def parse_port(v)
+      parts = v.split(':')
+      case parts.length
+      when 3
+        host_ip = parts[0]
+        host_port = parts[1]
+        container_port = parts[2]
+      when 2
+        host_ip = '0.0.0.0'
+        host_port = parts[0]
+        container_port = parts[1]
+      when 1
+        host_ip = ''
+        host_port = ''
+        container_port = parts[0]
+      end
+      port_range, protocol = container_port.split('/')
+      if port_range.include?('-')
+        port_range = container_port.split('-')
+        port_range.map!(&:to_i)
+        Chef::Log.fatal("FATAL: Invalid port range! #{container_port}") if port_range[0] > port_range[1]
+        port_range = (port_range[0]..port_range[1]).to_a
+      end
+      # qualify the port-binding protocol even when it is implicitly tcp #427.
+      protocol = 'tcp' if protocol.nil?
+      Array(port_range).map do |port|
+        {
+          'host_ip' => host_ip,
+          'host_port' => host_port,
+          'container_port' => "#{port}/#{protocol}",
+        }
+      end
+    end
+
     def remote_docker_host?
       # return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
       return true if config[:docker_host_url] =~ /^tcp:/

data/lib/kitchen/transport/dokken.rb

@@ -94,16 +94,33 @@ module Kitchen
 
           elsif options[:docker_host_url] =~ /tcp:/
             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|
               x.info['Names'][0].eql?(name)
             end.first.info['NetworkSettings']['Networks']['dokken']['IPAddress']
 
-            if port_open?(candidate_ip, '22')
+            # mapped port
+            candidate_ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
+
+            debug "candidate_ip - #{candidate_ip}"
+            debug "candidate_ssh_port - #{candidate_ssh_port}"
+
+            if port_open?(candidate_ip, candidate_ssh_port)
+              debug "candidate_ip - #{candidate_ip}/#{candidate_ssh_port} open"
+              ssh_ip = candidate_ip
+              ssh_port = candidate_ssh_port
+
+            elsif port_open?(candidate_ip, '22')
               ssh_ip = candidate_ip
               ssh_port = '22'
+              debug "candidate_ip - #{candidate_ip}/22 open"
             else
-              ssh_ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
-              ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
+              ssh_ip = docker_host_url_ip
+              ssh_port = candidate_ssh_port
             end
           else
             raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen