fog-google 1.7.1 → 1.8.0

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if instance_template = service.get_instance_template(identity)
-            new(instance_template.to_h)
+          if identity
+            instance_template = service.get_instance_template(identity).to_h
+            return new(instance_template)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -23,10 +23,19 @@ module Fog
           load(data.map(&:to_h) || [])
         end
 
-        def get(identity, zone)
-          machine_type = service.get_machine_type(identity, zone).to_h
-          return nil if machine_type.nil?
-          new(machine_type)
+        def get(identity, zone = nil)
+          if zone
+            machine_type = service.get_machine_type(identity, zone).to_h
+            return new(machine_type)
+          elsif identity
+            # This isn't very functional since it just shows the first available
+            # machine type globally, but needed due to overall compatibility
+            # See: https://github.com/fog/fog-google/issues/352
+            response = all(:filter => "name eq #{identity}",
+                           :max_results => 1)
+            machine_type = response.first unless response.empty?
+            return machine_type
+          end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if network = service.get_network(identity).to_h
-            new(network)
+          if identity
+            network = service.get_network(identity).to_h
+            return new(network)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -16,7 +16,7 @@ module Fog
           if zone
             data = service.list_zone_operations(zone, opts).to_h[:items]
           elsif region
-            data = service.list_region_operations(regions, opts).to_h[:items]
+            data = service.list_region_operations(region, opts).to_h[:items]
           else
             data = service.list_global_operations(opts).to_h[:items]
           end
@@ -26,15 +26,15 @@ module Fog
 
         def get(identity, zone = nil, region = nil)
           if !zone.nil?
-            response = service.get_zone_operation(zone, identity)
+            operation = service.get_zone_operation(zone, identity).to_h
+            return new(operation)
           elsif !region.nil?
-            response = service.get_region_operation(region, identity)
-          else
-            response = service.get_global_operation(identity)
+            operation = service.get_region_operation(region, identity).to_h
+            return new(operation)
+          elsif identity
+            operation = service.get_global_operation(identity).to_h
+            return new(operation)
           end
-
-          return nil if response.nil?
-          new(response.to_h)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -5,8 +5,9 @@ module Fog
         model Fog::Compute::Google::Project
 
         def get(identity)
-          if project = service.get_project(identity).to_h
-            new(project)
+          if identity
+            project = service.get_project(identity).to_h
+            return new(project)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if region = service.get_region(identity).to_h
-            new(region)
+          if identity
+            region = service.get_region(identity).to_h
+            return new(region)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if route = service.get_route(identity).to_h
-            new(route)
+          if identity
+            route = service.get_route(identity).to_h
+            return new(route)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -28,15 +28,15 @@ module Fog
 
         # TODO: This method needs to take self_links as well as names
         def get(identity, zone = nil)
-          response = nil
           if zone
-            response = service.get_server(identity, zone).to_h
-          else
-            server = all(:filter => "name eq .*#{identity}").first
-            response = server.attributes if server
+            server = service.get_server(identity, zone).to_h
+            return new(server)
+          elsif identity
+            response = all(:filter => "name eq .*#{identity}",
+                           :max_results => 1)
+            server = response.first unless response.empty?
+            return server
           end
-          return nil if response.nil?
-          new(response)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -17,10 +17,11 @@ module Fog
           load(items)
         end
 
-        def get(snap_id)
-          response = service.get_snapshot(snap_id)
-          return nil if response.nil?
-          new(response.to_h)
+        def get(identity)
+          if identity
+            snapshot = service.get_snapshot(identity).to_h
+            return new(snapshot)
+          end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -4,9 +4,10 @@ module Fog
       class SslCertificates < Fog::Collection
         model Fog::Compute::Google::SslCertificate
 
-        def get(certificate_name)
-          if certificate = service.get_ssl_certificate(certificate_name)
-            new(certificate.to_h)
+        def get(identity)
+          if identity
+            ssl_certificate = service.get_ssl_certificate(identity).to_h
+            return new(ssl_certificate)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -12,20 +12,26 @@ module Fog
             :page_token => page_token
           }
 
-          if region.nil?
+          if region
+            data = service.list_subnetworks(region, filters).to_h[:items] || []
+          else
             data = []
             service.list_aggregated_subnetworks(filters).to_h[:items].each_value do |region_obj|
               data.concat(region_obj[:subnetworks]) if region_obj[:subnetworks]
             end
-          else
-            data = service.list_subnetworks(region, filters).to_h[:items]
           end
-          load(data || [])
+          load(data)
         end
 
