kitchen-dokken 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5758ff1410fbf25008ce323eab6d27340835c482
-  data.tar.gz: 3efaa5e7c5ef7cbe4ddd452b16d53a78beb9bba7
+  metadata.gz: ee6436b7ffb1c6900e881ac88e7c6c9ee193a35b
+  data.tar.gz: 7d2146ac76c4c773f664ccc89662f1d43fd34408
 SHA512:
-  metadata.gz: aedf4dd36c3e2fdc23afdc970b4f1f55829dc3cd1133327e033871dd43bc0a1e24b61c3b795e1c0d9d20642cf29dab834f2b5791efbdc40d9d4389d0c462bf5f
-  data.tar.gz: e412ab58916d486eaa0c4e0d31532a3e28e4888e5ebc054152af1051f83b68b1332010daa06a0af91b243a296b93a4597a444b73a095cd444728e20390279939
+  metadata.gz: 1bb9a600392ff422bf25caaabaf235861a65ef150075bf2c87bb823fdd768c47a56e263cdb5379d46f6bf9f1bec725085fcac549949c9e2c7e9144cfc68f3765
+  data.tar.gz: dd3093f15147c00fe18d7c4b2010b7776bbd86ccce70ea2c1402cfae41408162b418d4849460ba41194cea29fdf801878aea090e0ce5af672e0a8cac55f42eca

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Dokken Changelog
 
+# 2.2.3
+- bugfix: Adding gaurd logic for already existing dokken network
+
 # 2.2.2
 - bugfix: Creating dokken network before chef container
 

data/lib/kitchen/driver/dokken.rb

@@ -62,7 +62,7 @@ module Kitchen
 
         # network
         make_dokken_network
-        
+
         # chef
         pull_chef_image
         create_chef_container state
@@ -296,9 +296,13 @@ module Kitchen
 
       def make_dokken_network
         debug 'driver - creating dokken network'
-        Docker::Network.create('dokken', {})
-      rescue ::Docker::Error => e
-        debug "driver - :#{e}:"
+        ::Docker::Network.get('dokken', {}, docker_connection)
+      rescue
+        begin
+          Docker::Network.create('dokken', {})
+        rescue ::Docker::Error => e
+          debug "driver - :#{e}:"
+        end
       end
 
       def make_data_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.2.2'.freeze
+    DOKKEN_VERSION = '2.2.3'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -95,11 +95,11 @@ EOF
     def dokken_create_sandbox
       info("Creating kitchen sandbox at #{dokken_kitchen_sandbox}")
       FileUtils.mkdir_p(dokken_kitchen_sandbox)
-      File.chmod(0755, dokken_kitchen_sandbox)
+      File.chmod(0o755, dokken_kitchen_sandbox)
 
       info("Creating verifier sandbox at #{dokken_verifier_sandbox}")
       FileUtils.mkdir_p(dokken_verifier_sandbox)
-      File.chmod(0755, dokken_verifier_sandbox)
+      File.chmod(0o755, dokken_verifier_sandbox)
     end
 
     def dokken_delete_sandbox
@@ -159,7 +159,7 @@ EOF
       info("Creating kitchen sandbox in #{sandbox_path}")
       unless ::Dir.exist?(sandbox_path)
         FileUtils.mkdir_p(sandbox_path)
-        File.chmod(0755, sandbox_path)
+        File.chmod(0o755, sandbox_path)
       end
     end
   end
@@ -171,7 +171,7 @@ module Kitchen
       def create_sandbox
         info("Creating kitchen sandbox in #{sandbox_path}")
         FileUtils.mkdir_p(sandbox_path)
-        File.chmod(0755, sandbox_path)
+        File.chmod(0o755, sandbox_path)
       end
 
       # this MUST be named 'sandbox_path' because ruby.
@@ -194,7 +194,7 @@ module Kitchen
         info("Creating kitchen sandbox in #{sandbox_path}")
         unless ::Dir.exist?(sandbox_path)
           FileUtils.mkdir_p(sandbox_path)
-          File.chmod(0755, sandbox_path)
+          File.chmod(0o755, sandbox_path)
         end
       end
 

data/lib/kitchen/transport/dokken.rb

@@ -97,11 +97,11 @@ module Kitchen
           end
 
           tmpdir = Dir.tmpdir + '/dokken/'
-          FileUtils.mkdir_p tmpdir.to_s, mode: 0777
+          FileUtils.mkdir_p tmpdir.to_s, mode: 0o777
           tmpdir += Process.uid.to_s
           FileUtils.mkdir_p tmpdir.to_s
           File.write("#{tmpdir}/id_rsa", insecure_ssh_private_key)
-          FileUtils.chmod(0600, "#{tmpdir}/id_rsa")
+          FileUtils.chmod(0o600, "#{tmpdir}/id_rsa")
 
           begin
             rsync_cmd = '/usr/bin/rsync -a -e'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Sean OMeara