knife-google 4.2.6 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffac7bed4b5402a8122a5b406e745e8f224af07bde6d5d2081d99227971f39e2
-  data.tar.gz: dfd93920997548e4c3412d8608479ea6f7d165cd503b5172130950cc274ed0c1
+  metadata.gz: f84e87e7003515b486193242d5518df11a8af14e1c087b5385917a2612fa571c
+  data.tar.gz: 2e0275e7f3fd9897aa60028dc8f9ba0235a3ce55e4a41446c0ed5be5b077f9b3
 SHA512:
-  metadata.gz: 475f550113eea3fee7f3b1c6b210ede9153198737b4ace8e25f71b4453db770dd52d9edf443b187ae9f14b43e41b03d7eafbb8655fbdae996008c00c843660f4
-  data.tar.gz: 3d5ea65b18dee8c16838ce0832e5db87e72b3b4dbee94e7642a2b72302f029e5fd1ca6993f0b032f2e745d355c295d855a7c28ffa745431f9d57ee18b0c3f072
+  metadata.gz: 5b93f9bdb33276374d0ab611520dffb8cc95cb0b53e21c35e18b6c18eb9047f92e62f774c1d95f53b607fe5d4c0af507c210ba99baf4c3068b4d04509c72be1d
+  data.tar.gz: 122e48ff1592b4ac750df5296fad2eba886804970dce7ceb15541885a4851627def159e0b393c0110d802b3b2dd891b30e4c1086201a1c29c064540750762b61

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

@@ -74,6 +74,10 @@ class Chef::Knife::Cloud
       "ubuntu-15-10" => { project: "ubuntu-os-cloud", prefix: "ubuntu-1510-wily" },
       "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" },
     }.freeze

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");
@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleDiskCreate < Command
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google disk create NAME --gce-disk-size N (options)"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     option :disk_size,
@@ -51,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_disk_delete.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleDiskDelete < Command
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google disk delete NAME [NAME] (options)"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/chef/knife/google_disk_list.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleDiskList < ResourceListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google disk list"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/chef/knife/google_image_list.rb

@@ -22,13 +22,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleImageList < ResourceListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google image list"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/chef/knife/google_project_quotas.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleProjectQuotas < ResourceListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google project quotas"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/chef/knife/google_region_list.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleRegionList < ResourceListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google region list"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/chef/knife/google_region_quotas.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleRegionQuotas < Command
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google region quotas"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

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");
@@ -25,13 +25,15 @@ require_relative "cloud/google_service_options"
 class Chef::Knife::Cloud
   class GoogleServerCreate < ServerCreateCommand
     include GoogleServiceOptions
-    include GoogleServiceHelpers
     include ServerCreateOptions
 
     banner "knife google server create NAME -m MACHINE_TYPE -I IMAGE (options)"
 
     deps do
+      require "gcewinpass"
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     option :machine_type,
@@ -165,37 +167,33 @@ class Chef::Knife::Cloud
       description: "Specifies the number of local SSDs to be created per node. Each local SSD is 375 GB in size, but you can attach up to eight local SSD devices for 3 TB of total local SSD storage space per instance.",
       default: "1"
 
-    deps do
-      require "gcewinpass"
-    end
-
     def before_exec_command
       super
 
       @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
 
@@ -210,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
@@ -227,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
@@ -247,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"
 
@@ -283,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
@@ -303,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/chef/knife/google_server_delete.rb

@@ -27,13 +27,14 @@ class Chef
     class Cloud
       class GoogleServerDelete < ServerDeleteCommand
         include ServerDeleteOptions
-        include GoogleServiceHelpers
         include GoogleServiceOptions
 
         banner "knife google server delete INSTANCE_NAME [INSTANCE_NAME] (options)"
 
         deps do
           require_relative "cloud/google_service"
+          require_relative "cloud/google_service_helpers"
+          include GoogleServiceHelpers
         end
 
         def validate_params!

data/lib/chef/knife/google_server_list.rb

@@ -24,11 +24,12 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleServerList < ServerListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     banner "knife google server list"

data/lib/chef/knife/google_server_show.rb

@@ -26,13 +26,14 @@ class Chef
     class Cloud
       class GoogleServerShow < ServerShowCommand
         include ServerShowOptions
-        include GoogleServiceHelpers
         include GoogleServiceOptions
 
         banner "knife google server show INSTANCE_NAME (options)"
 
         deps do
           require_relative "cloud/google_service"
+          require_relative "cloud/google_service_helpers"
+          include GoogleServiceHelpers
         end
 
         def validate_params!

data/lib/chef/knife/google_zone_list.rb

@@ -23,13 +23,14 @@ require_relative "cloud/google_service_options"
 
 class Chef::Knife::Cloud
   class GoogleZoneList < ResourceListCommand
-    include GoogleServiceHelpers
     include GoogleServiceOptions
 
     banner "knife google zone list"
 
     deps do
       require_relative "cloud/google_service"
+      require_relative "cloud/google_service_helpers"
+      include GoogleServiceHelpers
     end
 
     def validate_params!

data/lib/knife-google/version.rb

@@ -15,7 +15,7 @@
 #
 module Knife
   module Google
-    VERSION = "4.2.6"
+    VERSION = "5.0.2"
     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.6
+  version: 5.0.2
 platform: ruby
 authors:
 - Chiraq Jog
@@ -13,22 +13,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-07-10 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.37.0
+        version: 0.41.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.37.0
+        version: 0.41.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:
   - - ">="