google-cloud-storage 1.36.2 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c20986682a3f95c8fbea7f0132f5196d35f7978ba2b873530332a9709d3316c
-  data.tar.gz: 14de14960774f46eeaf07bbf9d8188228441dfdd8cb7b2c9a3649869f0909258
+  metadata.gz: 7377748053d6da28b196231e893002e4d80849cf558b5e983003926c19526a6c
+  data.tar.gz: b00e59073ea7230b4b654de40e6323766d6e36a562d765ad2545c8d154b16d2d
 SHA512:
-  metadata.gz: 95d9b766685011b4421ff24fb2ceaa8aa42a8c89e9ad12aab6ca3e496bf01788ef9bd191554acefa9e9d2be0154292fd56d78953bf731446b65a20c97cc3ee51
-  data.tar.gz: b8748e786883a80b98fa77c927342656bb54ba69d8e309b2a11076bde8667671b2f0398abf694b49538761aa4bad08f5b59c4d39a38923f3afd1695f385a8e1c
+  metadata.gz: 65b18a6857817dd24246d287c3e51cabfb2ec61fffda26f3fc00462fd030e60c506a893ccc86a14cfc1034d882c6d488b5220e744ee2fe3316d55271c9fdaadc
+  data.tar.gz: fede3f8da08220a89dc1642fd1937cc75ea6b57ee9d210bd8a8dc4efcb5c11ff5dab0d2962c7c25f383cda4e9aa548fe8764c0ec06867abf46ca91d7fbbd33e3

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 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
+
+* support OLM Prefix/Suffix ([#18190](https://github.com/googleapis/google-cloud-ruby/issues/18190)) 
+* allow retry options to be configurable on client initialization ([#18332](https://github.com/googleapis/google-cloud-ruby/issues/18332)) 
+#### Bug Fixes
+
+* update object path parsing to handle hashes in them 
+
 ### 1.36.2 (2022-04-20)
 
 #### Documentation

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

@@ -53,6 +53,8 @@ module Google
         #   rule.storage_class #=> "COLDLINE"
         #   rule.age #=> 10
         #   rule.matches_storage_class #=> ["STANDARD", "NEARLINE"]
+        #   rule.matches_prefix #=> ["myprefix/foo"]
+        #   rule.matches_suffix #=> [".jpg", ".png"]
         #
         # @example Updating the bucket's lifecycle management rules in a block.
         #   require "google/cloud/storage"
@@ -138,6 +140,12 @@ module Google
           #   files. If the value is N, this condition is satisfied when there
           #   are at least N versions (including the live version) newer than
           #   this version of the file.
+          # @param [Array<String,Symbol>] matches_prefix
+          #  Files having their name with the specified list of prefixs will be matched.
+          #  Arguments will be converted from symbols to strings.
+          # @param [Array<String,Symbol>] matches_suffix
+          #  Files having their name with the specified list of suffixes will be matched.
+          #  Arguments will be converted from symbols to strings.
           #
           # @example
           #   require "google/cloud/storage"
@@ -157,7 +165,9 @@ module Google
                                          is_live: nil,
                                          matches_storage_class: nil,
                                          noncurrent_time_before: nil,
-                                         num_newer_versions: nil
+                                         num_newer_versions: nil,
+                                         matches_prefix: nil,
+                                         matches_suffix: nil
             push Rule.new(
               "SetStorageClass",
               storage_class: storage_class_for(storage_class),
@@ -169,12 +179,14 @@ module Google
               is_live: is_live,
               matches_storage_class: storage_class_for(matches_storage_class),
               noncurrent_time_before: noncurrent_time_before,
-              num_newer_versions: num_newer_versions
+              num_newer_versions: num_newer_versions,
+              matches_prefix: Array(matches_prefix),
+              matches_suffix: Array(matches_suffix)
             )
           end
 
           ##
-          # Adds a SetStorageClass lifecycle rule to the Object Lifecycle
+          # Adds a Delete lifecycle rule to the Object Lifecycle
           # Management rules for a bucket.
           #
           # @see https://cloud.google.com/storage/docs/lifecycle Object
@@ -221,6 +233,12 @@ module Google
           #   files. If the value is N, this condition is satisfied when there
           #   are at least N versions (including the live version) newer than
           #   this version of the file.
+          # @param [Array<String,Symbol>] matches_prefix
+          #  Files having their name with the specified list of prefixs will be matched.
+          #  Arguments will be converted from symbols to strings.
+          # @param [Array<String,Symbol>] matches_suffix
+          #  Files having their name with the specified list of suffixes will be matched.
+          #  Arguments will be converted from symbols to strings.
           #
           # @example
           #   require "google/cloud/storage"
@@ -239,7 +257,9 @@ module Google
                               is_live: nil,
                               matches_storage_class: nil,
                               noncurrent_time_before: nil,
-                              num_newer_versions: nil
+                              num_newer_versions: nil,
+                              matches_prefix: nil,
+                              matches_suffix: nil
             push Rule.new(
               "Delete",
               age: age,
@@ -250,7 +270,49 @@ module Google
               is_live: is_live,
               matches_storage_class: storage_class_for(matches_storage_class),
               noncurrent_time_before: noncurrent_time_before,
-              num_newer_versions: num_newer_versions
+              num_newer_versions: num_newer_versions,
+              matches_prefix: Array(matches_prefix),
+              matches_suffix: Array(matches_suffix)
+            )
+          end
+
+          ##
+          # Adds a AbortIncompleteMultipartUpload lifecycle rule to the Object Lifecycle
+          # Management rules for a bucket.
+          #
+          # @see https://cloud.google.com/storage/docs/lifecycle Object
+          #   Lifecycle Management
+          # @see https://cloud.google.com/storage/docs/managing-lifecycles
+          #   Managing Object Lifecycles
+          #
+          # @param [Integer] age The age of a file (in days). This condition is
+          #   satisfied when a file reaches the specified age.
+          # @param [Array<String,Symbol>] matches_prefix
+          #  Files having their name with the specified list of prefixs will be matched.
+          #  Arguments will be converted from symbols to strings.
+          # @param [Array<String,Symbol>] matches_suffix
+          #  Files having their name with the specified list of suffixes will be matched.
+          #  Arguments will be converted from symbols to strings.
+          #
+          # @example
+          #   require "google/cloud/storage"
+          #
+          #   storage = Google::Cloud::Storage.new
+          #
+          #   bucket = storage.create_bucket "my-bucket" do |b|
+          #     b.lifecycle.add_abort_incomplete_multipart_upload_rule age: 10,
+          #                                                            matches_prefix: ["images/"],
+          #                                                            matches_suffix: [".pdf"]
+          #   end
+          #
+          def add_abort_incomplete_multipart_upload_rule age: nil,
+                                                         matches_prefix: nil,
+                                                         matches_suffix: nil
+            push Rule.new(
+              "AbortIncompleteMultipartUpload",
+              age: age,
+              matches_prefix: Array(matches_prefix),
+              matches_suffix: Array(matches_suffix)
             )
           end
 
@@ -346,6 +408,8 @@ module Google
           #   rule.storage_class #=> "COLDLINE"
           #   rule.age #=> 10
           #   rule.matches_storage_class #=> ["STANDARD", "NEARLINE"]
+          #   rule.matches_prefix #=> ["myprefix/foo"]
+          #   rule.matches_suffix #=> [".jpg", ".png"]
           #
           # @example Updating the bucket's lifecycle rules in a block.
           #   require "google/cloud/storage"
@@ -382,6 +446,8 @@ module Google
             attr_accessor :matches_storage_class
             attr_accessor :noncurrent_time_before
             attr_accessor :num_newer_versions
+            attr_accessor :matches_prefix
+            attr_accessor :matches_suffix
 
             # @private
             def initialize action,
@@ -394,7 +460,9 @@ module Google
                            is_live: nil,
                            matches_storage_class: nil,
                            noncurrent_time_before: nil,
-                           num_newer_versions: nil
+                           num_newer_versions: nil,
+                           matches_prefix: nil,
+                           matches_suffix: nil
               @action = action
               @storage_class = storage_class
               @age = age
@@ -406,6 +474,8 @@ module Google
               @matches_storage_class = Array(matches_storage_class)
               @noncurrent_time_before = noncurrent_time_before
               @num_newer_versions = num_newer_versions
+              @matches_prefix = Array(matches_prefix)
+              @matches_suffix = Array(matches_suffix)
             end
 
             # @private
@@ -420,7 +490,9 @@ module Google
                 is_live,
                 matches_storage_class,
                 noncurrent_time_before,
-                num_newer_versions
+                num_newer_versions,
+                matches_prefix,
+                matches_suffix
               )
               Google::Apis::StorageV1::Bucket::Lifecycle::Rule.new(
                 action: action_gapi(action, storage_class),
@@ -445,7 +517,9 @@ module Google
                                is_live,
                                matches_storage_class,
                                noncurrent_time_before,
-                               num_newer_versions
+                               num_newer_versions,
+                               matches_prefix,
+                               matches_suffix
               Google::Apis::StorageV1::Bucket::Lifecycle::Rule::Condition.new(
                 age: age,
                 created_before: created_before,
@@ -455,7 +529,9 @@ module Google
                 is_live: is_live,
                 matches_storage_class: Array(matches_storage_class),
                 noncurrent_time_before: noncurrent_time_before,
-                num_newer_versions: num_newer_versions
+                num_newer_versions: num_newer_versions,
+                matches_prefix: Array(matches_prefix),
+                matches_suffix: Array(matches_suffix)
               )
             end
 
@@ -475,7 +551,9 @@ module Google
                 is_live: c.is_live,
                 matches_storage_class: c.matches_storage_class,
                 noncurrent_time_before: c.noncurrent_time_before,
-                num_newer_versions: c.num_newer_versions
+                num_newer_versions: c.num_newer_versions,
+                matches_prefix: c.matches_prefix,
+                matches_suffix: c.matches_suffix
               )
             end
 

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/file/signer_v2.rb

@@ -48,7 +48,7 @@ module Google
           #
           def ext_path
             path = "/#{@bucket}/#{@path}"
-            escaped = Addressable::URI.escape path
+            escaped = Addressable::URI.encode_component path, Addressable::URI::CharacterClasses::PATH
             special_var = "${filename}"
             # Restore the unencoded `${filename}` variable, if present.
             if path.include? special_var

data/lib/google/cloud/storage/file/signer_v4.rb

@@ -326,7 +326,7 @@ module Google
           #
           def post_object_ext_path
             path = "/#{@bucket_name}/#{@file_name}"
-            escaped = Addressable::URI.escape path
+            escaped = Addressable::URI.encode_component path, Addressable::URI::CharacterClasses::PATH
             special_var = "${filename}"
             # Restore the unencoded `${filename}` variable, if present.
             if path.include? special_var

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

@@ -38,9 +38,12 @@ module Google
 
         ##
         # Creates a new Service instance.
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def initialize project, credentials, retries: nil,
                        timeout: nil, open_timeout: nil, read_timeout: nil,
-                       send_timeout: nil, host: nil, quota_project: nil
+                       send_timeout: nil, host: nil, quota_project: nil,
+                       max_elapsed_time: nil, base_interval: nil, max_interval: nil,
+                       multiplier: nil
           @project = project
           @credentials = credentials
           @service = API::StorageService.new
@@ -57,9 +60,14 @@ module Google
             "gl-ruby/#{RUBY_VERSION} gccl/#{Google::Cloud::Storage::VERSION}"
           @service.request_options.header["Accept-Encoding"] = "gzip"
           @service.request_options.quota_project = quota_project if quota_project
+          @service.request_options.max_elapsed_time = max_elapsed_time if max_elapsed_time
+          @service.request_options.base_interval = base_interval if base_interval
+          @service.request_options.max_interval = max_interval if max_interval
+          @service.request_options.multiplier = multiplier if multiplier
           @service.authorization = @credentials.client if @credentials
           @service.root_url = host if host
         end
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def service
           return mocked_service if mocked_service
@@ -480,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),
@@ -766,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.36.2".freeze
+      VERSION = "1.38.0".freeze
     end
   end
 end

data/lib/google/cloud/storage.rb

@@ -55,6 +55,11 @@ module Google
       #   * `https://www.googleapis.com/auth/devstorage.full_control`
       # @param [Integer] retries Number of times to retry requests on server
       #   error. The default value is `3`. Optional.
+      # @param [Integer] max_elapsed_time Total time in seconds that requests are allowed to keep being retried.
+      # @param [Float] base_interval The initial interval in seconds between tries.
+      # @param [Integer] max_interval The maximum interval in seconds that any individual retry can reach.
+      # @param [Integer] multiplier Each successive interval grows by this factor. A multipler of 1.5 means the next
+      #                  interval will be 1.5x the current interval.
       # @param [Integer] timeout (default timeout) The max duration, in seconds, to wait before timing out. Optional.
       #    If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
       # @param [Integer] open_timeout How long, in seconds, before failed connections time out. Optional.
@@ -79,18 +84,24 @@ module Google
       #   bucket = storage.bucket "my-bucket"
       #   file = bucket.file "path/to/my-file.ext"
       #
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
       def self.new project_id: nil, credentials: nil, scope: nil, retries: nil,
                    timeout: nil, open_timeout: nil, read_timeout: nil,
-                   send_timeout: nil, endpoint: nil, project: nil, keyfile: nil
-        scope        ||= configure.scope
-        retries      ||= configure.retries
-        timeout      ||= configure.timeout
-        open_timeout ||= (configure.open_timeout || timeout)
-        read_timeout ||= (configure.read_timeout || timeout)
-        send_timeout ||= (configure.send_timeout || timeout)
-        endpoint     ||= configure.endpoint
-        credentials  ||= (keyfile || default_credentials(scope: scope))
+                   send_timeout: nil, endpoint: nil, project: nil, keyfile: nil,
+                   max_elapsed_time: nil, base_interval: nil, max_interval: nil,
+                   multiplier: nil
+        scope             ||= configure.scope
+        retries           ||= configure.retries
+        timeout           ||= configure.timeout
+        open_timeout      ||= (configure.open_timeout || timeout)
+        read_timeout      ||= (configure.read_timeout || timeout)
+        send_timeout      ||= (configure.send_timeout || timeout)
+        endpoint          ||= configure.endpoint
+        credentials       ||= (keyfile || default_credentials(scope: scope))
+        max_elapsed_time  ||= configure.max_elapsed_time
+        base_interval     ||= configure.base_interval
+        max_interval      ||= configure.max_interval
+        multiplier        ||= configure.multiplier
 
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Storage::Credentials.new credentials, scope: scope
@@ -104,11 +115,13 @@ module Google
             project_id, credentials,
             retries: retries, timeout: timeout, open_timeout: open_timeout,
             read_timeout: read_timeout, send_timeout: send_timeout,
-            host: endpoint, quota_project: configure.quota_project
+            host: endpoint, quota_project: configure.quota_project,
+            max_elapsed_time: max_elapsed_time, base_interval: base_interval,
+            max_interval: max_interval, multiplier: multiplier
           )
         )
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
 
       ##
       # Creates an unauthenticated, anonymous client for retrieving public data
