Skip to content

Commit 8d6fdc7

Browse files
Google APIscopybara-github
authored andcommitted
build: configuration files update
PiperOrigin-RevId: 470047229
1 parent d1b1556 commit 8d6fdc7

5 files changed

Lines changed: 60 additions & 45 deletions

File tree

google/cloud/batch/v1/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ java_gapic_library(
7474
name = "batch_java_gapic",
7575
srcs = [":batch_proto_with_info"],
7676
gapic_yaml = None,
77-
grpc_service_config = "batch_grpc_service_config.json",
77+
grpc_service_config = "batch_v1_grpc_service_config.json",
7878
service_yaml = "batch_v1.yaml",
7979
test_deps = [
8080
":batch_java_grpc",
@@ -137,7 +137,7 @@ go_proto_library(
137137
go_gapic_library(
138138
name = "batch_go_gapic",
139139
srcs = [":batch_proto_with_info"],
140-
grpc_service_config = "batch_grpc_service_config.json",
140+
grpc_service_config = "batch_v1_grpc_service_config.json",
141141
importpath = "cloud.google.com/go/batch/apiv1;batch",
142142
metadata = True,
143143
service_yaml = "batch_v1.yaml",
@@ -184,7 +184,7 @@ load(
184184
py_gapic_library(
185185
name = "batch_py_gapic",
186186
srcs = [":batch_proto"],
187-
grpc_service_config = "batch_grpc_service_config.json",
187+
grpc_service_config = "batch_v1_grpc_service_config.json",
188188
service_yaml = "batch_v1.yaml",
189189
deps = [
190190
"//google/iam/v1:iam_policy_py_proto",
@@ -234,7 +234,7 @@ php_grpc_library(
234234
php_gapic_library(
235235
name = "batch_php_gapic",
236236
srcs = [":batch_proto_with_info"],
237-
grpc_service_config = "batch_grpc_service_config.json",
237+
grpc_service_config = "batch_v1_grpc_service_config.json",
238238
service_yaml = "batch_v1.yaml",
239239
deps = [
240240
":batch_php_grpc",
@@ -266,7 +266,7 @@ nodejs_gapic_library(
266266
package_name = "@google-cloud/batch",
267267
src = ":batch_proto_with_info",
268268
extra_protoc_parameters = ["metadata"],
269-
grpc_service_config = "batch_grpc_service_config.json",
269+
grpc_service_config = "batch_v1_grpc_service_config.json",
270270
package = "google.cloud.batch.v1",
271271
service_yaml = "batch_v1.yaml",
272272
deps = [],
@@ -310,7 +310,7 @@ ruby_cloud_gapic_library(
310310
"ruby-cloud-api-shortname=batch",
311311
"ruby-cloud-gem-name=google-cloud-batch-v1",
312312
],
313-
grpc_service_config = "batch_grpc_service_config.json",
313+
grpc_service_config = "batch_v1_grpc_service_config.json",
314314
ruby_cloud_description = "Google Cloud Batch is a fully managed service used by scientists, VFX artists, developers to easily and efficiently run batch workloads on Google Cloud. This service manages provisioning of resources to satisfy the requirements of the batch jobs for a variety of workloads including ML, HPC, VFX rendering, transcoding, genomics and others.",
315315
ruby_cloud_title = "Batch V1",
316316
service_yaml = "batch_v1.yaml",
@@ -356,7 +356,7 @@ csharp_gapic_library(
356356
name = "batch_csharp_gapic",
357357
srcs = [":batch_proto_with_info"],
358358
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
359-
grpc_service_config = "batch_grpc_service_config.json",
359+
grpc_service_config = "batch_v1_grpc_service_config.json",
360360
service_yaml = "batch_v1.yaml",
361361
deps = [
362362
":batch_csharp_grpc",

google/cloud/batch/v1/batch_grpc_service_config.json renamed to google/cloud/batch/v1/batch_v1_grpc_service_config.json

File renamed without changes.

google/cloud/batch/v1alpha/BUILD.bazel

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ proto_library_with_info(
4242
deps = [
4343
":batch_proto",
4444
"//google/cloud:common_resources_proto",
45+
"//google/cloud/location:location_proto",
46+
"//google/iam/v1:iam_policy_proto",
4547
],
4648
)
4749

@@ -72,20 +74,26 @@ java_gapic_library(
7274
name = "batch_java_gapic",
7375
srcs = [":batch_proto_with_info"],
7476
gapic_yaml = None,
75-
grpc_service_config = "batch_grpc_service_config.json",
76-
service_yaml = None,
77+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
78+
service_yaml = "batch_v1alpha.yaml",
7779
test_deps = [
7880
":batch_java_grpc",
81+
"//google/cloud/location:location_java_grpc",
82+
"//google/iam/v1:iam_java_grpc",
7983
],
84+
transport = "grpc+rest",
8085
deps = [
8186
":batch_java_proto",
8287
"//google/api:api_java_proto",
88+
"//google/cloud/location:location_java_proto",
89+
"//google/iam/v1:iam_java_proto",
8390
],
8491
)
8592

8693
java_gapic_test(
8794
name = "batch_java_gapic_test_suite",
8895
test_classes = [
96+
"com.google.cloud.batch.v1alpha.BatchServiceClientHttpJsonTest",
8997
"com.google.cloud.batch.v1alpha.BatchServiceClientTest",
9098
],
9199
runtime_deps = [":batch_java_gapic_test"],
@@ -95,6 +103,7 @@ java_gapic_test(
95103
java_gapic_assembly_gradle_pkg(
96104
name = "google-cloud-batch-v1alpha-java",
97105
include_samples = True,
106+
transport = "grpc+rest",
98107
deps = [
99108
":batch_java_gapic",
100109
":batch_java_grpc",
@@ -128,12 +137,15 @@ go_proto_library(
128137
go_gapic_library(
129138
name = "batch_go_gapic",
130139
srcs = [":batch_proto_with_info"],
131-
grpc_service_config = "batch_grpc_service_config.json",
140+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
132141
importpath = "cloud.google.com/go/batch/apiv1alpha;batch",
133142
metadata = True,
134-
service_yaml = None,
143+
service_yaml = "batch_v1alpha.yaml",
144+
transport = "grpc+rest",
135145
deps = [
136146
":batch_go_proto",
147+
"//google/cloud/location:location_go_proto",
148+
"//google/iam/v1:iam_go_proto",
137149
"//google/longrunning:longrunning_go_proto",
138150
"@com_google_cloud_go//longrunning:go_default_library",
139151
"@com_google_cloud_go//longrunning/autogen:go_default_library",
@@ -172,8 +184,11 @@ load(
172184
py_gapic_library(
173185
name = "batch_py_gapic",
174186
srcs = [":batch_proto"],
175-
grpc_service_config = "batch_grpc_service_config.json",
176-
service_yaml = None,
187+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
188+
service_yaml = "batch_v1alpha.yaml",
189+
deps = [
190+
"//google/iam/v1:iam_policy_py_proto",
191+
],
177192
)
178193

179194
py_test(
@@ -219,8 +234,8 @@ php_grpc_library(
219234
php_gapic_library(
220235
name = "batch_php_gapic",
221236
srcs = [":batch_proto_with_info"],
222-
grpc_service_config = "batch_grpc_service_config.json",
223-
service_yaml = None,
237+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
238+
service_yaml = "batch_v1alpha.yaml",
224239
deps = [
225240
":batch_php_grpc",
226241
":batch_php_proto",
@@ -251,9 +266,9 @@ nodejs_gapic_library(
251266
package_name = "@google-cloud/batch",
252267
src = ":batch_proto_with_info",
253268
extra_protoc_parameters = ["metadata"],
254-
grpc_service_config = "batch_grpc_service_config.json",
269+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
255270
package = "google.cloud.batch.v1alpha",
256-
service_yaml = None,
271+
service_yaml = "batch_v1alpha.yaml",
257272
deps = [],
258273
)
259274

@@ -295,7 +310,7 @@ ruby_cloud_gapic_library(
295310
"ruby-cloud-api-shortname=batch",
296311
"ruby-cloud-gem-name=google-cloud-batch-v1alpha",
297312
],
298-
grpc_service_config = "batch_grpc_service_config.json",
313+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
299314
ruby_cloud_description = "Google Cloud Batch is a fully managed service used by scientists, VFX artists, developers to easily and efficiently run batch workloads on Google Cloud. This service manages provisioning of resources to satisfy the requirements of the batch jobs for a variety of workloads including ML, HPC, VFX rendering, transcoding, genomics and others.",
300315
ruby_cloud_title = "Batch V1alpha",
301316
service_yaml = "batch_v1alpha.yaml",
@@ -341,8 +356,8 @@ csharp_gapic_library(
341356
name = "batch_csharp_gapic",
342357
srcs = [":batch_proto_with_info"],
343358
common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
344-
grpc_service_config = "batch_grpc_service_config.json",
345-
service_yaml = None,
359+
grpc_service_config = "batch_v1alpha_grpc_service_config.json",
360+
service_yaml = "batch_v1alpha.yaml",
346361
deps = [
347362
":batch_csharp_grpc",
348363
":batch_csharp_proto",

google/cloud/batch/v1alpha/batch_grpc_service_config.json

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"methodConfig": [{
3+
"name": [
4+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "ListJobs" },
5+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "ListTasks" },
6+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "GetJob" },
7+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "GetTask" }
8+
],
9+
"timeout": "60s",
10+
"retryPolicy": {
11+
"maxAttempts": 5,
12+
"initialBackoff": "1s",
13+
"maxBackoff": "10s",
14+
"backoffMultiplier": 1.3,
15+
"retryableStatusCodes": ["UNAVAILABLE"]
16+
}
17+
},
18+
{
19+
"name": [
20+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "CreateJob" },
21+
{ "service": "google.cloud.batch.v1alpha.BatchService", "method": "DeleteJob" }
22+
],
23+
"timeout": "60s"
24+
}]
25+
}

0 commit comments

Comments
 (0)