google-cloud-dataproc-v1 0.6.0 → 0.7.0

data/lib/google/cloud/dataproc/v1/batch_controller/paths.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Auto-generated by gapic-generator-ruby. DO NOT EDIT!
+
+
+module Google
+  module Cloud
+    module Dataproc
+      module V1
+        module BatchController
+          # Path helper methods for the BatchController API.
+          module Paths
+            ##
+            # Create a fully-qualified Batch resource string.
+            #
+            # The resource will be in the following format:
+            #
+            # `projects/{project}/locations/{location}/batches/{batch}`
+            #
+            # @param project [String]
+            # @param location [String]
+            # @param batch [String]
+            #
+            # @return [::String]
+            def batch_path project:, location:, batch:
+              raise ::ArgumentError, "project cannot contain /" if project.to_s.include? "/"
+              raise ::ArgumentError, "location cannot contain /" if location.to_s.include? "/"
+
+              "projects/#{project}/locations/#{location}/batches/#{batch}"
+            end
+
+            ##
+            # Create a fully-qualified Location resource string.
+            #
+            # The resource will be in the following format:
+            #
+            # `projects/{project}/locations/{location}`
+            #
+            # @param project [String]
+            # @param location [String]
+            #
+            # @return [::String]
+            def location_path project:, location:
+              raise ::ArgumentError, "project cannot contain /" if project.to_s.include? "/"
+
+              "projects/#{project}/locations/#{location}"
+            end
+
+            extend self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/dataproc/v1/batch_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Auto-generated by gapic-generator-ruby. DO NOT EDIT!
+
+require "gapic/common"
+require "gapic/config"
+require "gapic/config/method"
+
+require "google/cloud/dataproc/v1/version"
+
+require "google/cloud/dataproc/v1/batch_controller/credentials"
+require "google/cloud/dataproc/v1/batch_controller/paths"
+require "google/cloud/dataproc/v1/batch_controller/operations"
+require "google/cloud/dataproc/v1/batch_controller/client"
+
+module Google
+  module Cloud
+    module Dataproc
+      module V1
+        ##
+        # The BatchController provides methods to manage batch workloads.
+        #
+        # To load this service and instantiate a client:
+        #
+        #     require "google/cloud/dataproc/v1/batch_controller"
+        #     client = ::Google::Cloud::Dataproc::V1::BatchController::Client.new
+        #
+        module BatchController
+        end
+      end
+    end
+  end
+end
+
+helper_path = ::File.join __dir__, "batch_controller", "helpers.rb"
+require "google/cloud/dataproc/v1/batch_controller/helpers" if ::File.file? helper_path

data/lib/google/cloud/dataproc/v1/batches_pb.rb

