@@ -7,7 +7,6 @@ package(default_visibility = ["//visibility:public"])
77# Common
88##############################################################################
99load ("@rules_proto//proto:defs.bzl" , "proto_library" )
10- load ("@com_google_googleapis_imports//:imports.bzl" , "proto_library_with_info" )
1110
1211proto_library (
1312 name = "storage_proto" ,
@@ -16,33 +15,19 @@ proto_library(
1615 "storage_resources.proto" ,
1716 ],
1817 deps = [
19- "//google/api:client_proto" ,
2018 "//google/api:field_behavior_proto" ,
2119 "//google/iam/v1:iam_policy_proto" ,
22- "//google/iam/v1:policy_proto" ,
23- "@com_google_protobuf//:empty_proto" ,
2420 "@com_google_protobuf//:field_mask_proto" ,
2521 "@com_google_protobuf//:timestamp_proto" ,
2622 "@com_google_protobuf//:wrappers_proto" ,
2723 ],
2824)
2925
30- proto_library_with_info (
31- name = "storage_proto_with_info" ,
32- deps = [
33- ":storage_proto" ,
34- "//google/cloud:common_resources_proto" ,
35- ],
36- )
37-
3826##############################################################################
3927# Java
4028##############################################################################
4129load (
4230 "@com_google_googleapis_imports//:imports.bzl" ,
43- "java_gapic_assembly_gradle_pkg" ,
44- "java_gapic_library" ,
45- "java_gapic_test" ,
4631 "java_grpc_library" ,
4732 "java_proto_library" ,
4833)
@@ -58,52 +43,12 @@ java_grpc_library(
5843 deps = [":storage_java_proto" ],
5944)
6045
61- java_gapic_library (
62- name = "storage_java_gapic" ,
63- srcs = [":storage_proto_with_info" ],
64- gapic_yaml = "storage_gapic.yaml" ,
65- grpc_service_config = "storage_grpc_service_config.json" ,
66- test_deps = [
67- ":storage_java_grpc" ,
68- "//google/iam/v1:iam_java_grpc" ,
69- ],
70- transport = "grpc+rest" ,
71- deps = [
72- ":storage_java_proto" ,
73- "//google/iam/v1:iam_java_proto" ,
74- ],
75- )
76-
77- java_gapic_test (
78- name = "storage_java_gapic_test_suite" ,
79- test_classes = [
80- "com.google.cloud.google.storage.v1.StorageClientHttpJsonTest" ,
81- "com.google.cloud.google.storage.v1.StorageClientTest" ,
82- ],
83- runtime_deps = [":storage_java_gapic_test" ],
84- )
85-
86- # Open Source Packages
87- java_gapic_assembly_gradle_pkg (
88- name = "google-cloud-storage-v1-java" ,
89- transport = "grpc+rest" ,
90- deps = [
91- ":storage_java_gapic" ,
92- ":storage_java_grpc" ,
93- ":storage_java_proto" ,
94- ":storage_proto" ,
95- ],
96- )
97-
9846##############################################################################
9947# Go
10048##############################################################################
10149load (
10250 "@com_google_googleapis_imports//:imports.bzl" ,
103- "go_gapic_assembly_pkg" ,
104- "go_gapic_library" ,
10551 "go_proto_library" ,
106- "go_test" ,
10752)
10853
10954go_proto_library (
@@ -117,121 +62,58 @@ go_proto_library(
11762 ],
11863)
11964
120- go_gapic_library (
121- name = "storage_go_gapic" ,
122- srcs = [":storage_proto_with_info" ],
123- grpc_service_config = "storage_grpc_service_config.json" ,
124- importpath = "cloud.google.com/go/storage/apiv1;storage" ,
125- service_yaml = "storage_v1.yaml" ,
126- deps = [
127- ":storage_go_proto" ,
128- "//google/iam/v1:iam_go_proto" ,
129- ],
130- )
131-
132- go_test (
133- name = "storage_go_gapic_test" ,
134- srcs = [":storage_go_gapic_srcjar_test" ],
135- embed = [":storage_go_gapic" ],
136- importpath = "cloud.google.com/go/storage/apiv1" ,
137- )
138-
139- # Open Source Packages
140- go_gapic_assembly_pkg (
141- name = "gapi-cloud-storage-v1-go" ,
142- deps = [
143- ":storage_go_gapic" ,
144- ":storage_go_gapic_srcjar-test.srcjar" ,
145- ":storage_go_proto" ,
146- ],
147- )
148-
14965##############################################################################
15066# Python
15167##############################################################################
15268load (
15369 "@com_google_googleapis_imports//:imports.bzl" ,
154- "py_gapic_assembly_pkg " ,
155- "py_gapic_library " ,
156- "py_test " ,
70+ "moved_proto_library " ,
71+ "py_grpc_library " ,
72+ "py_proto_library " ,
15773)
15874
159- py_gapic_library (
160- name = "storage_py_gapic " ,
75+ moved_proto_library (
76+ name = "storage_moved_proto " ,
16177 srcs = [":storage_proto" ],
162- grpc_service_config = "storage_grpc_service_config.json" ,
16378 deps = [
164- "//google/iam/v1:iam_policy_py_proto" ,
79+ "//google/api:field_behavior_proto" ,
80+ "//google/iam/v1:iam_policy_proto" ,
81+ "@com_google_protobuf//:field_mask_proto" ,
82+ "@com_google_protobuf//:timestamp_proto" ,
83+ "@com_google_protobuf//:wrappers_proto" ,
16584 ],
16685)
16786
168- py_test (
169- name = "storage_py_gapic_test" ,
170- srcs = [
171- "storage_py_gapic_pytest.py" ,
172- "storage_py_gapic_test.py" ,
173- ],
174- legacy_create_init = False ,
175- deps = [":storage_py_gapic" ],
87+ py_proto_library (
88+ name = "storage_py_proto" ,
89+ deps = [":storage_moved_proto" ],
17690)
17791
178- # Open Source Packages
179- py_gapic_assembly_pkg (
180- name = "storage-v1-py" ,
181- deps = [
182- ":storage_py_gapic" ,
183- ],
92+ py_grpc_library (
93+ name = "storage_py_grpc" ,
94+ srcs = [":storage_moved_proto" ],
95+ deps = [":storage_py_proto" ],
18496)
18597
18698##############################################################################
18799# PHP
188100##############################################################################
189- # Note: The GCS gRPC API is launching without PHP client library support (see
190- # https://buganizer.corp.google.com/issues/118459221#comment3), but we need to
191- # generate Bazel build rules for all languages must be present else the
192- # build_gen step will fail with NPE. We further needed to comment out the
193- # PHP lines here because building PHP clients requires all RPCs in the service
194- # definitions to contain http_rule annotations.
195- #load(
196- # "@com_google_googleapis_imports//:imports.bzl",
197- # "php_gapic_assembly_pkg",
198- # "php_gapic_library",
199- # "php_grpc_library",
200- # "php_proto_library",
201- #)
202- #
203- #php_proto_library(
204- # name = "storage_php_proto",
205- # deps = [":storage_proto"],
206- #)
207- #
208- #php_grpc_library(
209- # name = "storage_php_grpc",
210- # srcs = [":storage_proto"],
211- # deps = [":storage_php_proto"],
212- #)
213- #
214- #php_gapic_library(
215- # name = "storage_php_gapic",
216- # src = ":storage_proto_with_info",
217- # gapic_yaml = "storage_gapic.yaml",
218- # package = "google.storage.v1",
219- # service_yaml = "storage_v1.yaml",
220- # deps = [
221- # ":storage_php_grpc",
222- # ":storage_php_proto",
223- # ],
224- #)
225- #
226- ## Open Source Packages
227- #php_gapic_assembly_pkg(
228- # name = "google-cloud-storage-v1-php",
229- # deps = [
230- # ":storage_php_gapic",
231- # ":storage_php_grpc",
232- # ":storage_php_proto",
233- # ],
234- #)
101+ load (
102+ "@com_google_googleapis_imports//:imports.bzl" ,
103+ "php_grpc_library" ,
104+ "php_proto_library" ,
105+ )
106+
107+ php_proto_library (
108+ name = "storage_php_proto" ,
109+ deps = [":storage_proto" ],
110+ )
111+
112+ php_grpc_library (
113+ name = "storage_php_grpc" ,
114+ srcs = [":storage_proto" ],
115+ deps = [":storage_php_proto" ],
116+ )
235117
236118##############################################################################
237119# Node.js
@@ -242,31 +124,12 @@ load(
242124 "nodejs_gapic_library" ,
243125)
244126
245- nodejs_gapic_library (
246- name = "storage_nodejs_gapic" ,
247- src = ":storage_proto_with_info" ,
248- extra_protoc_parameters = ["metadata" ],
249- grpc_service_config = "storage_grpc_service_config.json" ,
250- package = "google.storage.v1" ,
251- service_yaml = "storage_v1.yaml" ,
252- deps = [],
253- )
254-
255- nodejs_gapic_assembly_pkg (
256- name = "storage-v1-nodejs" ,
257- deps = [
258- ":storage_nodejs_gapic" ,
259- ":storage_proto" ,
260- ],
261- )
262127
263128##############################################################################
264129# Ruby
265130##############################################################################
266131load (
267132 "@com_google_googleapis_imports//:imports.bzl" ,
268- "ruby_cloud_gapic_library" ,
269- "ruby_gapic_assembly_pkg" ,
270133 "ruby_grpc_library" ,
271134 "ruby_proto_library" ,
272135)
@@ -282,33 +145,11 @@ ruby_grpc_library(
282145 deps = [":storage_ruby_proto" ],
283146)
284147
285- ruby_cloud_gapic_library (
286- name = "storage_ruby_gapic" ,
287- srcs = [":storage_proto_with_info" ],
288- extra_protoc_parameters = ["ruby-cloud-gem-name=google-cloud-storage-v1" ],
289- deps = [
290- ":storage_ruby_grpc" ,
291- ":storage_ruby_proto" ,
292- ],
293- )
294-
295- # Open Source Packages
296- ruby_gapic_assembly_pkg (
297- name = "google-cloud-storage-v1-ruby" ,
298- deps = [
299- ":storage_ruby_gapic" ,
300- ":storage_ruby_grpc" ,
301- ":storage_ruby_proto" ,
302- ],
303- )
304-
305148##############################################################################
306149# C#
307150##############################################################################
308151load (
309152 "@com_google_googleapis_imports//:imports.bzl" ,
310- "csharp_gapic_assembly_pkg" ,
311- "csharp_gapic_library" ,
312153 "csharp_grpc_library" ,
313154 "csharp_proto_library" ,
314155)
@@ -324,28 +165,6 @@ csharp_grpc_library(
324165 deps = [":storage_csharp_proto" ],
325166)
326167
327- # Client streaming unsupported in C#, cannot build.
328- # csharp_gapic_library(
329- # name = "storage_csharp_gapic",
330- # srcs = [":storage_proto_with_info"],
331- # grpc_service_config = "storage_grpc_service_config.json",
332- # common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
333- # deps = [
334- # ":storage_csharp_grpc",
335- # ":storage_csharp_proto",
336- # ],
337- # )
338-
339- # # Open Source Packages
340- # csharp_gapic_assembly_pkg(
341- # name = "google-cloud-storage-v1-csharp",
342- # deps = [
343- # ":storage_csharp_gapic",
344- # ":storage_csharp_grpc",
345- # ":storage_csharp_proto",
346- # ],
347- # )
348-
349168##############################################################################
350169# C++
351170##############################################################################
@@ -363,7 +182,6 @@ cc_proto_library(
363182cc_grpc_library (
364183 name = "storage_cc_grpc" ,
365184 srcs = [":storage_proto" ],
366- generate_mocks = True ,
367185 grpc_only = True ,
368186 deps = [":storage_cc_proto" ],
369187)
0 commit comments