kitchen-google 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfd4ade3df944044cc61c6c64f41c3b7f41493efd8a6024751c6bf52a5d468c8
-  data.tar.gz: 45998c3ff751583c50ebe770cc9f1bd29ad4c190ecbdd90d6c4055131f4e8df9
+  metadata.gz: 684c38ac157c082d70153c97229db2b95dc29ff27e1ac52d5e150a4a014d02ff
+  data.tar.gz: ddc7a786e39fe48540c6f175c641fa3c49cf0a0705badb62fd5bd3632e7f11d9
 SHA512:
-  metadata.gz: c1510d83ac112662bb2c0e6573df8e19e07e5b2f2afdd110e52f3addd02d3b6fe7e9452b703c5998249f1b310a13730b8fc661b8bdc3787c6e3986e8cb2ad7f1
-  data.tar.gz: 9bab8a5f721cc7ca72f46ad69a0e274fed394ff7954ea0f1c1c88386108da2b81f396458449f68ee54d8bcf8dc405d4284e0750a854e829715b6421307e91b78
+  metadata.gz: f35f7af9b6c1b98aed559a8e2824a16ce78110d96584d7f06f93fbee96a04fbea3448689210ab13ae88d7cea607fd4ee57e2b3a445e418596b2948bf9be49f78
+  data.tar.gz: b97674af3911f920142dc1b6672a60686ede8c9cc310e522be391194409bf897e8dd7a03738917440143d2207029fc9efe800cb719375e128780f0c473a02a6b

data/lib/kitchen/driver/gce.rb

@@ -334,8 +334,8 @@ module Kitchen
         disk_name.to_s.match(DISK_NAME_REGEX).to_s.length == disk_name.length
       end
 
-      def image_exist?
-        check_api_call { connection.get_image(image_project, image_name) }
+      def image_exist?(image = image_name)
+        check_api_call { connection.get_image(image_project, image) }
       end
 
       def server_exist?(server_name)
@@ -428,11 +428,7 @@ module Kitchen
       end
 
       def generate_server_name
-        name = if config[:inst_name]
-                 config[:inst_name]
-               else
-                 "tk-#{instance.name.downcase}-#{SecureRandom.hex(3)}"
-               end
+        name = config[:inst_name] || "tk-#{instance.name.downcase}-#{SecureRandom.hex(3)}"
 
         if name.length > 63
           warn("The TK instance name (#{instance.name}) has been removed from the GCE instance name due to size limitations. Consider setting shorter platform or suite names.")
@@ -444,13 +440,12 @@ module Kitchen
 
       def create_disks(server_name)
         disks = []
-
         config[:disks].each do |disk_name, disk_config|
           unique_disk_name = "#{server_name}-#{disk_name}"
           if disk_config[:boot]
             disk = create_local_disk(unique_disk_name, disk_config)
             disks.unshift(disk)
-          elsif disk_config[:disk_type] == "local-ssd"
+          elsif (disk_config[:disk_type] == "local-ssd") || disk_config[:custom_image]
             disk = create_local_disk(unique_disk_name, disk_config)
             disks.push(disk)
           else
@@ -473,10 +468,15 @@ module Kitchen
         if disk_config[:disk_type] == "local-ssd"
           info("Creating a 375 GB local ssd as scratch disk (https://cloud.google.com/compute/docs/disks/#localssds).")
           disk.type = "SCRATCH"
-        else
-          info("Creating a #{disk_config[:disk_size]} GB boot disk named #{unique_disk_name}...")
+        elsif disk.boot
+          info("Creating a #{disk_config[:disk_size]} GB boot disk named #{unique_disk_name} from image #{image_name}...")
           params.source_image = boot_disk_source_image unless disk_config[:disk_type] == "local-ssd"
           params.disk_name    = unique_disk_name unless disk_config[:disk_type] == "local-ssd"
+        else
+          info("Creating a #{disk_config[:disk_size]} GB extra disk named #{unique_disk_name} from image #{disk_config[:custom_image]}...")
+          params.source_image = image_url(disk_config[:custom_image]) unless disk_config[:disk_type] == "local-ssd"
+          params.disk_name    = unique_disk_name unless disk_config[:disk_type] == "local-ssd"
+
         end
         disk.initialize_params = params
         disk
@@ -524,8 +524,8 @@ module Kitchen
         @boot_disk_source ||= image_url
       end
 
-      def image_url
-        return "projects/#{image_project}/global/images/#{image_name}" if image_exist?
+      def image_url(image = image_name)
+        return "projects/#{image_project}/global/images/#{image}" if image_exist?(image)
       end
 
       def image_name_for_family(image_family)

data/lib/kitchen/driver/gce_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    GCE_VERSION = "2.1.0".freeze
+    GCE_VERSION = "2.2.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Andrew Leonard
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcewinpass
@@ -32,9 +32,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.23.9
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.52.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +42,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.23.9
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="