From 15bd8007c076dbb9258f86e70986e88ed29f61ef Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 14 Dec 2020 10:08:23 -0800 Subject: [PATCH] chore: use microgenerator for binaryauthorization, domains, and retail PiperOrigin-RevId: 347410694 --- .../binaryauthorization/v1beta1/BUILD.bazel | 44 ++--------------- google/cloud/domains/v1beta1/BUILD.bazel | 47 ++---------------- google/cloud/retail/v2/BUILD.bazel | 49 +++---------------- 3 files changed, 12 insertions(+), 128 deletions(-) diff --git a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel index ba2d7363..545c603b 100644 --- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel +++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel @@ -140,53 +140,17 @@ 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_grpc_library", - "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", - py_gapic_library = "py_gapic_library_legacy", -) - -moved_proto_library( - name = "binaryauthorization_moved_proto", - srcs = [":binaryauthorization_proto"], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:resource_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:timestamp_proto", - ], -) - -py_proto_library( - name = "binaryauthorization_py_proto", - plugin = "@protoc_docs_plugin//:docs_plugin", - deps = [":binaryauthorization_moved_proto"], -) - -py_grpc_library( - name = "binaryauthorization_py_grpc", - srcs = [":binaryauthorization_moved_proto"], - deps = [":binaryauthorization_py_proto"], + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( name = "binaryauthorization_py_gapic", - src = ":binaryauthorization_proto_with_info", - gapic_yaml = "binaryauthorization_gapic.yaml", + srcs = [":binaryauthorization_proto"], grpc_service_config = "binaryauthorization_grpc_service_config.json", - package = "google.cloud.binaryauthorization.v1beta1", - service_yaml = "binaryauthorization_v1beta1.yaml", - deps = [ - ":binaryauthorization_py_grpc", - ":binaryauthorization_py_proto", - ], ) # Open Source Packages @@ -194,8 +158,6 @@ py_gapic_assembly_pkg( name = "binaryauthorization-v1beta1-py", deps = [ ":binaryauthorization_py_gapic", - ":binaryauthorization_py_grpc", - ":binaryauthorization_py_proto", ], ) diff --git a/google/cloud/domains/v1beta1/BUILD.bazel b/google/cloud/domains/v1beta1/BUILD.bazel index daa772e9..5b91a84b 100644 --- a/google/cloud/domains/v1beta1/BUILD.bazel +++ b/google/cloud/domains/v1beta1/BUILD.bazel @@ -157,56 +157,17 @@ 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_grpc_library", - "py_proto_library", - py_gapic_assembly_pkg = "py_gapic_assembly_pkg_legacy", - py_gapic_library = "py_gapic_library_legacy", -) - -moved_proto_library( - name = "domains_moved_proto", - srcs = [":domains_proto"], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:resource_proto", - "//google/longrunning:operations_proto", - "//google/type:money_proto", - "//google/type:postal_address_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:timestamp_proto", - ], -) - -py_proto_library( - name = "domains_py_proto", - plugin = "@protoc_docs_plugin//:docs_plugin", - deps = [":domains_moved_proto"], -) - -py_grpc_library( - name = "domains_py_grpc", - srcs = [":domains_moved_proto"], - deps = [":domains_py_proto"], + "py_gapic_assembly_pkg", + "py_gapic_library", ) py_gapic_library( name = "domains_py_gapic", - src = ":domains_proto_with_info", - gapic_yaml = "domains_gapic.yaml", + srcs = [":domains_proto"], grpc_service_config = "domains_grpc_service_config.json", - package = "google.cloud.domains.v1beta1", - service_yaml = "domains_v1beta1.yaml", - deps = [ - ":domains_py_grpc", - ":domains_py_proto", - ], ) # Open Source Packages @@ -214,8 +175,6 @@ py_gapic_assembly_pkg( name = "domains-v1beta1-py", deps = [ ":domains_py_gapic", - ":domains_py_grpc", - ":domains_py_proto", ], ) diff --git a/google/cloud/retail/v2/BUILD.bazel b/google/cloud/retail/v2/BUILD.bazel index ffcd81ea..cee795f3 100644 --- a/google/cloud/retail/v2/BUILD.bazel +++ b/google/cloud/retail/v2/BUILD.bazel @@ -42,8 +42,8 @@ load( "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", + "py_gapic_assembly_pkg", + "py_gapic_library" ) # This is an API workspace, having public visibility by default makes perfect sense. @@ -182,49 +182,14 @@ go_gapic_assembly_pkg( ], ) -moved_proto_library( - name = "retail_moved_proto", - srcs = [":retail_proto"], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:httpbody_proto", - "//google/api:resource_proto", - "//google/longrunning:operations_proto", - "//google/rpc:status_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - "@com_google_protobuf//:wrappers_proto", - ], -) - -py_proto_library( - name = "retail_py_proto", - plugin = "@protoc_docs_plugin//:docs_plugin", - deps = [":retail_moved_proto"], -) - -py_grpc_library( - name = "retail_py_grpc", - srcs = [":retail_moved_proto"], - deps = [":retail_py_proto"], -) +############################################################################## +# Python +############################################################################## py_gapic_library( name = "retail_py_gapic", - src = ":retail_proto_with_info", - gapic_yaml = "retail_gapic.yaml", + srcs = [":retail_proto"], grpc_service_config = "retail_grpc_service_config.json", - package = "google.cloud.retail.v2", - service_yaml = "retail_v2.yaml", - deps = [ - ":retail_py_grpc", - ":retail_py_proto", - ], ) # Open Source Packages @@ -232,8 +197,6 @@ py_gapic_assembly_pkg( name = "retail-v2-py", deps = [ ":retail_py_gapic", - ":retail_py_grpc", - ":retail_py_proto", ], )