@@ -116,6 +129,11 @@ module Google
       #
       # @param [Integer] retries Number of times to retry requests on server
       #   error. The default value is `3`. Optional.
+      # @param [Integer] max_elapsed_time Total time in seconds that requests are allowed to keep being retried.
+      # @param [Float] base_interval The initial interval in seconds between tries.
+      # @param [Integer] max_interval The maximum interval in seconds that any individual retry can reach.
+      # @param [Integer] multiplier Each successive interval grows by this factor. A multipler of 1.5 means the next
+      #                  interval will be 1.5x the current interval.
       # @param [Integer] timeout (default timeout) The max duration, in seconds, to wait before timing out. Optional.
       #    If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
       # @param [Integer] open_timeout How long, in seconds, before failed connections time out. Optional.
@@ -139,14 +157,18 @@ module Google
       #   downloaded.read #=> "Hello world!"
       #
       def self.anonymous retries: nil, timeout: nil, open_timeout: nil,
-                         read_timeout: nil, send_timeout: nil, endpoint: nil
+                         read_timeout: nil, send_timeout: nil, endpoint: nil,
+                         max_elapsed_time: nil, base_interval: nil, max_interval: nil,
+                         multiplier: nil
         open_timeout ||= timeout
         read_timeout ||= timeout
         send_timeout ||= timeout
         Storage::Project.new(
           Storage::Service.new(
             nil, nil, retries: retries, timeout: timeout, open_timeout: open_timeout,
-            read_timeout: read_timeout, send_timeout: send_timeout, host: endpoint
+            read_timeout: read_timeout, send_timeout: send_timeout, host: endpoint,
+            max_elapsed_time: max_elapsed_time, base_interval: base_interval,
+            max_interval: max_interval, multiplier: multiplier
           )
         )
       end
