google-cloud-storage 1.37.0 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4978faf0cccd7a12e58085b8a5eb44a0bdfb54446c17e5c377ef66e443a93671
-  data.tar.gz: 7487e0b96eabba4902ebc21992b651e08261523175d49c4477e820e941757be3
+  metadata.gz: 7377748053d6da28b196231e893002e4d80849cf558b5e983003926c19526a6c
+  data.tar.gz: b00e59073ea7230b4b654de40e6323766d6e36a562d765ad2545c8d154b16d2d
 SHA512:
-  metadata.gz: 7e0728273ad8a402031e43930695f11c0f908c7379a2a80c28b68f6278034f8957a47f980161aa490ffa261e16559b699eabd5526f7304176167493e8bf1b7c0
-  data.tar.gz: 3cebdabf2dbefc4f8f4a23f8c6df43b25770cda527c0fc502e7a2cd8ab9ac9cfa8a82a1fc108c28168becc6e9f9a624a5c588c5ef8657f1f83b2dfafecd9f413
+  metadata.gz: 65b18a6857817dd24246d287c3e51cabfb2ec61fffda26f3fc00462fd030e60c506a893ccc86a14cfc1034d882c6d488b5220e744ee2fe3316d55271c9fdaadc
+  data.tar.gz: fede3f8da08220a89dc1642fd1937cc75ea6b57ee9d210bd8a8dc4efcb5c11ff5dab0d2962c7c25f383cda4e9aa548fe8764c0ec06867abf46ca91d7fbbd33e3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 1.38.0 (2022-07-31)
+
+#### Features
+
+* Add support for dual region gcs buckets ([#18862](https://github.com/googleapis/google-cloud-ruby/issues/18862)) 
+
 ### 1.37.0 (2022-06-30)
 
 #### Features

data/lib/google/cloud/storage/bucket.rb

@@ -301,6 +301,20 @@ module Google
           @gapi.location_type
         end
 
+        ##
+        # Returns the list of regional locations for custom dual-region buckets.
+        #
+        # @return [String, nil] Returns nil if the property has not been set before creation,
+        # if the bucket's resource has not been loaded from the server,
+        # or if the bucket is not a dual-regions bucket.
+
+        # @see https://cloud.google.com/storage/docs/json_api/v1/buckets and
+        # https://cloud.google.com/storage/docs/locations
+        #
+        def data_locations
+          @gapi.custom_placement_config&.data_locations
+        end
+
         ##
         # The destination bucket name for the bucket's logs.
         #

data/lib/google/cloud/storage/project.rb

@@ -290,9 +290,9 @@ module Google
         #     access, and allUsers get READER access.
         # @param [String] location The location of the bucket. Optional.
         #   If not passed, the default location, 'US', will be used.
-        #   If specifying a dual-region location, the regions can be specified
-        #   by joining them with a plus sign, for example 'US-CENTRAL1+US-WEST1'. See:
-        #   [Storage Locaitons](https://cloud.google.com/storage/docs/locations).
+        #   If specifying a dual-region location, the `customPlacementConfig`
+        #   property should be set in conjunction. See:
+        #   [Storage Locations](https://cloud.google.com/storage/docs/locations).
         # @param [String] logging_bucket The destination bucket for the bucket's
         #   logs. For more information, see [Access
         #   Logs](https://cloud.google.com/storage/docs/access-logs).
@@ -367,6 +367,7 @@ module Google
                           acl: nil,
                           default_acl: nil,
                           location: nil,
+                          custom_placement_config: nil,
                           storage_class: nil,
                           logging_bucket: nil,
                           logging_prefix: nil,
@@ -377,7 +378,8 @@ module Google
                           user_project: nil
           params = {
             name: bucket_name,
-            location: location
+            location: location,
+            custom_placement_config: custom_placement_config
           }.delete_if { |_, v| v.nil? }
           new_bucket = Google::Apis::StorageV1::Bucket.new(**params)
           storage_class = storage_class_for storage_class

data/lib/google/cloud/storage/service.rb

@@ -488,7 +488,7 @@ module Google
           options = range_header options, range
 
           execute do
-            service.get_object_with_response \
+            service.get_object \
               bucket_name, file_path,
               download_dest: target_path, generation: generation,
               user_project: user_project(user_project),
@@ -774,160 +774,4 @@ module Google
       end
     end
   end
-
-  # rubocop:disable all
-
-  # @private
-  #
-  # IMPORTANT: These monkey-patches of Apis::StorageV1::StorageService and
-  # Apis::Core::DownloadCommand must be verified and updated (if needed) for
-  # every upgrade of google-api-client.
-  #
-  # The purpose of these modifications is to provide access to response headers
-  # (in particular, the Content-Encoding header) for the #download_file method,
-  # above. If google-api-client is modified to expose response headers to its
-  # clients, this code should be removed, and #download_file updated to use that
-  # solution instead.
-  #
-  module Apis
-    # @private
-    module StorageV1
-      # @private
-      class StorageService
-        # Returns a two-element array containing:
-        #   * The `result` that is the usual return type of #get_object.
-        #   * The `http_resp` from DownloadCommand#execute_once.
-        def get_object_with_response(bucket, object, generation: nil, if_generation_match: nil, if_generation_not_match: nil, if_metageneration_match: nil, if_metageneration_not_match: nil, projection: nil, user_project: nil, fields: nil, quota_user: nil, user_ip: nil, download_dest: nil, options: nil, &block)
-          if download_dest.nil?
-            command =  make_simple_command(:get, 'b/{bucket}/o/{object}', options)
-          else
-            command = make_download_command(:get, 'b/{bucket}/o/{object}', options)
-            command.download_dest = download_dest
-          end
-          command.response_representation = Google::Apis::StorageV1::Object::Representation
-          command.response_class = Google::Apis::StorageV1::Object
-          command.params['bucket'] = bucket unless bucket.nil?
-          command.params['object'] = object unless object.nil?
-          command.query['generation'] = generation unless generation.nil?
-          command.query['ifGenerationMatch'] = if_generation_match unless if_generation_match.nil?
-          command.query['ifGenerationNotMatch'] = if_generation_not_match unless if_generation_not_match.nil?
-          command.query['ifMetagenerationMatch'] = if_metageneration_match unless if_metageneration_match.nil?
-          command.query['ifMetagenerationNotMatch'] = if_metageneration_not_match unless if_metageneration_not_match.nil?
-          command.query['projection'] = projection unless projection.nil?
-          command.query['userProject'] = user_project unless user_project.nil?
-          command.query['fields'] = fields unless fields.nil?
-          command.query['quotaUser'] = quota_user unless quota_user.nil?
-          command.query['userIp'] = user_ip unless user_ip.nil?
-          execute_or_queue_command_with_response(command, &block)
-        end
-
-        # Returns a two-element array containing:
-        #   * The `result` that is the usual return type of #execute_or_queue_command.
-        #   * The `http_resp` from DownloadCommand#execute_once.
-        def execute_or_queue_command_with_response(command, &callback)
-          batch_command = current_batch
-          if batch_command
-            raise "Can not combine services in a batch" if Thread.current[:google_api_batch_service] != self
-            batch_command.add(command, &callback)
-            nil
-          else
-            command.execute_with_response(client, &callback)
-          end
-        end
-      end
-    end
-    # @private
-    module Core
-      # @private
-      # Streaming/resumable media download support
-      class DownloadCommand < ApiCommand
-        # Returns a two-element array containing:
-        #   * The `result` that is the usual return type of #execute.
-        #   * The `http_resp` from #execute_once.
-        def execute_with_response(client)
-          prepare!
-          begin
-            Retriable.retriable tries: options.retries + 1,
-                                base_interval: 1,
-                                multiplier: 2,
-                                on: RETRIABLE_ERRORS do |try|
-              # This 2nd level retriable only catches auth errors, and supports 1 retry, which allows
-              # auth to be re-attempted without having to retry all sorts of other failures like
-              # NotFound, etc
-              auth_tries = (try == 1 && authorization_refreshable? ? 2 : 1)
-              Retriable.retriable tries: auth_tries,
-                                  on: [Google::Apis::AuthorizationError, Signet::AuthorizationError],
-                                  on_retry: proc { |*| refresh_authorization } do
-                execute_once_with_response(client).tap do |result|
-                  if block_given?
-                    yield result, nil
-                  end
-                end
-              end
-            end
-          rescue => e
-            if block_given?
-              yield nil, e
-            else
-              raise e
-            end
-          end
-        ensure
-          release!
-        end
-
-        # Returns a two-element array containing:
-        #   * The `result` that is the usual return type of #execute_once.
-        #   * The `http_resp`.
-        def execute_once_with_response(client, &block)
-          request_header = header.dup
-          apply_request_options(request_header)
-          download_offset = nil
-
-          if @offset > 0
-            logger.debug { sprintf('Resuming download from offset %d', @offset) }
-            request_header[RANGE_HEADER] = sprintf('bytes=%d-', @offset)
-          end
-
-          http_res = client.get(url.to_s,
-                     query: query,
-                     header: request_header,
-                     follow_redirect: true) do |res, chunk|
-            status = res.http_header.status_code.to_i
-            next unless OK_STATUS.include?(status)
-
-            download_offset ||= (status == 206 ? @offset : 0)
-            download_offset  += chunk.bytesize
-
-            if download_offset - chunk.bytesize == @offset
-              next_chunk = chunk
-            else
-              # Oh no! Requested a chunk, but received the entire content
-              chunk_index = @offset - (download_offset - chunk.bytesize)
-              next_chunk = chunk.byteslice(chunk_index..-1)
-              next if next_chunk.nil?
-            end
-            # logger.debug { sprintf('Writing chunk (%d bytes, %d total)', chunk.length, bytes_read) }
-            @download_io.write(next_chunk)
-
-            @offset += next_chunk.bytesize
-          end
-
-          @download_io.flush
-
-          if @close_io_on_finish
-            result = nil
-          else
-            result = @download_io
-          end
-          check_status(http_res.status.to_i, http_res.header, http_res.body)
-          success([result, http_res], &block)
-        rescue => e
-          @download_io.flush
-          error(e, rethrow: true, &block)
-        end
-      end
-    end
-  end
-  # rubocop:enable all
 end

data/lib/google/cloud/storage/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "1.37.0".freeze
+      VERSION = "1.38.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.37.0
+  version: 1.38.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement