diff --git a/WORKSPACE b/WORKSPACE index e3e6f7b6..8477710d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -76,8 +76,8 @@ rules_proto_toolchains() # section http_archive( name = "com_google_api_codegen", - strip_prefix = "gapic-generator-2.8.0", - urls = ["https://github.com/googleapis/gapic-generator/archive/v2.8.0.zip"], + strip_prefix = "gapic-generator-2.9.0", + urls = ["https://github.com/googleapis/gapic-generator/archive/v2.9.0.zip"], ) # rules_go (support Golang under bazel) diff --git a/google/ads/admob/v1/BUILD.bazel b/google/ads/admob/v1/BUILD.bazel index 27ac28e1..a2a18e88 100644 --- a/google/ads/admob/v1/BUILD.bazel +++ b/google/ads/admob/v1/BUILD.bazel @@ -46,11 +46,11 @@ proto_library_with_info( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -150,14 +150,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/analytics/admin/v1alpha/BUILD.bazel b/google/analytics/admin/v1alpha/BUILD.bazel index a57635b9..3405839d 100644 --- a/google/analytics/admin/v1alpha/BUILD.bazel +++ b/google/analytics/admin/v1alpha/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -152,13 +151,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/analytics/data/v1alpha/BUILD.bazel b/google/analytics/data/v1alpha/BUILD.bazel index 3ae4cb03..3d209c7d 100644 --- a/google/analytics/data/v1alpha/BUILD.bazel +++ b/google/analytics/data/v1alpha/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -148,13 +147,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/api/servicemanagement/v1/BUILD.bazel b/google/api/servicemanagement/v1/BUILD.bazel index b6e19342..0bc5c1f0 100644 --- a/google/api/servicemanagement/v1/BUILD.bazel +++ b/google/api/servicemanagement/v1/BUILD.bazel @@ -41,13 +41,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,14 +157,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/area120/tables/v1alpha1/BUILD.bazel b/google/area120/tables/v1alpha1/BUILD.bazel index bfc59282..f378e03b 100644 --- a/google/area120/tables/v1alpha1/BUILD.bazel +++ b/google/area120/tables/v1alpha1/BUILD.bazel @@ -44,13 +44,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -151,12 +150,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/bigtable/admin/v2/BUILD.bazel b/google/bigtable/admin/v2/BUILD.bazel index fc5e5b22..3037ee25 100644 --- a/google/bigtable/admin/v2/BUILD.bazel +++ b/google/bigtable/admin/v2/BUILD.bazel @@ -43,13 +43,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -159,14 +158,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/bigtable/v2/BUILD.bazel b/google/bigtable/v2/BUILD.bazel index b1aa3d8d..65a9d4f1 100644 --- a/google/bigtable/v2/BUILD.bazel +++ b/google/bigtable/v2/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -142,14 +141,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/chromeos/moblab/v1beta1/BUILD.bazel b/google/chromeos/moblab/v1beta1/BUILD.bazel index a54256dc..1de27f2f 100644 --- a/google/chromeos/moblab/v1beta1/BUILD.bazel +++ b/google/chromeos/moblab/v1beta1/BUILD.bazel @@ -36,13 +36,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -60,8 +59,8 @@ java_grpc_library( java_gapic_library( name = "moblab_java_gapic", - grpc_service_config = "moblab_grpc_service_config.json", srcs = [":moblab_proto_with_info"], + grpc_service_config = "moblab_grpc_service_config.json", package = "google.chromeos.moblab.v1beta1", test_deps = [ ":moblab_java_grpc", @@ -145,14 +144,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/accessapproval/v1/BUILD.bazel b/google/cloud/accessapproval/v1/BUILD.bazel index 8407f5b4..fd94e6d1 100644 --- a/google/cloud/accessapproval/v1/BUILD.bazel +++ b/google/cloud/accessapproval/v1/BUILD.bazel @@ -43,15 +43,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -150,12 +149,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/aiplatform/v1beta1/BUILD.bazel b/google/cloud/aiplatform/v1beta1/BUILD.bazel index cc169a51..6ef2e645 100644 --- a/google/cloud/aiplatform/v1beta1/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/BUILD.bazel @@ -85,15 +85,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) _JAVA_PROTO_SUBPACKAGE_DEPS = [ @@ -220,12 +219,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) _PY_GAPIC_SUBPACKAGE_DEPS = [ diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel b/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel index 61d0a44c..998cbf4f 100644 --- a/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel @@ -70,10 +70,10 @@ go_proto_library( load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", + "py_gapic_assembly_pkg", + "py_gapic_library", "py_grpc_library", "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", ) moved_proto_library( @@ -98,11 +98,11 @@ py_grpc_library( py_gapic_library( name = "instance_py_gapic", + srcs = [":instance_proto"], opt_args = [ "python-gapic-namespace=google.cloud.aiplatform.v1beta1.schema.predict", "python-gapic-name=instance", ], - srcs = [":instance_proto"], ) # Open Source Packages @@ -110,7 +110,7 @@ py_gapic_assembly_pkg( name = "instance-py", deps = [ ":instance_py_gapic", - ] + ], ) ############################################################################## @@ -142,7 +142,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel b/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel index 00be8197..df84939b 100644 --- a/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel @@ -67,10 +67,10 @@ go_proto_library( load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", + "py_gapic_assembly_pkg", + "py_gapic_library", "py_grpc_library", "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", ) moved_proto_library( @@ -95,11 +95,11 @@ py_grpc_library( py_gapic_library( name = "params_py_gapic", + srcs = [":params_proto"], opt_args = [ "python-gapic-namespace=google.cloud.aiplatform.v1beta1.schema.predict", "python-gapic-name=params", ], - srcs = [":params_proto"], ) # Open Source Packages @@ -107,7 +107,7 @@ py_gapic_assembly_pkg( name = "params-py", deps = [ ":params_py_gapic", - ] + ], ) ############################################################################## @@ -139,7 +139,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel b/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel index 23ca6113..148c893e 100644 --- a/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel @@ -77,10 +77,10 @@ go_proto_library( load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", + "py_gapic_assembly_pkg", + "py_gapic_library", "py_grpc_library", "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", ) moved_proto_library( @@ -109,11 +109,11 @@ py_grpc_library( py_gapic_library( name = "prediction_py_gapic", + srcs = [":prediction_proto"], opt_args = [ "python-gapic-namespace=google.cloud.aiplatform.v1beta1.schema.predict", "python-gapic-name=prediction", ], - srcs = [":prediction_proto"], ) # Open Source Packages @@ -121,7 +121,7 @@ py_gapic_assembly_pkg( name = "prediction-py", deps = [ ":prediction_py_gapic", - ] + ], ) ############################################################################## @@ -153,7 +153,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel index 4898cfaa..efea04ae 100644 --- a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel @@ -73,10 +73,10 @@ go_proto_library( load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", + "py_gapic_assembly_pkg", + "py_gapic_library", "py_grpc_library", "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", ) moved_proto_library( @@ -101,11 +101,11 @@ py_grpc_library( py_gapic_library( name = "definition_py_gapic", + srcs = [":definition_proto"], opt_args = [ "python-gapic-namespace=google.cloud.aiplatform.v1beta1.schema.trainingjob", "python-gapic-name=definition", ], - srcs = [":definition_proto"], ) # Open Source Packages @@ -113,7 +113,7 @@ py_gapic_assembly_pkg( name = "definition_py", deps = [ ":definition_py_gapic", - ] + ], ) ############################################################################## @@ -145,7 +145,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/cloud/asset/v1/BUILD.bazel b/google/cloud/asset/v1/BUILD.bazel index 4309a960..fedae9b1 100644 --- a/google/cloud/asset/v1/BUILD.bazel +++ b/google/cloud/asset/v1/BUILD.bazel @@ -46,15 +46,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -168,12 +167,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/asset/v1beta1/BUILD.bazel b/google/cloud/asset/v1beta1/BUILD.bazel index d2121651..838ac5ba 100644 --- a/google/cloud/asset/v1beta1/BUILD.bazel +++ b/google/cloud/asset/v1beta1/BUILD.bazel @@ -38,13 +38,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,12 +157,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/asset/v1p1beta1/BUILD.bazel b/google/cloud/asset/v1p1beta1/BUILD.bazel index ec037403..9ac16d08 100644 --- a/google/cloud/asset/v1p1beta1/BUILD.bazel +++ b/google/cloud/asset/v1p1beta1/BUILD.bazel @@ -33,13 +33,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -143,12 +142,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/asset/v1p2beta1/BUILD.bazel b/google/cloud/asset/v1p2beta1/BUILD.bazel index 64b5432d..2ac5294b 100644 --- a/google/cloud/asset/v1p2beta1/BUILD.bazel +++ b/google/cloud/asset/v1p2beta1/BUILD.bazel @@ -40,13 +40,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -156,12 +155,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/asset/v1p4beta1/BUILD.bazel b/google/cloud/asset/v1p4beta1/BUILD.bazel index b57d71a5..2a9c538f 100644 --- a/google/cloud/asset/v1p4beta1/BUILD.bazel +++ b/google/cloud/asset/v1p4beta1/BUILD.bazel @@ -36,13 +36,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/asset/v1p5beta1/BUILD.bazel b/google/cloud/asset/v1p5beta1/BUILD.bazel index 31db0a10..812050b5 100644 --- a/google/cloud/asset/v1p5beta1/BUILD.bazel +++ b/google/cloud/asset/v1p5beta1/BUILD.bazel @@ -39,15 +39,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -151,12 +150,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/assuredworkloads/v1beta1/BUILD.bazel b/google/cloud/assuredworkloads/v1beta1/BUILD.bazel index c0303266..8bb19027 100644 --- a/google/cloud/assuredworkloads/v1beta1/BUILD.bazel +++ b/google/cloud/assuredworkloads/v1beta1/BUILD.bazel @@ -46,15 +46,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -157,13 +156,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/automl/v1/BUILD.bazel b/google/cloud/automl/v1/BUILD.bazel index 71fff1c2..8b42b3c2 100644 --- a/google/cloud/automl/v1/BUILD.bazel +++ b/google/cloud/automl/v1/BUILD.bazel @@ -58,15 +58,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -173,12 +172,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/automl/v1beta1/BUILD.bazel b/google/cloud/automl/v1beta1/BUILD.bazel index b8b61fbc..d7cabed5 100644 --- a/google/cloud/automl/v1beta1/BUILD.bazel +++ b/google/cloud/automl/v1beta1/BUILD.bazel @@ -67,15 +67,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -182,12 +181,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/connection/v1/BUILD.bazel b/google/cloud/bigquery/connection/v1/BUILD.bazel index 913767a9..8b87dc88 100644 --- a/google/cloud/bigquery/connection/v1/BUILD.bazel +++ b/google/cloud/bigquery/connection/v1/BUILD.bazel @@ -37,15 +37,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel index e6fb3e99..ebef1a4f 100644 --- a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel +++ b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel @@ -37,15 +37,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -147,12 +146,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel index 1cee601b..b35f3b04 100644 --- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel +++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel @@ -40,15 +40,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,13 +147,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/reservation/v1/BUILD.bazel b/google/cloud/bigquery/reservation/v1/BUILD.bazel index 82462425..fec817a3 100644 --- a/google/cloud/bigquery/reservation/v1/BUILD.bazel +++ b/google/cloud/bigquery/reservation/v1/BUILD.bazel @@ -36,15 +36,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -143,12 +142,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel b/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel index 1b86f8a9..9aeaad12 100644 --- a/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel +++ b/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel @@ -36,15 +36,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -142,14 +141,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/bigquery/storage/v1/BUILD.bazel b/google/cloud/bigquery/storage/v1/BUILD.bazel index 1ae344c1..a27293bb 100644 --- a/google/cloud/bigquery/storage/v1/BUILD.bazel +++ b/google/cloud/bigquery/storage/v1/BUILD.bazel @@ -34,14 +34,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -141,13 +142,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel b/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel index 6ec76159..8f427277 100644 --- a/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel +++ b/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel @@ -40,14 +40,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -150,8 +151,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel index 5b3cb589..2d1eb432 100644 --- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel +++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel @@ -43,9 +43,9 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -147,8 +147,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/storage/v1beta2/BUILD.bazel b/google/cloud/bigquery/storage/v1beta2/BUILD.bazel index 1800b25c..d267c8e6 100644 --- a/google/cloud/bigquery/storage/v1beta2/BUILD.bazel +++ b/google/cloud/bigquery/storage/v1beta2/BUILD.bazel @@ -45,9 +45,9 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -150,8 +150,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/bigquery/v2/BUILD.bazel b/google/cloud/bigquery/v2/BUILD.bazel index 96a0cdc9..72e872b6 100644 --- a/google/cloud/bigquery/v2/BUILD.bazel +++ b/google/cloud/bigquery/v2/BUILD.bazel @@ -38,15 +38,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -144,12 +143,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/billing/budgets/v1/BUILD.bazel b/google/cloud/billing/budgets/v1/BUILD.bazel index 7888a5dd..15ab20c3 100644 --- a/google/cloud/billing/budgets/v1/BUILD.bazel +++ b/google/cloud/billing/budgets/v1/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -153,13 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. - load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/billing/budgets/v1beta1/BUILD.bazel b/google/cloud/billing/budgets/v1beta1/BUILD.bazel index 33f46152..91731442 100644 --- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel +++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel @@ -23,9 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -172,18 +172,6 @@ moved_proto_library( ], ) -############################################################################## -# Python -############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. - -load( - "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", -) - py_gapic_library( name = "budgets_py_gapic", srcs = [":budgets_proto"], diff --git a/google/cloud/billing/v1/BUILD.bazel b/google/cloud/billing/v1/BUILD.bazel index b78ec8fd..cdeaab03 100644 --- a/google/cloud/billing/v1/BUILD.bazel +++ b/google/cloud/billing/v1/BUILD.bazel @@ -38,13 +38,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -150,12 +149,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel index 03c39089..ba2d7363 100644 --- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel +++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel @@ -38,11 +38,11 @@ proto_library_with_info( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -140,14 +140,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/channel/v1/BUILD.bazel b/google/cloud/channel/v1/BUILD.bazel index 387de7e6..19d71983 100644 --- a/google/cloud/channel/v1/BUILD.bazel +++ b/google/cloud/channel/v1/BUILD.bazel @@ -56,14 +56,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -169,14 +170,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/datacatalog/v1/BUILD.bazel b/google/cloud/datacatalog/v1/BUILD.bazel index e0fee181..731a9a84 100644 --- a/google/cloud/datacatalog/v1/BUILD.bazel +++ b/google/cloud/datacatalog/v1/BUILD.bazel @@ -44,13 +44,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -154,12 +153,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/datacatalog/v1beta1/BUILD.bazel b/google/cloud/datacatalog/v1beta1/BUILD.bazel index 4883de84..e35c0793 100644 --- a/google/cloud/datacatalog/v1beta1/BUILD.bazel +++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,12 +157,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/datalabeling/v1beta1/BUILD.bazel b/google/cloud/datalabeling/v1beta1/BUILD.bazel index 026ad376..b96dd330 100644 --- a/google/cloud/datalabeling/v1beta1/BUILD.bazel +++ b/google/cloud/datalabeling/v1beta1/BUILD.bazel @@ -47,15 +47,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -159,12 +158,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel index e7812c57..5464994c 100644 --- a/google/cloud/dataproc/v1/BUILD.bazel +++ b/google/cloud/dataproc/v1/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,12 +157,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dataproc/v1beta2/BUILD.bazel b/google/cloud/dataproc/v1beta2/BUILD.bazel index b0b1f62a..3ac0c944 100644 --- a/google/cloud/dataproc/v1beta2/BUILD.bazel +++ b/google/cloud/dataproc/v1beta2/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -157,12 +156,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dataqna/v1alpha/BUILD.bazel b/google/cloud/dataqna/v1alpha/BUILD.bazel index d55721a3..acd45f4b 100644 --- a/google/cloud/dataqna/v1alpha/BUILD.bazel +++ b/google/cloud/dataqna/v1alpha/BUILD.bazel @@ -49,14 +49,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -160,8 +161,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dialogflow/cx/v3/BUILD.bazel b/google/cloud/dialogflow/cx/v3/BUILD.bazel index 01a78ef3..e29e515b 100644 --- a/google/cloud/dialogflow/cx/v3/BUILD.bazel +++ b/google/cloud/dialogflow/cx/v3/BUILD.bazel @@ -63,15 +63,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -189,13 +188,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel b/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel index da10ef91..6c1085df 100644 --- a/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel +++ b/google/cloud/dialogflow/cx/v3beta1/BUILD.bazel @@ -62,15 +62,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -187,13 +186,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel index 412eaf5c..9b05f566 100644 --- a/google/cloud/dialogflow/v2/BUILD.bazel +++ b/google/cloud/dialogflow/v2/BUILD.bazel @@ -58,15 +58,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -178,12 +177,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/dialogflow/v2beta1/BUILD.bazel b/google/cloud/dialogflow/v2beta1/BUILD.bazel index 22fbd235..807e8fca 100644 --- a/google/cloud/dialogflow/v2beta1/BUILD.bazel +++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel @@ -61,15 +61,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -183,12 +182,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/documentai/v1beta1/BUILD.bazel b/google/cloud/documentai/v1beta1/BUILD.bazel index a6a92775..122a5e81 100644 --- a/google/cloud/documentai/v1beta1/BUILD.bazel +++ b/google/cloud/documentai/v1beta1/BUILD.bazel @@ -37,15 +37,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,14 +147,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/documentai/v1beta2/BUILD.bazel b/google/cloud/documentai/v1beta2/BUILD.bazel index 64d1353e..87447c10 100644 --- a/google/cloud/documentai/v1beta2/BUILD.bazel +++ b/google/cloud/documentai/v1beta2/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,12 +148,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/documentai/v1beta3/BUILD.bazel b/google/cloud/documentai/v1beta3/BUILD.bazel index a2b29bc5..e8c62008 100644 --- a/google/cloud/documentai/v1beta3/BUILD.bazel +++ b/google/cloud/documentai/v1beta3/BUILD.bazel @@ -52,13 +52,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -168,12 +167,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/domains/v1alpha2/BUILD.bazel b/google/cloud/domains/v1alpha2/BUILD.bazel index 18429182..85c9e292 100644 --- a/google/cloud/domains/v1alpha2/BUILD.bazel +++ b/google/cloud/domains/v1alpha2/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,14 +157,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/domains/v1beta1/BUILD.bazel b/google/cloud/domains/v1beta1/BUILD.bazel index f3243ef0..daa772e9 100644 --- a/google/cloud/domains/v1beta1/BUILD.bazel +++ b/google/cloud/domains/v1beta1/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -158,14 +157,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/functions/v1/BUILD.bazel b/google/cloud/functions/v1/BUILD.bazel index 70e1f2c2..5d875b48 100644 --- a/google/cloud/functions/v1/BUILD.bazel +++ b/google/cloud/functions/v1/BUILD.bazel @@ -49,16 +49,15 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -166,12 +165,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/gaming/v1/BUILD.bazel b/google/cloud/gaming/v1/BUILD.bazel index 5cfe0cee..1f2ca348 100644 --- a/google/cloud/gaming/v1/BUILD.bazel +++ b/google/cloud/gaming/v1/BUILD.bazel @@ -53,15 +53,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -167,12 +166,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/gaming/v1beta/BUILD.bazel b/google/cloud/gaming/v1beta/BUILD.bazel index 69966c63..dccd0137 100644 --- a/google/cloud/gaming/v1beta/BUILD.bazel +++ b/google/cloud/gaming/v1beta/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -158,12 +157,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/iot/v1/BUILD.bazel b/google/cloud/iot/v1/BUILD.bazel index b64944d9..a9c65d58 100644 --- a/google/cloud/iot/v1/BUILD.bazel +++ b/google/cloud/iot/v1/BUILD.bazel @@ -39,13 +39,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -150,12 +149,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel index 51c4bb8f..746a3067 100644 --- a/google/cloud/kms/v1/BUILD.bazel +++ b/google/cloud/kms/v1/BUILD.bazel @@ -39,15 +39,16 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", + java_resource_name_proto_library = "java_resource_name_proto_library_legacy", ) java_proto_library( @@ -164,12 +165,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/language/v1/BUILD.bazel b/google/cloud/language/v1/BUILD.bazel index bb1d7808..b5e6aab5 100644 --- a/google/cloud/language/v1/BUILD.bazel +++ b/google/cloud/language/v1/BUILD.bazel @@ -40,13 +40,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -146,13 +145,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/language/v1beta2/BUILD.bazel b/google/cloud/language/v1beta2/BUILD.bazel index a4b89ec0..0862e066 100644 --- a/google/cloud/language/v1beta2/BUILD.bazel +++ b/google/cloud/language/v1beta2/BUILD.bazel @@ -41,13 +41,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -147,12 +146,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/managedidentities/v1/BUILD.bazel b/google/cloud/managedidentities/v1/BUILD.bazel index 631aea3e..bb1fab1f 100644 --- a/google/cloud/managedidentities/v1/BUILD.bazel +++ b/google/cloud/managedidentities/v1/BUILD.bazel @@ -36,15 +36,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -145,14 +144,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/managedidentities/v1beta1/BUILD.bazel b/google/cloud/managedidentities/v1beta1/BUILD.bazel index bec1e958..e8ffabad 100644 --- a/google/cloud/managedidentities/v1beta1/BUILD.bazel +++ b/google/cloud/managedidentities/v1beta1/BUILD.bazel @@ -35,15 +35,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -144,14 +143,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/mediatranslation/v1beta1/BUILD.bazel b/google/cloud/mediatranslation/v1beta1/BUILD.bazel index f6bf8b4b..160c8b6e 100644 --- a/google/cloud/mediatranslation/v1beta1/BUILD.bazel +++ b/google/cloud/mediatranslation/v1beta1/BUILD.bazel @@ -40,15 +40,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -147,14 +146,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/memcache/v1beta2/BUILD.bazel b/google/cloud/memcache/v1beta2/BUILD.bazel index 4f331f66..f9b19f4d 100644 --- a/google/cloud/memcache/v1beta2/BUILD.bazel +++ b/google/cloud/memcache/v1beta2/BUILD.bazel @@ -35,15 +35,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -144,14 +143,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/metastore/v1alpha/BUILD.bazel b/google/cloud/metastore/v1alpha/BUILD.bazel index 87aff6b6..bd78988f 100644 --- a/google/cloud/metastore/v1alpha/BUILD.bazel +++ b/google/cloud/metastore/v1alpha/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -153,14 +152,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/notebooks/v1beta1/BUILD.bazel b/google/cloud/notebooks/v1beta1/BUILD.bazel index e1355aa7..33207651 100644 --- a/google/cloud/notebooks/v1beta1/BUILD.bazel +++ b/google/cloud/notebooks/v1beta1/BUILD.bazel @@ -45,15 +45,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -155,12 +154,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/orgpolicy/v1/BUILD.bazel b/google/cloud/orgpolicy/v1/BUILD.bazel index 9998df78..abca865f 100644 --- a/google/cloud/orgpolicy/v1/BUILD.bazel +++ b/google/cloud/orgpolicy/v1/BUILD.bazel @@ -25,9 +25,9 @@ proto_library( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", ) java_proto_library( @@ -71,13 +71,14 @@ go_proto_library( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", ) moved_proto_library( diff --git a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel index bc3e7704..34793fbd 100644 --- a/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel +++ b/google/cloud/osconfig/agentendpoint/v1/BUILD.bazel @@ -43,15 +43,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -149,14 +148,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel index 52d6e298..614fa025 100644 --- a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel +++ b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel @@ -42,15 +42,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,14 +147,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/osconfig/v1/BUILD.bazel b/google/cloud/osconfig/v1/BUILD.bazel index f74dcee6..774e79e4 100644 --- a/google/cloud/osconfig/v1/BUILD.bazel +++ b/google/cloud/osconfig/v1/BUILD.bazel @@ -23,6 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -33,17 +36,14 @@ load( "php_grpc_library", "php_proto_library", "proto_library_with_info", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", "ruby_gapic_assembly_pkg", "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) # This is an API workspace, having public visibility by default makes perfect sense. diff --git a/google/cloud/osconfig/v1beta/BUILD.bazel b/google/cloud/osconfig/v1beta/BUILD.bazel index c8526ce3..7af4bc61 100644 --- a/google/cloud/osconfig/v1beta/BUILD.bazel +++ b/google/cloud/osconfig/v1beta/BUILD.bazel @@ -42,15 +42,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -151,14 +150,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/oslogin/common/BUILD.bazel b/google/cloud/oslogin/common/BUILD.bazel index 1d2c053b..a705a0dc 100644 --- a/google/cloud/oslogin/common/BUILD.bazel +++ b/google/cloud/oslogin/common/BUILD.bazel @@ -22,7 +22,7 @@ proto_library( proto_library_with_info( name = "common_proto_with_info", deps = [ - ":common_proto", + ":common_proto", ], ) @@ -67,12 +67,10 @@ go_proto_library( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( @@ -109,7 +107,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/cloud/oslogin/v1/BUILD.bazel b/google/cloud/oslogin/v1/BUILD.bazel index b9a74893..0a8b0908 100644 --- a/google/cloud/oslogin/v1/BUILD.bazel +++ b/google/cloud/oslogin/v1/BUILD.bazel @@ -38,15 +38,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) _JAVA_PROTO_SUBPACKAGE_DEPS = [ @@ -156,12 +155,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/oslogin/v1beta/BUILD.bazel b/google/cloud/oslogin/v1beta/BUILD.bazel index 6dc24f43..0ad55b08 100644 --- a/google/cloud/oslogin/v1beta/BUILD.bazel +++ b/google/cloud/oslogin/v1beta/BUILD.bazel @@ -37,15 +37,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) _JAVA_PROTO_SUBPACKAGE_DEPS = [ @@ -152,12 +151,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/phishingprotection/v1beta1/BUILD.bazel b/google/cloud/phishingprotection/v1beta1/BUILD.bazel index 415cd7f6..caed9f23 100644 --- a/google/cloud/phishingprotection/v1beta1/BUILD.bazel +++ b/google/cloud/phishingprotection/v1beta1/BUILD.bazel @@ -32,15 +32,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -139,12 +138,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/pubsublite/v1/BUILD.bazel b/google/cloud/pubsublite/v1/BUILD.bazel index 986291a4..79f73927 100644 --- a/google/cloud/pubsublite/v1/BUILD.bazel +++ b/google/cloud/pubsublite/v1/BUILD.bazel @@ -50,15 +50,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -163,12 +162,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/recaptchaenterprise/v1/BUILD.bazel b/google/cloud/recaptchaenterprise/v1/BUILD.bazel index 5cbed121..0cdcfbde 100644 --- a/google/cloud/recaptchaenterprise/v1/BUILD.bazel +++ b/google/cloud/recaptchaenterprise/v1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -141,14 +140,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel b/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel index 7141b6c3..e0bc9c7d 100644 --- a/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel +++ b/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -141,14 +140,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/recommendationengine/v1beta1/BUILD.bazel b/google/cloud/recommendationengine/v1beta1/BUILD.bazel index 773b437d..419d8e84 100644 --- a/google/cloud/recommendationengine/v1beta1/BUILD.bazel +++ b/google/cloud/recommendationengine/v1beta1/BUILD.bazel @@ -14,9 +14,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -27,14 +27,14 @@ load( "php_grpc_library", "php_proto_library", "proto_library_with_info", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", "ruby_gapic_assembly_pkg", "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) # This is an API workspace, having public visibility by default makes perfect sense. diff --git a/google/cloud/recommender/v1/BUILD.bazel b/google/cloud/recommender/v1/BUILD.bazel index 4296f0fb..f7e7b217 100644 --- a/google/cloud/recommender/v1/BUILD.bazel +++ b/google/cloud/recommender/v1/BUILD.bazel @@ -47,13 +47,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -155,12 +154,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/recommender/v1beta1/BUILD.bazel b/google/cloud/recommender/v1beta1/BUILD.bazel index 90d72a44..301aefc6 100644 --- a/google/cloud/recommender/v1beta1/BUILD.bazel +++ b/google/cloud/recommender/v1beta1/BUILD.bazel @@ -47,13 +47,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -155,12 +154,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/redis/v1/BUILD.bazel b/google/cloud/redis/v1/BUILD.bazel index 03b372b4..6efc87db 100644 --- a/google/cloud/redis/v1/BUILD.bazel +++ b/google/cloud/redis/v1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -146,12 +145,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/redis/v1beta1/BUILD.bazel b/google/cloud/redis/v1beta1/BUILD.bazel index 3b663c7f..2973a5e3 100644 --- a/google/cloud/redis/v1beta1/BUILD.bazel +++ b/google/cloud/redis/v1beta1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -147,12 +146,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/retail/v2/BUILD.bazel b/google/cloud/retail/v2/BUILD.bazel index 6dff4326..ffcd81ea 100644 --- a/google/cloud/retail/v2/BUILD.bazel +++ b/google/cloud/retail/v2/BUILD.bazel @@ -23,6 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -33,17 +36,14 @@ load( "php_grpc_library", "php_proto_library", "proto_library_with_info", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", "ruby_gapic_assembly_pkg", "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) # This is an API workspace, having public visibility by default makes perfect sense. diff --git a/google/cloud/retail/v2alpha/BUILD.bazel b/google/cloud/retail/v2alpha/BUILD.bazel index 93e0df11..d3681065 100644 --- a/google/cloud/retail/v2alpha/BUILD.bazel +++ b/google/cloud/retail/v2alpha/BUILD.bazel @@ -23,6 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -33,17 +36,14 @@ load( "php_grpc_library", "php_proto_library", "proto_library_with_info", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", "ruby_gapic_assembly_pkg", "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) # This is an API workspace, having public visibility by default makes perfect sense. diff --git a/google/cloud/retail/v2beta/BUILD.bazel b/google/cloud/retail/v2beta/BUILD.bazel index 8d834ea7..4c1ec0d0 100644 --- a/google/cloud/retail/v2beta/BUILD.bazel +++ b/google/cloud/retail/v2beta/BUILD.bazel @@ -23,6 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -33,17 +36,14 @@ load( "php_grpc_library", "php_proto_library", "proto_library_with_info", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", "ruby_gapic_assembly_pkg", "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) # This is an API workspace, having public visibility by default makes perfect sense. diff --git a/google/cloud/scheduler/v1/BUILD.bazel b/google/cloud/scheduler/v1/BUILD.bazel index 49f10c43..9ea73ba8 100644 --- a/google/cloud/scheduler/v1/BUILD.bazel +++ b/google/cloud/scheduler/v1/BUILD.bazel @@ -39,15 +39,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,8 +147,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/scheduler/v1beta1/BUILD.bazel b/google/cloud/scheduler/v1beta1/BUILD.bazel index 73b6b28e..45dfd44e 100644 --- a/google/cloud/scheduler/v1beta1/BUILD.bazel +++ b/google/cloud/scheduler/v1beta1/BUILD.bazel @@ -39,15 +39,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,8 +147,8 @@ go_gapic_assembly_pkg( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/secretmanager/v1/BUILD.bazel b/google/cloud/secretmanager/v1/BUILD.bazel index db517a0d..5e721fd1 100644 --- a/google/cloud/secretmanager/v1/BUILD.bazel +++ b/google/cloud/secretmanager/v1/BUILD.bazel @@ -38,15 +38,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/secrets/v1beta1/BUILD.bazel b/google/cloud/secrets/v1beta1/BUILD.bazel index 260eafaf..2c8c843d 100644 --- a/google/cloud/secrets/v1beta1/BUILD.bazel +++ b/google/cloud/secrets/v1beta1/BUILD.bazel @@ -36,13 +36,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -146,12 +145,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/security/privateca/v1beta1/BUILD.bazel b/google/cloud/security/privateca/v1beta1/BUILD.bazel index fc84e230..f593f951 100644 --- a/google/cloud/security/privateca/v1beta1/BUILD.bazel +++ b/google/cloud/security/privateca/v1beta1/BUILD.bazel @@ -47,15 +47,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -158,12 +157,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel b/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel index 75483205..b5a81118 100644 --- a/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel +++ b/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel @@ -40,13 +40,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -145,14 +144,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/securitycenter/v1/BUILD.bazel b/google/cloud/securitycenter/v1/BUILD.bazel index e342dfa3..0d2a2c2d 100644 --- a/google/cloud/securitycenter/v1/BUILD.bazel +++ b/google/cloud/securitycenter/v1/BUILD.bazel @@ -49,13 +49,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -165,12 +164,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/securitycenter/v1beta1/BUILD.bazel b/google/cloud/securitycenter/v1beta1/BUILD.bazel index 5f35e85f..dfbb30f5 100644 --- a/google/cloud/securitycenter/v1beta1/BUILD.bazel +++ b/google/cloud/securitycenter/v1beta1/BUILD.bazel @@ -46,13 +46,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -162,12 +161,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/securitycenter/v1p1beta1/BUILD.bazel b/google/cloud/securitycenter/v1p1beta1/BUILD.bazel index 8c94e2f9..3c0042eb 100644 --- a/google/cloud/securitycenter/v1p1beta1/BUILD.bazel +++ b/google/cloud/securitycenter/v1p1beta1/BUILD.bazel @@ -58,13 +58,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -174,12 +173,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/servicedirectory/v1/BUILD.bazel b/google/cloud/servicedirectory/v1/BUILD.bazel index 5a282052..9460c0c4 100644 --- a/google/cloud/servicedirectory/v1/BUILD.bazel +++ b/google/cloud/servicedirectory/v1/BUILD.bazel @@ -23,6 +23,9 @@ load( "go_gapic_library", "go_proto_library", "go_test", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", "moved_proto_library", @@ -41,9 +44,6 @@ load( "ruby_gapic_library", "ruby_grpc_library", "ruby_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) # This is an API workspace, having public visibility by default makes perfect sense. @@ -164,17 +164,6 @@ go_gapic_assembly_pkg( ], ) -############################################################################## -# Python -############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. -load( - "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", -) - py_gapic_library( name = "servicedirectory_py_gapic", srcs = [":servicedirectory_proto"], diff --git a/google/cloud/servicedirectory/v1beta1/BUILD.bazel b/google/cloud/servicedirectory/v1beta1/BUILD.bazel index 855c9c60..48a83496 100644 --- a/google/cloud/servicedirectory/v1beta1/BUILD.bazel +++ b/google/cloud/servicedirectory/v1beta1/BUILD.bazel @@ -40,15 +40,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -151,12 +150,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/speech/v1/BUILD.bazel b/google/cloud/speech/v1/BUILD.bazel index b1d4d94d..6aaaaeda 100644 --- a/google/cloud/speech/v1/BUILD.bazel +++ b/google/cloud/speech/v1/BUILD.bazel @@ -36,15 +36,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -149,12 +148,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/speech/v1p1beta1/BUILD.bazel b/google/cloud/speech/v1p1beta1/BUILD.bazel index b7022415..dce03648 100644 --- a/google/cloud/speech/v1p1beta1/BUILD.bazel +++ b/google/cloud/speech/v1p1beta1/BUILD.bazel @@ -38,15 +38,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -151,12 +150,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/talent/v4/BUILD.bazel b/google/cloud/talent/v4/BUILD.bazel index 87f07f3a..7acc3468 100644 --- a/google/cloud/talent/v4/BUILD.bazel +++ b/google/cloud/talent/v4/BUILD.bazel @@ -64,15 +64,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -185,12 +184,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/talent/v4beta1/BUILD.bazel b/google/cloud/talent/v4beta1/BUILD.bazel index a2c0c294..c7c29039 100644 --- a/google/cloud/talent/v4beta1/BUILD.bazel +++ b/google/cloud/talent/v4beta1/BUILD.bazel @@ -61,15 +61,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -185,12 +184,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/tasks/v2/BUILD.bazel b/google/cloud/tasks/v2/BUILD.bazel index 701887ad..316b5172 100644 --- a/google/cloud/tasks/v2/BUILD.bazel +++ b/google/cloud/tasks/v2/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/tasks/v2beta2/BUILD.bazel b/google/cloud/tasks/v2beta2/BUILD.bazel index a006d651..c8474e8e 100644 --- a/google/cloud/tasks/v2beta2/BUILD.bazel +++ b/google/cloud/tasks/v2beta2/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -154,12 +153,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/tasks/v2beta3/BUILD.bazel b/google/cloud/tasks/v2beta3/BUILD.bazel index 640f6ba4..bf999d9b 100644 --- a/google/cloud/tasks/v2beta3/BUILD.bazel +++ b/google/cloud/tasks/v2beta3/BUILD.bazel @@ -42,13 +42,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -154,12 +153,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/texttospeech/v1/BUILD.bazel b/google/cloud/texttospeech/v1/BUILD.bazel index b746dd83..8facf9e5 100644 --- a/google/cloud/texttospeech/v1/BUILD.bazel +++ b/google/cloud/texttospeech/v1/BUILD.bazel @@ -31,15 +31,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -136,14 +135,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/texttospeech/v1beta1/BUILD.bazel b/google/cloud/texttospeech/v1beta1/BUILD.bazel index 6f3c8a0e..561298ae 100644 --- a/google/cloud/texttospeech/v1beta1/BUILD.bazel +++ b/google/cloud/texttospeech/v1beta1/BUILD.bazel @@ -31,15 +31,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -136,14 +135,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/translate/v3/BUILD.bazel b/google/cloud/translate/v3/BUILD.bazel index 26773730..64dfdb76 100644 --- a/google/cloud/translate/v3/BUILD.bazel +++ b/google/cloud/translate/v3/BUILD.bazel @@ -34,15 +34,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -144,12 +143,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/translate/v3beta1/BUILD.bazel b/google/cloud/translate/v3beta1/BUILD.bazel index a76241ce..95c5cf9c 100644 --- a/google/cloud/translate/v3beta1/BUILD.bazel +++ b/google/cloud/translate/v3beta1/BUILD.bazel @@ -34,15 +34,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -144,12 +143,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/video/transcoder/v1beta1/BUILD.bazel b/google/cloud/video/transcoder/v1beta1/BUILD.bazel index f417ac64..12d5c649 100644 --- a/google/cloud/video/transcoder/v1beta1/BUILD.bazel +++ b/google/cloud/video/transcoder/v1beta1/BUILD.bazel @@ -45,15 +45,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/videointelligence/v1/BUILD.bazel b/google/cloud/videointelligence/v1/BUILD.bazel index 84c83419..8e26ded8 100644 --- a/google/cloud/videointelligence/v1/BUILD.bazel +++ b/google/cloud/videointelligence/v1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/videointelligence/v1beta2/BUILD.bazel b/google/cloud/videointelligence/v1beta2/BUILD.bazel index 289cf83d..24929a22 100644 --- a/google/cloud/videointelligence/v1beta2/BUILD.bazel +++ b/google/cloud/videointelligence/v1beta2/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel index 6813c538..eeed6e09 100644 --- a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel index a0311215..9f3587bd 100644 --- a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -148,12 +147,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel index a2e9b04f..a7049622 100644 --- a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,12 +148,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/vision/v1/BUILD.bazel b/google/cloud/vision/v1/BUILD.bazel index cdbbeacd..232ad01b 100644 --- a/google/cloud/vision/v1/BUILD.bazel +++ b/google/cloud/vision/v1/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -159,12 +158,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/vision/v1p1beta1/BUILD.bazel b/google/cloud/vision/v1p1beta1/BUILD.bazel index f1a512dd..080c0805 100644 --- a/google/cloud/vision/v1p1beta1/BUILD.bazel +++ b/google/cloud/vision/v1p1beta1/BUILD.bazel @@ -37,15 +37,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -146,12 +145,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/vision/v1p2beta1/BUILD.bazel b/google/cloud/vision/v1p2beta1/BUILD.bazel index 203ae9d2..61dcd5da 100644 --- a/google/cloud/vision/v1p2beta1/BUILD.bazel +++ b/google/cloud/vision/v1p2beta1/BUILD.bazel @@ -39,15 +39,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/vision/v1p3beta1/BUILD.bazel b/google/cloud/vision/v1p3beta1/BUILD.bazel index a36920ec..148d856d 100644 --- a/google/cloud/vision/v1p3beta1/BUILD.bazel +++ b/google/cloud/vision/v1p3beta1/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -159,12 +158,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/vision/v1p4beta1/BUILD.bazel b/google/cloud/vision/v1p4beta1/BUILD.bazel index 50902068..a745a163 100644 --- a/google/cloud/vision/v1p4beta1/BUILD.bazel +++ b/google/cloud/vision/v1p4beta1/BUILD.bazel @@ -45,15 +45,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -160,12 +159,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/webrisk/v1/BUILD.bazel b/google/cloud/webrisk/v1/BUILD.bazel index 7d62a225..5c4e194a 100644 --- a/google/cloud/webrisk/v1/BUILD.bazel +++ b/google/cloud/webrisk/v1/BUILD.bazel @@ -33,15 +33,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -140,13 +139,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/webrisk/v1beta1/BUILD.bazel b/google/cloud/webrisk/v1beta1/BUILD.bazel index 02922da1..701c5406 100644 --- a/google/cloud/webrisk/v1beta1/BUILD.bazel +++ b/google/cloud/webrisk/v1beta1/BUILD.bazel @@ -32,15 +32,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -139,13 +138,11 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/websecurityscanner/v1/BUILD.bazel b/google/cloud/websecurityscanner/v1/BUILD.bazel index 35b07d54..043d9a6f 100644 --- a/google/cloud/websecurityscanner/v1/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1/BUILD.bazel @@ -44,13 +44,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,14 +148,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel index 1c09e66b..5783f63a 100644 --- a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel @@ -41,13 +41,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -147,12 +146,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/websecurityscanner/v1beta/BUILD.bazel b/google/cloud/websecurityscanner/v1beta/BUILD.bazel index ec8dde8a..54f708cd 100644 --- a/google/cloud/websecurityscanner/v1beta/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1beta/BUILD.bazel @@ -44,13 +44,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -150,12 +149,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/workflows/executions/v1beta/BUILD.bazel b/google/cloud/workflows/executions/v1beta/BUILD.bazel index 59590a88..8cd74c62 100644 --- a/google/cloud/workflows/executions/v1beta/BUILD.bazel +++ b/google/cloud/workflows/executions/v1beta/BUILD.bazel @@ -33,13 +33,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -57,8 +56,8 @@ java_grpc_library( java_gapic_library( name = "executions_java_gapic", - grpc_service_config = "executions_grpc_service_config.json", srcs = [":executions_proto_with_info"], + grpc_service_config = "executions_grpc_service_config.json", package = "google.cloud.workflows.executions.v1beta", test_deps = [ ":executions_java_grpc", @@ -139,12 +138,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/cloud/workflows/v1beta/BUILD.bazel b/google/cloud/workflows/v1beta/BUILD.bazel index a55891d4..c8eb736c 100644 --- a/google/cloud/workflows/v1beta/BUILD.bazel +++ b/google/cloud/workflows/v1beta/BUILD.bazel @@ -35,13 +35,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -59,8 +58,8 @@ java_grpc_library( java_gapic_library( name = "workflows_java_gapic", - grpc_service_config = "workflows_grpc_service_config.json", srcs = [":workflows_proto_with_info"], + grpc_service_config = "workflows_grpc_service_config.json", package = "google.cloud.workflows.v1beta", test_deps = [ ":workflows_java_grpc", @@ -145,12 +144,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/container/v1/BUILD.bazel b/google/container/v1/BUILD.bazel index 3100e966..62c857aa 100644 --- a/google/container/v1/BUILD.bazel +++ b/google/container/v1/BUILD.bazel @@ -33,13 +33,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -140,12 +139,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/container/v1beta1/BUILD.bazel b/google/container/v1beta1/BUILD.bazel index e8f8ba79..593f9d9b 100644 --- a/google/container/v1beta1/BUILD.bazel +++ b/google/container/v1beta1/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -146,12 +145,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/datastore/admin/v1/BUILD.bazel b/google/datastore/admin/v1/BUILD.bazel index 6b98186c..8c61dbd1 100644 --- a/google/datastore/admin/v1/BUILD.bazel +++ b/google/datastore/admin/v1/BUILD.bazel @@ -34,13 +34,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -145,12 +144,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/datastore/v1/BUILD.bazel b/google/datastore/v1/BUILD.bazel index 7185edbf..9b8ebc2d 100644 --- a/google/datastore/v1/BUILD.bazel +++ b/google/datastore/v1/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -145,12 +144,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/devtools/artifactregistry/v1beta2/BUILD.bazel b/google/devtools/artifactregistry/v1beta2/BUILD.bazel index 70bea6b2..2e0e9d21 100644 --- a/google/devtools/artifactregistry/v1beta2/BUILD.bazel +++ b/google/devtools/artifactregistry/v1beta2/BUILD.bazel @@ -53,13 +53,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -166,14 +165,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/devtools/build/v1/BUILD.bazel b/google/devtools/build/v1/BUILD.bazel index 0fb0a65d..abb626c9 100644 --- a/google/devtools/build/v1/BUILD.bazel +++ b/google/devtools/build/v1/BUILD.bazel @@ -38,13 +38,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -145,14 +144,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/devtools/cloudbuild/v1/BUILD.bazel b/google/devtools/cloudbuild/v1/BUILD.bazel index 1b4e673a..5b75baf9 100644 --- a/google/devtools/cloudbuild/v1/BUILD.bazel +++ b/google/devtools/cloudbuild/v1/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,12 +148,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/devtools/clouddebugger/v2/BUILD.bazel b/google/devtools/clouddebugger/v2/BUILD.bazel index cde99dbe..ecd17243 100644 --- a/google/devtools/clouddebugger/v2/BUILD.bazel +++ b/google/devtools/clouddebugger/v2/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -145,14 +144,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel b/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel index 2bad613b..09b3c307 100644 --- a/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel +++ b/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel @@ -37,13 +37,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -147,12 +146,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/devtools/cloudtrace/v1/BUILD.bazel b/google/devtools/cloudtrace/v1/BUILD.bazel index 26090212..ef37c2b3 100644 --- a/google/devtools/cloudtrace/v1/BUILD.bazel +++ b/google/devtools/cloudtrace/v1/BUILD.bazel @@ -43,13 +43,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,14 +148,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/devtools/cloudtrace/v2/BUILD.bazel b/google/devtools/cloudtrace/v2/BUILD.bazel index 63328e2b..dbc14f15 100644 --- a/google/devtools/cloudtrace/v2/BUILD.bazel +++ b/google/devtools/cloudtrace/v2/BUILD.bazel @@ -51,9 +51,9 @@ proto_library_with_info( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -154,14 +154,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/devtools/containeranalysis/v1/BUILD.bazel b/google/devtools/containeranalysis/v1/BUILD.bazel index d9986d27..873cd920 100644 --- a/google/devtools/containeranalysis/v1/BUILD.bazel +++ b/google/devtools/containeranalysis/v1/BUILD.bazel @@ -48,15 +48,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -163,12 +162,10 @@ go_proto_library( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/devtools/containeranalysis/v1beta1/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/BUILD.bazel index 7b166737..b5899bf6 100644 --- a/google/devtools/containeranalysis/v1beta1/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/BUILD.bazel @@ -49,15 +49,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) _JAVA_PROTO_SUBPACKAGE_DEPS = [ diff --git a/google/devtools/remoteworkers/v1test2/BUILD.bazel b/google/devtools/remoteworkers/v1test2/BUILD.bazel index afd654d8..2ea3cdda 100644 --- a/google/devtools/remoteworkers/v1test2/BUILD.bazel +++ b/google/devtools/remoteworkers/v1test2/BUILD.bazel @@ -43,9 +43,9 @@ proto_library_with_info( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -147,14 +147,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/example/library/v1/BUILD.bazel b/google/example/library/v1/BUILD.bazel index eeb6c111..b78cbaa9 100644 --- a/google/example/library/v1/BUILD.bazel +++ b/google/example/library/v1/BUILD.bazel @@ -33,13 +33,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -138,14 +137,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/firestore/admin/v1/BUILD.bazel b/google/firestore/admin/v1/BUILD.bazel index 0a214641..03518891 100644 --- a/google/firestore/admin/v1/BUILD.bazel +++ b/google/firestore/admin/v1/BUILD.bazel @@ -41,14 +41,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -153,12 +154,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/firestore/bundle/BUILD.bazel b/google/firestore/bundle/BUILD.bazel index f6511841..e5432e06 100644 --- a/google/firestore/bundle/BUILD.bazel +++ b/google/firestore/bundle/BUILD.bazel @@ -31,8 +31,7 @@ proto_library_with_info( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - "java_grpc_library", + "java_gapic_assembly_gradle_pkg", "java_proto_library", ) diff --git a/google/firestore/v1/BUILD.bazel b/google/firestore/v1/BUILD.bazel index f704766b..add70215 100644 --- a/google/firestore/v1/BUILD.bazel +++ b/google/firestore/v1/BUILD.bazel @@ -41,13 +41,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -150,12 +149,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/firestore/v1beta1/BUILD.bazel b/google/firestore/v1beta1/BUILD.bazel index b3a2ed30..f20c938e 100644 --- a/google/firestore/v1beta1/BUILD.bazel +++ b/google/firestore/v1beta1/BUILD.bazel @@ -41,13 +41,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -149,14 +148,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/home/enterprise/sdm/v1/BUILD.bazel b/google/home/enterprise/sdm/v1/BUILD.bazel index e2b2bf16..8df3c3d1 100644 --- a/google/home/enterprise/sdm/v1/BUILD.bazel +++ b/google/home/enterprise/sdm/v1/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -149,14 +148,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/home/graph/v1/BUILD.bazel b/google/home/graph/v1/BUILD.bazel index 7099081d..47b812cc 100644 --- a/google/home/graph/v1/BUILD.bazel +++ b/google/home/graph/v1/BUILD.bazel @@ -35,15 +35,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -140,14 +139,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/iam/admin/v1/BUILD.bazel b/google/iam/admin/v1/BUILD.bazel index ec3ef6fa..85f65fed 100644 --- a/google/iam/admin/v1/BUILD.bazel +++ b/google/iam/admin/v1/BUILD.bazel @@ -47,15 +47,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -157,14 +156,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/iam/credentials/v1/BUILD.bazel b/google/iam/credentials/v1/BUILD.bazel index 3e527ea8..ea0ca378 100644 --- a/google/iam/credentials/v1/BUILD.bazel +++ b/google/iam/credentials/v1/BUILD.bazel @@ -35,15 +35,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -142,12 +141,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/iam/v1beta/BUILD.bazel b/google/iam/v1beta/BUILD.bazel index 3337e982..878c775c 100644 --- a/google/iam/v1beta/BUILD.bazel +++ b/google/iam/v1beta/BUILD.bazel @@ -43,13 +43,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -153,14 +152,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/identity/accesscontextmanager/type/BUILD.bazel b/google/identity/accesscontextmanager/type/BUILD.bazel index c3fa40fc..cd61676f 100644 --- a/google/identity/accesscontextmanager/type/BUILD.bazel +++ b/google/identity/accesscontextmanager/type/BUILD.bazel @@ -23,9 +23,9 @@ proto_library( ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", ) java_proto_library( diff --git a/google/identity/accesscontextmanager/v1/BUILD.bazel b/google/identity/accesscontextmanager/v1/BUILD.bazel index 0474171c..8d4ec7b2 100644 --- a/google/identity/accesscontextmanager/v1/BUILD.bazel +++ b/google/identity/accesscontextmanager/v1/BUILD.bazel @@ -25,13 +25,12 @@ proto_library( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", ) java_proto_library( diff --git a/google/logging/v2/BUILD.bazel b/google/logging/v2/BUILD.bazel index 837c1eb9..18c04dd5 100644 --- a/google/logging/v2/BUILD.bazel +++ b/google/logging/v2/BUILD.bazel @@ -55,13 +55,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -172,12 +171,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/maps/playablelocations/v3/BUILD.bazel b/google/maps/playablelocations/v3/BUILD.bazel index 5adcf5be..7793e34e 100644 --- a/google/maps/playablelocations/v3/BUILD.bazel +++ b/google/maps/playablelocations/v3/BUILD.bazel @@ -37,14 +37,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( diff --git a/google/maps/roads/v1op/BUILD.bazel b/google/maps/roads/v1op/BUILD.bazel index 32b45b0b..6a1cf1ed 100644 --- a/google/maps/roads/v1op/BUILD.bazel +++ b/google/maps/roads/v1op/BUILD.bazel @@ -34,14 +34,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -138,13 +139,14 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) py_proto_library( diff --git a/google/maps/routes/v1/BUILD.bazel b/google/maps/routes/v1/BUILD.bazel index adb08dc1..2a45816f 100644 --- a/google/maps/routes/v1/BUILD.bazel +++ b/google/maps/routes/v1/BUILD.bazel @@ -50,12 +50,13 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", ) java_proto_library( @@ -170,7 +171,6 @@ load( "nodejs_gapic_library", ) - ############################################################################## # Ruby ############################################################################## diff --git a/google/maps/routespreferred/v1/BUILD.bazel b/google/maps/routespreferred/v1/BUILD.bazel index 3f063176..a17d2e64 100644 --- a/google/maps/routespreferred/v1/BUILD.bazel +++ b/google/maps/routespreferred/v1/BUILD.bazel @@ -22,14 +22,15 @@ alias( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_gapic_library( diff --git a/google/monitoring/dashboard/v1/BUILD.bazel b/google/monitoring/dashboard/v1/BUILD.bazel index 6c151f55..cce1ebe8 100644 --- a/google/monitoring/dashboard/v1/BUILD.bazel +++ b/google/monitoring/dashboard/v1/BUILD.bazel @@ -47,13 +47,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -156,12 +155,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/monitoring/v3/BUILD.bazel b/google/monitoring/v3/BUILD.bazel index cc2646f2..53cea48a 100644 --- a/google/monitoring/v3/BUILD.bazel +++ b/google/monitoring/v3/BUILD.bazel @@ -60,15 +60,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -183,12 +182,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/partner/aistreams/v1alpha1/BUILD.bazel b/google/partner/aistreams/v1alpha1/BUILD.bazel index 46996c30..6c7a837e 100644 --- a/google/partner/aistreams/v1alpha1/BUILD.bazel +++ b/google/partner/aistreams/v1alpha1/BUILD.bazel @@ -44,15 +44,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -153,14 +152,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/privacy/dlp/v2/BUILD.bazel b/google/privacy/dlp/v2/BUILD.bazel index d2cf4781..cba9cc3e 100644 --- a/google/privacy/dlp/v2/BUILD.bazel +++ b/google/privacy/dlp/v2/BUILD.bazel @@ -41,15 +41,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/pubsub/v1/BUILD.bazel b/google/pubsub/v1/BUILD.bazel index 43a0047c..48eac226 100644 --- a/google/pubsub/v1/BUILD.bazel +++ b/google/pubsub/v1/BUILD.bazel @@ -35,15 +35,16 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", + java_resource_name_proto_library = "java_resource_name_proto_library_legacy", ) java_proto_library( @@ -70,8 +71,8 @@ java_gapic_library( name = "pubsub_java_gapic", src = ":pubsub_proto_with_info", gapic_yaml = "pubsub_gapic.yaml", - grpc_service_config = "pubsub_grpc_service_config.json", gen_resource_name = False, + grpc_service_config = "pubsub_grpc_service_config.json", service_yaml = ":pubsub_v1.yaml", test_deps = [ ":pubsub_java_grpc", @@ -108,19 +109,17 @@ java_gapic_assembly_gradle_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( name = "pubsub_py_gapic", srcs = [":pubsub_proto"], grpc_service_config = "pubsub_grpc_service_config.json", - opt_args = ["add-iam-methods"] + opt_args = ["add-iam-methods"], ) py_gapic_assembly_pkg( @@ -129,6 +128,7 @@ py_gapic_assembly_pkg( ":pubsub_py_gapic", ], ) + ############################################################################## # Go ############################################################################## @@ -235,13 +235,13 @@ nodejs_gapic_library( name = "pubsub_nodejs_gapic", package_name = "@google-cloud/pubsub", src = ":pubsub_proto_with_info", - grpc_service_config = "pubsub_grpc_service_config.json", - service_yaml = ":pubsub_v1.yaml", bundle_config = "pubsub_gapic.yaml", - main_service = "pubsub", - deps = [], - iam_service = "true", extra_protoc_parameters = ["template=typescript_gapic"], + grpc_service_config = "pubsub_grpc_service_config.json", + iam_service = "true", + main_service = "pubsub", + service_yaml = ":pubsub_v1.yaml", + deps = [], ) nodejs_gapic_assembly_pkg( diff --git a/google/spanner/admin/database/v1/BUILD.bazel b/google/spanner/admin/database/v1/BUILD.bazel index 436845fe..719d9a92 100644 --- a/google/spanner/admin/database/v1/BUILD.bazel +++ b/google/spanner/admin/database/v1/BUILD.bazel @@ -40,13 +40,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -155,12 +154,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/spanner/admin/instance/v1/BUILD.bazel b/google/spanner/admin/instance/v1/BUILD.bazel index d98d9eb8..2ff522bb 100644 --- a/google/spanner/admin/instance/v1/BUILD.bazel +++ b/google/spanner/admin/instance/v1/BUILD.bazel @@ -38,13 +38,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -153,12 +152,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/spanner/v1/BUILD.bazel b/google/spanner/v1/BUILD.bazel index 72e32e5a..07dfc3c7 100644 --- a/google/spanner/v1/BUILD.bazel +++ b/google/spanner/v1/BUILD.bazel @@ -43,13 +43,12 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", ) @@ -152,12 +151,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/google/storage/v1/BUILD.bazel b/google/storage/v1/BUILD.bazel index 984721bd..29a8e214 100644 --- a/google/storage/v1/BUILD.bazel +++ b/google/storage/v1/BUILD.bazel @@ -37,14 +37,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -146,14 +147,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/google/streetview/publish/v1/BUILD.bazel b/google/streetview/publish/v1/BUILD.bazel index b6f9e24f..91a0eb70 100644 --- a/google/streetview/publish/v1/BUILD.bazel +++ b/google/streetview/publish/v1/BUILD.bazel @@ -37,14 +37,15 @@ proto_library_with_info( ############################################################################## # Java +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Java Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_gapic_test", "java_grpc_library", "java_proto_library", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg_legacy", + java_gapic_library = "java_gapic_library_legacy", + java_gapic_test = "java_gapic_test_legacy", ) java_proto_library( @@ -144,14 +145,15 @@ go_gapic_assembly_pkg( ############################################################################## # Python +# DO NOT OVERRIDE with autogenerated rules if NOT migrated to Python Microgen ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", "py_grpc_library", "py_proto_library", + py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", + py_gapic_library = "py_gapic_library_legacy", ) moved_proto_library( diff --git a/grafeas/v1/BUILD.bazel b/grafeas/v1/BUILD.bazel index d7b6ac48..768559c8 100644 --- a/grafeas/v1/BUILD.bazel +++ b/grafeas/v1/BUILD.bazel @@ -47,15 +47,14 @@ proto_library_with_info( ############################################################################## # Java -# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules. ############################################################################## load( "@com_google_googleapis_imports//:imports.bzl", + "java_gapic_assembly_gradle_pkg", + "java_gapic_library", + "java_gapic_test", "java_grpc_library", "java_proto_library", - java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", - java_gapic_library = "java_gapic_library2", - java_gapic_test = "java_gapic_test2", ) java_proto_library( @@ -154,12 +153,10 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## -# This library is using Python microgenerator. -# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", - py_gapic_library = "py_gapic_library2", + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( diff --git a/repository_rules.bzl b/repository_rules.bzl index b95be8b5..eea29793 100644 --- a/repository_rules.bzl +++ b/repository_rules.bzl @@ -136,36 +136,36 @@ def switched_rules_by_language( ) rules["java_gapic_library"] = _switch( java and grpc and gapic, - "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", - ) - rules["java_resource_name_proto_library"] = _switch( - java and grpc and gapic, - "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", + "@gapic_generator_java//rules_java_gapic:java_gapic.bzl", ) rules["java_gapic_test"] = _switch( java and grpc and gapic, - "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", + "@gapic_generator_java//rules_java_gapic:java_gapic.bzl", ) rules["java_gapic_assembly_gradle_pkg"] = _switch( java and grpc and gapic, - "@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl", + "@gapic_generator_java//rules_java_gapic:java_gapic_pkg.bzl", ) - # Java microgenerator. - # These will eventually replace the monolith Java rules. - rules["java_gapic_library2"] = _switch( + # Removed the legacy rules once monolith generator is decommissioned + rules["java_gapic_library_legacy"] = _switch( java and grpc and gapic, - "@gapic_generator_java//rules_java_gapic:java_gapic.bzl", + "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", "java_gapic_library", ) - rules["java_gapic_test2"] = _switch( + rules["java_resource_name_proto_library_legacy"] = _switch( java and grpc and gapic, - "@gapic_generator_java//rules_java_gapic:java_gapic.bzl", + "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", + "java_resource_name_proto_library", + ) + rules["java_gapic_test_legacy"] = _switch( + java and grpc and gapic, + "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", "java_gapic_test", ) - rules["java_gapic_assembly_gradle_pkg2"] = _switch( + rules["java_gapic_assembly_gradle_pkg_legacy"] = _switch( java and grpc and gapic, - "@gapic_generator_java//rules_java_gapic:java_gapic_pkg.bzl", + "@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl", "java_gapic_assembly_gradle_pkg", ) @@ -182,20 +182,20 @@ def switched_rules_by_language( ) rules["py_gapic_library"] = _switch( python and grpc and gapic, - "@com_google_api_codegen//rules_gapic/python:py_gapic.bzl", + "@gapic_generator_python//rules_python_gapic:py_gapic.bzl", ) rules["py_gapic_assembly_pkg"] = _switch( python and grpc and gapic, - "@com_google_api_codegen//rules_gapic/python:py_gapic_pkg.bzl", + "@gapic_generator_python//rules_python_gapic:py_gapic_pkg.bzl", ) - rules["py_gapic_library2"] = _switch( + rules["py_gapic_library_legacy"] = _switch( python and grpc and gapic, - "@gapic_generator_python//rules_python_gapic:py_gapic.bzl", + "@com_google_api_codegen//rules_gapic/python:py_gapic.bzl", "py_gapic_library", ) - rules["py_gapic_assembly_pkg2"] = _switch( + rules["py_gapic_assembly_pkg_legacy"] = _switch( python and grpc and gapic, - "@gapic_generator_python//rules_python_gapic:py_gapic_pkg.bzl", + "@com_google_api_codegen//rules_gapic/python:py_gapic_pkg.bzl", "py_gapic_assembly_pkg", )