@@ -168,6 +190,13 @@ module Google
       #   the set of resources and operations that the connection can access.
       # * `retries` - (Integer) Number of times to retry requests on server
       #   error.
+      # * `max_elapsed_time` - (Integer) Total time in seconds that requests
+      #    are allowed to keep being retried.
+      # * `base_interval` - (Float) The initial interval in seconds between tries.
+      # * `max_interval` - (Integer) The maximum interval in seconds that any
+      #   individual retry can reach.
+      # * `multiplier` - (Integer) Each successive interval grows by this factor.
+      #    A multipler of 1.5 means the next interval will be 1.5x the current interval.
       # * `timeout` - (Integer) (default timeout) The max duration, in seconds, to wait before timing out.
       #       If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
       # * `open_timeout` - (Integer) How long, in seconds, before failed connections time out.

data/lib/google-cloud-storage.rb

@@ -45,8 +45,13 @@ module Google
     #   * `https://www.googleapis.com/auth/devstorage.full_control`
     # @param [Integer] retries Number of times to retry requests on server
     #   error. The default value is `3`. Optional.
+    # @param [Integer] max_elapsed_time Total time in seconds that requests are allowed to keep being retried.
+    # @param [Float] base_interval The initial interval in seconds between tries.
+    # @param [Integer] max_interval The maximum interval in seconds that any individual retry can reach.
+    # @param [Integer] multiplier Each successive interval grows by this factor. A multipler of 1.5 means the next
+    #                  interval will be 1.5x the current interval.
     # @param [Integer] timeout (default timeout) The max duration, in seconds, to wait before timing out. Optional.
