knife-google 4.2.14 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 292eb0dd39c319feaddb9add7bf3500723607605427517a24d4d222835217326
-  data.tar.gz: 478f6c09f4f131ebf466b9c4336520601235c00d19dd11ee02e4f423146adb64
+  metadata.gz: 5acf2d54f40bb7d262441d72b9b9e9da63c9ebb6a43000d0ae9ded373ebd6b35
+  data.tar.gz: 3649681e242ad68f5341d840a146da9226061df16056d67585b01467c4545f99
 SHA512:
-  metadata.gz: 7b7206307c0d0a60b4846fab5aeb6ea4a6d86c41d11f824b72e16ccd85491f7d7239db345d607ba5f064e8ce6085212393e5b267f941eeba429b293f0209cafd
-  data.tar.gz: c957c1e0f17d53855e5bdf080804b84d0ab8e0779c88dee435744fa80fbbd3d721487173b67fb69bb7f83fb5ff99340cd6931d313be3b1d8a8f8dcb74b111f23
+  metadata.gz: 5d4a0e82aca291a1dc96472f850b135ea4409f682d5edf8e0ca0822d73d433ebdfa4a68369a44d646720aac56a86359f525c8e435d7f9514b9072d70cee4ce46
+  data.tar.gz: 168b0c4c5f76ce12aeec1644182d955607ed62d4e33bf292b12d456aefaf8072ba9ad9aca325b36942c8000caf6ca2f6a483928122e34cdfd8a65ac8d451a567

data/lib/chef/knife/cloud/google_service.rb

@@ -56,26 +56,32 @@ class Chef::Knife::Cloud
     IMAGE_ALIAS_MAP = {
       "centos-6" => { project: "centos-cloud", prefix: "centos-6" },
       "centos-7" => { project: "centos-cloud", prefix: "centos-7" },
+      "centos-8" => { project: "centos-cloud", prefix: "centos-8" },
       "container-vm" => { project: "google-containers", prefix: "container-vm" },
       "coreos" => { project: "coreos-cloud", prefix: "coreos-stable" },
-      "debian-7" => { project: "debian-cloud", prefix: "debian-7-wheezy" },
-      "debian-7-backports" => { project: "debian-cloud", prefix: "backports-debian-7-wheezy" },
-      "debian-8" => { project: "debian-cloud", prefix: "debian-8-jessie" },
+      "debian-9" => { project: "debian-cloud", prefix: "debian-9" },
+      "debian-10" => { project: "debian-cloud", prefix: "debian-10" },
       "opensuse-13" => { project: "opensuse-cloud", prefix: "opensuse-13" },
       "rhel-6" => { project: "rhel-cloud", prefix: "rhel-6" },
       "rhel-7" => { project: "rhel-cloud", prefix: "rhel-7" },
-      "sles-11" => { project: "suse-cloud", prefix: "sles-11" },
+      "rhel-8" => { project: "rhel-cloud", prefix: "rhel-8" },
       "sles-12" => { project: "suse-cloud", prefix: "sles-12" },
-      "ubuntu-12-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1204-precise" },
-      "ubuntu-1204-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1204-precise" },
-      "ubuntu-14-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1404-trusty" },
-      "ubuntu-1404-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1404-trusty" },
-      "ubuntu-15-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1504-vivid" },
-      "ubuntu-15-10" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1510-wily" },
+      "sles-15" => { project: "suse-cloud", prefix: "sles-15" },
       "ubuntu-16-04" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1604-xenial" },
       "ubuntu-1604-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1604-xenial" },
+      "ubuntu-1804-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1804-bionic" },
+      "ubuntu-2004-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-2004-focal" },
+      "ubuntu-minimal-1604-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-minimal-1604-xenial" },
+      "ubuntu-minimal-1804-lts" => { project: "ubuntu-os-cloud", prefix: "ubuntu-minimal-1804-bionic" },
       "windows-2008-r2" => { project: "windows-cloud", prefix: "windows-server-2008-r2" },
       "windows-2012-r2" => { project: "windows-cloud", prefix: "windows-server-2012-r2" },
