fog-google 1.9.1 → 1.10.0

data/examples/sql/operations.rb

@@ -1,20 +1,24 @@
-def test
-  connection = Fog::Google::SQL.new
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
 
-  puts "Create a Instance..."
-  puts "--------------------"
-  instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
-  instance.wait_for { ready? }
+require "bundler"
+Bundler.require(:default, :development)
 
-  puts "Delete the Instance..."
-  puts "----------------------"
-  operation = instance.destroy
+connection = Fog::Google::SQL.new
 
-  puts "Get the Operation..."
-  puts "--------------------"
-  connection.operations.get(operation.identity)
+puts "Create a Instance..."
+puts "--------------------"
+instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
+instance.wait_for { ready? }
 
-  puts "Listing all Operations..."
-  puts "-------------------------"
-  connection.operations.all(instance.identity)
-end
+puts "Delete the Instance..."
+puts "----------------------"
+operation = instance.destroy
+
+puts "Get the Operation..."
+puts "--------------------"
+connection.operations.get(operation.identity)
+
+puts "Listing all Operations..."
+puts "-------------------------"
+connection.operations.all(instance.identity)

data/examples/sql/ssl_certs.rb

@@ -1,28 +1,32 @@
-def test
-  connection = Fog::Google::SQL.new
-
-  puts "Create a Instance..."
-  puts "--------------------"
-  instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
-  instance.wait_for { ready? }
-
-  puts "Create a SSL certificate..."
-  puts "---------------------------"
-  ssl_cert = connection.ssl_certs.create(:instance => instance.name, :common_name => Fog::Mock.random_letters(16))
-
-  puts "Get the SSL certificate..."
-  puts "--------------------------"
-  connection.ssl_certs.get(instance.name, ssl_cert.sha1_fingerprint)
-
-  puts "List all SSL certificate..."
-  puts "---------------------------"
-  connection.ssl_certs.all(instance.name)
-
-  puts "Delete the SSL certificate..."
-  puts "-----------------------------"
-  ssl_cert.destroy
-
-  puts "Delete the Instance..."
-  puts "----------------------"
-  instance.destroy
-end
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Create a Instance..."
+puts "--------------------"
+instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "db-n1-standard-1")
+instance.wait_for { ready? }
+
+puts "Create a SSL certificate..."
+puts "---------------------------"
+ssl_cert = connection.ssl_certs.create(:instance => instance.name, :common_name => Fog::Mock.random_letters(16))
+
+puts "Get the SSL certificate..."
+puts "--------------------------"
+connection.ssl_certs.get(instance.name, ssl_cert.sha1_fingerprint)
+
+puts "List all SSL certificate..."
+puts "---------------------------"
+connection.ssl_certs.all(instance.name)
+
+puts "Delete the SSL certificate..."
+puts "-----------------------------"
+ssl_cert.destroy
+
+puts "Delete the Instance..."
+puts "----------------------"
+instance.destroy

data/examples/sql/tiers.rb

@@ -1,7 +1,11 @@
-def test
-  connection = Fog::Google::SQL.new
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
 
-  puts "Listing all Tiers..."
-  puts "--------------------"
-  connection.tiers
-end
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Listing all Tiers..."
+puts "--------------------"
+connection.tiers

data/fog-google.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
   # Hard Requirement as of 1.0
-  spec.add_dependency "google-api-client", "~> 0.23.0"
+  spec.add_dependency "google-api-client", ">= 0.32", "< 0.34"
   
   # Debugger
   spec.add_development_dependency "pry"

data/lib/fog/compute/google.rb

@@ -13,6 +13,7 @@ module Fog
         :google_client,
         :google_client_options,
         :google_extra_global_projects,
+        :google_exclude_projects,
         :google_key_location,
         :google_key_string,
         :google_json_key_location,
@@ -170,6 +171,7 @@ module Fog
       request :set_forwarding_rule_target
       request :set_global_forwarding_rule_target
       request :set_server_disk_auto_delete
+      request :set_server_machine_type
       request :set_server_metadata
       request :set_server_scheduling
       request :set_server_tags
