kitchen-dokken 2.3.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d57a3f9e31b502476ae1e99b045b550132c98f2
-  data.tar.gz: 241ab4e34076eeeddec3bb4c883953a804d188d7
+  metadata.gz: b36486a74d03c58b8ed8fdad948f06028f1fb1ae
+  data.tar.gz: c8a95b0ab5526d783a60a23c0a693392645f51d2
 SHA512:
-  metadata.gz: 962d742a44fae5ee8916f751b04d500e4ebf06430c35ce5e2168790042fbcec052d1a06471031ac1d0808f7fa4f9fc656fd3a9b6fcbf6a1e20798217ed027558
-  data.tar.gz: 385d6239b82aae293e9bca7c4b17a9fa7bafe6f4859f8518b9bdceaabde238da00de1a363ef6a75338da03b81d13171a81c3e8bf06806c2604e7d0bb883b72be
+  metadata.gz: 7ca1a539cecff671e82091faf2cb41e696bf52c8b330398748dd89989d18e8842011ef2ead744537cd569f3771582f98f00641ef9a5647ecc7450c9f373c5796
+  data.tar.gz: 59ffd591e931ae9698c3aafc8240baaa1c13101838b6e1d729294b8270563671769097fe29ffa1a6f1dc216e07262ff5a980003154ab032de4741b9509ebbc9a

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Dokken Changelog
 
+# 2.4.1
+- Adding NotFoundError to with_retries and beefing up rescues
+
+# 2.4.0
+- Features meant for 2.2.0, but tested properly this time.
+- Initial support for clusters / inter-suite name resolution
+- Dokken now creates a user-defined network named "dokken" and
+  connects containers to it. This allows us to take advantage of the
+  built in DNS server that in Docker 1.10 and later.
+
+   ```
+   driver:
+     hostname: www.computers.biz
+   ```
+
+# 2.3.1
+- Actually doing the things in 2.3.0
+
 # 2.3.0
 - Reverting 2.2.x bits to 2.1.x. to restore stability to users.
 - That'll teach me to push gems at odd hours.

data/lib/kitchen/driver/dokken.rb

@@ -41,7 +41,7 @@ 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 :docker_info, docker_info
       default_config :docker_host_url, default_docker_host
       default_config :forward, nil
       default_config :hostname, 'dokken'
@@ -114,10 +114,12 @@ module Kitchen
         return unless ::Docker::Image.exist?(work_image, {}, docker_connection)
         with_retries { @work_image = ::Docker::Image.get(work_image, {}, docker_connection) }
 
-        begin
-          with_retries { @work_image.remove(force: true) }
-        rescue ::Docker::Error::ConflictError
-          debug "driver - #{work_image} cannot be removed"
+        with_retries do
+          begin
+            with_retries { @work_image.remove(force: true) }
+          rescue ::Docker::Error::ConflictError
+            debug "driver - #{work_image} cannot be removed"
+          end
         end
       end
 
@@ -280,7 +282,14 @@ module Kitchen
           'HostConfig' => {
             'PortBindings' => port_forwards({}, '22'),
             'PublishAllPorts' => true,
-            'NetworkMode' => self[:network_mode],
+            'NetworkMode' => 'bridge',
+          },
+          'NetworkingConfig' => {
+            'EndpointsConfig' => {
+              self[:network_mode] => {
+                'Aliases' => Array(self[:hostname]),
+              },
+            },
           },
         }
         data_container = run_container(config)
@@ -288,14 +297,17 @@ module Kitchen
       end
 
       def make_dokken_network
-        info 'driver - checking for dokken network'
-        ::Docker::Network.get('dokken', {}, docker_connection)
+        debug 'driver - checking for dokken network'
+        with_retries { ::Docker::Network.get('dokken', {}, docker_connection) }
       rescue
-        begin
-          info 'driver - creating dokken network'
-          ::Docker::Network.create('dokken', {})
-        rescue ::Docker::Error => e
-          info "driver - :#{e}:"
+        with_retries do
+          begin
+            info 'Creating dokken network'
+            n = ::Docker::Network.create('dokken', {})
+            debug "n - #{n}"
+          rescue ::Docker::Error => e
+            debug "driver - :#{e}:"
+          end
         end
       end
 
