fog-google 1.11.0 → 1.15.0

data/lib/fog/google/requests/monitoring/list_timeseries.rb

@@ -39,7 +39,7 @@ module Fog
             end
           end
 
-          @monitoring.list_project_time_series("projects/#{@project}", options)
+          @monitoring.list_project_time_series("projects/#{@project}", **options)
         end
       end
 

data/lib/fog/google/requests/pubsub/acknowledge_subscription.rb

@@ -12,7 +12,7 @@ module Fog
             ack_ids = [ack_ids]
           end
           ack_request = ::Google::Apis::PubsubV1::AcknowledgeRequest.new(
-            :ack_ids => ack_ids
+            ack_ids: ack_ids
           )
 
           @pubsub.acknowledge_subscription(subscription, ack_request)

data/lib/fog/google/requests/pubsub/create_subscription.rb

@@ -18,9 +18,9 @@ module Fog
         # @see https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create
         def create_subscription(subscription_name, topic, push_config = {}, ack_deadline_seconds = nil)
           subscription = ::Google::Apis::PubsubV1::Subscription.new(
-            :topic => topic,
-            :ack_deadline_seconds => ack_deadline_seconds,
-            :push_config => push_config
+            topic: topic,
+            ack_deadline_seconds: ack_deadline_seconds,
+            push_config: push_config
           )
 
           @pubsub.create_subscription(subscription_name, subscription)

data/lib/fog/google/requests/sql/clone_instance.rb

@@ -15,14 +15,14 @@ module Fog
 
           unless log_filename.nil? || log_position.nil?
             context[:bin_log_coordinates] = ::Google::Apis::SqladminV1beta4::BinLogCoordinates.new(
-              :kind => "sql#binLogCoordinates",
-              :log_filename => log_filename,
-              :log_position => log_position
+              kind: "sql#binLogCoordinates",
+              log_filename: log_filename,
+              log_position: log_position
             )
           end
 
           clone_request = ::Google::Apis::SqladminV1beta4::CloneInstancesRequest.new(
-            :clone_context => ::Google::Apis::SqladminV1beta4::CloneContext.new(context)
+            clone_context: ::Google::Apis::SqladminV1beta4::CloneContext.new(**context)
           )
 
           @sql.clone_instance(@project, instance_id, clone_request)

data/lib/fog/google/requests/sql/delete_user.rb

@@ -8,7 +8,7 @@ module Fog
 
       class Real
         def delete_user(instance_id, host, name)
-          @sql.delete_user(@project, instance_id, host, name)
+          @sql.delete_user(@project, instance_id, host: host, name: name)
         end
       end
 

data/lib/fog/google/requests/sql/export_instance.rb

@@ -24,12 +24,12 @@ module Fog
 
           unless csv_export_options.empty?
             data[:csv_export_options] =
-              ::Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions.new(csv_export_options)
+              ::Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions.new(**csv_export_options)
           end
 
           unless sql_export_options.nil?
             data[:sql_export_options] =
-              ::Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions.new(sql_export_options)
+              ::Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions.new(**sql_export_options)
           end
 
           export_context = ::Google::Apis::SqladminV1beta4::ExportContext.new(export_context)
@@ -37,7 +37,7 @@ module Fog
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::ExportInstancesRequest.new(
-              :export_context => export_context
+              export_context: export_context
             )
           )
         end

data/lib/fog/google/requests/sql/import_instance.rb

@@ -19,14 +19,14 @@ module Fog
           data[:import_user] = import_user unless import_user.nil?
           unless csv_import_options.nil?
             data[:csv_import_options] =
-              ::Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions.new(csv_import_options)
+              ::Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions.new(**csv_import_options)
           end
 
           @sql.import_instance(
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::ImportInstancesRequest.new(
-              :import_context => ::Google::Apis::SqladminV1beta4::ImportContext.new(data)
+              import_context: ::Google::Apis::SqladminV1beta4::ImportContext.new(**data)
             )
           )
         end