@@ -0,0 +1,123 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: google/cloud/dataproc/v1/batches.proto
+
+require 'google/api/annotations_pb'
+require 'google/api/client_pb'
+require 'google/api/field_behavior_pb'
+require 'google/api/resource_pb'
+require 'google/cloud/dataproc/v1/shared_pb'
+require 'google/longrunning/operations_pb'
+require 'google/protobuf/empty_pb'
+require 'google/protobuf/timestamp_pb'
+require 'google/protobuf'
+
+Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("google/cloud/dataproc/v1/batches.proto", :syntax => :proto3) do
+    add_message "google.cloud.dataproc.v1.CreateBatchRequest" do
+      optional :parent, :string, 1
+      optional :batch, :message, 2, "google.cloud.dataproc.v1.Batch"
+      optional :batch_id, :string, 3
+      optional :request_id, :string, 4
+    end
+    add_message "google.cloud.dataproc.v1.GetBatchRequest" do
+      optional :name, :string, 1
+    end
+    add_message "google.cloud.dataproc.v1.ListBatchesRequest" do
+      optional :parent, :string, 1
+      optional :page_size, :int32, 2
+      optional :page_token, :string, 3
+    end
+    add_message "google.cloud.dataproc.v1.ListBatchesResponse" do
+      repeated :batches, :message, 1, "google.cloud.dataproc.v1.Batch"
+      optional :next_page_token, :string, 2
+    end
+    add_message "google.cloud.dataproc.v1.DeleteBatchRequest" do
+      optional :name, :string, 1
+    end
+    add_message "google.cloud.dataproc.v1.Batch" do
+      optional :name, :string, 1
+      optional :uuid, :string, 2
+      optional :create_time, :message, 3, "google.protobuf.Timestamp"
+      optional :runtime_info, :message, 8, "google.cloud.dataproc.v1.RuntimeInfo"
+      optional :state, :enum, 9, "google.cloud.dataproc.v1.Batch.State"
+      optional :state_message, :string, 10
+      optional :state_time, :message, 11, "google.protobuf.Timestamp"
+      optional :creator, :string, 12
+      map :labels, :string, :string, 13
+      optional :runtime_config, :message, 14, "google.cloud.dataproc.v1.RuntimeConfig"
+      optional :environment_config, :message, 15, "google.cloud.dataproc.v1.EnvironmentConfig"
+      optional :operation, :string, 16
+      repeated :state_history, :message, 17, "google.cloud.dataproc.v1.Batch.StateHistory"
+      oneof :batch_config do
+        optional :pyspark_batch, :message, 4, "google.cloud.dataproc.v1.PySparkBatch"
+        optional :spark_batch, :message, 5, "google.cloud.dataproc.v1.SparkBatch"
+        optional :spark_r_batch, :message, 6, "google.cloud.dataproc.v1.SparkRBatch"
+        optional :spark_sql_batch, :message, 7, "google.cloud.dataproc.v1.SparkSqlBatch"
+      end
+    end
+    add_message "google.cloud.dataproc.v1.Batch.StateHistory" do
+      optional :state, :enum, 1, "google.cloud.dataproc.v1.Batch.State"
+      optional :state_message, :string, 2
+      optional :state_start_time, :message, 3, "google.protobuf.Timestamp"
+    end
+    add_enum "google.cloud.dataproc.v1.Batch.State" do
+      value :STATE_UNSPECIFIED, 0
+      value :PENDING, 1
+      value :RUNNING, 2
+      value :CANCELLING, 3
+      value :CANCELLED, 4
+      value :SUCCEEDED, 5
+      value :FAILED, 6
+    end
+    add_message "google.cloud.dataproc.v1.PySparkBatch" do
+      optional :main_python_file_uri, :string, 1
+      repeated :args, :string, 2
+      repeated :python_file_uris, :string, 3
+      repeated :jar_file_uris, :string, 4
+      repeated :file_uris, :string, 5
+      repeated :archive_uris, :string, 6
+    end
+    add_message "google.cloud.dataproc.v1.SparkBatch" do
+      repeated :args, :string, 3
+      repeated :jar_file_uris, :string, 4
+      repeated :file_uris, :string, 5
+      repeated :archive_uris, :string, 6
+      oneof :driver do
+        optional :main_jar_file_uri, :string, 1
+        optional :main_class, :string, 2
+      end
+    end
+    add_message "google.cloud.dataproc.v1.SparkRBatch" do
+      optional :main_r_file_uri, :string, 1
+      repeated :args, :string, 2
+      repeated :file_uris, :string, 3
+      repeated :archive_uris, :string, 4
+    end
+    add_message "google.cloud.dataproc.v1.SparkSqlBatch" do
+      optional :query_file_uri, :string, 1
+      map :query_variables, :string, :string, 2
+      repeated :jar_file_uris, :string, 3
+    end
+  end
+end
+
+module Google
+  module Cloud
+    module Dataproc
+      module V1
+        CreateBatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.CreateBatchRequest").msgclass
+        GetBatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.GetBatchRequest").msgclass
+        ListBatchesRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.ListBatchesRequest").msgclass
+        ListBatchesResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.ListBatchesResponse").msgclass
+        DeleteBatchRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.DeleteBatchRequest").msgclass
+        Batch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.Batch").msgclass
+        Batch::StateHistory = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.Batch.StateHistory").msgclass
+        Batch::State = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.Batch.State").enummodule
+        PySparkBatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.PySparkBatch").msgclass
+        SparkBatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.SparkBatch").msgclass
+        SparkRBatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.SparkRBatch").msgclass
+        SparkSqlBatch = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.dataproc.v1.SparkSqlBatch").msgclass
+      end
+    end
+  end
+end

data/lib/google/cloud/dataproc/v1/batches_services_pb.rb