-        def get(identity, region)
-          if subnetwork = service.get_subnetwork(identity, region).to_h
-            new(subnetwork)
+        def get(identity, region = nil)
+          if region
+            subnetwork = service.get_subnetwork(identity, region).to_h
+            return new(subnetwork)
+          elsif identity
+            response = all(:filter => "name eq #{identity}",
+                           :max_results => 1)
+            subnetwork = response.first unless response.empty?
+            return subnetwork
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if target_http_proxy = service.get_target_http_proxy(identity).to_h
-            new(target_http_proxy)
+          if identity
+            target_http_proxy = service.get_target_http_proxy(identity).to_h
+            return new(target_http_proxy)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if target_https_proxy = service.get_target_https_proxy(identity).to_h
-            new(target_https_proxy)
+          if identity
+            target_https_proxy = service.get_target_https_proxy(identity).to_h
+            return new(target_https_proxy)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -26,16 +26,16 @@ module Fog
           load(data)
         end
 
-        def get(target_instance, zone = nil)
-          response = nil
+        def get(identity, zone = nil)
           if zone
-            response = service.get_target_instance(target_instance, zone).to_h
-          else
-            response = all(:filter => "name eq #{target_instance}").first
-            response = response.attributes unless response.nil?
+            target_instance = service.get_target_instance(target_instance, zone).to_h
+            return new(target_instance)
+          elsif identity
+            response = all(:filter => "name eq #{identity}",
+                           :max_results => 1)
+            target_instance = response.first unless response.empty?
+            return target_instance
           end
-          return nil if response.nil?
-          new(response)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -25,17 +25,14 @@ module Fog
         end
 
         def get(identity, region = nil)
-          response = nil
-          if region.nil?
-            data = all(:filter => "name eq #{identity}").first
-            unless data.nil?
-              response = data.attributes
-            end
-          else
-            response = service.get_target_pool(identity, region).to_h
+          if region
+            target_pool = service.get_target_pool(identity, region).to_h
+            return new(target_pool)
+          elsif identity
+            response = all(:filter => "name eq #{identity}")
+            target_pool = response.first unless response.empty?
+            return target_pool
           end
-          return nil if response.nil?
-          new(response)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code = 404
           nil

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

@@ -10,8 +10,9 @@ module Fog
         end
 
         def get(identity)
-          if url_map = service.get_url_map(identity).to_h
-            new(url_map)
+          if identity
+            url_map = service.get_url_map(identity).to_h
+            return new(url_map)
           end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

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

@@ -10,8 +10,10 @@ module Fog
         end
 
         def get(identity)
-          data = service.get_zone(identity).to_h
-          new(data)
+          if identity
+            zone = service.get_zone(identity).to_h
+            new(zone)
+          end
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
           nil

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

@@ -13,6 +13,8 @@ module Fog
 
           initialize_google_client(options)
           @compute = ::Google::Apis::ComputeV1::ComputeService.new
+          apply_client_options(@compute, options)
+
           @extra_global_projects = options[:google_extra_global_projects] || []
         end
       end

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

@@ -9,8 +9,7 @@ module Fog
 
       class Real
         def list_aggregated_instance_groups(options = {})
-          @compute.list_aggregated_instance_groups(@project,
-                                                   :filter => options[:filter])
+          @compute.list_aggregated_instance_groups(@project, options)
         end
       end
     end

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

@@ -11,6 +11,7 @@ module Fog
           options[:google_api_scope_url] = GOOGLE_DNS_API_SCOPE_URLS.join(" ")
           initialize_google_client(options)
           @dns = ::Google::Apis::DnsV1::DnsService.new
+          apply_client_options(@dns, options)
         end
       end
     end

data/lib/fog/google/models/sql/instances.rb

@@ -23,7 +23,10 @@ module Fog
         # @return [Fog::Google::SQL::Instance] Instance resource
         def get(instance_id)
           instance = service.get_instance(instance_id).to_h
-          if instance
+          # XXX if we pass `nil` to get() it returns empty DB object with
+          # kind set to "sql#instancesList"
+          # see https://github.com/google/google-api-ruby-client/issues/699
+          if instance[:kind].eql?("sql#instance")
             new(instance)
           end
         rescue ::Google::Apis::ClientError => e

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

@@ -12,6 +12,7 @@ module Fog
 
           initialize_google_client(options)
           @monitoring = ::Google::Apis::MonitoringV3::MonitoringService.new
+          apply_client_options(@monitoring, options)
         end
       end
     end

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

@@ -13,6 +13,7 @@ module Fog
 
           @client = initialize_google_client(options)
           @pubsub = ::Google::Apis::PubsubV1::PubsubService.new
+          apply_client_options(@pubsub, options)
         end
       end
     end

data/lib/fog/google/shared.rb

