@@ -49,6 +49,12 @@ proto_from_disco(
4949load ("@rules_proto//proto:defs.bzl" , "proto_library" )
5050load ("@com_google_googleapis_imports//:imports.bzl" , "proto_library_with_info" )
5151
52+ # TODO: Remove legacy rule imports after the monolith has been removed from this repo.
53+ load (
54+ "@com_google_api_codegen//rules_gapic:gapic.bzl" ,
55+ proto_library_with_info_legacy = "proto_library_with_info" ,
56+ )
57+
5258proto_library (
5359 name = "compute_proto" ,
5460 srcs = [
@@ -71,6 +77,14 @@ proto_library_with_info(
7177 ],
7278)
7379
80+ proto_library_with_info_legacy (
81+ name = "compute_proto_with_info_legacy" ,
82+ deps = [
83+ ":compute_proto" ,
84+ "@com_google_googleapis//google/cloud:common_resources_proto" ,
85+ ],
86+ )
87+
7488proto_library (
7589 name = "compute_small_proto" ,
7690 srcs = [
@@ -94,19 +108,35 @@ proto_library_with_info(
94108 ],
95109)
96110
111+ proto_library_with_info_legacy (
112+ name = "compute_small_proto_with_info_legacy" ,
113+ deps = [
114+ ":compute_small_proto" ,
115+ "@com_google_googleapis//google/cloud:common_resources_proto" ,
116+ ],
117+ )
118+
97119##############################################################################
98120# Java
99121##############################################################################
100122load (
101123 "@com_google_googleapis_imports//:imports.bzl" ,
102- "java_gapic_assembly_gradle_pkg_legacy" ,
103- "java_gapic_library_legacy" ,
104- "java_gapic_test_legacy" ,
105124 "java_gapic_assembly_gradle_pkg" ,
106125 "java_gapic_library" ,
107126 "java_gapic_test" ,
108- "java_proto_library" ,
109127 "java_grpc_library" ,
128+ "java_proto_library" ,
129+ )
130+
131+ # TODO: Remove legacy rule imports after the monolith has been removed from this repo.
132+ load (
133+ "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl" ,
134+ java_gapic_library_legacy = "java_gapic_library" ,
135+ java_gapic_test_legacy = "java_gapic_test" ,
136+ )
137+ load (
138+ "@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl" ,
139+ java_gapic_assembly_gradle_pkg_legacy = "java_gapic_assembly_gradle_pkg" ,
110140)
111141
112142java_proto_library (
@@ -116,12 +146,12 @@ java_proto_library(
116146
117147java_gapic_library_legacy (
118148 name = "compute_java_gapic" ,
119- src = ":compute_proto_with_info " ,
149+ src = ":compute_proto_with_info_legacy " ,
120150 gapic_yaml = "compute_gapic.yaml" ,
121151 package = "google.cloud.compute.v1" ,
122152 service_yaml = "compute_v1.yaml" ,
123- transport = "rest" ,
124153 test_deps = [],
154+ transport = "rest" ,
125155 deps = [
126156 ":compute_java_proto" ,
127157 ],
@@ -224,9 +254,9 @@ java_proto_library(
224254# Used for integration tests
225255java_gapic_library (
226256 name = "compute_small_java_gapic" ,
227- srcs = [":compute_small_proto_with_info" ],
228- transport = "rest" ,
257+ srcs = [":compute_small_proto_with_info_legacy" ],
229258 test_deps = [],
259+ transport = "rest" ,
230260 deps = [
231261 ":compute_small_java_proto" ,
232262 ],
@@ -294,9 +324,9 @@ py_gapic_assembly_pkg(
294324##############################################################################
295325load (
296326 "@com_google_googleapis_imports//:imports.bzl" ,
297- php_gapic_assembly_pkg = "php_gapic_assembly_pkg2 " ,
298- php_gapic_library = "php_gapic_library2 " ,
299- php_proto_library = "php_proto_library2 " ,
327+ "php_gapic_assembly_pkg " ,
328+ "php_gapic_library " ,
329+ "php_proto_library " ,
300330)
301331
302332php_proto_library (
@@ -371,37 +401,37 @@ nodejs_gapic_assembly_pkg(
371401load (
372402 "@com_google_googleapis_imports//:imports.bzl" ,
373403 "ruby_cloud_gapic_library" ,
404+ "ruby_gapic_assembly_pkg" ,
374405 "ruby_proto_library" ,
375- "ruby_gapic_assembly_pkg"
376406)
377407
378408ruby_proto_library (
379- name = "compute_ruby_proto" ,
380- deps = [":compute_proto" ],
409+ name = "compute_ruby_proto" ,
410+ deps = [":compute_proto" ],
381411)
382412
383413ruby_cloud_gapic_library (
384- name = "compute_ruby_gapic" ,
385- srcs = [":compute_proto_with_info" ],
386- ruby_cloud_title = "Google Cloud Compute V1 (ALPHA)" ,
387- ruby_cloud_description = "google-cloud-compute-v1 is the official client library for the Google Cloud Compute V1 API. This library is considered to be in alpha. This means it is still a work-in-progress and under active development. Any release is subject to backwards-incompatible changes at any time. " ,
388- extra_protoc_parameters = [
389- "ruby-cloud-gem-name=google- cloud- compute-v1 " ,
390- "ruby-cloud-env-prefix=COMPUTE " ,
391- "ruby-cloud-product-url=https://cloud.google.com/ compute/ " ,
392- "ruby-cloud-api-id=compute.googleapis.com " ,
393- "ruby-cloud-api-shortname=compute" ,
394- "ruby -cloud-generate-transports=rest " ,
395- ] ,
396- deps = [
397- ":compute_ruby_proto" ,
398- ],
414+ name = "compute_ruby_gapic" ,
415+ srcs = [":compute_proto_with_info" ],
416+ extra_protoc_parameters = [
417+ "ruby-cloud-gem-name=google-cloud-compute-v1 " ,
418+ "ruby-cloud-env-prefix=COMPUTE" ,
419+ "ruby-cloud-product-url=https:// cloud.google.com/ compute/ " ,
420+ "ruby-cloud-api-id=compute.googleapis.com " ,
421+ "ruby-cloud-api-shortname= compute" ,
422+ "ruby-cloud-generate-transports=rest " ,
423+ ] ,
424+ ruby_cloud_description = "google -cloud-compute-v1 is the official client library for the Google Cloud Compute V1 API. This library is considered to be in alpha. This means it is still a work-in-progress and under active development. Any release is subject to backwards-incompatible changes at any time. " ,
425+ ruby_cloud_title = "Google Cloud Compute V1 (ALPHA)" ,
426+ deps = [
427+ ":compute_ruby_proto" ,
428+ ],
399429)
400430
401431ruby_gapic_assembly_pkg (
402- name = "google-cloud-compute-v1-ruby" ,
403- deps = [
404- ":compute_ruby_gapic" ,
405- ":compute_ruby_proto" ,
406- ],
432+ name = "google-cloud-compute-v1-ruby" ,
433+ deps = [
434+ ":compute_ruby_gapic" ,
435+ ":compute_ruby_proto" ,
436+ ],
407437)
0 commit comments