-    #    If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
+    #                  If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
     # @param [Integer] open_timeout How long, in seconds, before failed connections time out. Optional.
     # @param [Integer] read_timeout How long, in seconds, before requests time out. Optional.
     # @param [Integer] send_timeout How long, in seconds, before receiving response from server times out. Optional.
@@ -68,13 +73,18 @@ module Google
     #   readonly_scope = "https://www.googleapis.com/auth/devstorage.read_only"
     #   readonly_storage = gcloud.storage scope: readonly_scope
     #
-    def storage scope: nil, retries: nil, timeout: nil, open_timeout: nil, read_timeout: nil, send_timeout: nil
+    def storage scope: nil, retries: nil, timeout: nil, open_timeout: nil, read_timeout: nil, send_timeout: nil,
+                max_elapsed_time: nil, base_interval: nil, max_interval: nil, multiplier: nil
       Google::Cloud.storage @project, @keyfile, scope: scope,
                                                 retries: (retries || @retries),
                                                 timeout: (timeout || @timeout),
                                                 open_timeout: (open_timeout || timeout),
                                                 read_timeout: (read_timeout || timeout),
-                                                send_timeout: (send_timeout || timeout)
+                                                send_timeout: (send_timeout || timeout),
+                                                max_elapsed_time: max_elapsed_time,
+                                                base_interval: base_interval,
+                                                max_interval: max_interval,
+                                                multiplier: multiplier
     end
 
     ##
