fog-google 1.24.0 → 1.25.0

data/lib/fog/{dns/google → google/dns}/requests/list_resource_record_sets.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class Google
+  module Google
+    class DNS
       ##
       # Enumerates Resource Record Sets that have been created but not yet deleted.
       #

data/lib/fog/{dns/google.rb → google/dns.rb}

@@ -1,8 +1,8 @@
 module Fog
-  module DNS
-    class Google < Fog::Service
-      autoload :Mock, File.expand_path("../google/mock", __FILE__)
-      autoload :Real, File.expand_path("../google/real", __FILE__)
+  module Google
+    class DNS < Fog::Service
+      autoload :Mock, "fog/google/dns/mock"
+      autoload :Real, "fog/google/dns/real"
 
       requires :google_project
       recognizes(
@@ -24,7 +24,7 @@ module Fog
 
       ##
       # MODELS
-      model_path "fog/dns/google/models"
+      model_path "fog/google/dns/models"
 
       # Zone
       model :zone
@@ -44,7 +44,7 @@ module Fog
 
       ##
       # REQUESTS
-      request_path "fog/dns/google/requests"
+      request_path "fog/google/dns/requests"
 
       # Zone
       request :create_managed_zone

data/lib/fog/{parsers/storage/google → google/parsers/storage}/access_control_list.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class AccessControlList < Fog::Parsers::Base
           def reset
             @in_entries = false

data/lib/fog/{parsers/storage/google → google/parsers/storage}/copy_object.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class CopyObject < Fog::Parsers::Base
           def end_element(name)
             case name

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_bucket.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class GetBucket < Fog::Parsers::Base
           def reset
             @object = { "Owner" => {} }

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_bucket_logging.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class AccessControlList < Fog::Parsers::Base
           def reset
             @grant = { "Grantee" => {} }

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_bucket_object_versions.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class GetBucketObjectVersions < Fog::Parsers::Base
           def reset
             @delete_marker = { "Owner" => {} }

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_bucket_versioning.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class GetBucketVersioning < Fog::Parsers::Base
           def reset
             @response = { "VersioningConfiguration" => {} }

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_request_payment.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class GetRequestPayment < Fog::Parsers::Base
           def end_element(name)
             case name

data/lib/fog/{parsers/storage/google → google/parsers/storage}/get_service.rb

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Storage
-      module Google
+  module Google
+    module Parsers
+      module Storage
         class GetService < Fog::Parsers::Base
           def reset
             @bucket = {}

data/lib/fog/google/parsers/storage.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Google
+    module Parsers
+      module Storage
+        autoload :AccessControlList, 'fog/google/parsers/storage/access_control_list'
+        autoload :CopyObject, 'fog/google/parsers/storage/copy_object'
+        autoload :GetBucket, 'fog/google/parsers/storage/get_bucket'
+        autoload :GetBucketLogging, 'fog/google/parsers/storage/get_bucket_logging'
+        autoload :GetBucketObjectVersions, 'fog/google/parsers/storage/get_bucket_object_versions'
+        autoload :GetRequestPayment, 'fog/google/parsers/storage/get_request_payment'
+        autoload :GetService, 'fog/google/parsers/storage/get_service'
+      end
+    end
+  end
+end

data/lib/fog/google/shared.rb

@@ -40,16 +40,16 @@ module Fog
         begin
           # TODO: google-api-client is in gemspec now, re-assess if this initialization logic is still needed
           require "google/apis/monitoring_#{Fog::Google::Monitoring::GOOGLE_MONITORING_API_VERSION}"
-          require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}"
-          require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}"
+          require "google/apis/compute_#{Fog::Google::Compute::GOOGLE_COMPUTE_API_VERSION}"
+          require "google/apis/dns_#{Fog::Google::DNS::GOOGLE_DNS_API_VERSION}"
           require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}"
           require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}"
-          require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
-          require "google/apis/iamcredentials_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}"
+          require "google/apis/storage_#{Fog::Google::StorageJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
+          require "google/apis/iamcredentials_#{Fog::Google::StorageJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}"
           require "googleauth"
-        rescue LoadError => error
+        rescue LoadError => e
           Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider")
-          raise error
+          raise e
         end
 
         validate_client_options(options)
@@ -67,20 +67,21 @@ module Fog
           ::Google::Apis.logger.level = ::Logger::DEBUG
         end
 