data/lib/fog/google/requests/sql/insert_backup_run.rb

@@ -11,7 +11,7 @@ module Fog
           @sql.insert_backup_run(
             @project,
             instance_id,
-            ::Google::Apis::SqladminV1beta4::BackupRun.new(backup_run)
+            ::Google::Apis::SqladminV1beta4::BackupRun.new(**backup_run)
           )
         end
       end

data/lib/fog/google/requests/sql/insert_instance.rb

@@ -8,9 +8,9 @@ module Fog
 
       class Real
         def insert_instance(name, tier, options = {})
-          instance = ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(options)
+          instance = ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(**options)
           instance.name = name
-          instance.settings = ::Google::Apis::SqladminV1beta4::Settings.new(instance.settings || {})
+          instance.settings = ::Google::Apis::SqladminV1beta4::Settings.new(**instance.settings || {})
           instance.settings.tier = tier
           @sql.insert_instance(@project, instance)
         end

data/lib/fog/google/requests/sql/insert_ssl_cert.rb

@@ -12,7 +12,7 @@ module Fog
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::InsertSslCertsRequest.new(
-              :common_name => common_name
+              common_name: common_name
             )
           )
         end

data/lib/fog/google/requests/sql/insert_user.rb

@@ -9,7 +9,7 @@ module Fog
       class Real
         def insert_user(instance_id, user)
           @sql.insert_user(@project, instance_id,
-                           ::Google::Apis::SqladminV1beta4::User.new(user))
+                           ::Google::Apis::SqladminV1beta4::User.new(**user))
         end
       end
 

data/lib/fog/google/requests/sql/restore_instance_backup.rb

@@ -9,10 +9,10 @@ module Fog
       class Real
         def restore_instance_backup(instance_id, backup_run_id)
           request = ::Google::Apis::SqladminV1beta4::RestoreInstancesBackupRequest.new(
-            :restore_backup_context => ::Google::Apis::SqladminV1beta4::RestoreBackupContext.new(
-              :backup_run_id => backup_run_id,
-              :instance_id => instance_id,
-              :kind => "sql#restoreBackupContext"
+            restore_backup_context: ::Google::Apis::SqladminV1beta4::RestoreBackupContext.new(
+              backup_run_id: backup_run_id,
+              instance_id: instance_id,
+              kind: "sql#restoreBackupContext"
             )
           )
           @sql.restore_instance_backup(@project, instance_id, request)

data/lib/fog/google/requests/sql/update_instance.rb

@@ -7,14 +7,14 @@ module Fog
       # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/instances/update
       class Real
         def update_instance(instance_id, settings_version, tier, settings = {})
-          settings = ::Google::Apis::SqladminV1beta4::Settings.new(settings)
+          settings = ::Google::Apis::SqladminV1beta4::Settings.new(**settings)
           settings.tier = tier
           settings.settings_version = settings_version
 
           @sql.update_instance(
             @project,
             instance_id,
-            ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(:settings => settings)
+            ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(settings: settings)
           )
         end
       end

data/lib/fog/google/shared.rb

@@ -87,10 +87,10 @@ module Fog
       # 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)
+      # @param [Hash] options (all ignored a.t.m., except :google_client_options)
       # @return [void]
-      def apply_client_options(service, google_client_options: nil, **_ignored)
+      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]

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.11.0".freeze
+    VERSION = "1.15.0".freeze
   end
 end

data/lib/fog/storage/google_json/models/directories.rb

@@ -5,7 +5,7 @@ module Fog
         model Fog::Storage::GoogleJSON::Directory
 
         def all(opts = {})
-          data = service.list_buckets(opts).to_h[:items] || []
+          data = service.list_buckets(**opts).to_h[:items] || []
           load(data)
         end
 

data/lib/fog/storage/google_json/models/directory.rb

@@ -52,7 +52,7 @@ module Fog
 
         def save
           requires :key