@@ -100,6 +110,11 @@ module Google
     #   * `https://www.googleapis.com/auth/devstorage.full_control`
     # @param [Integer] retries Number of times to retry requests on server
     #   error. The default value is `3`. Optional.
+    # @param [Integer] max_elapsed_time Total time in seconds that requests are allowed to keep being retried.
+    # @param [Float] base_interval The initial interval in seconds between tries.
+    # @param [Integer] max_interval The maximum interval in seconds that any individual retry can reach.
+    # @param [Integer] multiplier Each successive interval grows by this factor. A multipler of 1.5 means the next
+    #                  interval will be 1.5x the current interval.
     # @param [Integer] timeout (default timeout) The max duration, in seconds, to wait before timing out. Optional.
     #    If left blank, the wait will be at most the time permitted by the underlying HTTP/RPC protocol.
     # @param [Integer] open_timeout How long, in seconds, before failed connections time out. Optional.
@@ -118,7 +133,8 @@ module Google
     #   file = bucket.file "path/to/my-file.ext"
     #
     def self.storage project_id = nil, credentials = nil, scope: nil,
-                     retries: nil, timeout: nil, open_timeout: nil, read_timeout: nil, send_timeout: nil
+                     retries: nil, timeout: nil, open_timeout: nil, read_timeout: nil, send_timeout: nil,
+                     max_elapsed_time: nil, base_interval: nil, max_interval: nil, multiplier: nil
       require "google/cloud/storage"
       Google::Cloud::Storage.new project_id: project_id,
                                  credentials: credentials,