+      "windows-2012-r2-core" => { project: "windows-cloud", prefix: "windows-server-2012-r2-dc-core" },
+      "windows-2016-core" => { project: "windows-cloud", prefix: "windows-server-2016-dc-core" },
+      "windows-2016" => { project: "windows-cloud", prefix: "windows-server-2016-dc" },
+      "windows-2019-core-for-containers" => { project: "windows-cloud", prefix: "windows-server-2019-dc-core-for-containers" },
+      "windows-2019-core" => { project: "windows-cloud", prefix: "windows-server-2019-dc-core" },
+      "windows-2019-for-containers" => { project: "windows-cloud", prefix: "windows-server-2019-dc-for-containers" },
+      "windows-2019" => { project: "windows-cloud", prefix: "windows-server-2019-dc" },
     }.freeze
 
     PUBLIC_PROJECTS = %w{

data/lib/chef/knife/cloud/google_service_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2016 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");
@@ -23,19 +23,19 @@ class Chef::Knife::Cloud
 
     def create_service_instance
       Chef::Knife::Cloud::GoogleService.new(
-        project:       locate_config_value(:gce_project),
-        zone:          locate_config_value(:gce_zone),
-        wait_time:     locate_config_value(:request_timeout),
-        refresh_rate:  locate_config_value(:request_refresh_rate),
-        max_pages:     locate_config_value(:gce_max_pages),
-        max_page_size: locate_config_value(:gce_max_page_size)
+        project:       config[:gce_project],
+        zone:          config[:gce_zone],
+        wait_time:     config[:request_timeout],
+        refresh_rate:  config[:request_refresh_rate],
+        max_pages:     config[:gce_max_pages],
+        max_page_size: config[:gce_max_page_size]
       )
     end
 
     def check_for_missing_config_values!(*keys)
       keys_to_check = REQUIRED_KEYS + keys
 
-      missing = keys_to_check.select { |x| locate_config_value(x).nil? }
+      missing = keys_to_check.select { |x| config[x].nil? }
 
       unless missing.empty?
         message = "The following required parameters are missing: #{missing.join(", ")}"

data/lib/chef/knife/google_disk_create.rb

@@ -2,7 +2,7 @@
 #
 # Author:: Paul Rossman (<paulrossman@google.com>)
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright 2015-2016 Google Inc., 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");
@@ -52,16 +52,16 @@ class Chef::Knife::Cloud
     def validate_params!
       check_for_missing_config_values!(:gce_zone, :disk_size, :disk_type)
       raise "Please specify a disk name." unless @name_args.first
-      raise "Disk size must be between 10 and 10,000" unless valid_disk_size?(locate_config_value(:disk_size))
+      raise "Disk size must be between 10 and 10,000" unless valid_disk_size?(config[:disk_size])
 
       super
     end
 
     def execute_command
       name = @name_args.first
-      size = locate_config_value(:disk_size)
-      type = locate_config_value(:disk_type)
-      src  = locate_config_value(:disk_source)
+      size = config[:disk_size]
+      type = config[:disk_type]
+      src  = config[:disk_source]
 
       service.create_disk(name, size, type, src)
     end

data/lib/chef/knife/google_server_create.rb

@@ -2,7 +2,7 @@
 #
 # Author:: Paul Rossman (<paulrossman@google.com>)
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright 2015-2016 Google Inc., 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");
@@ -172,28 +172,28 @@ class Chef::Knife::Cloud
 
       @create_options = {
         name: instance_name,
-        image: locate_config_value(:image),
-        image_project: locate_config_value(:image_project),
-        network: locate_config_value(:network),
-        subnet: locate_config_value(:subnet),
-        public_ip: locate_config_value(:public_ip),
+        image: config[:image],
+        image_project: config[:image_project],
+        network: config[:network],
+        subnet: config[:subnet],
+        public_ip: config[:public_ip],
         auto_migrate: auto_migrate?,
         auto_restart: auto_restart?,
         preemptible: preemptible?,
-        boot_disk_autodelete: locate_config_value(:boot_disk_autodelete),
-        boot_disk_name: locate_config_value(:boot_disk_name),
+        boot_disk_autodelete: config[:boot_disk_autodelete],
+        boot_disk_name: config[:boot_disk_name],
         boot_disk_size: boot_disk_size,
-        boot_disk_ssd: locate_config_value(:boot_disk_ssd),
-        additional_disks: locate_config_value(:additional_disks),
-        local_ssd: locate_config_value(:local_ssd),
-        interface: locate_config_value(:interface),
+        boot_disk_ssd: config[:boot_disk_ssd],
+        additional_disks: config[:additional_disks],
+        local_ssd: config[:local_ssd],
+        interface: config[:interface],
         number_of_local_ssd: number_of_local_ssd,
-        can_ip_forward: locate_config_value(:can_ip_forward),
-        machine_type: locate_config_value(:machine_type),
-        service_account_scopes: locate_config_value(:service_account_scopes),
-        service_account_name: locate_config_value(:service_account_name),
+        can_ip_forward: config[:can_ip_forward],
+        machine_type: config[:machine_type],
+        service_account_scopes: config[:service_account_scopes],
+        service_account_name: config[:service_account_name],
         metadata: metadata,
-        tags: locate_config_value(:tags),
+        tags: config[:tags],
       }
     end
 
@@ -208,16 +208,16 @@ class Chef::Knife::Cloud
       raise "You must supply an instance name." if @name_args.first.nil?
       raise "Boot disk size must be between 10 and 10,000" unless valid_disk_size?(boot_disk_size)
 
-      if locate_config_value(:connection_protocol) == "winrm" && locate_config_value(:gce_email).nil?
+      if config[:connection_protocol] == "winrm" && config[:gce_email].nil?
         raise "Please provide your Google Cloud console email address via --gce-email. " \
           "It is required when resetting passwords on Windows hosts."
       end
 
-      raise "Please provide connection port via --connection-port." unless locate_config_value(:connection_port)
-      raise "Please provide image os type via --image-os-type." unless locate_config_value(:image_os_type)
+      raise "Please provide connection port via --connection-port." unless config[:connection_port]
+      raise "Please provide image os type via --image-os-type." unless config[:image_os_type]
 
-      ui.warn("Auto-migrate disabled for preemptible instance") if preemptible? && locate_config_value(:auto_migrate)
-      ui.warn("Auto-restart disabled for preemptible instance") if preemptible? && locate_config_value(:auto_restart)
+      ui.warn("Auto-migrate disabled for preemptible instance") if preemptible? && config[:auto_migrate]
+      ui.warn("Auto-restart disabled for preemptible instance") if preemptible? && config[:auto_restart]
 
       super
     end
@@ -225,10 +225,10 @@ class Chef::Knife::Cloud
     def before_bootstrap
       super
 
-      config[:chef_node_name] = locate_config_value(:chef_node_name) ? locate_config_value(:chef_node_name) : instance_name
+      config[:chef_node_name] = config[:chef_node_name] ? config[:chef_node_name] : instance_name
       config[:bootstrap_ip_address] = ip_address_for_bootstrap
 
-      if locate_config_value(:image_os_type) == "windows"
+      if config[:image_os_type] == "windows"
         ui.msg("Resetting the Windows login password so the bootstrap can continue...")
         config[:connection_password] = reset_windows_password
       end
@@ -245,31 +245,31 @@ class Chef::Knife::Cloud
     end
 
     def project
-      locate_config_value(:gce_project)
+      config[:gce_project]
     end
 
     def zone
-      locate_config_value(:gce_zone)
+      config[:gce_zone]
     end
 
     def email
-      locate_config_value(:gce_email)
+      config[:gce_email]
     end
 
     def preemptible?
-      locate_config_value(:preemptible)
+      config[:preemptible]
     end
 
     def auto_migrate?
-      preemptible? ? false : locate_config_value(:auto_migrate)
+      preemptible? ? false : config[:auto_migrate]
     end
 
     def auto_restart?
-      preemptible? ? false : locate_config_value(:auto_restart)
+      preemptible? ? false : config[:auto_restart]
     end
 
     def ip_address_for_bootstrap
-      ip = locate_config_value(:use_private_ip) ? private_ip_for(server) : public_ip_for(server)
+      ip = config[:use_private_ip] ? private_ip_for(server) : public_ip_for(server)
 
       raise "Unable to determine instance IP address for bootstrapping" if ip == "unknown"
 
@@ -281,18 +281,18 @@ class Chef::Knife::Cloud
     end
 
     def metadata
-      locate_config_value(:metadata).each_with_object({}) do |item, memo|
+      config[:metadata].each_with_object({}) do |item, memo|
         key, value = item.split("=")
         memo[key] = value
       end
     end
 
     def boot_disk_size
-      locate_config_value(:boot_disk_size).to_i
+      config[:boot_disk_size].to_i
     end
 
     def number_of_local_ssd
-      locate_config_value(:number_of_local_ssd).to_i
+      config[:number_of_local_ssd].to_i
     end
 
     def reset_windows_password
@@ -301,7 +301,7 @@ class Chef::Knife::Cloud
         zone:          zone,
         instance_name: instance_name,
         email:         email,
-        username:      locate_config_value(:connection_user),
+        username:      config[:connection_user],
         debug:         gcewinpass_debug_mode
       ).new_password
     end

data/lib/knife-google/version.rb

@@ -15,7 +15,7 @@
 #
 module Knife
   module Google
-    VERSION = "4.2.14"
+    VERSION = "5.0.5"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-google
 version: !ruby/object:Gem::Version
-  version: 4.2.14
+  version: 5.0.5
 platform: ruby
 authors:
 - Chiraq Jog
@@ -13,22 +13,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '15.11'
 - !ruby/object:Gem::Dependency
   name: knife-cloud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +52,7 @@ dependencies:
         version: 0.23.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.43.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,7 +62,7 @@ dependencies:
         version: 0.23.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.43.0
 - !ruby/object:Gem::Dependency
   name: gcewinpass
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="