-          service.put_bucket(key, attributes)
+          service.put_bucket(key, **attributes)
           true
         end
       end

data/lib/fog/storage/google_json/models/file.rb

@@ -105,7 +105,7 @@ module Fog
           
           options[:predefined_acl] ||= @predefined_acl
 
-          service.put_object(directory.key, key, body, options)
+          service.put_object(directory.key, key, body, **options)
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true

data/lib/fog/storage/google_json/models/files.rb

@@ -33,7 +33,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = service.get_object(directory.key, key, options, &block).to_h
+          data = service.get_object(directory.key, key, **options, &block).to_h
           new(data)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404

data/lib/fog/storage/google_json/requests/copy_object.rb

@@ -14,9 +14,20 @@ module Fog
         def copy_object(source_bucket, source_object,
                         target_bucket, target_object, options = {})
           request_options = ::Google::Apis::RequestOptions.default.merge(options)
+
+          object = ::Google::Apis::StorageV1::Object.new(**options)
+
           @storage_json.copy_object(source_bucket, source_object,
                                     target_bucket, target_object,
-                                    request_options)
+                                    object, options: request_options, **filter_keyword_args(options))
+        end
+
+        private
+
+        def filter_keyword_args(options)
+          method = @storage_json.method(:copy_object)
+          allowed = method.parameters.filter { |param| %i(key keyreq).include?(param[0]) }.map { |param| param[1] }.compact
+          options.filter { |key, _| allowed.include?(key) }
         end
       end
 

data/lib/fog/storage/google_json/requests/get_object.rb

@@ -39,6 +39,8 @@ module Fog
           raise ArgumentError.new("object_name is required") unless object_name
 
           buf = Tempfile.new("fog-google-storage-temp")
+          buf.binmode
+          buf.unlink
 
           # Two requests are necessary, first for metadata, then for content.
           # google-api-ruby-client doesn't allow fetching both metadata and content
@@ -53,18 +55,19 @@ module Fog
             :options => request_options
           }
 
-          object = @storage_json.get_object(bucket_name, object_name, all_opts).to_h
+          object = @storage_json.get_object(bucket_name, object_name, **all_opts).to_h
           @storage_json.get_object(
             bucket_name,
             object_name,
-            all_opts.merge(:download_dest => buf.path)
+            **all_opts.merge(:download_dest => buf)
           )
 
+          buf.seek(0)
+
           if block_given?
             yield buf.read, nil, nil
           else
             object[:body] = buf.read
-            buf.unlink
           end
 
           object

data/lib/fog/storage/google_json/requests/list_buckets.rb

@@ -11,10 +11,10 @@ module Fog
                          prefix: nil, projection: nil)
           @storage_json.list_buckets(
             @project,
-            :max_results => max_results,
-            :page_token => page_token,
-            :prefix => prefix,
-            :projection => projection
+            max_results: max_results,
+            page_token: page_token,
+            prefix: prefix,
+            projection: projection
           )
         end
       end

data/lib/fog/storage/google_json/requests/list_objects.rb

@@ -31,7 +31,7 @@ module Fog
 
           @storage_json.list_objects(
             bucket,
-            options.select { |k, _| allowed_opts.include? k }
+            **options.select { |k, _| allowed_opts.include? k }
           )
         end
       end

data/lib/fog/storage/google_json/requests/put_bucket.rb