@@ -0,0 +1,52 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Source: google/cloud/dataproc/v1/batches.proto for package 'google.cloud.dataproc.v1'
+# Original file comments:
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'grpc'
+require 'google/cloud/dataproc/v1/batches_pb'
+
+module Google
+  module Cloud
+    module Dataproc
+      module V1
+        module BatchController
+          # The BatchController provides methods to manage batch workloads.
+          class Service
+
+            include ::GRPC::GenericService
+
+            self.marshal_class_method = :encode
+            self.unmarshal_class_method = :decode
+            self.service_name = 'google.cloud.dataproc.v1.BatchController'
+
+            # Creates a batch workload that executes asynchronously.
+            rpc :CreateBatch, ::Google::Cloud::Dataproc::V1::CreateBatchRequest, ::Google::Longrunning::Operation
+            # Gets the batch workload resource representation.
+            rpc :GetBatch, ::Google::Cloud::Dataproc::V1::GetBatchRequest, ::Google::Cloud::Dataproc::V1::Batch
+            # Lists batch workloads.
+            rpc :ListBatches, ::Google::Cloud::Dataproc::V1::ListBatchesRequest, ::Google::Cloud::Dataproc::V1::ListBatchesResponse
+            # Deletes the batch workload resource. If the batch is not in terminal state,
+            # the delete fails and the response returns `FAILED_PRECONDITION`.
+            rpc :DeleteBatch, ::Google::Cloud::Dataproc::V1::DeleteBatchRequest, ::Google::Protobuf::Empty
+          end
+
+          Stub = Service.rpc_stub_class
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/dataproc/v1/cluster_controller/client.rb

@@ -42,13 +42,12 @@ module Google
             # See {::Google::Cloud::Dataproc::V1::ClusterController::Client::Configuration}
             # for a description of the configuration fields.
             #
-            # ## Example
+            # @example
             #
-            # To modify the configuration for all ClusterController clients:
-            #
-            #     ::Google::Cloud::Dataproc::V1::ClusterController::Client.configure do |config|
-            #       config.timeout = 10.0
-            #     end
+            #   # Modify the configuration for all ClusterController clients
+            #   ::Google::Cloud::Dataproc::V1::ClusterController::Client.configure do |config|
+            #     config.timeout = 10.0
+            #   end
             #
             # @yield [config] Configure the Client client.
             # @yieldparam config [Client::Configuration]
@@ -68,50 +67,32 @@ module Google
 
                 default_config.rpcs.create_cluster.timeout = 300.0
                 default_config.rpcs.create_cluster.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [14]
                 }
 
                 default_config.rpcs.update_cluster.timeout = 300.0
                 default_config.rpcs.update_cluster.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [14]
                 }
 
                 default_config.rpcs.delete_cluster.timeout = 300.0
                 default_config.rpcs.delete_cluster.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [14]
                 }
 
                 default_config.rpcs.get_cluster.timeout = 300.0
                 default_config.rpcs.get_cluster.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [13, 4, 14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [13, 4, 14]
                 }
 
                 default_config.rpcs.list_clusters.timeout = 300.0
                 default_config.rpcs.list_clusters.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [13, 4, 14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [13, 4, 14]
                 }
 
                 default_config.rpcs.diagnose_cluster.timeout = 300.0
                 default_config.rpcs.diagnose_cluster.retry_policy = {
-                  initial_delay: 0.1,
-              max_delay: 60.0,
-              multiplier: 1.3,
-              retry_codes: [14]
+                  initial_delay: 0.1, max_delay: 60.0, multiplier: 1.3, retry_codes: [14]
                 }
 
                 default_config
@@ -143,19 +124,15 @@ module Google
             ##
             # Create a new ClusterController client object.
             #
-            # ## Examples
-            #
-            # To create a new ClusterController client with the default
-            # configuration:
+            # @example
             #
-            #     client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new
+            #   # Create a client using the default configuration
+            #   client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new
             #
-            # To create a new ClusterController client with a custom
-            # configuration:
-            #
-            #     client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new do |config|
-            #       config.timeout = 10.0
-            #     end
+            #   # Create a client using a custom configuration
+            #   client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new do |config|
+            #     config.timeout = 10.0
+            #   end
             #
             # @yield [config] Configure the ClusterController client.
             # @yieldparam config [Client::Configuration]
@@ -175,14 +152,13 @@ module Google
 
               # Create credentials
               credentials = @config.credentials
-              # Use self-signed JWT if the scope and endpoint are unchanged from default,
+              # Use self-signed JWT if the endpoint is unchanged from default,
               # but only if the default endpoint does not have a region prefix.
-              enable_self_signed_jwt = @config.scope == Client.configure.scope &&
-                                       @config.endpoint == Client.configure.endpoint &&
+              enable_self_signed_jwt = @config.endpoint == Client.configure.endpoint &&
                                        !@config.endpoint.split(".").first.include?("-")
               credentials ||= Credentials.default scope: @config.scope,
                                                   enable_self_signed_jwt: enable_self_signed_jwt
