Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8a251f5

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: Enable REST transport for most of Java and Go clients
PiperOrigin-RevId: 456641589
1 parent 49de8b0 commit 8a251f5

File tree

273 files changed

+2317
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+2317
-520
lines changed

‎BUILD.bazel‎

Lines changed: 774 additions & 0 deletions
Large diffs are not rendered by default.

‎WORKSPACE‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ rules_proto_dependencies()
7272

7373
rules_proto_toolchains()
7474

75-
7675
##############################################################################
7776
# Go
7877
##############################################################################
@@ -116,21 +115,21 @@ _gapic_generator_go_version = "0.31.0"
116115

117116
http_archive(
118117
name = "com_googleapis_gapic_generator_go",
119-
strip_prefix = "gapic-generator-go-%s" % _gapic_generator_go_version,
120-
urls = ["https://github.com/googleapis/gapic-generator-go/archive/v%s.tar.gz" % _gapic_generator_go_version],
121118
repo_mapping = {
122-
"@go_googleapis": "@com_google_googleapis",
119+
"@go_googleapis": "@com_google_googleapis",
123120
},
121+
strip_prefix = "gapic-generator-go-%s" % _gapic_generator_go_version,
122+
urls = ["https://github.com/googleapis/gapic-generator-go/archive/v%s.tar.gz" % _gapic_generator_go_version],
124123
)
125124

126125
load("@com_googleapis_gapic_generator_go//:repositories.bzl", "com_googleapis_gapic_generator_go_repositories")
127126

128127
com_googleapis_gapic_generator_go_repositories()
129128

130129
# rules_gapic also depends on rules_go, so it must come after our own dependency on rules_go.
131-
_rules_gapic_version = "0.13.0"
130+
_rules_gapic_version = "0.14.1"
132131

133-
_rules_gapic_sha256 = "1ebbd74b064697f4ff01d8f59764ba8431d52673f48f636be6b135b6da640b8e"
132+
_rules_gapic_sha256 = "8483dfe3def57fb6549167dfc9792cdb878af2d521340fc50f094050a7a4180d"
134133

