kitchen-google 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c141067ea1834ac95cca930609e6250db49bf1bf6a8322c892196150f2dee2
-  data.tar.gz: d7905be8235af74ea4d6ab70e5aed7b0ae8bdaea4ca9b60fb9e6bbec9487b429
+  metadata.gz: 49b9b4e9bb1cd2c7415d168d392f78f0dcc1151f5b7fa84d96b08fdac759a9bd
+  data.tar.gz: ff3bcefcf72654dcfe45ab567601174e54974e03bf19b80a3d6bc765cc807881
 SHA512:
-  metadata.gz: b03d62fa8449ce6c8d49f02049bf1a0f59a1a1a7a7e950fefbd8c0dfa1d40175b22c705169428d24de68866870554051e9048e7e4676e27a1846d4ca384f3561
-  data.tar.gz: 8cfde5e13c6cb3613ca273e4049a0e3b3667f6c0d73d3f134a09226d7f3aea18820bc498fea3c9b78c7b0653bb6f0955b41267282e3a5f6c8905293e3ba6d585
+  metadata.gz: 96508c913564f0f724ae4551a07d9b82b57ddd73f14d82768a9b68851ab58850a6d5588880de2da0112fd13e710323c4849f32dc853935fb55e26add85fec978
+  data.tar.gz: fee4542d0f03cc5934dc5660d509c167f133f9ca6fd5fbee0d14b1c47cf9cb357427483e881d267f794215c7caaa764ae6aab6bde7a546659668a696b2f67eff

data/lib/kitchen/driver/gce.rb

@@ -32,25 +32,25 @@ module Kitchen
       attr_accessor :state
 
       SCOPE_ALIAS_MAP = {
-        "bigquery"           => "bigquery",
-        "cloud-platform"     => "cloud-platform",
-        "compute-ro"         => "compute.readonly",
-        "compute-rw"         => "compute",
-        "datastore"          => "datastore",
-        "logging-write"      => "logging.write",
-        "monitoring"         => "monitoring",
-        "monitoring-write"   => "monitoring.write",
-        "service-control"    => "servicecontrol",
+        "bigquery" => "bigquery",
+        "cloud-platform" => "cloud-platform",
+        "compute-ro" => "compute.readonly",
+        "compute-rw" => "compute",
+        "datastore" => "datastore",
+        "logging-write" => "logging.write",
+        "monitoring" => "monitoring",
+        "monitoring-write" => "monitoring.write",
+        "service-control" => "servicecontrol",
         "service-management" => "service.management",
-        "sql"                => "sqlservice",
-        "sql-admin"          => "sqlservice.admin",
-        "storage-full"       => "devstorage.full_control",
-        "storage-ro"         => "devstorage.read_only",
-        "storage-rw"         => "devstorage.read_write",
-        "taskqueue"          => "taskqueue",
-        "useraccounts-ro"    => "cloud.useraccounts.readonly",
-        "useraccounts-rw"    => "cloud.useraccounts",
-        "userinfo-email"     => "userinfo.email",
+        "sql" => "sqlservice",
+        "sql-admin" => "sqlservice.admin",
+        "storage-full" => "devstorage.full_control",
+        "storage-ro" => "devstorage.read_only",
+        "storage-rw" => "devstorage.read_write",
+        "taskqueue" => "taskqueue",
+        "useraccounts-ro" => "cloud.useraccounts.readonly",
+        "useraccounts-rw" => "cloud.useraccounts",
+        "userinfo-email" => "userinfo.email",
       }.freeze
 
       kitchen_driver_api_version 2
@@ -83,7 +83,7 @@ module Kitchen
       default_config :metadata, {}
       default_config :labels, {}
 
-      DISK_NAME_REGEX = /(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)/
+      DISK_NAME_REGEX = /(?:[a-z](?:[-a-z0-9]{0,61}[a-z0-9])?)/.freeze
 
       def name
         "Google Compute (GCE)"
@@ -192,6 +192,7 @@ module Kitchen
 
             if disk_config[:disk_type] == "local-ssd"
               raise "#{disk_name}: Cannot use 'disk_size' with local SSD. They always have 375 GB (https://cloud.google.com/compute/docs/disks/#localssds)." unless disk_config[:disk_size].nil?
+
               # Since disk_size is set to 10 in default_config, it needs to be adjusted for local SSDs
               config[:disks][disk_name.to_sym][:disk_size] = nil
             end
@@ -295,31 +296,37 @@ module Kitchen
 
       def valid_machine_type?
         return false if config[:machine_type].nil?
+
         check_api_call { connection.get_machine_type(project, zone, config[:machine_type]) }
       end
 
       def valid_network?
         return false if config[:network].nil?
+
         check_api_call { connection.get_network(network_project, config[:network]) }
       end
 
       def valid_subnet?
         return false if config[:subnet].nil?
+
         check_api_call { connection.get_subnetwork(subnet_project, region, config[:subnet]) }
       end
 
       def valid_zone?
         return false if config[:zone].nil?
+
         check_api_call { connection.get_zone(project, config[:zone]) }
       end
 
       def valid_region?
         return false if config[:region].nil?
+
         check_api_call { connection.get_region(project, config[:region]) }
       end
 
       def valid_disk_type?(disk_type)
         return false if disk_type.nil?
+
         check_api_call { connection.get_disk_type(project, zone, disk_type) }
       end
 
@@ -528,9 +535,9 @@ module Kitchen
 
       def metadata
         default_metadata = {
-          "created-by"            => "test-kitchen",
+          "created-by" => "test-kitchen",
           "test-kitchen-instance" => instance.name,
-          "test-kitchen-user"     => env_user,
+          "test-kitchen-user" => env_user,
         }
         if winrm_transport?
           image_identifier = config[:image_family] || config[:image_name]
@@ -577,6 +584,7 @@ module Kitchen
 
       def subnet_url
         return unless config[:subnet]
+
         "projects/#{subnet_project}/regions/#{region}/subnetworks/#{config[:subnet]}"
       end
 
@@ -626,6 +634,7 @@ module Kitchen
 
       def service_account_scope_url(scope)
         return scope if scope.start_with?("https://www.googleapis.com/auth/")
+
         "https://www.googleapis.com/auth/#{translate_scope_alias(scope)}"
       end
 

data/lib/kitchen/driver/gce_version.rb

@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    GCE_VERSION = "2.0.1".freeze
+    GCE_VERSION = "2.0.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Andrew Leonard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gcewinpass
@@ -29,16 +29,22 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.9
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.23.9
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -153,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Gce