-              if credentials.is_a?(String) || credentials.is_a?(Hash)
+              if credentials.is_a?(::String) || credentials.is_a?(::Hash)
                 credentials = Credentials.new credentials, scope: @config.scope
               end
               @quota_project_id = @config.quota_project
@@ -226,7 +202,7 @@ module Google
             #   @param options [::Gapic::CallOptions, ::Hash]
             #     Overrides the default settings for this call, e.g, timeout, retries, etc. Optional.
             #
-            # @overload create_cluster(project_id: nil, region: nil, cluster: nil, request_id: nil)
+            # @overload create_cluster(project_id: nil, region: nil, cluster: nil, request_id: nil, action_on_failed_primary_workers: nil)
             #   Pass arguments to `create_cluster` via keyword arguments. Note that at
             #   least one keyword argument is required. To specify no parameters, or to keep all
             #   the default parameter values, pass an empty Hash as a request object (see above).
@@ -239,7 +215,7 @@ module Google
             #   @param cluster [::Google::Cloud::Dataproc::V1::Cluster, ::Hash]
             #     Required. The cluster to create.
             #   @param request_id [::String]
-            #     Optional. A unique id used to identify the request. If the server receives two
+            #     Optional. A unique ID used to identify the request. If the server receives two
             #     [CreateClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.CreateClusterRequest)s
             #     with the same id, then the second request will be ignored and the
             #     first {::Google::Longrunning::Operation google.longrunning.Operation} created and stored in the backend
@@ -248,8 +224,10 @@ module Google
             #     It is recommended to always set this value to a
             #     [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
             #
-            #     The id must contain only letters (a-z, A-Z), numbers (0-9),
+            #     The ID must contain only letters (a-z, A-Z), numbers (0-9),
             #     underscores (_), and hyphens (-). The maximum length is 40 characters.
+            #   @param action_on_failed_primary_workers [::Google::Cloud::Dataproc::V1::FailureAction]
+            #     Optional. Failure action when primary worker creation fails.
             #
             # @yield [response, operation] Access the result along with the RPC operation
             # @yieldparam response [::Gapic::Operation]
@@ -286,7 +264,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.create_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.create_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :create_cluster, request, options: options do |response, operation|
@@ -302,6 +282,8 @@ module Google
             # Updates a cluster in a project. The returned
             # {::Google::Longrunning::Operation#metadata Operation.metadata} will be
             # [ClusterOperationMetadata](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#clusteroperationmetadata).
+            # The cluster must be in a {::Google::Cloud::Dataproc::V1::ClusterStatus::State `RUNNING`} state or an error
+            # is returned.
             #
             # @overload update_cluster(request, options = nil)
             #   Pass arguments to `update_cluster` via a request object, either of type
@@ -390,7 +372,7 @@ module Google
             #      </tbody>
             #      </table>
             #   @param request_id [::String]
-            #     Optional. A unique id used to identify the request. If the server
+            #     Optional. A unique ID used to identify the request. If the server
             #     receives two
             #     [UpdateClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.UpdateClusterRequest)s
             #     with the same id, then the second request will be ignored and the
@@ -400,7 +382,7 @@ module Google
             #     It is recommended to always set this value to a
             #     [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
             #
-            #     The id must contain only letters (a-z, A-Z), numbers (0-9),
+            #     The ID must contain only letters (a-z, A-Z), numbers (0-9),
             #     underscores (_), and hyphens (-). The maximum length is 40 characters.
             #
             # @yield [response, operation] Access the result along with the RPC operation
@@ -439,7 +421,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.update_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.update_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :update_cluster, request, options: options do |response, operation|
@@ -480,7 +464,7 @@ module Google
             #     Optional. Specifying the `cluster_uuid` means the RPC will fail
             #     (with error NOT_FOUND) if a cluster with the specified UUID does not exist.
             #   @param request_id [::String]
-            #     Optional. A unique id used to identify the request. If the server
+            #     Optional. A unique ID used to identify the request. If the server
             #     receives two
             #     [StopClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.StopClusterRequest)s
             #     with the same id, then the second request will be ignored and the
@@ -490,7 +474,7 @@ module Google
             #     Recommendation: Set this value to a
             #     [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
             #
-            #     The id must contain only letters (a-z, A-Z), numbers (0-9),
+            #     The ID must contain only letters (a-z, A-Z), numbers (0-9),
             #     underscores (_), and hyphens (-). The maximum length is 40 characters.
             #
             # @yield [response, operation] Access the result along with the RPC operation