@@ -212,6 +214,8 @@ module Fog
 
       request :deprecate_image
 
+      request :reset_windows_password
+
       model_path "fog/compute/google/models"
       model :server
       collection :servers

data/lib/fog/compute/google/mock.rb

@@ -3,11 +3,12 @@ module Fog
     class Google
       class Mock
         include Fog::Google::Shared
-        attr_reader :extra_global_projects
+        attr_reader :extra_global_projects, :exclude_projects
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_COMPUTE_API_VERSION, GOOGLE_COMPUTE_BASE_URL)
           @extra_global_projects = options.fetch(:google_extra_global_projects, [])
+          @exclude_projects = options.fetch(:google_exclude_projects, [])
         end
 
         def self.data(api_version)

data/lib/fog/compute/google/models/address.rb

@@ -74,7 +74,15 @@ module Fog
 
         private
 
-        def associate(nic_name, async = true)
+        # Associates the ip address to a given server
+        #
+        # @param [String]  server - GCE instance name
+        # @param [String]  nic_name - NIC interface name, defaults to GCE
+        #                             standard primary nic - "nic0"
+        # @param [Boolean]  async - whether to run the operation asynchronously
+        #
+        # @return [Fog::Compute::Google::Operation]
+        def associate(server, nic_name = "nic0", async = false)
           requires :address
 
           data = service.add_server_access_config(
@@ -86,7 +94,12 @@ module Fog
           operation.wait_for { ready? } unless async
         end
 
-        def disassociate
+        # Disassociates the ip address from a resource it's attached to
+        #
+        # @param [Boolean]  async - whether to run the operation asynchronously
+        #
+        # @return [Fog::Compute::Google::Operation]
+        def disassociate(async = false)
           requires :address
 
           return nil if !in_use? || users.nil? || users.empty?

data/lib/fog/compute/google/models/disk.rb

@@ -17,6 +17,9 @@ module Fog
         attribute :source_snapshot, :aliases => "sourceSnapshot"
         attribute :source_snapshot_id, :aliases => "sourceSnapshotId"
         attribute :type
+        attribute :labels
+        attribute :label_fingerprint, :aliases => "labelFingerprint"
+        attribute :users
 
         def default_description
           if !source_image.nil?
@@ -36,8 +39,9 @@ module Fog
             :type => type,
             :size_gb => size_gb,
             :source_image => source_image,
-            :source_snapshot => source_snapshot
-          }
+            :source_snapshot => source_snapshot,
+            :labels => labels
+          }.reject { |_, v| v.nil? }
 
           if options[:source_image]
             unless source_image.include?("projects/")

data/lib/fog/compute/google/models/images.rb

@@ -14,6 +14,7 @@ module Fog
           coreos-cloud
           debian-cloud
           rhel-cloud
+          rhel-sap-cloud
           suse-cloud
           suse-sap-cloud
           ubuntu-os-cloud
@@ -96,7 +97,11 @@ module Fog
 
         def all_projects
           # Search own project before global projects
-          [service.project] + GLOBAL_PROJECTS + service.extra_global_projects
+          project_list = [service.project] + GLOBAL_PROJECTS + service.extra_global_projects
+          unless service.exclude_projects.empty?
+            project_list.delete_if { |project| service.exclude_projects.include?(project) }
+          end
+          project_list
         end
       end
     end

data/lib/fog/compute/google/models/instance_groups.rb

@@ -40,7 +40,7 @@ module Fog
           nil
         end
 