@@ -305,22 +317,24 @@ module Kitchen
       end
 
       def create_chef_container(state)
-        ::Docker::Container.get(chef_container_name, {}, docker_connection)
+        with_retries { ::Docker::Container.get(chef_container_name, {}, docker_connection) }
       rescue ::Docker::Error::NotFoundError
-        begin
-          debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
-          config = {
-            'name' => chef_container_name,
-            'Cmd' => 'true',
-            'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
-            'HostConfig' => {
-              'NetworkMode' => self[:network_mode],
-            },
-          }
-          chef_container = create_container(config)
-          state[:chef_container] = chef_container.json
-        rescue ::Docker::Error => e
-          raise "driver - #{chef_container_name} failed to create #{e}"
+        with_retries do
+          begin
+            debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
+            config = {
+              'name' => chef_container_name,
+              'Cmd' => 'true',
+              'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
+              'HostConfig' => {
+                'NetworkMode' => self[:network_mode],
+              },
+            }
+            chef_container = create_container(config)
+            state[:chef_container] = chef_container.json
+          rescue ::Docker::Error => e
+            raise "driver - #{chef_container_name} failed to create #{e}"
+          end
         end
       end
 
@@ -366,12 +380,25 @@ module Kitchen
       end
 
       def create_container(args)
+        with_retries { @container = ::Docker::Container.get(args['name'], {}, docker_connection) }
+      rescue
         with_retries do
-          @container = ::Docker::Container.create(args.clone, docker_connection)
-          @container = ::Docker::Container.get(args['name'], {}, docker_connection)
+          begin
+            info "Creating container #{args['name']}"
+            debug "driver - create_container args #{args}"
+            with_retries do
+              begin
+                @container = ::Docker::Container.create(args.clone, docker_connection)
+              rescue ::Docker::Error::ConflictError
+                debug "driver - rescue ConflictError: #{args['name']}"
+                with_retries { @container = ::Docker::Container.get(args['name'], {}, docker_connection) }
+
+              end
+            end
+          rescue ::Docker::Error => e
+            raise "driver - failed to create_container #{args['name']}"
+          end
         end
-      rescue ::Docker::Error::ConflictError
-        with_retries { @container = ::Docker::Container.get(args['name'], {}, docker_connection) }
       end
 
       def run_container(args)
@@ -492,9 +519,12 @@ module Kitchen
         rescue ::Docker::Error::ServerError, # 404
                ::Docker::Error::UnexpectedResponseError, # 400
                ::Docker::Error::TimeoutError,
-               ::Docker::Error::IOError => e
+               ::Docker::Error::IOError,
+               ::Docker::Error::NotFoundError => e
           tries -= 1
+          sleep 0.1
           retry if tries > 0
+          debug "tries: #{tries} e: #{e}"
           raise e
         end
       end

data/lib/kitchen/driver/dokken_version.rb

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

data/lib/kitchen/helpers.rb

@@ -1,5 +1,26 @@
 module Dokken
   module Helpers
+    # https://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
+    require 'socket'
+    require 'timeout'
+
+    def port_open?(ip, port)
+      begin
+        Timeout.timeout(1) do
+          begin
+            s = TCPSocket.new(ip, port)
+            s.close
+            return true
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return false
+          end
+        end
+      rescue Timeout::Error
+      end
+
+      false
+    end
+
     def insecure_ssh_public_key
       <<-EOF
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCoJwyW7qNhw+NTuOjC4+RVpESl+JBXebXzB7JqxRgKAbymq6B39azEAiNx5NzHkWcQmOyQNhFpKFSAufegcXRS4ctS1LcElEoXe9brDAqKEBSkmnXYfZXMNIG0Enw4+5W/rZxHFCAlsUSAHYtYZEs+3CgbIWuHhZ95C8UC6nGLWHNZOjcbsYZFrnFfO0qg0ene2w8LKhxqj5X0MRSdCIn1IwyxIbl5NND5Yk1Hx8JKsJtTiNTdxssiMgmM5bvTbYQUSf8pbGrRI30VQKBgQ8/UkidZbaTfvzWXYpwcDUERSbzEYCvkUytTemZIv6uhpPxqkfjl6KEOOml/iGqquPEr test-kitchen-rsa
@@ -42,14 +63,20 @@ EOF
       <<-EOF
 FROM centos:7
 MAINTAINER Sean OMeara \"sean@sean.io\"
