knife-google 5.0.2 → 5.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f84e87e7003515b486193242d5518df11a8af14e1c087b5385917a2612fa571c
-  data.tar.gz: 2e0275e7f3fd9897aa60028dc8f9ba0235a3ce55e4a41446c0ed5be5b077f9b3
+  metadata.gz: f5d7f6fe6c7b73d74cd886d74afce562b1b5decd20217158ce5cfe2d07c01159
+  data.tar.gz: 7f16a26912877044dace963a17514d23ee53ea34fa8bdf56d4fca31b6deaf445
 SHA512:
-  metadata.gz: 5b93f9bdb33276374d0ab611520dffb8cc95cb0b53e21c35e18b6c18eb9047f92e62f774c1d95f53b607fe5d4c0af507c210ba99baf4c3068b4d04509c72be1d
-  data.tar.gz: 122e48ff1592b4ac750df5296fad2eba886804970dce7ceb15541885a4851627def159e0b393c0110d802b3b2dd891b30e4c1086201a1c29c064540750762b61
+  metadata.gz: 4171868bccefed161f8bca3603f09f1413a17f7df0241513f9584452f25474f1e84a49b6d885e8da0b390cf6de1b5ddfd39a40dfd485b436498b8ca3126ed17f
+  data.tar.gz: 0f8fe814751df5b97a93525ef028b557912ea00638ec91c3631cd15af5699e853085db13ae3218620e0dbf5e473395604c556e32a300d2706c1bae162bdb0c23

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

@@ -22,7 +22,7 @@ require "chef/knife/cloud/service"
 require "chef/knife/cloud/helpers"
 require_relative "google_service_helpers"
 require "google/apis/compute_v1"
-require "ipaddr"
+require "ipaddr" unless defined?(IPAddr)
 require_relative "../../../knife-google/version"
 
 class Chef::Knife::Cloud
@@ -56,22 +56,17 @@ 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" },
@@ -80,6 +75,13 @@ class Chef::Knife::Cloud
       "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{
@@ -410,8 +412,7 @@ class Chef::Knife::Cloud
 
       latest_image = connection.list_images(image_project).items
         .select { |image| image.name.start_with?(image_prefix) }
-        .sort_by(&:name)
-        .last
+        .max_by(&:name)
 
       return if latest_image.nil?
 

data/lib/chef/knife/google_server_create.rb

@@ -199,7 +199,7 @@ class Chef::Knife::Cloud
 
     def set_default_config
       # dumb hack for knife-cloud, which expects the user to pass in the WinRM password to use when bootstrapping.
-      # We won't know the password until the instance is created and we forceably reset it.
+      # We won't know the password until the instance is created and we forcibly reset it.
       config[:connection_password] = "will_change_this_later"
     end
 
@@ -225,7 +225,7 @@ class Chef::Knife::Cloud
     def before_bootstrap
       super
 
-      config[:chef_node_name] = config[:chef_node_name] ? config[:chef_node_name] : instance_name
+      config[:chef_node_name] = config[:chef_node_name] || instance_name
       config[:bootstrap_ip_address] = ip_address_for_bootstrap
 
       if config[:image_os_type] == "windows"

data/lib/knife-google/version.rb

@@ -15,7 +15,7 @@
 #
 module Knife
   module Google
-    VERSION = "5.0.2"
+    VERSION = "5.0.11"
     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: 5.0.2
+  version: 5.0.11
 platform: ruby
 authors:
 - Chiraq Jog
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -52,7 +52,7 @@ dependencies:
         version: 0.23.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.53.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: 0.23.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.41.0
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: gcewinpass
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Google Compute Engine Support for Chef's Knife Command