fix: migrate dataproc/v1 to grpc_service_config

PiperOrigin-RevId: 320442976
huCow · Jul 9, 2020 · ec05fa8 · ec05fa8
1 parent 979372f
commit ec05fa8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 92 deletions.
diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel
@@ -67,6 +67,7 @@ java_gapic_library(
     name = "dataproc_java_gapic",
     src = ":dataproc_proto_with_info",
     gapic_yaml = "dataproc_gapic.yaml",
+    grpc_service_config = "dataproc_grpc_service_config.json",
     package = "google.cloud.dataproc.v1",
     service_yaml = "dataproc_v1.yaml",
     test_deps = [
@@ -198,6 +199,7 @@ py_gapic_library(
     name = "dataproc_py_gapic",
     src = ":dataproc_proto_with_info",
     gapic_yaml = "dataproc_gapic.yaml",
+    grpc_service_config = "dataproc_grpc_service_config.json",
     package = "google.cloud.dataproc.v1",
     service_yaml = "dataproc_v1.yaml",
     deps = [
@@ -242,6 +244,7 @@ php_gapic_library(
     name = "dataproc_php_gapic",
     src = ":dataproc_proto_with_info",
     gapic_yaml = "dataproc_gapic.yaml",
+    grpc_service_config = "dataproc_grpc_service_config.json",
     package = "google.cloud.dataproc.v1",
     service_yaml = "dataproc_v1.yaml",
     deps = [

diff --git a/google/cloud/dataproc/v1/dataproc_gapic.yaml b/google/cloud/dataproc/v1/dataproc_gapic.yaml
@@ -17,140 +17,48 @@ language_settings:
     package_name: dataproc.v1
     domain_layer_location: google-cloud
 interfaces:
-- name: google.cloud.dataproc.v1.AutoscalingPolicyService
-  methods:
-  - name: UpdateAutoscalingPolicy
-    retry_codes_name: idempotent
 - name: google.cloud.dataproc.v1.ClusterController
   smoke_test:
     method: ListClusters
     init_fields:
     - project_id=$PROJECT_ID
     - region="global"
-  retry_codes_def:
-  - name: idempotent
-    retry_codes:
-    - INTERNAL
-    - DEADLINE_EXCEEDED
-    - UNAVAILABLE
-  - name: non_idempotent
-    retry_codes:
-    - UNAVAILABLE
-  retry_params_def:
-  - name: default
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 30000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 30000
-    total_timeout_millis: 300000
   methods:
   - name: CreateCluster
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 900000
   - name: UpdateCluster
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 900000
   - name: DeleteCluster
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 900000
-  - name: GetCluster
-    retry_codes_name: idempotent
-  - name: ListClusters
-    retry_codes_name: idempotent
   - name: DiagnoseCluster
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 30000
-- name: google.cloud.dataproc.v1.JobController
-  retry_codes_def:
-  - name: idempotent
-    retry_codes:
-    - DEADLINE_EXCEEDED
-    - INTERNAL
-    - UNAVAILABLE
-  - name: non_idempotent
-    retry_codes:
-    - UNAVAILABLE
-  retry_params_def:
-  - name: default
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 30000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 30000
-    total_timeout_millis: 900000
-  methods:
-  - name: SubmitJob
-    retry_codes_name: non_idempotent
-  - name: GetJob
-    retry_codes_name: idempotent
-  - name: ListJobs
-    retry_codes_name: idempotent
-  - name: UpdateJob
-    retry_codes_name: non_idempotent
-  - name: CancelJob
-    retry_codes_name: idempotent
-  - name: DeleteJob
-    retry_codes_name: non_idempotent
 - name: google.cloud.dataproc.v1.WorkflowTemplateService
-  retry_codes_def:
-  - name: idempotent
-    retry_codes:
-    - DEADLINE_EXCEEDED
-    - INTERNAL
-    - UNAVAILABLE
-  - name: non_idempotent
-    retry_codes:
-    - UNAVAILABLE
-  retry_params_def:
-  - name: default
-    initial_retry_delay_millis: 100
-    retry_delay_multiplier: 1.3
-    max_retry_delay_millis: 60000
-    initial_rpc_timeout_millis: 30000
-    rpc_timeout_multiplier: 1
-    max_rpc_timeout_millis: 30000
-    total_timeout_millis: 900000
   methods:
-  - name: CreateWorkflowTemplate
-    retry_codes_name: non_idempotent
-  - name: GetWorkflowTemplate
-    retry_codes_name: idempotent
   - name: InstantiateWorkflowTemplate
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 43200000
   - name: InstantiateInlineWorkflowTemplate
-    retry_codes_name: non_idempotent
     long_running:
       initial_poll_delay_millis: 1000
       poll_delay_multiplier: 2
       max_poll_delay_millis: 10000
       total_poll_timeout_millis: 43200000
-  - name: UpdateWorkflowTemplate
-    retry_codes_name: non_idempotent
-  - name: ListWorkflowTemplates
-    retry_codes_name: idempotent
-  - name: DeleteWorkflowTemplate
-    retry_codes_name: non_idempotent