Merge pull request #164 from kashira202111/kashira/fix_bug_about_gcs_…

…client Fix `gcs_client` in order to load data using `gcs_bucket` parameter
embulk · Jul 21, 2024 · c197ecf · c197ecf
2 parents b20fc4e + 2c1c9f6
commit c197ecf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/embulk/output/bigquery/gcs_client.rb b/lib/embulk/output/bigquery/gcs_client.rb
@@ -48,7 +48,7 @@ def insert_temporary_bucket(bucket = nil)
             opts = {}
 
             Embulk.logger.debug { "embulk-output-bigquery: insert_temporary_bucket(#{@project}, #{body}, #{opts})" }
-            with_network_retry { client.insert_bucket(@project, body, opts) }
+            with_network_retry { client.insert_bucket(@project, body, **opts) }
           rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
             if e.status_code == 409 && /conflict:/ =~ e.message
               # ignore 'Already Exists' error
@@ -81,7 +81,7 @@ def insert_object(path, object: nil, bucket: nil)
 
             Embulk.logger.debug { "embulk-output-bigquery: insert_object(#{bucket}, #{body}, #{opts})" }
             # memo: gcs is strongly consistent for insert (read-after-write). ref: https://cloud.google.com/storage/docs/consistency
-            with_network_retry { client.insert_object(bucket, body, opts) }
+            with_network_retry { client.insert_object(bucket, body, **opts) }
           rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
             response = {status_code: e.status_code, message: e.message, error_class: e.class}
             Embulk.logger.error {
@@ -114,7 +114,7 @@ def delete_object(object, bucket: nil)
             opts = {}
 
             Embulk.logger.debug { "embulk-output-bigquery: delete_object(#{bucket}, #{object}, #{opts})" }
-            response = with_network_retry { client.delete_object(bucket, object, opts) }
+            response = with_network_retry { client.delete_object(bucket, object, **opts) }
           rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
             if e.status_code == 404 # ignore 'notFound' error
               return nil