@@ -127,12 +143,17 @@ module Google
                                  timeout: timeout,
                                  open_timeout: (open_timeout || timeout),
                                  read_timeout: (read_timeout || timeout),
-                                 send_timeout: (send_timeout || timeout)
+                                 send_timeout: (send_timeout || timeout),
+                                 max_elapsed_time: max_elapsed_time,
+                                 base_interval: base_interval,
+                                 max_interval: max_interval,
+                                 multiplier: multiplier
     end
   end
 end
 
 # Set the default storage configuration
+# rubocop:disable Metrics/BlockLength
 Google::Cloud.configure.add_config! :storage do |config|
   default_project = Google::Cloud::Config.deferred do
     ENV["STORAGE_PROJECT"]
@@ -153,6 +174,10 @@ Google::Cloud.configure.add_config! :storage do |config|
   config.add_field! :scope, nil, match: [String, Array]
   config.add_field! :quota_project, nil, match: String
   config.add_field! :retries, nil, match: Integer
+  config.add_field! :max_elapsed_time, nil, match: Integer
+  config.add_field! :base_interval, nil, match: Float
+  config.add_field! :max_interval, nil, match: Integer
+  config.add_field! :multiplier, nil, match: Integer
   config.add_field! :timeout, nil, match: Integer
   config.add_field! :open_timeout, nil, match: Integer
   config.add_field! :read_timeout, nil, match: Integer
@@ -160,3 +185,4 @@ Google::Cloud.configure.add_config! :storage do |config|
   # TODO: Remove once discovery document is updated.
   config.add_field! :endpoint, "https://storage.googleapis.com/", match: String
 end
+# rubocop:enable Metrics/BlockLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.36.2
+  version: 1.38.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 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
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Storage