kitchen-google 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c6f8ac82e7287b315c4983229aad826ffc6dc2616d7b94c0f1887c3f3fbfdd4
-  data.tar.gz: 15e6f00245977ef5f27fa4c9fb09ee81e320534e2b2757ab6f812cb43f2d5e03
+  metadata.gz: 0b723b02e719da68e14ea28e557e7288ebf83e3f7770fe26b7a24c67b5edfa2a
+  data.tar.gz: 7fc550f1fa2ee2ef1803849c04ed561eeb8417ea34c7a9dec37a336d02223d90
 SHA512:
-  metadata.gz: 813a82a35180d748b4d629b71e9ff9204a31a4482443e70e49830a1457ff545d7b7542ecfea6644991a864a5052f3cf3ef905276cfd171e0248b62327072d6f0
-  data.tar.gz: ddbdb11f5bf6420395f772189ce8145f65120c01aee09a065702c735fae641f75a809875713dd6a525eaf0d1ecb53724d5fe5fe48fc246ca21d9268393f0235f
+  metadata.gz: 619b786dc4939d75e666676eace51b0b87623ee800333e9569bd3ccc31204773badc2d5bcb449e2e9852faec5dc1cce997fd7d83dae58c07bb2651f265769081
+  data.tar.gz: e260b90a3249fe4f5de2469e9777b0f6a6a3e8c21cb86989c8470ee575d17155b7505df325f792321f91d098549278cf368026ff6275dee369c56be26cfc904c

data/lib/kitchen/driver/gce.rb

@@ -125,11 +125,17 @@ module Kitchen
 
       # Configuration applied to every disk before the user's own settings.
       #
+      # Deliberately sets no `disk_type`. GCE derives an omitted disk type from
+      # the instance's machine series -- pd-standard on first- and
+      # second-generation series such as N1 and N2, pd-balanced on C3, C3D and
+      # M3, and hyperdisk-balanced on C4, N4 and newer -- so leaving it unset is
+      # the only default that is compatible with every machine type. Naming one
+      # here would fail outright on the families that no longer accept it.
+      #
       # @return [Hash] the per-disk defaults
       DISK_DEFAULT_CONFIG = {
         autodelete_disk: true,
         disk_size: 10,
-        disk_type: "pd-standard",
       }.freeze
 
       # Human-readable driver name shown in Test Kitchen output.
@@ -269,9 +275,12 @@ module Kitchen
           boot: true,
           autodelete_disk: config.fetch(:autodelete_disk, DISK_DEFAULT_CONFIG[:autodelete_disk]),
           disk_size: config.fetch(:disk_size, DISK_DEFAULT_CONFIG[:disk_size]),
-          disk_type: config.fetch(:disk_type, DISK_DEFAULT_CONFIG[:disk_type]),
         }
 
+        # Carry the key only when the user set it, so that an unset type stays
+        # absent rather than becoming an explicit nil. See DISK_DEFAULT_CONFIG.
+        disk_config[:disk_type] = config[:disk_type] if config[:disk_type]
+
         raise "Disk type #{disk_config[:disk_type]} is not valid" unless valid_disk_type?(disk_config[:disk_type])
 
         disk_config
@@ -525,10 +534,13 @@ module Kitchen
 
       # Whether a disk type exists in the target zone.
       #
+      # An unset type is valid: the driver sends no `diskType` at all and GCE
+      # substitutes the default for the instance's machine series.
+      #
       # @param disk_type [String, nil] the disk type to check
-      # @return [Boolean] true if the disk type is valid
+      # @return [Boolean] true if the disk type is valid or unset
       def valid_disk_type?(disk_type)
-        return false if disk_type.nil?
+        return true if disk_type.nil?
 
         check_api_call { connection.get_disk_type(project, zone, disk_type) }
       end
@@ -753,7 +765,7 @@ module Kitchen
         disk.boot           = true if disk_config[:boot]
         disk.auto_delete    = disk_config[:autodelete_disk]
         params.disk_size_gb = disk_config[:disk_size]
-        params.disk_type    = disk_type_url_for(disk_config[:disk_type])
+        params.disk_type    = disk_type_url_for(disk_config[:disk_type]) if disk_config[:disk_type]
 
         if local_ssd?(disk_config)
           info("Creating a #{LOCAL_SSD_SIZE_GB} GB local ssd as scratch disk (https://cloud.google.com/compute/docs/disks/#localssds).")
@@ -781,7 +793,7 @@ module Kitchen
         disk = Google::Apis::ComputeV1::Disk.new
         disk.name    = unique_disk_name
         disk.size_gb = disk_config[:disk_size]
-        disk.type    = disk_type_url_for(disk_config[:disk_type])
+        disk.type    = disk_type_url_for(disk_config[:disk_type]) if disk_config[:disk_type]
 
         info("Creating a #{disk_config[:disk_size]} GB disk named #{unique_disk_name}...")
         wait_for_operation(connection.insert_disk(project, zone, disk))

data/lib/kitchen/driver/gce_version.rb

@@ -28,6 +28,6 @@ module Kitchen
     # release. Keep it on one line.
     #
     # @return [String] the gem version
-    GCE_VERSION = "3.0.0"
+    GCE_VERSION = "3.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Test Kitchen Team