135134
http_archive(
136135
name = "rules_gapic",
@@ -192,12 +191,13 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS")
192191
# dependencies through maven_install.
193192
# https://github.com/protocolbuffers/protobuf/issues/9132
194193
RULES_JVM_EXTERNAL_TAG = "4.2"
194+
195195
RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
196196

197197
http_archive(
198198
name = "rules_jvm_external",
199-
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
200199
sha256 = RULES_JVM_EXTERNAL_SHA,
200+
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
201201
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
202202
)
203203

@@ -343,6 +343,7 @@ gapic_generator_php_repositories()
343343

344344
# Required to access the C#-specific common resources config.
345345
_gax_dotnet_version = "Google.Api.Gax-3.3.0"
346+
346347
_gax_dotnet_sha256 = "c4d31345a226987e8551cb81afa685c9322d3f806077d9f02011676cf00c15d9"
347348

348349
http_archive(
@@ -354,6 +355,7 @@ http_archive(
354355
)
355356

356357
_gapic_generator_csharp_version = "1.4.2"
358+
357359
_gapic_generator_csharp_sha256 = "8141912164b242dfa25d7b10118faac68ce04b209112170057da7b95962a15c6"
358360

359361
http_archive(
@@ -364,27 +366,29 @@ http_archive(
364366
)
365367

366368
load("@gapic_generator_csharp//:repositories.bzl", "gapic_generator_csharp_repositories")
367-
gapic_generator_csharp_repositories()
368369

370+
gapic_generator_csharp_repositories()
369371

370372
# Version of C# generator targeting GAX v3. This is present so that teams that
371373
# do not want to move immediately to GAX v4 when it comes out (e.g. Ads) are
372374
# able to stick with the GAX-v3-based generator.
373375

374376
_gapic_generator_csharp_gax_v3_version = "1.3.19"
377+
375378
_gapic_generator_csharp_gax_v3_sha256 = "0e624db75f11a4d8ca1f8cc5c619c143be312aef892f76fc94695f9723a9c1e9"
376379

377380
http_archive(
378381
name = "gapic_generator_csharp_gax_v3",
379-
sha256 = _gapic_generator_csharp_gax_v3_sha256,
380-
strip_prefix = "gapic-generator-csharp-%s" % _gapic_generator_csharp_gax_v3_version,
381-
urls = ["https://github.com/googleapis/gapic-generator-csharp/archive/refs/tags/v%s.tar.gz" % _gapic_generator_csharp_gax_v3_version],
382382
repo_mapping = {
383383
"@gapic_generator_restore": "@gapic_generator_restore_gax_v3",
384384
},
385+
sha256 = _gapic_generator_csharp_gax_v3_sha256,
386+
strip_prefix = "gapic-generator-csharp-%s" % _gapic_generator_csharp_gax_v3_version,
387+
urls = ["https://github.com/googleapis/gapic-generator-csharp/archive/refs/tags/v%s.tar.gz" % _gapic_generator_csharp_gax_v3_version],
385388
)
386389

387390
load("@gapic_generator_csharp_gax_v3//:repositories.bzl", gapic_generator_csharp_repositories_gax_v3 = "gapic_generator_csharp_repositories")
391+
388392
gapic_generator_csharp_repositories_gax_v3(gapic_generator_suffix = "_gax_v3")
389393

390394
##############################################################################

‎google/ads/admob/v1/BUILD.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ java_gapic_library(
7171
],
7272
gapic_yaml = "admob_gapic.yaml",
7373
grpc_service_config = "//google/ads/admob:admob_grpc_service_config.json",
74-
transport = "rest",
7574
test_deps = [
7675
":admob_java_grpc",
7776
],
77+
transport = "rest",
7878
deps = [
7979
":admob_java_proto",
8080
],
@@ -91,7 +91,7 @@ java_gapic_test(
9191
# Open Source Packages
9292
java_gapic_assembly_gradle_pkg(
9393
name = "google-ads-admob-v1-java",
94-
transport = "rest",
94+
transport = "grpc+rest",
9595
deps = [
9696
":admob_java_gapic",
9797
":admob_java_grpc",
@@ -128,6 +128,7 @@ go_gapic_library(
128128
grpc_service_config = None,
129129
importpath = "google.golang.org/google/ads/admob/v1;admob",
130130
service_yaml = "//google/ads/admob:admob_v1.yaml",
131+
transport = "grpc+rest",
131132
deps = [
132133
":admob_go_proto",
133134
],

‎google/analytics/admin/v1alpha/BUILD.bazel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ java_gapic_library(
8383
java_gapic_test(
8484
name = "admin_java_gapic_test_suite",
8585
test_classes = [
86-
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientTest",
8786
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientHttpJsonTest",
87+
"com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClientTest",
8888
],
8989
runtime_deps = [":admin_java_gapic_test"],
9090
)
@@ -128,6 +128,7 @@ go_gapic_library(
128128
grpc_service_config = "admin_grpc_service_config.json",
129129
importpath = "google.golang.org/google/analytics/admin/v1alpha;admin",
130130
service_yaml = "analyticsadmin_v1alpha.yaml",
131+
transport = "grpc+rest",
131132
deps = [
132133
":admin_go_proto",
133134
],

‎google/analytics/data/v1alpha/BUILD.bazel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ java_gapic_library(
8181
java_gapic_test(
8282
name = "data_java_gapic_test_suite",
8383
test_classes = [
84-
"com.google.analytics.data.v1alpha.AlphaAnalyticsDataClientTest",
8584
"com.google.analytics.data.v1alpha.AlphaAnalyticsDataClientHttpJsonTest",
85+
"com.google.analytics.data.v1alpha.AlphaAnalyticsDataClientTest",
8686
],
8787
runtime_deps = [":data_java_gapic_test"],
8888
)
@@ -127,6 +127,7 @@ go_gapic_library(
127127
importpath = "google.golang.org/google/analytics/data/v1alpha;data",
128128
metadata = True,
129129
service_yaml = "analyticsdata_v1alpha.yaml",
130+
transport = "grpc+rest",
130131
deps = [
131132
":data_go_proto",
132133
"@io_bazel_rules_go//proto/wkt:duration_go_proto",

‎google/analytics/data/v1beta/BUILD.bazel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ java_gapic_library(
7979
java_gapic_test(
8080
name = "data_java_gapic_test_suite",
8181
test_classes = [
82-
"com.google.analytics.data.v1beta.BetaAnalyticsDataClientTest",
8382
"com.google.analytics.data.v1beta.BetaAnalyticsDataClientHttpJsonTest",
83+
"com.google.analytics.data.v1beta.BetaAnalyticsDataClientTest",
8484
],
8585
runtime_deps = [":data_java_gapic_test"],
8686
)
@@ -125,6 +125,7 @@ go_gapic_library(
125125
importpath = "google.golang.org/google/analytics/data/v1beta;data",
126126
metadata = True,
127127
service_yaml = "analyticsdata_v1beta.yaml",
128+
transport = "grpc+rest",
128129
deps = [
129130
":data_go_proto",
130131
],

‎google/api/BUILD.bazel‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,17 @@ proto_library(
244244
proto_library(
245245
name = "visibility_proto",
246246
srcs = ["visibility.proto"],
247-
deps = ["@com_google_protobuf//:descriptor_proto"],
248247
visibility = ["//visibility:public"],
248+
deps = ["@com_google_protobuf//:descriptor_proto"],
249249
)
250250

251251
##############################################################################
252252
# Java
253253
##############################################################################
254-
load("@com_google_googleapis_imports//:imports.bzl",
255-
"java_proto_library",
256-
"java_gapic_assembly_gradle_pkg"
254+
load(
255+
"@com_google_googleapis_imports//:imports.bzl",
256+
"java_gapic_assembly_gradle_pkg",
257+
"java_proto_library",
257258
)
258259

259260
java_proto_library(
@@ -298,8 +299,8 @@ java_proto_library(
298299
# Open Source Packages
299300
java_gapic_assembly_gradle_pkg(
300301
name = "google-api-java",
302+
transport = "grpc+rest",
301303
deps = [
302-
":api_java_proto",
303304
"annotations_proto",
304305
"auth_proto",
305306
"backend_proto",
@@ -331,6 +332,7 @@ java_gapic_assembly_gradle_pkg(
331332
"system_parameter_proto",
332333
"usage_proto",
333334
"visibility_proto",
335+
":api_java_proto",
334336
],
335337
)
336338

‎google/api/servicecontrol/v1/BUILD.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ java_gapic_library(
9090
java_gapic_test(
9191
name = "servicecontrol_java_gapic_test_suite",
9292
test_classes = [
93-
"com.google.api.servicecontrol.v1.QuotaControllerClientTest",
94-
"com.google.api.servicecontrol.v1.ServiceControllerClientTest",
9593
"com.google.api.servicecontrol.v1.QuotaControllerClientHttpJsonTest",
94+
"com.google.api.servicecontrol.v1.QuotaControllerClientTest",
9695
"com.google.api.servicecontrol.v1.ServiceControllerClientHttpJsonTest",
96+
"com.google.api.servicecontrol.v1.ServiceControllerClientTest",
9797
],
9898
runtime_deps = [":servicecontrol_java_gapic_test"],
9999
)
@@ -141,6 +141,7 @@ go_gapic_library(
141141
importpath = "cloud.google.com/go/api/servicecontrol/apiv1;servicecontrol",
142142
metadata = True,
143143
service_yaml = "servicecontrol.yaml",
144+
transport = "grpc+rest",
144145
deps = [
145146
":servicecontrol_go_proto",
146147
"@io_bazel_rules_go//proto/wkt:duration_go_proto",

‎google/api/servicecontrol/v2/BUILD.bazel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ java_gapic_library(
8282
java_gapic_test(
8383
name = "servicecontrol_java_gapic_test_suite",
8484
test_classes = [
85-
"com.google.api.servicecontrol.v2.ServiceControllerClientTest",
8685
"com.google.api.servicecontrol.v2.ServiceControllerClientHttpJsonTest",
86+
"com.google.api.servicecontrol.v2.ServiceControllerClientTest",
8787
],
8888
runtime_deps = [":servicecontrol_java_gapic_test"],
8989
)
@@ -130,6 +130,7 @@ go_gapic_library(
130130
importpath = "cloud.google.com/go/api/servicecontrol/apiv2;servicecontrol",
131131
metadata = True,
132132
service_yaml = "servicecontrol.yaml",
133+
transport = "grpc+rest",
133134
deps = [
134135
":servicecontrol_go_proto",
135136
],

‎google/api/servicemanagement/v1/BUILD.bazel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ java_gapic_library(
8686
java_gapic_test(
8787
name = "servicemanagement_java_gapic_test_suite",
8888
test_classes = [
89-
"com.google.cloud.api.servicemanagement.v1.ServiceManagerClientTest",
9089
"com.google.cloud.api.servicemanagement.v1.ServiceManagerClientHttpJsonTest",
90+
"com.google.cloud.api.servicemanagement.v1.ServiceManagerClientTest",
9191
],
9292
runtime_deps = [":servicemanagement_java_gapic_test"],
9393
)
@@ -135,6 +135,7 @@ go_gapic_library(
135135
importpath = "cloud.google.com/go/api/servicemanagement/apiv1;servicemanagement",
136136
metadata = True,
137137
service_yaml = "servicemanagement_v1.yaml",
138+
transport = "grpc+rest",
138139
deps = [
139140
":servicemanagement_go_proto",
140141
"//google/api:serviceconfig_go_proto",

0 commit comments

Comments
 (0)