@@ -529,7 +513,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.stop_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.stop_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :stop_cluster, request, options: options do |response, operation|
@@ -570,7 +556,7 @@ module Google
             #     Optional. Specifying the `cluster_uuid` means the RPC will fail
             #     (with error NOT_FOUND) if a cluster with the specified UUID does not exist.
             #   @param request_id [::String]
-            #     Optional. A unique id used to identify the request. If the server
+            #     Optional. A unique ID used to identify the request. If the server
             #     receives two
             #     [StartClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.StartClusterRequest)s
             #     with the same id, then the second request will be ignored and the
@@ -580,7 +566,7 @@ module Google
             #     Recommendation: Set this value to a
             #     [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
             #
-            #     The id must contain only letters (a-z, A-Z), numbers (0-9),
+            #     The ID must contain only letters (a-z, A-Z), numbers (0-9),
             #     underscores (_), and hyphens (-). The maximum length is 40 characters.
             #
             # @yield [response, operation] Access the result along with the RPC operation
@@ -619,7 +605,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.start_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.start_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :start_cluster, request, options: options do |response, operation|
@@ -662,7 +650,7 @@ module Google
             #     Optional. Specifying the `cluster_uuid` means the RPC should fail
             #     (with error NOT_FOUND) if cluster with specified UUID does not exist.
             #   @param request_id [::String]
-            #     Optional. A unique id used to identify the request. If the server
+            #     Optional. A unique ID used to identify the request. If the server
             #     receives two
             #     [DeleteClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.DeleteClusterRequest)s
             #     with the same id, then the second request will be ignored and the
@@ -672,7 +660,7 @@ module Google
             #     It is recommended to always set this value to a
             #     [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier).
             #
-            #     The id must contain only letters (a-z, A-Z), numbers (0-9),
+            #     The ID must contain only letters (a-z, A-Z), numbers (0-9),
             #     underscores (_), and hyphens (-). The maximum length is 40 characters.
             #
             # @yield [response, operation] Access the result along with the RPC operation
@@ -711,7 +699,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.delete_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.delete_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :delete_cluster, request, options: options do |response, operation|
@@ -785,7 +775,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.get_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.get_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :get_cluster, request, options: options do |response, operation|
@@ -879,7 +871,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.list_clusters.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.list_clusters.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :list_clusters, request, options: options do |response, operation|
@@ -959,7 +953,9 @@ module Google
               options.apply_defaults timeout:      @config.rpcs.diagnose_cluster.timeout,
                                      metadata:     metadata,
                                      retry_policy: @config.rpcs.diagnose_cluster.retry_policy
-              options.apply_defaults metadata:     @config.metadata,
+
+              options.apply_defaults timeout:      @config.timeout,
+                                     metadata:     @config.metadata,
                                      retry_policy: @config.retry_policy
 
               @cluster_controller_stub.call_rpc :diagnose_cluster, request, options: options do |response, operation|
@@ -984,22 +980,21 @@ module Google
             # Configuration can be applied globally to all clients, or to a single client
             # on construction.
             #
-            # # Examples
-            #
-            # To modify the global config, setting the timeout for create_cluster
-            # to 20 seconds, and all remaining timeouts to 10 seconds:
-            #
-            #     ::Google::Cloud::Dataproc::V1::ClusterController::Client.configure do |config|
-            #       config.timeout = 10.0
-            #       config.rpcs.create_cluster.timeout = 20.0
-            #     end
-            #
-            # To apply the above configuration only to a new client:
-            #
-            #     client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new do |config|
-            #       config.timeout = 10.0
-            #       config.rpcs.create_cluster.timeout = 20.0
-            #     end
+            # @example
+            #
+            #   # Modify the global config, setting the timeout for
+            #   # create_cluster to 20 seconds,
+            #   # and all remaining timeouts to 10 seconds.
+            #   ::Google::Cloud::Dataproc::V1::ClusterController::Client.configure do |config|
+            #     config.timeout = 10.0
+            #     config.rpcs.create_cluster.timeout = 20.0
+            #   end
+            #
+            #   # Apply the above configuration only to a new client.
+            #   client = ::Google::Cloud::Dataproc::V1::ClusterController::Client.new do |config|
+            #     config.timeout = 10.0
+            #     config.rpcs.create_cluster.timeout = 20.0
+            #   end
             #
             # @!attribute [rw] endpoint
             #   The hostname or hostname:port of the service endpoint.