-
 ENV LANG en_US.UTF-8
 
 RUN yum -y install tar rsync openssh-server passwd git
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
 
+# uncomment to debug cert issues
+# RUN echo 'root:dokkendokkendokken' | chpasswd
+# RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+# RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
+
 RUN mkdir -p /root/.ssh/
 COPY authorized_keys /root/.ssh/authorized_keys
+RUN chmod 700 /root/.ssh/
+RUN chmod 600  /root/.ssh/authorized_keys
 
 EXPOSE 22
 CMD [ "/usr/sbin/sshd", "-D", "-p", "22", "-o", "UseDNS=no", "-o", "UsePrivilegeSeparation=no", "-o", "MaxAuthTries=60" ]
@@ -142,7 +169,7 @@ EOF
     end
 
     def remote_docker_host?
-      return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
+      # return false if config[:docker_info]['OperatingSystem'].include?('Boot2Docker')
       return true if config[:docker_host_url] =~ /^tcp:/
       false
     end

data/lib/kitchen/transport/dokken.rb

@@ -77,26 +77,42 @@ module Kitchen
         end
 
         def upload(locals, remote)
-          port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
-
           if options[:host_ip_override]
             # Allow connecting to any ip/hostname to support sibling containers
-            ip = options[:host_ip_override]
+            ssh_ip = options[:host_ip_override]
+            ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
+
           elsif options[:docker_host_url] =~ /unix:/
             if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] == '0.0.0.0'
-              ip = options[:data_container][:NetworkSettings][:IPAddress]
-              port = '22'
+              ssh_ip = options[:data_container][:NetworkSettings][:IPAddress]
+              ssh_port = '22'
             else
               # we should read the proper mapped ip, since this allows us to upload the files
-              ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
+              ssh_ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
+              ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
             end
+
           elsif options[:docker_host_url] =~ /tcp:/
-            ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
+            name = options[:data_container][:Name]
+            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')
+              ssh_ip = candidate_ip
+              ssh_port = '22'
+            else
+              ssh_ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
+              ssh_port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
+            end
           else
             raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
           end
 
-          require 'pry'; tmpdir = Dir.tmpdir + '/dokken/'
+          debug "ssh_ip : #{ssh_ip}"
+          debug "ssh_port : #{ssh_port}"
+
+          tmpdir = Dir.tmpdir + '/dokken/'
           FileUtils.mkdir_p tmpdir.to_s, mode: 0o777
           tmpdir += Process.uid.to_s
           FileUtils.mkdir_p tmpdir.to_s
@@ -114,20 +130,20 @@ module Kitchen
             rsync_cmd << ' -o StrictHostKeyChecking=no'
             rsync_cmd << ' -o UserKnownHostsFile=/dev/null'
             rsync_cmd << ' -o LogLevel=ERROR'
-            rsync_cmd << " -p #{port}"
+            rsync_cmd << " -p #{ssh_port}"
             rsync_cmd << '\''
-            rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
+            rsync_cmd << " #{locals.join(' ')} root@#{ssh_ip}:#{remote}"
             debug "rsync_cmd :#{rsync_cmd}:"
             `#{rsync_cmd}`
           rescue Errno::ENOENT
             debug 'Rsync is not installed. Falling back to SCP.'
             locals.each do |local|
-              Net::SCP.upload!(ip,
+              Net::SCP.upload!(ssh_ip,
                                'root',
                                local,
                                remote,
                                recursive: true,
-                               ssh: { port: port, keys: ["#{tmpdir}/id_rsa"] })
+                               ssh: { port: ssh_port, keys: ["#{tmpdir}/id_rsa"] })
             end
           end
         end

metadata

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