@@ -30,7 +30,7 @@ module Fog
       # @option options [String] :app_name The app name to set in the user agent
       # @option options [String] :app_version The app version to set in the user agent
       # @option options [Google::APIClient] :google_client Existing Google API Client
-      # @option options [Hash] :google_client_options A hash to send adition options to Google API Client
+      # @option options [Hash] :google_client_options A hash to send additional options to Google API Client
       # @return [Google::APIClient] Google API Client
       # @raises [ArgumentError] If there is any missing argument
       def initialize_google_client(options)
@@ -119,6 +119,20 @@ module Fog
         auth
       end
 
+      ##
+      # Applies given options to the client instance
+      #
+      # @param [Google::Apis::Core::BaseService] service API service client instance
+      # @param [Hash] google_client_options Service client options to apply
+      # @param [Hash] _ignored Rest of the options (for convenience, ignored)
+      # @return [void]
+      def apply_client_options(service, google_client_options: nil, **_ignored)
+        return if google_client_options.nil? || google_client_options.empty?
+        (service.client_options.members & google_client_options.keys).each do |option|
+          service.client_options[option] = google_client_options[option]
+        end
+      end
+
       ##
       # Executes a request and wraps it in a result object
       #

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

@@ -13,6 +13,7 @@ module Fog
 
           initialize_google_client(options)
           @sql = ::Google::Apis::SqladminV1beta4::SQLAdminService.new
+          apply_client_options(@sql, options)
         end
       end
     end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.7.1".freeze
+    VERSION = "1.8.0".freeze
   end
 end

data/lib/fog/storage/google_json/real.rb

@@ -15,6 +15,8 @@ module Fog
 
           @client = initialize_google_client(options)
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
+          apply_client_options(@storage_json, options)
+
           @storage_json.client_options.open_timeout_sec = options[:open_timeout_sec] if options[:open_timeout_sec]
           @storage_json.client_options.read_timeout_sec = options[:read_timeout_sec] if options[:read_timeout_sec]
           @storage_json.client_options.send_timeout_sec = options[:send_timeout_sec] if options[:send_timeout_sec]

data/test/helpers/integration_test_helper.rb

@@ -17,6 +17,8 @@ TEST_REGION = "us-central1".freeze
 TEST_SIZE_GB = 10
 TEST_MACHINE_TYPE = "n1-standard-1".freeze
 TEST_IMAGE = "debian-9-stretch-v20180611".freeze
+TEST_IMAGE_PROJECT = "debian-cloud".freeze
+TEST_IMAGE_FAMILY = "debian-9".freeze
 
 # XXX This depends on a public image in gs://fog-test-bucket; there may be a better way to do this
 # The image was created like so: https://cloud.google.com/compute/docs/images#export_an_image_to_google_cloud_storage

data/test/helpers/test_collection.rb

@@ -13,8 +13,26 @@ module TestCollection
     assert_includes @subject.all.map(&:identity), one.identity
     assert_includes @subject.all.map(&:identity), two.identity
 
-    assert_equal one.identity, @factory.get(one.identity).identity
-    assert_equal two.identity, @factory.get(two.identity).identity
+    assert_equal one.identity, @subject.get(one.identity).identity
+    assert_equal two.identity, @subject.get(two.identity).identity
+
+    # Some factories that have scoped parameters (zone, region) have a special
+    # `get` method defined in the factory to pass the correct parameters in
+    if @factory.respond_to?(:get)
+      assert_equal one.identity, @factory.get(one.identity).identity
+      assert_equal two.identity, @factory.get(two.identity).identity
+    end
+
+    # Some factories that have scoped parameters (zone, region) have a special
+    # `all` method defined in the factory to pass the correct parameters in
+    if @factory.respond_to?(:all)
+      subject_list = @subject.all
+      scoped_subject_list = @factory.all
+
+      # Assert that whatever .all(scope) returns is a subset of .all
+      assert(scoped_subject_list.all? { |x| subject_list.include? x },
+             "Output of @factory.all must be a subset of @subject.all")
+    end
 
     one.destroy
     two.destroy
@@ -24,13 +42,18 @@ module TestCollection
   end
 
   def test_get_returns_nil_if_resource_does_not_exist
-    assert_nil @factory.get("fog-test-fake-identity")
+    assert_nil @factory.get("fog-test-fake-identity") if @factory.respond_to?(:get)
+    assert_nil @subject.get("fog-test-fake-identity")
   end
 
   def test_enumerable
     assert_respond_to @subject, :each
   end
 
+  def test_nil_get
+    assert_nil @subject.get(nil)
+  end
+
   def teardown
     @factory.cleanup
   end