kitchen-google 2.0.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72735ed5ed5396500393e68fc3675f838c190059c510c172795e975ff89482bc
-  data.tar.gz: 20ec8c3e7b609edd8f2cf2d72f22e8632bc4f5c090ec020a05867be4b3d9a680
+  metadata.gz: a142a2341a15a16f2c7b9927d12f8c57d33c94db98098499f52e702630443cd7
+  data.tar.gz: 61e22bda90466800948289013796bbafd8a301ffd98caafe414cf1d582a7b012
 SHA512:
-  metadata.gz: '09e960eca3e4c66afd1f63678a71058e39f8d325bed0cad6b15140f0b482616a4f82d4176e8dde14114cb8b81d894155446eafc29db79203e8d6bfd57765599d'
-  data.tar.gz: 3811f8bcc71cfe60b26162f38964021561908a0c9f3b746d9b050b1e3ab828c1a148b3b52399e0f3ba8768cfa40911c86576e5dc146b5d835eedbbd4aef8d66e
+  metadata.gz: 93900453aee042687510bad02c0934b0bd4291a6c9bd4249473485e6e2beb344d674d9af367e64917e14978bcb77a5990c721b9d20f232a1ced8a0d7279f54bd
+  data.tar.gz: d99fe7b567f16e7c6ead71e89b6a1b96d04d109dd2c093c13d68695feecd39010264471f03e61e4271ed3eb78e9ecdd26c499e5cca9836fd9352ea824f4d4134

data/lib/kitchen/driver/gce.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Author:: Andrew Leonard (<andy@hurricane-ridge.com>)
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
@@ -21,7 +20,7 @@ require "gcewinpass"
 require "google/apis/compute_v1"
 require "kitchen"
 require_relative "gce_version"
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 
 module Kitchen
   module Driver
@@ -63,6 +62,7 @@ module Kitchen
 
       default_config :machine_type, "n1-standard-1"
       default_config :network, "default"
+      default_config :network_ip, nil
       default_config :network_project, nil
       default_config :subnet, nil
       default_config :subnet_project, nil
@@ -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)
@@ -362,6 +362,10 @@ module Kitchen
         config[:network_project].nil? ? project : config[:network_project]
       end
 
+      def network_ip
+        config[:network_ip]
+      end
+
       def region
         config[:region].nil? ? region_for_zone : config[:region]
       end
@@ -424,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.")
@@ -440,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
@@ -469,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
@@ -520,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)
@@ -572,6 +576,7 @@ module Kitchen
       def instance_network_interfaces
         interface                = Google::Apis::ComputeV1::NetworkInterface.new
         interface.network        = network_url if config[:subnet_project].nil?
+        interface.network_ip     = network_ip unless network_ip.nil?
         interface.subnetwork     = subnet_url if subnet_url
         interface.access_configs = interface_access_configs
 

data/lib/kitchen/driver/gce_version.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2015-2020 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,6 @@
 
 module Kitchen
   module Driver
-    GCE_VERSION = "2.0.3".freeze
+    GCE_VERSION = "2.3.0".freeze
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-google
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Andrew Leonard
 - Chef Partner Engineering
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2022-06-10 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.36.0
+        version: 0.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,93 +42,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.23.9
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.36.0
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 description: A Test-Kitchen driver for Google Compute Engine
 email:
 - andy@hurricane-ridge.com
@@ -144,7 +74,7 @@ homepage: https://github.com/test-kitchen/kitchen-google
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,15 +82,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Kitchen::Driver::Gce
 test_files: []