-        # TODO: To be deprecated
+        # TODO(2.0): To be deprecated
         def add_instance(params)
           Fog::Logger.deprecation(
             "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"
@@ -49,7 +49,7 @@ module Fog
           service.add_instance_group_instances(params[:group], params[:zone], params[:instance])
         end
 
-        # TODO: To be deprecated
+        # TODO(2.0): To be deprecated
         def remove_instance(params)
           Fog::Logger.deprecation(
             "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller(0..0)})[/]"

data/lib/fog/compute/google/models/server.rb

@@ -266,14 +266,13 @@ module Fog
         # @param async [TrueClass] execute the api call asynchronously
         # @param options [Hash]
         # @return [Object]
-        # TODO: Figure out what options hash is for here.
-        def attach_disk(disk, async = true, options = {})
+        def attach_disk(disk, async = true, attached_disk_options = {})
           requires :identity, :zone
 
           if disk.is_a? Disk
             disk_obj = disk.get_attached_disk
           elsif disk.is_a? String
-            disk_obj = service.disks.attached_disk_obj(disk, options)
+            disk_obj = service.disks.attached_disk_obj(disk, attached_disk_options)
           end
 
           data = service.attach_disk(identity, zone_name, disk_obj)
@@ -344,10 +343,10 @@ module Fog
           operation
         end
 
-        def serial_port_output
+        def serial_port_output(port: 1)
           requires :identity, :zone
 
-          service.get_server_serial_port_output(identity, zone_name).to_h[:contents]
+          service.get_server_serial_port_output(identity, zone_name, :port => port).to_h[:contents]
         end
 
         def set_disk_auto_delete(auto_delete, device_name = nil, async = true)
@@ -415,6 +414,21 @@ module Fog
           reload
         end
 
+        def set_machine_type(new_machine_type, async = true)
+          requires :identity, :zone
+
+          raise Fog::Errors::Error.new("Instance must be stopped to change machine type") unless stopped?
+
+          data = service.set_server_machine_type(
+            identity, zone_name, new_machine_type
+          )
+          operation = Fog::Compute::Google::Operations
+                      .new(:service => service)
+                      .get(data.name, data.zone)
+          operation.wait_for { ready? } unless async
+          reload
+        end
+
         def set_tags(new_tags = [], async = true)
           requires :identity, :zone
 
@@ -554,13 +568,23 @@ module Fog
 
           ssh_keys = metadata_map["ssh-keys"] || metadata_map["sshKeys"] || ""
           ssh_keys += "\n" unless ssh_keys.empty?
-          ssh_keys += "#{username}:#{key.strip}"
+          ssh_keys += "#{username}:#{ensure_key_comment(key, username)}"
 
           metadata_map["ssh-keys"] = ssh_keys
           metadata[:items] = metadata_to_item_list(metadata_map)
           metadata
         end
 
+        def ensure_key_comment(key, default_comment = "fog-user")
+          parts = key.strip.split
+          parts << default_comment if parts.size < 3
+          parts.join(" ")
+        end
+
+        def reset_windows_password(user)
+          service.reset_windows_password(:server => self, :user => user)
+        end
+
         private
 
         def metadata_to_item_list(metadata)

data/lib/fog/compute/google/real.rb

@@ -5,7 +5,7 @@ module Fog
         include Fog::Google::Shared
 
         attr_accessor :client
-        attr_reader :compute, :extra_global_projects
+        attr_reader :compute, :extra_global_projects, :exclude_projects
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_COMPUTE_API_VERSION, GOOGLE_COMPUTE_BASE_URL)
@@ -16,6 +16,7 @@ module Fog
           apply_client_options(@compute, options)
 
           @extra_global_projects = options[:google_extra_global_projects] || []
+          @exclude_projects = options[:google_exclude_projects] || []
         end
       end
     end

data/lib/fog/compute/google/requests/abandon_instances.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def abandon_instances(_instance_group_manager, _instances)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/add_backend_service_backends.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def add_backend_service_backends(_backend_service, _new_backends)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/add_instance_group_instances.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def add_instance_group_instances(_group_name, _zone, _instances)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/add_server_access_config.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def add_server_access_config(_identity, _zone, _nic, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/add_target_pool_health_checks.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def add_target_pool_health_checks(_target_pool, _region, _health_checks)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/add_target_pool_instances.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def add_target_pool_instances(_target_pool, _region, _instances)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/attach_disk.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def attach_disk(_instance, _zone, _disk = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/create_disk_snapshot.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def create_disk_snapshot(_snapshot_name, _disk, _zone, _snapshot = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/lib/fog/compute/google/requests/delete_address.rb

@@ -3,7 +3,9 @@ module Fog
     class Google
       class Mock
         def delete_address(_address_name, _region_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end