-        auth = nil
+        initialize_auth(options).tap do |auth|
+          ::Google::Apis::RequestOptions.default.authorization = auth
+        end
+      end
 
+      def initialize_auth(options)
         if options[:google_json_key_location] || options[:google_json_key_string]
-          auth = process_key_auth(options)
+          process_key_auth(options)
         elsif options[:google_auth]
-          auth = options[:google_auth]
+          options[:google_auth]
         elsif options[:google_application_default]
-          auth = process_application_default_auth(options)
+          process_application_default_auth(options)
         else
-          auth = process_fallback_auth(options)
+          process_fallback_auth(options)
         end
-
-        ::Google::Apis::RequestOptions.default.authorization = auth
-        auth
       end
 
       ##
@@ -92,6 +93,7 @@ module Fog
       def apply_client_options(service, options = {})
         google_client_options = options[:google_client_options]
         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
@@ -175,7 +177,7 @@ module Fog
         )
         begin
           return process_application_default_auth(options)
-        rescue
+        rescue StandardError
           raise Fog::Errors::Error.new(
             "Fallback auth failed, could not configure authentication for Fog client.\n" \
               "Check your auth options, must be one of:\n" \

data/lib/fog/{storage/google_json → google/storage/storage_json}/mock.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Mock
         include Utils
         include Fog::Google::Shared

data/lib/fog/{storage/google_json → google/storage/storage_json}/models/directories.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Directories < Fog::Collection
-        model Fog::Storage::GoogleJSON::Directory
+        model Fog::Google::StorageJSON::Directory
 
         def all(opts = {})
           data = service.list_buckets(**opts).to_h[:items] || []
@@ -33,6 +33,7 @@ module Fog
         rescue ::Google::Apis::ClientError => e
           # metageneration check failures returns HTTP 412 Precondition Failed
           raise e unless e.status_code == 404 || e.status_code == 412
+
           nil
         end
       end

data/lib/fog/{storage/google_json → google/storage/storage_json}/models/directory.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       ##
       # Represents a Google Storage bucket
       class Directory < Fog::Model
@@ -39,7 +39,7 @@ module Fog
 
         def files(attr = {})
           @files ||= begin
-            Fog::Storage::GoogleJSON::Files.new(
+            Fog::Google::StorageJSON::Files.new(
               attr.merge(:directory => self, :service => service)
             )
           end

data/lib/fog/{storage/google_json → google/storage/storage_json}/models/file.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class File < Fog::Model
         identity :key, :aliases => ["Key", :name]
 

data/lib/fog/{storage/google_json → google/storage/storage_json}/models/files.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Files < Fog::Collection
-        model Fog::Storage::GoogleJSON::File
+        model Fog::Google::StorageJSON::File
 
         extend Fog::Deprecation
         deprecate :get_url, :get_https_url
@@ -11,7 +11,7 @@ module Fog
         attribute :delimiter,       :aliases => "Delimiter"
         attribute :directory
         attribute :page_token,      :aliases => %w(pageToken page_token)
-        attribute :max_results,     :aliases => ["MaxKeys", "max-keys"]
+        attribute :max_results,     :aliases => %w(MaxKeys max-keys)
         attribute :prefix,          :aliases => "Prefix"
         attribute :next_page_token
 
@@ -24,14 +24,14 @@ module Fog
         end
 
         alias_method :each_file_this_page, :each
-        def each
+        def each(&block)
           if block_given?
             subset = dup.all
 
-            subset.each_file_this_page { |f| yield f }
+            subset.each_file_this_page(&block)
             while subset.next_page_token
               subset = subset.all(:page_token => subset.next_page_token)
-              subset.each_file_this_page { |f| yield f }
+              subset.each_file_this_page(&block)
             end
           end
           self
@@ -43,6 +43,7 @@ module Fog
           new(data)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
+
           nil
         end
 

data/lib/fog/{storage/google_json → google/storage/storage_json}/real.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         include Utils
         include Fog::Google::Shared
@@ -10,16 +10,12 @@ module Fog
 
         def initialize(options = {})
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          @options = options.dup
           options[:google_api_scope_url] = GOOGLE_STORAGE_JSON_API_SCOPE_URLS.join(" ")
           @host = options[:host] || "storage.googleapis.com"
 
           # TODO(temikus): Do we even need this client?
           @client = initialize_google_client(options)
-          # IAM client used for SignBlob API
-          @iam_service = ::Google::Apis::IamcredentialsV1::IAMCredentialsService.new
-          apply_client_options(@iam_service, {
-                                 google_api_scope_url: GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS.join(" ")
-                               })
 
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
           apply_client_options(@storage_json, options)
@@ -141,6 +137,18 @@ DATA
           return key.sign(digest, string_to_sign)
         end
 
+        # IAM client used for SignBlob API.
+        # Lazily initialize this since it requires another authorization request.
+        def iam_service
+          return @iam_service if defined?(@iam_service)
+
+          @iam_service = ::Google::Apis::IamcredentialsV1::IAMCredentialsService.new
+          apply_client_options(@iam_service, @options)
+          iam_options = @options.merge(google_api_scope_url: GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS.join(" "))
+          @iam_service.authorization = initialize_auth(iam_options)
+          @iam_service
+        end
+
         ##
         # Fallback URL signer using the IAM SignServiceAccountBlob API, see
         #   Google::Apis::IamcredentialsV1::IAMCredentialsService#sign_service_account_blob
@@ -162,7 +170,7 @@ DATA
           )
 
           resource = "projects/-/serviceAccounts/#{google_access_id}"
-          response = @iam_service.sign_service_account_blob(resource, request)
+          response = iam_service.sign_service_account_blob(resource, request)
 
           return response.signed_blob
         end

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/copy_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Copy an object from one Google Storage bucket to another
         #

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/delete_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Delete an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/buckets/delete

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/delete_object.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Delete an object from Google Storage
         # https://cloud.google.com/storage/docs/json_api/v1/objects/delete

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/delete_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from Google Storage for deleting an object
         # https://cloud.google.com/storage/docs/access-control#Signed-URLs

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # List information about objects in an Google Storage bucket #
         # https://cloud.google.com/storage/docs/json_api/v1/buckets#resource

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list entry for an Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/get

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object.rb

@@ -1,8 +1,8 @@
 require "tempfile"
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an object from Google Storage
         # @see https://cloud.google.com/storage/docs/json_api/v1/objects/get

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list for an Google Storage object
         # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object_http_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       module GetObjectHttpUrl
         def get_object_http_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object_https_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       module GetObjectHttpsUrl
         def get_object_https_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object_metadata.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Fetch metadata for an object in Google Storage
         #

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/get_object_url.rb

@@ -1,18 +1,18 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from GCS
         # Deprecated, redirects to get_object_https_url.rb
         def get_object_url(bucket_name, object_name, expires, options = {})
-          Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
           get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end
 
       class Mock # :nodoc:all
         def get_object_url(bucket_name, object_name, expires, options = {})
-          Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
+          Fog::Logger.deprecation("Fog::Google::Storage => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
           get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/list_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get access control list for an Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/list

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/list_buckets.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Retrieves a list of buckets for a given project
         # https://cloud.google.com/storage/docs/json_api/v1/buckets/list

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/list_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # List access control list for an Google Storage object
         # https://cloud.google.com/storage/docs/json_api/v1/objectAccessControls/get

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/list_objects.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Lists objects in a bucket matching some criteria.
         #

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/put_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Create a Google Storage bucket
         # @see https://cloud.google.com/storage/docs/json_api/v1/buckets/insert

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/put_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Change access control list for an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls/insert

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/put_object.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Create an object in an Google Storage bucket
         # https://cloud.google.com/storage/docs/json_api/v1/objects/insert

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/put_object_acl.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Change access control list for an Google Storage object
         #

data/lib/fog/{storage/google_json → google/storage/storage_json}/requests/put_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       class Real
         # Get an expiring object url from Google Storage for putting an object
         # https://cloud.google.com/storage/docs/access-control#Signed-URLs

data/lib/fog/{storage/google_json → google/storage/storage_json}/utils.rb

@@ -1,8 +1,8 @@
-require 'addressable'
+require "addressable"
 
 module Fog
-  module Storage
-    class GoogleJSON
+  module Google
+    class StorageJSON
       module Utils
         def http_url(params, expires)
           "http://" << host_path_query(params, expires)
@@ -13,7 +13,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Google::Storage => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end