@@ -19,7 +19,7 @@ module Fog
                        predefined_default_object_acl: nil,
                        **options)
           bucket = ::Google::Apis::StorageV1::Bucket.new(
-            options.merge(:name => bucket_name)
+            **options.merge(:name => bucket_name)
           )
 
           @storage_json.insert_bucket(

data/lib/fog/storage/google_json/requests/put_bucket_acl.rb

@@ -12,7 +12,7 @@ module Fog
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(acl)
+          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(**acl)
           @storage_json.insert_bucket_access_control(bucket_name, acl_update)
         end
       end

data/lib/fog/storage/google_json/requests/put_object.rb

@@ -51,7 +51,7 @@ module Fog
           data, options = normalize_data(data, options)
 
           object_config = ::Google::Apis::StorageV1::Object.new(
-            options.merge(:name => object_name)
+            **options.merge(:name => object_name)
           )
 
           @storage_json.insert_object(

data/lib/fog/storage/google_json/requests/put_object_acl.rb

@@ -15,7 +15,7 @@ module Fog
           raise ArgumentError.new("object_name is required") unless object_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(acl)
+          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(**acl)
 
           @storage_json.insert_object_access_control(
             bucket_name, object_name, acl_object

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

@@ -19,7 +19,11 @@ module Fog
 
         def host_path_query(params, expires)
           params[:headers]["Date"] = expires.to_i
-          params[:path] = URI.encode(params[:path]).gsub("%2F", "/")
+          # implementation from CGI.escape, but without ' ' to  '+' conversion
+          params[:path] = params[:path].b.gsub(/([^a-zA-Z0-9_.\-~]+)/) { |m|
+            '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+          }.gsub("%2F", "/")
+
           query = []
 
           if params[:query]

data/lib/fog/storage/google_xml/models/file.rb

@@ -51,7 +51,7 @@ module Fog
 
         remove_method :metadata
         def metadata
-          attributes.reject { |key, _value| key.to_s =~ /^x-goog-meta-/ }
+          attributes.select { |key, _value| key.to_s =~ /^x-goog-meta-/ }
         end
 
         remove_method :metadata=
@@ -109,7 +109,7 @@ module Fog
           options["Expires"] = expires if expires
           options.merge!(metadata)
 
-          data = service.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, **options)
           merge_attributes(data.headers.reject { |key, _value| ["Content-Length", "Content-Type"].include?(key) })
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)

data/tasks/changelog.rake

@@ -25,13 +25,15 @@ end
 
 # Extracts all github users contributed since last tag
 def users_since_last_tag
-  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%s" | cut -d' ' -f 6 | cut -d/ -f1 | uniq`
+  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%s" | cut -d' ' -f 6 | cut -d/ -f1 | sort | uniq`
 end
 
 namespace :changelog do
   task :generate do
     insert_after_line("CHANGELOG.md", changes_since_last_tag, /^## Next/)
-    printf("Users contributed since last release:\n")
-    printf(users_since_last_tag)
+    contributors = users_since_last_tag.split("\n").map { |name| "@" + name }
+    printf("Huge thanks to all our contributors 🎆\n")
+    printf("Special thanks to: " + contributors.join(" ") + "\n")
+    printf("\nI'll merge this and release the gem once all tests pass.\n")
   end
 end

data/test/integration/monitoring/test_metric_descriptors.rb

@@ -68,7 +68,7 @@ class TestMetricDescriptors < FogIntegrationTest
       :labels => [label]
     }
 
-    created = @client.create_metric_descriptor(options)
+    created = @client.create_metric_descriptor(**options)
 
     # Check created metric descriptor
     assert_equal(_full_name(metric_type), created.name)

data/test/integration/storage/storage_shared.rb

@@ -86,9 +86,14 @@ class StorageShared < FogIntegrationTest
     "hello world"
   end
 
-  def some_temp_file
+  def binary_file_content
+    "PK\x03\x04\x14\x00\x00\x00\b\x00\x18\x89\x8AM\xE7!\xB7\x1C\x1C\x15j\x00\xB4\xB9".force_encoding(Encoding::ASCII_8BIT)
+  end
+
+  def some_temp_file(content = temp_file_content)
     @some_temp_file ||= Tempfile.new("fog-google-storage").tap do |t|
-      t.write(temp_file_content)
+      t.binmode
+      t.write(content)
       t.close
     end
     File.open(@some_temp_file.path, "r")