diff --git a/BUILD.bazel b/BUILD.bazel index c93a7537..d542a8a4 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -8,7 +8,7 @@ pkg_tar( deps = [ '//google/api/expr/v1alpha1:gapi-cloud-cel-v1alpha1-go', '//google/api/expr/v1alpha1:google-cloud-cel-v1alpha1-java', - '//google/bigtable/admin/v2:gapi-cloud-bigtableadmin-v2-go', + '//google/bigtable/admin/v2:gapi-cloud-bigtable-admin-v2-go', '//google/bigtable/admin/v2:google-cloud-bigtable-admin-v2-java', '//google/bigtable/v2:gapi-cloud-bigtable-v2-go', '//google/bigtable/v2:google-cloud-bigtable-v2-java', @@ -62,8 +62,6 @@ pkg_tar( '//google/cloud/texttospeech/v1beta1:google-cloud-texttospeech-v1beta1-java', '//google/cloud/texttospeech/v1:gapi-cloud-texttospeech-v1-go', '//google/cloud/texttospeech/v1:google-cloud-texttospeech-v1-java', - '//google/cloud/videointelligence/v1beta1:gapi-cloud-video-intelligence-v1beta1-go', - '//google/cloud/videointelligence/v1beta1:google-cloud-video-intelligence-v1beta1-java', '//google/cloud/videointelligence/v1beta2:gapi-cloud-video-intelligence-v1beta2-go', '//google/cloud/videointelligence/v1beta2:google-cloud-video-intelligence-v1beta2-java', '//google/cloud/videointelligence/v1:gapi-cloud-video-intelligence-v1-go', diff --git a/WORKSPACE b/WORKSPACE index 7ce00ddd..942da0c0 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,6 +11,7 @@ load("//:repository_rules.bzl", "switched_rules_by_language") switched_rules_by_language( name = "com_google_googleapis_imports", cc = True, + csharp = True, gapic = True, go = True, grpc = True, @@ -18,7 +19,6 @@ switched_rules_by_language( nodejs = True, php = True, ruby = True, - csharp = True, ) # Protobuf depends on very old version of bazel_skylib (forward compatible with the new one). @@ -32,7 +32,7 @@ http_archive( http_archive( name = "com_google_protobuf", - strip_prefix = "protobuf-c60aaf79e63b911b2c04c04e1eacb4f3c36ef790", # this is 3.9.1 with fixes + strip_prefix = "protobuf-c60aaf79e63b911b2c04c04e1eacb4f3c36ef790", # this is 3.9.1 with fixes urls = ["https://github.com/protocolbuffers/protobuf/archive/c60aaf79e63b911b2c04c04e1eacb4f3c36ef790.zip"], ) @@ -44,8 +44,8 @@ protobuf_deps() # section http_archive( name = "com_google_api_codegen", - strip_prefix = "gapic-generator-5aa30f3d6850c8ebc1092d17ef471aea27a81242", - urls = ["https://github.com/googleapis/gapic-generator/archive/5aa30f3d6850c8ebc1092d17ef471aea27a81242.zip"], + strip_prefix = "gapic-generator-89ca580bf9534eaef2e06292c4b083c72dfa8ec1", + urls = ["https://github.com/googleapis/gapic-generator/archive/89ca580bf9534eaef2e06292c4b083c72dfa8ec1.zip"], ) ############################################################################## @@ -62,7 +62,7 @@ http_archive( http_archive( name = "com_github_grpc_grpc", - strip_prefix = "grpc-0542eb59d9b7a75f16edfd9e3010c8d7d399626d", # this is 1.23.0 with fixes + strip_prefix = "grpc-0542eb59d9b7a75f16edfd9e3010c8d7d399626d", # this is 1.23.0 with fixes urls = ["https://github.com/grpc/grpc/archive/0542eb59d9b7a75f16edfd9e3010c8d7d399626d.zip"], ) @@ -71,14 +71,17 @@ load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") grpc_deps() load("@upb//bazel:repository_defs.bzl", "bazel_version_repository") + bazel_version_repository( name = "bazel_version", ) load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") + apple_rules_dependencies() load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") + apple_support_dependencies() ############################################################################## @@ -96,8 +99,8 @@ apple_support_dependencies() http_archive( name = "com_google_api_gax_java", - strip_prefix = "gax-java-425d9111bc8a2e2c950e60b7e925de83d00b9da9", - urls = ["https://github.com/googleapis/gax-java/archive/425d9111bc8a2e2c950e60b7e925de83d00b9da9.zip"], + strip_prefix = "gax-java-1.49.0", + urls = ["https://github.com/googleapis/gax-java/archive/v1.49.0.zip"], ) load("@com_google_api_gax_java//:repository_rules.bzl", "com_google_api_gax_java_properties") @@ -122,14 +125,14 @@ com_google_api_codegen_properties( load("@com_google_api_codegen//:repositories.bzl", "com_google_api_codegen_repositories") -com_google_api_codegen_repositories() - http_archive( name = "com_google_protoc_java_resource_names_plugin", - strip_prefix = "protoc-java-resource-names-plugin-86949f7d0f25546499acceb12c9c1a5741c71617", - urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/86949f7d0f25546499acceb12c9c1a5741c71617.zip"], + strip_prefix = "protoc-java-resource-names-plugin-10f4e3d48d6501efdf29009b7437f506903f6d61", + urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/10f4e3d48d6501efdf29009b7437f506903f6d61.zip"], ) +com_google_api_codegen_repositories() + # protoc-java-resource-names-plugin (loaded in com_google_api_codegen_repositories()) # (required to support resource names feature in gapic generator) load( diff --git a/google/api/expr/v1alpha1/BUILD.bazel b/google/api/expr/v1alpha1/BUILD.bazel index 95ee8b65..2380d157 100644 --- a/google/api/expr/v1alpha1/BUILD.bazel +++ b/google/api/expr/v1alpha1/BUILD.bazel @@ -31,6 +31,8 @@ proto_library( ":checked_proto", ":eval_proto", ":syntax_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/rpc:status_proto", ], ) @@ -83,6 +85,8 @@ proto_library( "value.proto", ], deps = [ + "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/rpc:status_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:duration_proto", @@ -94,7 +98,10 @@ proto_library( proto_library_with_info( name = "cel_proto_with_info", - deps = [":cel_proto"], + deps = [ + ":cel_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -106,13 +113,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "cel_java_proto", deps = [":cel_proto"], @@ -121,7 +124,7 @@ java_proto_library( java_grpc_library( name = "cel_java_grpc", srcs = [":cel_proto"], - deps = [":cel_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":cel_java_proto"], ) java_gapic_library( @@ -130,31 +133,27 @@ java_gapic_library( gapic_yaml = "cel_gapic.yaml", service_yaml = "//google/api/expr:cel.yaml", test_deps = [":cel_java_grpc"], - deps = [":cel_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":cel_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "cel_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.api.expr.v1alpha1.CelServiceClientTest", + "com.google.cloud.api.expr.v1alpha1.ConformanceServiceClientTest", + ], runtime_deps = [":cel_java_gapic_test"], -) for test_name in [ - "com.google.cloud.api.expr.v1alpha1.CelServiceClientTest", - "com.google.cloud.api.expr.v1alpha1.ConformanceServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-cel-v1alpha1-java", - client_deps = [":cel_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":cel_java_gapic_test"], - grpc_deps = [":cel_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":cel_java_gapic", + ":cel_java_grpc", ":cel_java_proto", ":cel_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/bigtable/admin/v2/BUILD.bazel b/google/bigtable/admin/v2/BUILD.bazel index 03cfa601..a8572898 100644 --- a/google/bigtable/admin/v2/BUILD.bazel +++ b/google/bigtable/admin/v2/BUILD.bazel @@ -29,7 +29,10 @@ proto_library( proto_library_with_info( name = "bigtableadmin_proto_with_info", - deps = [":bigtableadmin_proto"], + deps = [ + ":bigtableadmin_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -41,8 +44,7 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) _JAVA_GRPC_DEPS = [ @@ -58,13 +60,7 @@ java_proto_library( java_grpc_library( name = "bigtableadmin_java_grpc", srcs = [":bigtableadmin_proto"], - deps = [":bigtableadmin_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "bigtableadmin_resource_name_java_proto", - gapic_yaml = "bigtableadmin_gapic.yaml", - deps = [":bigtableadmin_proto"], + deps = [":bigtableadmin_java_proto"], ) java_gapic_library( @@ -72,36 +68,34 @@ java_gapic_library( src = ":bigtableadmin_proto_with_info", gapic_yaml = "bigtableadmin_gapic.yaml", service_yaml = "//google/bigtable/admin:bigtableadmin.yaml", - test_deps = [":bigtableadmin_java_grpc"], + test_deps = [ + ":bigtableadmin_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":bigtableadmin_java_proto", - ":bigtableadmin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "bigtableadmin_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClientTest", + "com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClientTest", + ], runtime_deps = [":bigtableadmin_java_gapic_test"], -) for test_name in [ - "com.google.cloud.bigtable.admin.v2.BaseBigtableInstanceAdminClientTest", - "com.google.cloud.bigtable.admin.v2.BaseBigtableTableAdminClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-bigtable-admin-v2-java", - client_deps = [":bigtableadmin_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":bigtableadmin_java_gapic_test"], - grpc_deps = [":bigtableadmin_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ - ":bigtableadmin_proto", + deps = [ + ":bigtableadmin_java_gapic", + ":bigtableadmin_java_grpc", ":bigtableadmin_java_proto", - ":bigtableadmin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ":bigtableadmin_proto", + ], ) ############################################################################## @@ -151,7 +145,7 @@ go_test( # Opensource Packages go_gapic_assembly_pkg( - name = "gapi-cloud-bigtableadmin-v2-go", + name = "gapi-cloud-bigtable-admin-v2-go", deps = [ ":bigtableadmin_go_gapic", ":bigtableadmin_go_gapic_srcjar-smoke-test.srcjar", diff --git a/google/bigtable/v2/BUILD.bazel b/google/bigtable/v2/BUILD.bazel index a1d7fc10..329e7b85 100644 --- a/google/bigtable/v2/BUILD.bazel +++ b/google/bigtable/v2/BUILD.bazel @@ -21,7 +21,10 @@ proto_library( proto_library_with_info( name = "bigtable_proto_with_info", - deps = [":bigtable_proto"], + deps = [ + ":bigtable_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -33,14 +36,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "bigtable_java_proto", deps = [":bigtable_proto"], @@ -49,13 +47,7 @@ java_proto_library( java_grpc_library( name = "bigtable_java_grpc", srcs = [":bigtable_proto"], - deps = [":bigtable_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "bigtable_resource_name_java_proto", - gapic_yaml = "bigtable_gapic.yaml", - deps = [":bigtable_proto"], + deps = [":bigtable_java_proto"], ) java_gapic_library( @@ -64,34 +56,26 @@ java_gapic_library( gapic_yaml = "bigtable_gapic.yaml", service_yaml = "//google/bigtable:bigtable.yaml", test_deps = [":bigtable_java_grpc"], - deps = [ - ":bigtable_java_proto", - ":bigtable_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":bigtable_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "bigtable_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.bigtable.data.v2.BaseBigtableDataClientTest", + ], runtime_deps = [":bigtable_java_gapic_test"], -) for test_name in [ - "com.google.cloud.bigtable.data.v2.BaseBigtableDataClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-bigtable-v2-java", - client_deps = [":bigtable_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":bigtable_java_gapic_test"], - grpc_deps = [":bigtable_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":bigtable_java_gapic", + ":bigtable_java_grpc", ":bigtable_java_proto", ":bigtable_proto", - ":bigtable_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/BUILD.bazel b/google/cloud/BUILD.bazel new file mode 100644 index 00000000..b112ef3d --- /dev/null +++ b/google/cloud/BUILD.bazel @@ -0,0 +1,11 @@ +# This is an API workspace, having public visibility by default makes perfect sense. +package(default_visibility = ["//visibility:public"]) + +############################################################################## +# Common +############################################################################## +proto_library( + name = "common_resources_proto", + srcs = ["common_resources.proto"], + deps = ["//google/api:resource_proto"], +) \ No newline at end of file diff --git a/google/cloud/asset/v1beta1/BUILD.bazel b/google/cloud/asset/v1beta1/BUILD.bazel index 6b2b2ac9..e2e2a189 100644 --- a/google/cloud/asset/v1beta1/BUILD.bazel +++ b/google/cloud/asset/v1beta1/BUILD.bazel @@ -24,7 +24,10 @@ proto_library( proto_library_with_info( name = "asset_proto_with_info", - deps = [":asset_proto"], + deps = [ + ":asset_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,8 +39,7 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) _JAVA_GRPC_DEPS = [ @@ -53,7 +55,7 @@ java_proto_library( java_grpc_library( name = "asset_java_grpc", srcs = [":asset_proto"], - deps = [":asset_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":asset_java_proto"], ) java_gapic_library( @@ -61,37 +63,36 @@ java_gapic_library( src = ":asset_proto_with_info", gapic_yaml = "cloudasset_gapic.yaml", service_yaml = "//google/cloud/asset:asset_v1beta1.yaml", - test_deps = [":asset_java_grpc"], - deps = [":asset_java_proto"] + _JAVA_GRPC_DEPS, + test_deps = [ + ":asset_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], + deps = [ + ":asset_java_proto", + "//google/iam/v1:iam_java_proto", + ], ) # TODO: configure flattened methods in AssetServiceClient so # com.google.cloud.asset.v1beta1.AssetServiceClientTest has actual methods to test (now it is empty, # and Bazel does not allow to run empty test classes (test classes without test methods)). -# -#[java_test( -# name = test_name, -# test_class = test_name, -# runtime_deps = [ -# ":asset_java_gapic_test", -# ], -#) for test_name in [ -# "com.google.cloud.asset.v1beta1.AssetServiceClientTest", -#]] +java_gapic_test( + name = "asset_java_gapic_test_suite", + test_classes = [ + # "com.google.cloud.asset.v1beta1.AssetServiceClientTest", + ], + runtime_deps = [":asset_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-asset-v1beta1-java", - client_deps = [":asset_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":asset_java_gapic_test"], - grpc_deps = [":asset_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":asset_java_gapic", + ":asset_java_grpc", ":asset_java_proto", ":asset_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/automl/v1beta1/BUILD.bazel b/google/cloud/automl/v1beta1/BUILD.bazel index e806b8bc..b42d7c10 100644 --- a/google/cloud/automl/v1beta1/BUILD.bazel +++ b/google/cloud/automl/v1beta1/BUILD.bazel @@ -54,7 +54,10 @@ proto_library( proto_library_with_info( name = "automl_proto_with_info", - deps = [":automl_proto"], + deps = [ + ":automl_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -66,14 +69,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "automl_java_proto", deps = [":automl_proto"], @@ -82,13 +80,7 @@ java_proto_library( java_grpc_library( name = "automl_java_grpc", srcs = [":automl_proto"], - deps = [":automl_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "automl_resource_name_java_proto", - gapic_yaml = "automl_gapic.yaml", - deps = [":automl_proto"], + deps = [":automl_java_proto"], ) java_gapic_library( @@ -97,37 +89,27 @@ java_gapic_library( gapic_yaml = "automl_gapic.yaml", service_yaml = "//google/cloud/automl:automl_v1beta1.yaml", test_deps = [":automl_java_grpc"], - deps = [ - ":automl_java_proto", - ":automl_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":automl_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":automl_java_gapic_test", +java_gapic_test( + name = "automl_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.automl.v1beta1.AutoMlClientTest", + "com.google.cloud.automl.v1beta1.PredictionServiceClientTest", ], -) for test_name in [ - "com.google.cloud.automl.v1beta1.AutoMlClientTest", - "com.google.cloud.automl.v1beta1.PredictionServiceClientTest", -]] + runtime_deps = [":automl_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-automl-v1beta1-java", - client_deps = [":automl_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":automl_java_gapic_test"], - grpc_deps = [":automl_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":automl_java_gapic", + ":automl_java_grpc", ":automl_java_proto", ":automl_proto", - ":automl_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel index a26bb5e1..9aee67ea 100644 --- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel +++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel @@ -15,6 +15,8 @@ proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/rpc:status_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", @@ -27,7 +29,10 @@ proto_library( proto_library_with_info( name = "bigquerydatatransfer_proto_with_info", - deps = [":bigquerydatatransfer_proto"], + deps = [ + ":bigquerydatatransfer_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -39,14 +44,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "bigquerydatatransfer_java_proto", deps = [":bigquerydatatransfer_proto"], @@ -55,55 +55,35 @@ java_proto_library( java_grpc_library( name = "bigquerydatatransfer_java_grpc", srcs = [":bigquerydatatransfer_proto"], - deps = [":bigquerydatatransfer_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "bigquerydatatransfer_resource_name_java_proto", - gapic_yaml = "bigquerydatatransfer_gapic.yaml", - deps = [":bigquerydatatransfer_proto"], + deps = [":bigquerydatatransfer_java_proto"], ) java_gapic_library( name = "bigquerydatatransfer_java_gapic", src = ":bigquerydatatransfer_proto_with_info", gapic_yaml = "bigquerydatatransfer_gapic.yaml", - service_yaml = "//google/cloud/bigquery/datatransfer:datatransfer.yaml", + service_yaml = "bigquerydatatransfer_v1.yaml", test_deps = [":bigquerydatatransfer_java_grpc"], - deps = [ - ":bigquerydatatransfer_java_proto", - ":bigquerydatatransfer_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":bigquerydatatransfer_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":bigquerydatatransfer_java_gapic_test", +java_gapic_test( + name = "bigquerydatatransfer_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClientTest", ], -) for test_name in [ - "com.google.cloud.bigquery.datatransfer.v1.DataTransferServiceClientTest", -]] + runtime_deps = [":bigquerydatatransfer_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-bigquerydatatransfer-v1-java", - client_deps = [ + deps = [ ":bigquerydatatransfer_java_gapic", - ], - client_group = "com.google.cloud", - client_test_deps = [ - ":bigquerydatatransfer_java_gapic_test", - ], - grpc_deps = [":bigquerydatatransfer_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + ":bigquerydatatransfer_java_grpc", ":bigquerydatatransfer_java_proto", ":bigquerydatatransfer_proto", - ":bigquerydatatransfer_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -133,7 +113,7 @@ go_gapic_library( src = ":bigquerydatatransfer_proto_with_info", gapic_yaml = "bigquerydatatransfer_gapic.yaml", importpath = "cloud.google.com/go/bigquery/datatransfer/apiv1", - service_yaml = "//google/cloud/bigquery/datatransfer:datatransfer.yaml", + service_yaml = "bigquerydatatransfer_v1.yaml", deps = [":bigquerydatatransfer_go_proto"], ) diff --git a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel index 27e30f9c..07d4ffb5 100644 --- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel +++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel @@ -18,6 +18,7 @@ proto_library( 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", @@ -26,7 +27,10 @@ proto_library( proto_library_with_info( name = "bigquerystorage_proto_with_info", - deps = [":bigquerystorage_proto"], + deps = [ + ":bigquerystorage_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -38,14 +42,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "bigquerystorage_java_proto", deps = [":bigquerystorage_proto"], @@ -54,51 +53,35 @@ java_proto_library( java_grpc_library( name = "bigquerystorage_java_grpc", srcs = [":bigquerystorage_proto"], - deps = [":bigquerystorage_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "bigquerystorage_resource_name_java_proto", - gapic_yaml = "bigquerystorage_gapic.yaml", - deps = [":bigquerystorage_proto"], + deps = [":bigquerystorage_java_proto"], ) java_gapic_library( name = "bigquerystorage_java_gapic", src = ":bigquerystorage_proto_with_info", gapic_yaml = "bigquerystorage_gapic.yaml", - service_yaml = "//google/cloud/bigquery/storage:storage_v1beta1.yaml", + service_yaml = "bigquerystorage_v1beta1.yaml", test_deps = [":bigquerystorage_java_grpc"], - deps = [ - ":bigquerystorage_java_proto", - ":bigquerystorage_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":bigquerystorage_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":bigquerystorage_java_gapic_test", +java_gapic_test( + name = "bigquerystorage_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.bigquery.storage.v1beta1.BaseBigQueryStorageClientTest", ], -) for test_name in [ - "com.google.cloud.bigquery.storage.v1beta1.BaseBigQueryStorageClientTest", -]] + runtime_deps = [":bigquerystorage_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-bigquerystorage-v1-java", - client_deps = [":bigquerystorage_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":bigquerystorage_java_gapic_test"], - grpc_deps = [":bigquerystorage_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":bigquerystorage_java_gapic", + ":bigquerystorage_java_grpc", ":bigquerystorage_java_proto", ":bigquerystorage_proto", - ":bigquerystorage_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -127,7 +110,7 @@ go_gapic_library( src = ":bigquerystorage_proto_with_info", gapic_yaml = "bigquerystorage_gapic.yaml", importpath = "cloud.google.com/go/bigquery/datatransfer/apiv1", - service_yaml = "//google/cloud/bigquery/storage:storage_v1beta1.yaml", + service_yaml = "bigquerystorage_v1beta1.yaml", deps = [":bigquerystorage_go_proto"], ) diff --git a/google/cloud/dataproc/v1/BUILD.bazel b/google/cloud/dataproc/v1/BUILD.bazel index 6f15914c..516f0577 100644 --- a/google/cloud/dataproc/v1/BUILD.bazel +++ b/google/cloud/dataproc/v1/BUILD.bazel @@ -18,6 +18,9 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/longrunning:operations_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", @@ -28,7 +31,10 @@ proto_library( proto_library_with_info( name = "dataproc_proto_with_info", - deps = [":dataproc_proto"], + deps = [ + ":dataproc_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -40,14 +46,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "dataproc_java_proto", deps = [":dataproc_proto"], @@ -56,13 +57,7 @@ java_proto_library( java_grpc_library( name = "dataproc_java_grpc", srcs = [":dataproc_proto"], - deps = [":dataproc_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "dataproc_resource_name_java_proto", - gapic_yaml = "dataproc_gapic.yaml", - deps = [":dataproc_proto"], + deps = [":dataproc_java_proto"], ) java_gapic_library( @@ -71,38 +66,28 @@ java_gapic_library( gapic_yaml = "dataproc_gapic.yaml", service_yaml = "dataproc.yaml", test_deps = [":dataproc_java_grpc"], - deps = [ - ":dataproc_java_proto", - ":dataproc_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":dataproc_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":dataproc_java_gapic_test", +java_gapic_test( + name = "dataproc_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.dataproc.v1.ClusterControllerClientTest", + "com.google.cloud.dataproc.v1.JobControllerClientTest", + "com.google.cloud.dataproc.v1.WorkflowTemplateServiceClientTest", ], -) for test_name in [ - "com.google.cloud.dataproc.v1.ClusterControllerClientTest", - "com.google.cloud.dataproc.v1.JobControllerClientTest", - "com.google.cloud.dataproc.v1.WorkflowTemplateServiceClientTest", -]] + runtime_deps = [":dataproc_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-dataproc-v1-java", - client_deps = [":dataproc_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":dataproc_java_gapic_test"], - grpc_deps = [":dataproc_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":dataproc_java_gapic", + ":dataproc_java_grpc", ":dataproc_java_proto", ":dataproc_proto", - ":dataproc_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/dataproc/v1beta2/BUILD.bazel b/google/cloud/dataproc/v1beta2/BUILD.bazel index 9c73c96c..778a100f 100644 --- a/google/cloud/dataproc/v1beta2/BUILD.bazel +++ b/google/cloud/dataproc/v1beta2/BUILD.bazel @@ -18,6 +18,9 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/longrunning:operations_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", @@ -28,7 +31,10 @@ proto_library( proto_library_with_info( name = "dataproc_proto_with_info", - deps = [":dataproc_proto"], + deps = [ + ":dataproc_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -40,14 +46,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "dataproc_java_proto", deps = [":dataproc_proto"], @@ -56,13 +57,7 @@ java_proto_library( java_grpc_library( name = "dataproc_java_grpc", srcs = [":dataproc_proto"], - deps = [":dataproc_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "dataproc_resource_name_java_proto", - gapic_yaml = "dataproc_gapic.yaml", - deps = [":dataproc_proto"], + deps = [":dataproc_java_proto"], ) java_gapic_library( @@ -71,38 +66,28 @@ java_gapic_library( gapic_yaml = "dataproc_gapic.yaml", service_yaml = "dataproc.yaml", test_deps = [":dataproc_java_grpc"], - deps = [ - ":dataproc_java_proto", - ":dataproc_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":dataproc_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":dataproc_java_gapic_test", +java_gapic_test( + name = "dataproc_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.dataproc.v1beta2.ClusterControllerClientTest", + "com.google.cloud.dataproc.v1beta2.JobControllerClientTest", + "com.google.cloud.dataproc.v1beta2.WorkflowTemplateServiceClientTest", ], -) for test_name in [ - "com.google.cloud.dataproc.v1beta2.ClusterControllerClientTest", - "com.google.cloud.dataproc.v1beta2.JobControllerClientTest", - "com.google.cloud.dataproc.v1beta2.WorkflowTemplateServiceClientTest", -]] + runtime_deps = [":dataproc_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-dataproc-v1beta2-java", - client_deps = [":dataproc_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":dataproc_java_gapic_test"], - grpc_deps = [":dataproc_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":dataproc_java_gapic", + ":dataproc_java_grpc", ":dataproc_java_proto", ":dataproc_proto", - ":dataproc_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel index bc71a193..3f35f7d5 100644 --- a/google/cloud/dialogflow/v2/BUILD.bazel +++ b/google/cloud/dialogflow/v2/BUILD.bazel @@ -36,7 +36,10 @@ proto_library( proto_library_with_info( name = "dialogflow_proto_with_info", - deps = [":dialogflow_proto"], + deps = [ + ":dialogflow_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -48,14 +51,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "dialogflow_java_proto", deps = [":dialogflow_proto"], @@ -64,13 +62,7 @@ java_proto_library( java_grpc_library( name = "dialogflow_java_grpc", srcs = [":dialogflow_proto"], - deps = [":dialogflow_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "dialogflow_resource_name_java_proto", - gapic_yaml = "dialogflow_gapic.yaml", - deps = [":dialogflow_proto"], + deps = [":dialogflow_java_proto"], ) java_gapic_library( @@ -79,41 +71,31 @@ java_gapic_library( gapic_yaml = "dialogflow_gapic.yaml", service_yaml = ":dialogflow_v2.yaml", test_deps = [":dialogflow_java_grpc"], - deps = [ - ":dialogflow_java_proto", - ":dialogflow_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":dialogflow_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":dialogflow_java_gapic_test", +java_gapic_test( + name = "dialogflow_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.dialogflow.v2.AgentsClientTest", + "com.google.cloud.dialogflow.v2.ContextsClientTest", + "com.google.cloud.dialogflow.v2.EntityTypesClientTest", + "com.google.cloud.dialogflow.v2.IntentsClientTest", + "com.google.cloud.dialogflow.v2.SessionEntityTypesClientTest", + "com.google.cloud.dialogflow.v2.SessionsClientTest", ], -) for test_name in [ - "com.google.cloud.dialogflow.v2.AgentsClientTest", - "com.google.cloud.dialogflow.v2.ContextsClientTest", - "com.google.cloud.dialogflow.v2.EntityTypesClientTest", - "com.google.cloud.dialogflow.v2.IntentsClientTest", - "com.google.cloud.dialogflow.v2.SessionEntityTypesClientTest", - "com.google.cloud.dialogflow.v2.SessionsClientTest", -]] + runtime_deps = [":dialogflow_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-dialogflow-v2-java", - client_deps = [":dialogflow_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":dialogflow_java_gapic_test"], - grpc_deps = [":dialogflow_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":dialogflow_java_gapic", + ":dialogflow_java_grpc", ":dialogflow_java_proto", ":dialogflow_proto", - ":dialogflow_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/dialogflow/v2beta1/BUILD.bazel b/google/cloud/dialogflow/v2beta1/BUILD.bazel index d2920e98..c3cc60cd 100644 --- a/google/cloud/dialogflow/v2beta1/BUILD.bazel +++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel @@ -25,11 +25,11 @@ proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/api:resource_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "//google/type:latlng_proto", - "//google/api:field_behavior_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:empty_proto", "@com_google_protobuf//:field_mask_proto", @@ -40,7 +40,10 @@ proto_library( proto_library_with_info( name = "dialogflow_proto_with_info", - deps = [":dialogflow_proto"], + deps = [ + ":dialogflow_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -52,14 +55,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "dialogflow_java_proto", deps = [":dialogflow_proto"], @@ -68,13 +66,7 @@ java_proto_library( java_grpc_library( name = "dialogflow_java_grpc", srcs = [":dialogflow_proto"], - deps = [":dialogflow_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "dialogflow_resource_name_java_proto", - gapic_yaml = "dialogflow_gapic.yaml", - deps = [":dialogflow_proto"], + deps = [":dialogflow_java_proto"], ) java_gapic_library( @@ -83,43 +75,33 @@ java_gapic_library( gapic_yaml = "dialogflow_gapic.yaml", service_yaml = ":dialogflow_v2beta1.yaml", test_deps = [":dialogflow_java_grpc"], - deps = [ - ":dialogflow_java_proto", - ":dialogflow_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":dialogflow_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":dialogflow_java_gapic_test", +java_gapic_test( + name = "dialogflow_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.dialogflow.v2beta1.AgentsClientTest", + "com.google.cloud.dialogflow.v2beta1.ContextsClientTest", + "com.google.cloud.dialogflow.v2beta1.EntityTypesClientTest", + "com.google.cloud.dialogflow.v2beta1.DocumentsClientTest", + "com.google.cloud.dialogflow.v2beta1.IntentsClientTest", + "com.google.cloud.dialogflow.v2beta1.SessionEntityTypesClientTest", + "com.google.cloud.dialogflow.v2beta1.SessionsClientTest", + "com.google.cloud.dialogflow.v2beta1.KnowledgeBasesClientTest", ], -) for test_name in [ - "com.google.cloud.dialogflow.v2beta1.AgentsClientTest", - "com.google.cloud.dialogflow.v2beta1.ContextsClientTest", - "com.google.cloud.dialogflow.v2beta1.EntityTypesClientTest", - "com.google.cloud.dialogflow.v2beta1.DocumentsClientTest", - "com.google.cloud.dialogflow.v2beta1.IntentsClientTest", - "com.google.cloud.dialogflow.v2beta1.SessionEntityTypesClientTest", - "com.google.cloud.dialogflow.v2beta1.SessionsClientTest", - "com.google.cloud.dialogflow.v2beta1.KnowledgeBasesClientTest", -]] + runtime_deps = [":dialogflow_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-dialogflow-v2beta1-java", - client_deps = [":dialogflow_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":dialogflow_java_gapic_test"], - grpc_deps = [":dialogflow_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":dialogflow_java_gapic", + ":dialogflow_java_grpc", ":dialogflow_java_proto", ":dialogflow_proto", - ":dialogflow_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/iot/v1/BUILD.bazel b/google/cloud/iot/v1/BUILD.bazel index b7a13795..f1f093dc 100644 --- a/google/cloud/iot/v1/BUILD.bazel +++ b/google/cloud/iot/v1/BUILD.bazel @@ -26,7 +26,10 @@ proto_library( proto_library_with_info( name = "iot_proto_with_info", - deps = [":iot_proto"], + deps = [ + ":iot_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -38,15 +41,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "iot_java_proto", deps = [":iot_proto"], @@ -55,13 +52,7 @@ java_proto_library( java_grpc_library( name = "iot_java_grpc", srcs = [":iot_proto"], - deps = [":iot_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "iot_resource_name_java_proto", - gapic_yaml = "cloudiot_gapic.yaml", - deps = [":iot_proto"], + deps = [":iot_java_proto"], ) java_gapic_library( @@ -72,34 +63,27 @@ java_gapic_library( test_deps = [":iot_java_grpc"], deps = [ ":iot_java_proto", - ":iot_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":iot_java_gapic_test", +java_gapic_test( + name = "iot_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.iot.v1.DeviceManagerClientTest", ], -) for test_name in [ - "com.google.cloud.iot.v1.DeviceManagerClientTest", -]] + runtime_deps = [":iot_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-iot-v1-java", - client_deps = [":iot_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":iot_java_gapic_test"], - grpc_deps = [":iot_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":iot_java_gapic", + ":iot_java_grpc", ":iot_java_proto", ":iot_proto", - ":iot_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel index 88fd22db..828bd18a 100644 --- a/google/cloud/kms/v1/BUILD.bazel +++ b/google/cloud/kms/v1/BUILD.bazel @@ -27,6 +27,7 @@ proto_library_with_info( name = "kms_proto_with_info", deps = [ ":kms_proto", + "//google/cloud:common_resources_proto", "//google/iam/v1:iam_policy_proto", "//google/iam/v1:policy_proto", ], @@ -42,14 +43,9 @@ load( "java_gapic_assembly_gradle_pkg", "java_proto_library", "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "kms_java_proto", deps = [":kms_proto"], @@ -58,54 +54,53 @@ java_proto_library( java_grpc_library( name = "kms_java_grpc", srcs = [":kms_proto"], - deps = [":kms_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":kms_java_proto"], ) java_resource_name_proto_library( - name = "kms_resource_name_java_proto", + name = "kms_java_gapic_resource_name", gapic_yaml = "cloudkms_gapic.yaml", - deps = [":kms_proto"], + deps = [ + ":kms_proto", + "//google/cloud:common_resources_proto", + ], ) java_gapic_library( name = "kms_java_gapic", src = ":kms_proto_with_info", gapic_yaml = "cloudkms_gapic.yaml", + gen_resource_name = False, service_yaml = "//google/cloud/kms:cloudkms.yaml", test_deps = [ ":kms_java_grpc", - "@com_google_api_grpc_grpc_google_iam_v1//jar", + "//google/iam/v1:iam_java_grpc", ], deps = [ + ":kms_java_gapic_resource_name", ":kms_java_proto", - ":kms_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":kms_java_gapic_test", +java_gapic_test( + name = "kms_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.kms.v1.KeyManagementServiceClientTest", ], -) for test_name in [ - "com.google.cloud.kms.v1.KeyManagementServiceClientTest", -]] + runtime_deps = [":kms_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-kms-v1-java", - client_deps = [":kms_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":kms_java_gapic_test"], - grpc_deps = [":kms_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":kms_java_gapic", + ":kms_java_gapic_resource_name", + ":kms_java_grpc", ":kms_java_proto", ":kms_proto", - ":kms_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/language/v1/BUILD.bazel b/google/cloud/language/v1/BUILD.bazel index 8a6223ec..a703deb1 100644 --- a/google/cloud/language/v1/BUILD.bazel +++ b/google/cloud/language/v1/BUILD.bazel @@ -30,7 +30,7 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) _JAVA_GRPC_DEPS = [ @@ -57,27 +57,23 @@ java_gapic_library( deps = [":language_java_proto"] + _JAVA_GRPC_DEPS, ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "language_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.language.v1.LanguageServiceClientTest", + ], runtime_deps = [":language_java_gapic_test"], -) for test_name in [ - "com.google.cloud.language.v1.LanguageServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-language-v1-java", - client_deps = [":language_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":language_java_gapic_test"], - grpc_deps = [":language_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":language_java_gapic", + ":language_java_grpc", ":language_java_proto", ":language_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -278,4 +274,4 @@ csharp_gapic_assembly_pkg( ":language_csharp_grpc", ":language_csharp_proto", ], -) \ No newline at end of file +) diff --git a/google/cloud/language/v1beta2/BUILD.bazel b/google/cloud/language/v1beta2/BUILD.bazel index 1ce9261d..d2e87406 100644 --- a/google/cloud/language/v1beta2/BUILD.bazel +++ b/google/cloud/language/v1beta2/BUILD.bazel @@ -11,6 +11,8 @@ proto_library( srcs = ["language_service.proto"], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:timestamp_proto", @@ -19,7 +21,10 @@ proto_library( proto_library_with_info( name = "language_proto_with_info", - deps = [":language_proto"], + deps = [ + ":language_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -31,13 +36,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "language_java_proto", deps = [":language_proto"], @@ -46,7 +47,7 @@ java_proto_library( java_grpc_library( name = "language_java_grpc", srcs = [":language_proto"], - deps = [":language_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":language_java_proto"], ) java_gapic_library( @@ -55,30 +56,26 @@ java_gapic_library( gapic_yaml = "language_gapic.yaml", service_yaml = "//google/cloud/language:language_v1beta2.yaml", test_deps = [":language_java_grpc"], - deps = [":language_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":language_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "language_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.language.v1beta2.LanguageServiceClientTest", + ], runtime_deps = [":language_java_gapic_test"], -) for test_name in [ - "com.google.cloud.language.v1beta2.LanguageServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-language-v1beta2-java", - client_deps = [":language_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":language_java_gapic_test"], - grpc_deps = [":language_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":language_java_gapic", + ":language_java_grpc", ":language_java_proto", ":language_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/oslogin/common/BUILD.bazel b/google/cloud/oslogin/common/BUILD.bazel index 8b02bf5f..5af5fddf 100644 --- a/google/cloud/oslogin/common/BUILD.bazel +++ b/google/cloud/oslogin/common/BUILD.bazel @@ -13,6 +13,8 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", ], ) @@ -27,7 +29,6 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -41,12 +42,6 @@ java_grpc_library( deps = [":common_java_proto"], ) -java_resource_name_proto_library( - name = "common_resource_name_java_proto", - gapic_yaml = "//google/logging/v2:logging_gapic.yaml", - deps = [":common_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/cloud/oslogin/v1/BUILD.bazel b/google/cloud/oslogin/v1/BUILD.bazel index bcee7033..a18316a9 100644 --- a/google/cloud/oslogin/v1/BUILD.bazel +++ b/google/cloud/oslogin/v1/BUILD.bazel @@ -17,6 +17,9 @@ proto_library( ], 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//:field_mask_proto", ] + _PROTO_SUBPACKAGE_DEPS, @@ -24,7 +27,10 @@ proto_library( proto_library_with_info( name = "oslogin_proto_with_info", - deps = [":oslogin_proto"], + deps = [ + ":oslogin_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +42,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - _JAVA_PROTO_SUBPACKAGE_DEPS = [ "//google/cloud/oslogin/common:common_java_proto", ] @@ -64,51 +65,39 @@ java_proto_library( java_grpc_library( name = "oslogin_java_grpc", srcs = [":oslogin_proto"], - deps = [":oslogin_java_proto"] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, -) - -java_resource_name_proto_library( - name = "oslogin_resource_name_java_proto", - gapic_yaml = "oslogin_gapic.yaml", - deps = [":oslogin_proto"], + deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) java_gapic_library( name = "oslogin_java_gapic", src = ":oslogin_proto_with_info", gapic_yaml = "oslogin_gapic.yaml", - service_yaml = "//google/cloud/oslogin:oslogin_v1.yaml", + service_yaml = ":oslogin_v1.yaml", test_deps = [ ":oslogin_java_grpc", ] + _JAVA_GRPC_SUBPACKAGE_DEPS, deps = [ ":oslogin_java_proto", - ":oslogin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, + ] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "oslogin_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.oslogin.v1.OsLoginServiceClientTest", + ], runtime_deps = [":oslogin_java_gapic_test"], -) for test_name in [ - "com.google.cloud.oslogin.v1.OsLoginServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-oslogin-v1-java", - client_deps = [":oslogin_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":oslogin_java_gapic_test"], - grpc_deps = [":oslogin_java_grpc"] + _JAVA_GRPC_SUBPACKAGE_DEPS, - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":oslogin_java_gapic", + ":oslogin_java_grpc", ":oslogin_java_proto", ":oslogin_proto", - ":oslogin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS, - version = "0.0.0-SNAPSHOT", + ] + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS, ) ############################################################################## @@ -138,7 +127,7 @@ go_gapic_library( src = ":oslogin_proto_with_info", gapic_yaml = "oslogin_gapic.yaml", importpath = "cloud.google.com/go/oslogin/apiv1", - service_yaml = "//google/cloud/oslogin:oslogin_v1.yaml", + service_yaml = ":oslogin_v1.yaml", deps = [ ":oslogin_go_proto", "//google/cloud/oslogin/common:common_go_proto", diff --git a/google/cloud/oslogin/v1beta/BUILD.bazel b/google/cloud/oslogin/v1beta/BUILD.bazel index b9376849..2c8b3f9c 100644 --- a/google/cloud/oslogin/v1beta/BUILD.bazel +++ b/google/cloud/oslogin/v1beta/BUILD.bazel @@ -24,7 +24,10 @@ proto_library( proto_library_with_info( name = "oslogin_proto_with_info", - deps = [":oslogin_proto"], + deps = [ + ":oslogin_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +39,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - _JAVA_PROTO_SUBPACKAGE_DEPS = [ "//google/cloud/oslogin/common:common_java_proto", ] @@ -52,10 +50,6 @@ _JAVA_GRPC_SUBPACKAGE_DEPS = [ "//google/cloud/oslogin/common:common_java_grpc", ] -_RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS = [ - "//google/cloud/oslogin/common:common_resource_name_java_proto", -] - java_proto_library( name = "oslogin_java_proto", deps = [":oslogin_proto"], @@ -64,13 +58,7 @@ java_proto_library( java_grpc_library( name = "oslogin_java_grpc", srcs = [":oslogin_proto"], - deps = [":oslogin_java_proto"] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, -) - -java_resource_name_proto_library( - name = "oslogin_resource_name_java_proto", - gapic_yaml = "oslogin_gapic.yaml", - deps = [":oslogin_proto"], + deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) java_gapic_library( @@ -78,37 +66,29 @@ java_gapic_library( src = ":oslogin_proto_with_info", gapic_yaml = "oslogin_gapic.yaml", service_yaml = "//google/cloud/oslogin:oslogin_v1beta.yaml", - test_deps = [ - ":oslogin_java_grpc", - ] + _JAVA_GRPC_SUBPACKAGE_DEPS, + test_deps = [":oslogin_java_grpc"], deps = [ ":oslogin_java_proto", - ":oslogin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, + ] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "oslogin_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.oslogin.v1beta.OsLoginServiceClientTest", + ], runtime_deps = [":oslogin_java_gapic_test"], -) for test_name in [ - "com.google.cloud.oslogin.v1beta.OsLoginServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-oslogin-v1beta-java", - client_deps = [":oslogin_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":oslogin_java_gapic_test"], - grpc_deps = [":oslogin_java_grpc"] + _JAVA_GRPC_SUBPACKAGE_DEPS, - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":oslogin_java_gapic", + ":oslogin_java_grpc", ":oslogin_java_proto", ":oslogin_proto", - ":oslogin_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS, - version = "0.0.0-SNAPSHOT", + ] + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS, ) ############################################################################## diff --git a/google/cloud/redis/v1/BUILD.bazel b/google/cloud/redis/v1/BUILD.bazel index 5585f5d9..5a2e5cbf 100644 --- a/google/cloud/redis/v1/BUILD.bazel +++ b/google/cloud/redis/v1/BUILD.bazel @@ -24,7 +24,10 @@ proto_library( proto_library_with_info( name = "redis_proto_with_info", - deps = [":redis_proto"], + deps = [ + ":redis_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +39,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "redis_java_proto", deps = [":redis_proto"], @@ -52,13 +50,7 @@ java_proto_library( java_grpc_library( name = "redis_java_grpc", srcs = [":redis_proto"], - deps = [":redis_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "redis_resource_name_java_proto", - gapic_yaml = "redis_gapic.yaml", - deps = [":redis_proto"], + deps = [":redis_java_proto"], ) java_gapic_library( @@ -67,36 +59,26 @@ java_gapic_library( gapic_yaml = "redis_gapic.yaml", service_yaml = "//google/cloud/redis:redis_v1.yaml", test_deps = [":redis_java_grpc"], - deps = [ - ":redis_java_proto", - ":redis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":redis_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":redis_java_gapic_test", +java_gapic_test( + name = "redis_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.redis.v1.CloudRedisClientTest", ], -) for test_name in [ - "com.google.cloud.redis.v1.CloudRedisClientTest", -]] + runtime_deps = [":redis_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-redis-v1-java", - client_deps = [":redis_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":redis_java_gapic_test"], - grpc_deps = [":redis_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":redis_java_gapic", + ":redis_java_grpc", ":redis_java_proto", ":redis_proto", - ":redis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/redis/v1beta1/BUILD.bazel b/google/cloud/redis/v1beta1/BUILD.bazel index 09e66b77..721e1c03 100644 --- a/google/cloud/redis/v1beta1/BUILD.bazel +++ b/google/cloud/redis/v1beta1/BUILD.bazel @@ -25,7 +25,10 @@ proto_library( proto_library_with_info( name = "redis_proto_with_info", - deps = [":redis_proto"], + deps = [ + ":redis_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -37,14 +40,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "redis_java_proto", deps = [":redis_proto"], @@ -53,13 +51,7 @@ java_proto_library( java_grpc_library( name = "redis_java_grpc", srcs = [":redis_proto"], - deps = [":redis_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "redis_resource_name_java_proto", - gapic_yaml = "redis_gapic.yaml", - deps = [":redis_proto"], + deps = [":redis_java_proto"], ) java_gapic_library( @@ -68,36 +60,26 @@ java_gapic_library( gapic_yaml = "redis_gapic.yaml", service_yaml = "//google/cloud/redis:redis_v1beta1.yaml", test_deps = [":redis_java_grpc"], - deps = [ - ":redis_java_proto", - ":redis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":redis_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":redis_java_gapic_test", +java_gapic_test( + name = "redis_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.redis.v1beta1.CloudRedisClientTest", ], -) for test_name in [ - "com.google.cloud.redis.v1beta1.CloudRedisClientTest", -]] + runtime_deps = [":redis_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-redis-v1beta1-java", - client_deps = [":redis_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":redis_java_gapic_test"], - grpc_deps = [":redis_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":redis_java_gapic", + ":redis_java_grpc", ":redis_java_proto", ":redis_proto", - ":redis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/scheduler/v1beta1/BUILD.bazel b/google/cloud/scheduler/v1beta1/BUILD.bazel index 33ac9111..ad6739ce 100644 --- a/google/cloud/scheduler/v1beta1/BUILD.bazel +++ b/google/cloud/scheduler/v1beta1/BUILD.bazel @@ -27,7 +27,10 @@ proto_library( proto_library_with_info( name = "scheduler_proto_with_info", - deps = [":scheduler_proto"], + deps = [ + ":scheduler_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -39,14 +42,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "scheduler_java_proto", deps = [":scheduler_proto"], @@ -55,13 +53,7 @@ java_proto_library( java_grpc_library( name = "scheduler_java_grpc", srcs = [":scheduler_proto"], - deps = [":scheduler_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "scheduler_resource_name_java_proto", - gapic_yaml = "cloudscheduler_gapic.yaml", - deps = [":scheduler_proto"], + deps = [":scheduler_java_proto"], ) java_gapic_library( @@ -70,33 +62,26 @@ java_gapic_library( gapic_yaml = "cloudscheduler_gapic.yaml", service_yaml = "//google/cloud/scheduler:cloudscheduler_v1beta1.yaml", test_deps = [":scheduler_java_grpc"], - deps = [ - ":scheduler_java_proto", - "scheduler_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":scheduler_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "scheduler_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.scheduler.v1beta1.CloudSchedulerClientTest", + ], runtime_deps = [":scheduler_java_gapic_test"], -) for test_name in [ - "com.google.cloud.scheduler.v1beta1.CloudSchedulerClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-scheduler-v1beta1-java", - client_deps = [":scheduler_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":scheduler_java_gapic_test"], - grpc_deps = [":scheduler_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":scheduler_java_gapic", + ":scheduler_java_grpc", ":scheduler_java_proto", ":scheduler_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/securitycenter/v1beta1/BUILD.bazel b/google/cloud/securitycenter/v1beta1/BUILD.bazel index 6226c357..bbd7e8e4 100644 --- a/google/cloud/securitycenter/v1beta1/BUILD.bazel +++ b/google/cloud/securitycenter/v1beta1/BUILD.bazel @@ -32,7 +32,10 @@ proto_library( proto_library_with_info( name = "securitycenter_proto_with_info", - deps = [":securitycenter_proto"], + deps = [ + ":securitycenter_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -44,15 +47,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "securitycenter_java_proto", deps = [":securitycenter_proto"], @@ -61,13 +58,7 @@ java_proto_library( java_grpc_library( name = "securitycenter_java_grpc", srcs = [":securitycenter_proto"], - deps = [":securitycenter_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "securitycenter_resource_name_java_proto", - gapic_yaml = "securitycenter_gapic.yaml", - deps = [":securitycenter_proto"], + deps = [":securitycenter_java_proto"], ) java_gapic_library( @@ -75,34 +66,33 @@ java_gapic_library( src = ":securitycenter_proto_with_info", gapic_yaml = "securitycenter_gapic.yaml", service_yaml = "//google/cloud/securitycenter:securitycenter_v1beta1.yaml", - test_deps = [":securitycenter_java_grpc"], + test_deps = [ + ":securitycenter_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":securitycenter_java_proto", - "securitycenter_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "securitycenter_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.securitycenter.v1beta1.SecurityCenterClientTest", + ], runtime_deps = [":securitycenter_java_gapic_test"], -) for test_name in [ - "com.google.cloud.securitycenter.v1beta1.SecurityCenterClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-securitycenter-v1beta1-java", - client_deps = [":securitycenter_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":securitycenter_java_gapic_test"], - grpc_deps = [":securitycenter_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":securitycenter_java_gapic", + ":securitycenter_java_grpc", ":securitycenter_java_proto", ":securitycenter_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/speech/v1/BUILD.bazel b/google/cloud/speech/v1/BUILD.bazel index 06dafe72..a46dc78c 100644 --- a/google/cloud/speech/v1/BUILD.bazel +++ b/google/cloud/speech/v1/BUILD.bazel @@ -13,6 +13,8 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:any_proto", @@ -24,7 +26,10 @@ proto_library( proto_library_with_info( name = "speech_proto_with_info", - deps = [":speech_proto"], + deps = [ + ":speech_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +41,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "speech_java_proto", deps = [":speech_proto"], @@ -52,51 +52,35 @@ java_proto_library( java_grpc_library( name = "speech_java_grpc", srcs = [":speech_proto"], - deps = [":speech_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "speech_resource_name_java_proto", - gapic_yaml = "speech_gapic.yaml", - deps = [":speech_proto"], + deps = [":speech_java_proto"], ) java_gapic_library( name = "speech_java_gapic", src = ":speech_proto_with_info", gapic_yaml = "speech_gapic.yaml", - service_yaml = "//google/cloud/speech:speech_v1.yaml", + service_yaml = "speech_v1.yaml", test_deps = [":speech_java_grpc"], - deps = [ - ":speech_java_proto", - ":speech_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":speech_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":speech_java_gapic_test", +java_gapic_test( + name = "speech_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.speech.v1.SpeechClientTest", ], -) for test_name in [ - "com.google.cloud.speech.v1.SpeechClientTest", -]] + runtime_deps = [":speech_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-speech-v1-java", - client_deps = [":speech_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":speech_java_gapic_test"], - grpc_deps = [":speech_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":speech_java_gapic", + ":speech_java_grpc", ":speech_java_proto", ":speech_proto", - ":speech_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -127,7 +111,7 @@ go_gapic_library( src = ":speech_proto_with_info", gapic_yaml = "speech_gapic.yaml", importpath = "cloud.google.com/go/speech/apiv1", - service_yaml = "//google/cloud/speech:speech_v1.yaml", + service_yaml = "speech_v1.yaml", deps = [ ":speech_go_proto", "//google/longrunning:longrunning_go_gapic", diff --git a/google/cloud/speech/v1p1beta1/BUILD.bazel b/google/cloud/speech/v1p1beta1/BUILD.bazel index e2001e02..b7d99087 100644 --- a/google/cloud/speech/v1p1beta1/BUILD.bazel +++ b/google/cloud/speech/v1p1beta1/BUILD.bazel @@ -13,6 +13,8 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:any_proto", @@ -24,7 +26,10 @@ proto_library( proto_library_with_info( name = "speech_proto_with_info", - deps = [":speech_proto"], + deps = [ + ":speech_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +41,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "speech_java_proto", deps = [":speech_proto"], @@ -52,51 +52,35 @@ java_proto_library( java_grpc_library( name = "speech_java_grpc", srcs = [":speech_proto"], - deps = [":speech_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "speech_resource_name_java_proto", - gapic_yaml = "speech_gapic.yaml", - deps = [":speech_proto"], + deps = [":speech_java_proto"], ) java_gapic_library( name = "speech_java_gapic", src = ":speech_proto_with_info", gapic_yaml = "speech_gapic.yaml", - service_yaml = "//google/cloud/speech:speech_v1p1beta1.yaml", + service_yaml = "speech_v1p1beta1.yaml", test_deps = [":speech_java_grpc"], - deps = [ - ":speech_java_proto", - ":speech_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":speech_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":speech_java_gapic_test", +java_gapic_test( + name = "speech_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.speech.v1p1beta1.SpeechClientTest", ], -) for test_name in [ - "com.google.cloud.speech.v1p1beta1.SpeechClientTest", -]] + runtime_deps = [":speech_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-speech-v1p1beta1-java", - client_deps = [":speech_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":speech_java_gapic_test"], - grpc_deps = [":speech_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":speech_java_gapic", + ":speech_java_grpc", ":speech_java_proto", ":speech_proto", - ":speech_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -127,7 +111,7 @@ go_gapic_library( src = ":speech_proto_with_info", gapic_yaml = "speech_gapic.yaml", importpath = "cloud.google.com/go/speech/apiv1p1beta1", - service_yaml = "//google/cloud/speech:speech_v1p1beta1.yaml", + service_yaml = "speech_v1p1beta1.yaml", deps = [ ":speech_go_proto", "//google/longrunning:longrunning_go_gapic", diff --git a/google/cloud/tasks/v2beta2/BUILD.bazel b/google/cloud/tasks/v2beta2/BUILD.bazel index adc20bf3..bdc5ecce 100644 --- a/google/cloud/tasks/v2beta2/BUILD.bazel +++ b/google/cloud/tasks/v2beta2/BUILD.bazel @@ -32,7 +32,10 @@ proto_library( proto_library_with_info( name = "tasks_proto_with_info", - deps = [":tasks_proto"], + deps = [ + ":tasks_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -44,15 +47,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "tasks_java_proto", deps = [":tasks_proto"], @@ -61,13 +58,7 @@ java_proto_library( java_grpc_library( name = "tasks_java_grpc", srcs = [":tasks_proto"], - deps = [":tasks_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "tasks_resource_name_java_proto", - gapic_yaml = "cloudtasks_gapic.yaml", - deps = [":tasks_proto"], + deps = [":tasks_java_proto"], ) java_gapic_library( @@ -75,37 +66,33 @@ java_gapic_library( src = ":tasks_proto_with_info", gapic_yaml = "cloudtasks_gapic.yaml", service_yaml = "//google/cloud/tasks:cloudtasks_v2beta2.yaml", - test_deps = [":tasks_java_grpc"], + test_deps = [ + ":tasks_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":tasks_java_proto", - ":tasks_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":tasks_java_gapic_test", +java_gapic_test( + name = "tasks_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.tasks.v2beta2.CloudTasksClientTest", ], -) for test_name in [ - "com.google.cloud.tasks.v2beta2.CloudTasksClientTest", -]] + runtime_deps = [":tasks_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-tasks-v2beta2-java", - client_deps = [":tasks_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":tasks_java_gapic_test"], - grpc_deps = [":tasks_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":tasks_java_gapic", + ":tasks_java_grpc", ":tasks_java_proto", ":tasks_proto", - ":tasks_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/tasks/v2beta3/BUILD.bazel b/google/cloud/tasks/v2beta3/BUILD.bazel index 12b9e257..3e12aa03 100644 --- a/google/cloud/tasks/v2beta3/BUILD.bazel +++ b/google/cloud/tasks/v2beta3/BUILD.bazel @@ -32,7 +32,10 @@ proto_library( proto_library_with_info( name = "tasks_proto_with_info", - deps = [":tasks_proto"], + deps = [ + ":tasks_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -44,15 +47,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "tasks_java_proto", deps = [":tasks_proto"], @@ -61,13 +58,7 @@ java_proto_library( java_grpc_library( name = "tasks_java_grpc", srcs = [":tasks_proto"], - deps = [":tasks_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "tasks_resource_name_java_proto", - gapic_yaml = "cloudtasks_gapic.yaml", - deps = [":tasks_proto"], + deps = [":tasks_java_proto"], ) java_gapic_library( @@ -75,37 +66,33 @@ java_gapic_library( src = ":tasks_proto_with_info", gapic_yaml = "cloudtasks_gapic.yaml", service_yaml = "//google/cloud/tasks:cloudtasks_v2beta3.yaml", - test_deps = [":tasks_java_grpc"], + test_deps = [ + ":tasks_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":tasks_java_proto", - ":tasks_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":tasks_java_gapic_test", +java_gapic_test( + name = "tasks_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.tasks.v2beta3.CloudTasksClientTest", ], -) for test_name in [ - "com.google.cloud.tasks.v2beta3.CloudTasksClientTest", -]] + runtime_deps = [":tasks_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-tasks-v2beta3-java", - client_deps = [":tasks_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":tasks_java_gapic_test"], - grpc_deps = [":tasks_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":tasks_java_gapic", + ":tasks_java_grpc", ":tasks_java_proto", ":tasks_proto", - ":tasks_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/texttospeech/v1/BUILD.bazel b/google/cloud/texttospeech/v1/BUILD.bazel index dd89685f..75c75672 100644 --- a/google/cloud/texttospeech/v1/BUILD.bazel +++ b/google/cloud/texttospeech/v1/BUILD.bazel @@ -13,12 +13,17 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", ], ) proto_library_with_info( name = "texttospeech_proto_with_info", - deps = [":texttospeech_proto"], + deps = [ + ":texttospeech_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -30,13 +35,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "texttospeech_java_proto", deps = [":texttospeech_proto"], @@ -45,39 +46,36 @@ java_proto_library( java_grpc_library( name = "texttospeech_java_grpc", srcs = [":texttospeech_proto"], - deps = [":texttospeech_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":texttospeech_java_proto"], ) java_gapic_library( name = "texttospeech_java_gapic", src = ":texttospeech_proto_with_info", gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1", service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", test_deps = [":texttospeech_java_grpc"], - deps = [":texttospeech_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":texttospeech_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "texttospeech_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.texttospeech.v1.TextToSpeechClientTest", + ], runtime_deps = [":texttospeech_java_gapic_test"], -) for test_name in [ - "com.google.cloud.texttospeech.v1.TextToSpeechClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-texttospeech-v1-java", - client_deps = [":texttospeech_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":texttospeech_java_gapic_test"], - grpc_deps = [":texttospeech_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":texttospeech_java_gapic", + ":texttospeech_java_grpc", ":texttospeech_java_proto", ":texttospeech_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -104,6 +102,7 @@ go_gapic_library( src = ":texttospeech_proto_with_info", gapic_yaml = "texttospeech_gapic.yaml", importpath = "cloud.google.com/go/texttospeech/apiv1", + package = "google.cloud.texttospeech.v1", service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", deps = [":texttospeech_go_proto"], ) @@ -125,3 +124,161 @@ go_gapic_assembly_pkg( ":texttospeech_go_proto", ], ) + +############################################################################## +# PHP +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "php_proto_library", + "php_grpc_library", + "php_gapic_library", + "php_gapic_assembly_pkg", +) + +php_proto_library( + name = "texttospeech_php_proto", + deps = [":texttospeech_proto"], +) + +php_grpc_library( + name = "texttospeech_php_grpc", + srcs = [":texttospeech_proto"], + deps = [":texttospeech_php_proto"], +) + +php_gapic_library( + name = "texttospeech_php_gapic", + src = ":texttospeech_proto_with_info", + gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1", + service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", + deps = [ + ":texttospeech_php_grpc", + ":texttospeech_php_proto", + ], +) + +# Opensource Packages +php_gapic_assembly_pkg( + name = "google-cloud-texttospeech-v1-php", + deps = [ + ":texttospeech_php_gapic", + ":texttospeech_php_grpc", + ":texttospeech_php_proto", + ], +) + +############################################################################## +# Node.js +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "nodejs_gapic_library", + "nodejs_gapic_assembly_pkg", +) + +nodejs_gapic_library( + name = "texttospeech_nodejs_gapic", + src = ":texttospeech_proto_with_info", + gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1", + service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", + deps = [], +) + +nodejs_gapic_assembly_pkg( + name = "texttospeech-v1-nodejs", + deps = [ + ":texttospeech_nodejs_gapic", + ":texttospeech_proto", + ], +) + +############################################################################## +# Ruby +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "ruby_proto_library", + "ruby_grpc_library", + "ruby_gapic_library", + "ruby_gapic_assembly_pkg", +) + +ruby_proto_library( + name = "texttospeech_ruby_proto", + deps = [":texttospeech_proto"], +) + +ruby_grpc_library( + name = "texttospeech_ruby_grpc", + srcs = [":texttospeech_proto"], + deps = [":texttospeech_ruby_proto"], +) + +ruby_gapic_library( + name = "texttospeech_ruby_gapic", + src = ":texttospeech_proto_with_info", + gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1", + service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", + deps = [ + ":langauge_ruby_grpc", + ":texttospeech_ruby_proto", + ], +) + +# Opensource Packages +ruby_gapic_assembly_pkg( + name = "google-cloud-texttospeech-v1-ruby", + deps = [ + ":texttospeech_ruby_gapic", + ":texttospeech_ruby_grpc", + ":texttospeech_ruby_proto", + ], +) + +############################################################################## +# C# +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "csharp_proto_library", + "csharp_grpc_library", + "csharp_gapic_library", + "csharp_gapic_assembly_pkg", +) + +csharp_proto_library( + name = "texttospeech_csharp_proto", + deps = [":texttospeech_proto"], +) + +csharp_grpc_library( + name = "texttospeech_csharp_grpc", + srcs = [":texttospeech_proto"], + deps = [":texttospeech_csharp_proto"], +) + +csharp_gapic_library( + name = "texttospeech_csharp_gapic", + src = ":texttospeech_proto_with_info", + gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1", + service_yaml = "//google/cloud/texttospeech:tts_v1.yaml", + deps = [ + ":langauge_csharp_grpc", + ":texttospeech_csharp_proto", + ], +) + +# Opensource Packages +csharp_gapic_assembly_pkg( + name = "google-cloud-texttospeech-v1-csharp", + deps = [ + ":texttospeech_csharp_gapic", + ":texttospeech_csharp_grpc", + ":texttospeech_csharp_proto", + ], +) diff --git a/google/cloud/texttospeech/v1beta1/BUILD.bazel b/google/cloud/texttospeech/v1beta1/BUILD.bazel index 5a9557a2..33c46223 100644 --- a/google/cloud/texttospeech/v1beta1/BUILD.bazel +++ b/google/cloud/texttospeech/v1beta1/BUILD.bazel @@ -13,12 +13,17 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", + "//google/api:field_behavior_proto", ], ) proto_library_with_info( name = "texttospeech_proto_with_info", - deps = [":texttospeech_proto"], + deps = [ + ":texttospeech_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -30,13 +35,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "texttospeech_java_proto", deps = [":texttospeech_proto"], @@ -45,39 +46,36 @@ java_proto_library( java_grpc_library( name = "texttospeech_java_grpc", srcs = [":texttospeech_proto"], - deps = [":texttospeech_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":texttospeech_java_proto"], ) java_gapic_library( name = "texttospeech_java_gapic", src = ":texttospeech_proto_with_info", gapic_yaml = "texttospeech_gapic.yaml", + package = "google.cloud.texttospeech.v1beta1", service_yaml = "//google/cloud/texttospeech:tts_v1beta1.yaml", test_deps = [":texttospeech_java_grpc"], - deps = [":texttospeech_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":texttospeech_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "texttospeech_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.texttospeech.v1beta1.TextToSpeechClientTest", + ], runtime_deps = [":texttospeech_java_gapic_test"], -) for test_name in [ - "com.google.cloud.texttospeech.v1beta1.TextToSpeechClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-texttospeech-v1beta1-java", - client_deps = [":texttospeech_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":texttospeech_java_gapic_test"], - grpc_deps = [":texttospeech_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":texttospeech_java_gapic", + ":texttospeech_java_grpc", ":texttospeech_java_proto", ":texttospeech_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -104,6 +102,7 @@ go_gapic_library( src = ":texttospeech_proto_with_info", gapic_yaml = "texttospeech_gapic.yaml", importpath = "cloud.google.com/go/texttospeech/apiv1beta1", + package = "google.cloud.texttospeech.v1beta1", service_yaml = "//google/cloud/texttospeech:tts_v1beta1.yaml", deps = [":texttospeech_go_proto"], ) diff --git a/google/cloud/videointelligence/v1/BUILD.bazel b/google/cloud/videointelligence/v1/BUILD.bazel index 5beb6f0c..46effa7d 100644 --- a/google/cloud/videointelligence/v1/BUILD.bazel +++ b/google/cloud/videointelligence/v1/BUILD.bazel @@ -14,6 +14,7 @@ proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:duration_proto", @@ -23,7 +24,10 @@ proto_library( proto_library_with_info( name = "video_intelligence_proto_with_info", - deps = [":video_intelligence_proto"], + deps = [ + ":video_intelligence_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -35,14 +39,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "video_intelligence_java_proto", deps = [":video_intelligence_proto"], @@ -51,51 +50,35 @@ java_proto_library( java_grpc_library( name = "video_intelligence_java_grpc", srcs = [":video_intelligence_proto"], - deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "video_intelligence_resource_name_java_proto", - gapic_yaml = "videointelligence_gapic.yaml", - deps = [":video_intelligence_proto"], + deps = [":video_intelligence_java_proto"], ) java_gapic_library( name = "video_intelligence_java_gapic", src = ":video_intelligence_proto_with_info", gapic_yaml = "videointelligence_gapic.yaml", - service_yaml = "//google/cloud/videointelligence:videointelligence_v1.yaml", + service_yaml = ":videointelligence_v1.yaml", test_deps = [":video_intelligence_java_grpc"], - deps = [ - ":video_intelligence_java_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":video_intelligence_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":video_intelligence_java_gapic_test", +java_gapic_test( + name = "video_intelligence_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClientTest", ], -) for test_name in [ - "com.google.cloud.videointelligence.v1.VideoIntelligenceServiceClientTest", -]] + runtime_deps = [":video_intelligence_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-video-intelligence-v1-java", - client_deps = [":video_intelligence_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":video_intelligence_java_gapic_test"], - grpc_deps = [":video_intelligence_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":video_intelligence_java_gapic", + ":video_intelligence_java_grpc", ":video_intelligence_java_proto", ":video_intelligence_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -126,7 +109,7 @@ go_gapic_library( src = ":video_intelligence_proto_with_info", gapic_yaml = "videointelligence_gapic.yaml", importpath = "cloud.google.com/go/videointelligence/apiv1", - service_yaml = "//google/cloud/videointelligence:videointelligence_v1.yaml", + service_yaml = ":videointelligence_v1.yaml", deps = [ ":video_intelligence_go_proto", "//google/longrunning:longrunning_go_gapic", diff --git a/google/cloud/videointelligence/v1beta2/BUILD.bazel b/google/cloud/videointelligence/v1beta2/BUILD.bazel index acd3c583..dcfe119d 100644 --- a/google/cloud/videointelligence/v1beta2/BUILD.bazel +++ b/google/cloud/videointelligence/v1beta2/BUILD.bazel @@ -22,7 +22,10 @@ proto_library( proto_library_with_info( name = "video_intelligence_proto_with_info", - deps = [":video_intelligence_proto"], + deps = [ + ":video_intelligence_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -34,14 +37,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "video_intelligence_java_proto", deps = [":video_intelligence_proto"], @@ -50,13 +48,7 @@ java_proto_library( java_grpc_library( name = "video_intelligence_java_grpc", srcs = [":video_intelligence_proto"], - deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "video_intelligence_resource_name_java_proto", - gapic_yaml = "videointelligence_gapic.yaml", - deps = [":video_intelligence_proto"], + deps = [":video_intelligence_java_proto"], ) java_gapic_library( @@ -65,36 +57,26 @@ java_gapic_library( gapic_yaml = "videointelligence_gapic.yaml", service_yaml = "//google/cloud/videointelligence:videointelligence_v1beta2.yaml", test_deps = [":video_intelligence_java_grpc"], - deps = [ - ":video_intelligence_java_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":video_intelligence_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":video_intelligence_java_gapic_test", +java_gapic_test( + name = "video_intelligence_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceClientTest", ], -) for test_name in [ - "com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceClientTest", -]] + runtime_deps = [":video_intelligence_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-video-intelligence-v1beta2-java", - client_deps = [":video_intelligence_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":video_intelligence_java_gapic_test"], - grpc_deps = [":video_intelligence_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":video_intelligence_java_gapic", + ":video_intelligence_java_grpc", ":video_intelligence_java_proto", ":video_intelligence_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel index 6d519309..0dd7cc96 100644 --- a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel @@ -22,7 +22,10 @@ proto_library( proto_library_with_info( name = "video_intelligence_proto_with_info", - deps = [":video_intelligence_proto"], + deps = [ + ":video_intelligence_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -34,14 +37,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "video_intelligence_java_proto", deps = [":video_intelligence_proto"], @@ -50,13 +48,7 @@ java_proto_library( java_grpc_library( name = "video_intelligence_java_grpc", srcs = [":video_intelligence_proto"], - deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "video_intelligence_resource_name_java_proto", - gapic_yaml = "videointelligence_gapic.yaml", - deps = [":video_intelligence_proto"], + deps = [":video_intelligence_java_proto"], ) java_gapic_library( @@ -65,36 +57,26 @@ java_gapic_library( gapic_yaml = "videointelligence_gapic.yaml", service_yaml = "//google/cloud/videointelligence:videointelligence_v1p1beta1.yaml", test_deps = [":video_intelligence_java_grpc"], - deps = [ - ":video_intelligence_java_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":video_intelligence_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":video_intelligence_java_gapic_test", +java_gapic_test( + name = "video_intelligence_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceClientTest", ], -) for test_name in [ - "com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceClientTest", -]] + runtime_deps = [":video_intelligence_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-video-intelligence-v1p1beta1-java", - client_deps = [":video_intelligence_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":video_intelligence_java_gapic_test"], - grpc_deps = [":video_intelligence_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":video_intelligence_java_gapic", + ":video_intelligence_java_grpc", ":video_intelligence_java_proto", ":video_intelligence_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel index 2de85210..f2fe12ee 100644 --- a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel @@ -22,7 +22,10 @@ proto_library( proto_library_with_info( name = "video_intelligence_proto_with_info", - deps = [":video_intelligence_proto"], + deps = [ + ":video_intelligence_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -34,14 +37,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "video_intelligence_java_proto", deps = [":video_intelligence_proto"], @@ -50,13 +48,7 @@ java_proto_library( java_grpc_library( name = "video_intelligence_java_grpc", srcs = [":video_intelligence_proto"], - deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "video_intelligence_resource_name_java_proto", - gapic_yaml = "videointelligence_gapic.yaml", - deps = [":video_intelligence_proto"], + deps = [":video_intelligence_java_proto"], ) java_gapic_library( @@ -65,36 +57,26 @@ java_gapic_library( gapic_yaml = "videointelligence_gapic.yaml", service_yaml = "//google/cloud/videointelligence:videointelligence_v1p2beta1.yaml", test_deps = [":video_intelligence_java_grpc"], - deps = [ - ":video_intelligence_java_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":video_intelligence_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":video_intelligence_java_gapic_test", +java_gapic_test( + name = "video_intelligence_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.videointelligence.v1p2beta1.VideoIntelligenceServiceClientTest", ], -) for test_name in [ - "com.google.cloud.videointelligence.v1p2beta1.VideoIntelligenceServiceClientTest", -]] + runtime_deps = [":video_intelligence_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-video-intelligence-v1p2beta1-java", - client_deps = [":video_intelligence_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":video_intelligence_java_gapic_test"], - grpc_deps = [":video_intelligence_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":video_intelligence_java_gapic", + ":video_intelligence_java_grpc", ":video_intelligence_java_proto", ":video_intelligence_proto", - ":video_intelligence_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel index 17c796d5..70a12267 100644 --- a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel +++ b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel @@ -22,7 +22,10 @@ proto_library( proto_library_with_info( name = "video_intelligence_proto_with_info", - deps = [":video_intelligence_proto"], + deps = [ + "//google/cloud:common_resources_proto", + ":video_intelligence_proto" + ], ) # TODO: uncomment once https://github.com/googleapis/gapic-generator/issues/1149 is fixed @@ -35,13 +38,9 @@ proto_library_with_info( # "java_gapic_library", # "java_gapic_assembly_gradle_pkg", # "java_proto_library", -# "java_resource_name_proto_library", -# "java_test", -#) # -#_JAVA_GRPC_DEPS = [ -# "@com_google_api_grpc_proto_google_common_protos//jar", -#] +# "java_gapic_test", +#) # #java_proto_library( # name = "video_intelligence_java_proto", @@ -51,7 +50,7 @@ proto_library_with_info( #java_grpc_library( # name = "video_intelligence_java_grpc", # srcs = [":video_intelligence_proto"], -# deps = [":video_intelligence_java_proto"] + _JAVA_GRPC_DEPS, +# deps = [":video_intelligence_java_proto"] #) # #java_resource_name_proto_library( @@ -68,34 +67,26 @@ proto_library_with_info( # test_deps = [":video_intelligence_java_grpc"], # deps = [ # ":video_intelligence_java_proto", -# ":video_intelligence_resource_name_java_proto", -# ] + _JAVA_GRPC_DEPS, +# ], #) # -#[java_test( -# name = test_name, -# test_class = test_name, -# runtime_deps = [ -# ":video_intelligence_java_gapic_test", +#java_gapic_test( +# name = "video_intelligence_java_gapic_test_suite", +# test_classes = [ +# "com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClientTest" # ], -#) for test_name in [ -# "com.google.cloud.videointelligence.v1p3beta1.VideoIntelligenceServiceClientTest", -#]] - +# runtime_deps = [":video_intelligence_java_gapic_test"], +#) +# ## Opensource Packages #java_gapic_assembly_gradle_pkg( # name = "google-cloud-video-intelligence-v1p3beta1-java", -# client_deps = [":video_intelligence_java_gapic"], -# client_group = "com.google.cloud", -# client_test_deps = [":video_intelligence_java_gapic_test"], -# grpc_deps = [":video_intelligence_java_grpc"], -# grpc_group = "com.google.api.grpc", -# proto_deps = [ +# deps = [ +# ":video_intelligence_java_gapic", +# ":video_intelligence_java_grpc", # ":video_intelligence_java_proto", # ":video_intelligence_proto", -# ":video_intelligence_resource_name_java_proto", -# ] + _JAVA_GRPC_DEPS, -# version = "0.0.0-SNAPSHOT", +# ], #) ############################################################################## diff --git a/google/cloud/vision/v1/BUILD.bazel b/google/cloud/vision/v1/BUILD.bazel index 455908be..1f920d73 100644 --- a/google/cloud/vision/v1/BUILD.bazel +++ b/google/cloud/vision/v1/BUILD.bazel @@ -19,6 +19,8 @@ proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "//google/type:color_proto", @@ -31,7 +33,10 @@ proto_library( proto_library_with_info( name = "vision_proto_with_info", - deps = [":vision_proto"], + deps = [ + ":vision_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -43,14 +48,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "vision_java_proto", deps = [":vision_proto"], @@ -59,51 +59,35 @@ java_proto_library( java_grpc_library( name = "vision_java_grpc", srcs = [":vision_proto"], - deps = [":vision_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "vision_resource_name_java_proto", - gapic_yaml = "vision_gapic.yaml", - deps = [":vision_proto"], + deps = [":vision_java_proto"], ) java_gapic_library( name = "vision_java_gapic", src = ":vision_proto_with_info", gapic_yaml = "vision_gapic.yaml", - service_yaml = "//google/cloud/vision:vision_v1.yaml", + service_yaml = "vision_v1.yaml", test_deps = [":vision_java_grpc"], - deps = [ - ":vision_java_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":vision_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":vision_java_gapic_test", +java_gapic_test( + name = "vision_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.vision.v1.ImageAnnotatorClientTest", ], -) for test_name in [ - "com.google.cloud.vision.v1.ImageAnnotatorClientTest", -]] + runtime_deps = [":vision_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-vision-v1-java", - client_deps = [":vision_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":vision_java_gapic_test"], - grpc_deps = [":vision_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":vision_java_gapic", + ":vision_java_grpc", ":vision_java_proto", ":vision_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -136,7 +120,7 @@ go_gapic_library( src = ":vision_proto_with_info", gapic_yaml = "vision_gapic.yaml", importpath = "cloud.google.com/go/vision/apiv1", - service_yaml = "//google/cloud/vision:vision_v1.yaml", + service_yaml = "vision_v1.yaml", deps = [ ":vision_go_proto", "//google/longrunning:longrunning_go_gapic", diff --git a/google/cloud/vision/v1p1beta1/BUILD.bazel b/google/cloud/vision/v1p1beta1/BUILD.bazel index 9e0c8f78..e001b8cc 100644 --- a/google/cloud/vision/v1p1beta1/BUILD.bazel +++ b/google/cloud/vision/v1p1beta1/BUILD.bazel @@ -25,7 +25,10 @@ proto_library( proto_library_with_info( name = "vision_proto_with_info", - deps = [":vision_proto"], + deps = [ + ":vision_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -37,14 +40,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "vision_java_proto", deps = [":vision_proto"], @@ -53,13 +51,7 @@ java_proto_library( java_grpc_library( name = "vision_java_grpc", srcs = [":vision_proto"], - deps = [":vision_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "vision_resource_name_java_proto", - gapic_yaml = "vision_gapic.yaml", - deps = [":vision_proto"], + deps = [":vision_java_proto"], ) java_gapic_library( @@ -68,36 +60,26 @@ java_gapic_library( gapic_yaml = "vision_gapic.yaml", service_yaml = "//google/cloud/vision:vision_v1p1beta1.yaml", test_deps = [":vision_java_grpc"], - deps = [ - ":vision_java_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":vision_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":vision_java_gapic_test", +java_gapic_test( + name = "vision_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.vision.v1p1beta1.ImageAnnotatorClientTest", ], -) for test_name in [ - "com.google.cloud.vision.v1p1beta1.ImageAnnotatorClientTest", -]] + runtime_deps = [":vision_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-vision-v1p1beta1-java", - client_deps = [":vision_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":vision_java_gapic_test"], - grpc_deps = [":vision_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":vision_java_gapic", + ":vision_java_grpc", ":vision_java_proto", ":vision_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/vision/v1p2beta1/BUILD.bazel b/google/cloud/vision/v1p2beta1/BUILD.bazel index 8511d499..ad89f5d2 100644 --- a/google/cloud/vision/v1p2beta1/BUILD.bazel +++ b/google/cloud/vision/v1p2beta1/BUILD.bazel @@ -26,7 +26,10 @@ proto_library( proto_library_with_info( name = "vision_proto_with_info", - deps = [":vision_proto"], + deps = [ + ":vision_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -38,14 +41,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "vision_java_proto", deps = [":vision_proto"], @@ -54,13 +52,7 @@ java_proto_library( java_grpc_library( name = "vision_java_grpc", srcs = [":vision_proto"], - deps = [":vision_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "vision_resource_name_java_proto", - gapic_yaml = "vision_gapic.yaml", - deps = [":vision_proto"], + deps = [":vision_java_proto"], ) java_gapic_library( @@ -69,36 +61,26 @@ java_gapic_library( gapic_yaml = "vision_gapic.yaml", service_yaml = "//google/cloud/vision:vision_v1p2beta1.yaml", test_deps = [":vision_java_grpc"], - deps = [ - ":vision_java_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":vision_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":vision_java_gapic_test", +java_gapic_test( + name = "vision_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.vision.v1p2beta1.ImageAnnotatorClientTest", ], -) for test_name in [ - "com.google.cloud.vision.v1p2beta1.ImageAnnotatorClientTest", -]] + runtime_deps = [":vision_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-vision-v1p2beta1-java", - client_deps = [":vision_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":vision_java_gapic_test"], - grpc_deps = [":vision_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":vision_java_gapic", + ":vision_java_grpc", ":vision_java_proto", ":vision_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/vision/v1p3beta1/BUILD.bazel b/google/cloud/vision/v1p3beta1/BUILD.bazel index 371594f0..67f8c8a2 100644 --- a/google/cloud/vision/v1p3beta1/BUILD.bazel +++ b/google/cloud/vision/v1p3beta1/BUILD.bazel @@ -30,7 +30,10 @@ proto_library( proto_library_with_info( name = "vision_proto_with_info", - deps = [":vision_proto"], + deps = [ + ":vision_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -42,14 +45,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "vision_java_proto", deps = [":vision_proto"], @@ -58,13 +56,7 @@ java_proto_library( java_grpc_library( name = "vision_java_grpc", srcs = [":vision_proto"], - deps = [":vision_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "vision_resource_name_java_proto", - gapic_yaml = "vision_gapic.yaml", - deps = [":vision_proto"], + deps = [":vision_java_proto"], ) java_gapic_library( @@ -73,36 +65,26 @@ java_gapic_library( gapic_yaml = "vision_gapic.yaml", service_yaml = "//google/cloud/vision:vision_v1p3beta1.yaml", test_deps = [":vision_java_grpc"], - deps = [ - ":vision_java_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":vision_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":vision_java_gapic_test", +java_gapic_test( + name = "vision_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.vision.v1p3beta1.ImageAnnotatorClientTest", ], -) for test_name in [ - "com.google.cloud.vision.v1p3beta1.ImageAnnotatorClientTest", -]] + runtime_deps = [":vision_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-vision-v1p3beta1-java", - client_deps = [":vision_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":vision_java_gapic_test"], - grpc_deps = [":vision_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":vision_java_gapic", + ":vision_java_grpc", ":vision_java_proto", ":vision_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/vision/v1p4beta1/BUILD.bazel b/google/cloud/vision/v1p4beta1/BUILD.bazel index 1b263fa0..d4cc657c 100644 --- a/google/cloud/vision/v1p4beta1/BUILD.bazel +++ b/google/cloud/vision/v1p4beta1/BUILD.bazel @@ -30,7 +30,10 @@ proto_library( proto_library_with_info( name = "vision_proto_with_info", - deps = [":vision_proto"], + deps = [ + ":vision_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -42,14 +45,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "vision_java_proto", deps = [":vision_proto"], @@ -58,13 +56,7 @@ java_proto_library( java_grpc_library( name = "vision_java_grpc", srcs = [":vision_proto"], - deps = [":vision_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "vision_resource_name_java_proto", - gapic_yaml = "vision_gapic.yaml", - deps = [":vision_proto"], + deps = [":vision_java_proto"], ) java_gapic_library( @@ -73,36 +65,26 @@ java_gapic_library( gapic_yaml = "vision_gapic.yaml", service_yaml = "//google/cloud/vision:vision_v1p4beta1.yaml", test_deps = [":vision_java_grpc"], - deps = [ - ":vision_java_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":vision_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":vision_java_gapic_test", +java_gapic_test( + name = "vision_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.vision.v1p4beta1.ImageAnnotatorClientTest", ], -) for test_name in [ - "com.google.cloud.vision.v1p4beta1.ImageAnnotatorClientTest", -]] + runtime_deps = [":vision_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-vision-v1p4beta1-java", - client_deps = [":vision_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":vision_java_gapic_test"], - grpc_deps = [":vision_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":vision_java_gapic", + ":vision_java_grpc", ":vision_java_proto", ":vision_proto", - ":vision_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel index 33c9e29f..6a22231f 100644 --- a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel +++ b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel @@ -19,6 +19,9 @@ proto_library( ], 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//:field_mask_proto", "@com_google_protobuf//:timestamp_proto", @@ -27,7 +30,10 @@ proto_library( proto_library_with_info( name = "websecurityscanner_proto_with_info", - deps = [":websecurityscanner_proto"], + deps = [ + ":websecurityscanner_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -39,14 +45,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "websecurityscanner_java_proto", deps = [":websecurityscanner_proto"], @@ -55,49 +56,35 @@ java_proto_library( java_grpc_library( name = "websecurityscanner_java_grpc", srcs = [":websecurityscanner_proto"], - deps = [":websecurityscanner_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "websecurityscanner_resource_name_java_proto", - gapic_yaml = "websecurityscanner_gapic.yaml", - deps = [":websecurityscanner_proto"], + deps = [":websecurityscanner_java_proto"], ) java_gapic_library( name = "websecurityscanner_java_gapic", src = ":websecurityscanner_proto_with_info", gapic_yaml = "websecurityscanner_gapic.yaml", - service_yaml = "//google/cloud/websecurityscanner:web_security_scanner_v1alpha.yaml", + service_yaml = ":websecurityscanner_v1alpha.yaml", test_deps = [":websecurityscanner_java_grpc"], - deps = [ - ":websecurityscanner_java_proto", - ":websecurityscanner_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":websecurityscanner_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "websecurityscanner_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClientTest", + ], runtime_deps = [":websecurityscanner_java_gapic_test"], -) for test_name in [ - "com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-websecurityscanner-v1alpha-java", - client_deps = [":websecurityscanner_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":websecurityscanner_java_gapic_test"], - grpc_deps = [":websecurityscanner_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ - ":websecurityscanner_resource_name_java_proto", + deps = [ + ":websecurityscanner_java_gapic", + ":websecurityscanner_java_grpc", ":websecurityscanner_java_proto", ":websecurityscanner_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## @@ -124,7 +111,7 @@ go_gapic_library( src = ":websecurityscanner_proto_with_info", gapic_yaml = "websecurityscanner_gapic.yaml", importpath = "cloud.google.com/go/cloud/websecurityscanner/apiv1alpha", - service_yaml = "//google/cloud/websecurityscanner:web_security_scanner_v1alpha.yaml", + service_yaml = ":websecurityscanner_v1alpha.yaml", deps = [":websecurityscanner_go_proto"], ) diff --git a/google/container/v1/BUILD.bazel b/google/container/v1/BUILD.bazel index 810fe713..418d3f8d 100644 --- a/google/container/v1/BUILD.bazel +++ b/google/container/v1/BUILD.bazel @@ -17,7 +17,10 @@ proto_library( proto_library_with_info( name = "container_proto_with_info", - deps = [":container_proto"], + deps = [ + ":container_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -29,13 +32,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "container_java_proto", deps = [":container_proto"], @@ -44,7 +43,7 @@ java_proto_library( java_grpc_library( name = "container_java_grpc", srcs = [":container_proto"], - deps = [":container_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":container_java_proto"], ) java_gapic_library( @@ -53,30 +52,26 @@ java_gapic_library( gapic_yaml = "container_gapic.yaml", service_yaml = "//google/container:container_v1.yaml", test_deps = [":container_java_grpc"], - deps = [":container_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":container_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "container_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.container.v1.ClusterManagerClientTest", + ], runtime_deps = [":container_java_gapic_test"], -) for test_name in [ - "com.google.cloud.container.v1.ClusterManagerClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-container-v1-java", - client_deps = [":container_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":container_java_gapic_test"], - grpc_deps = [":container_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":container_java_gapic", + ":container_java_grpc", ":container_java_proto", ":container_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/datastore/v1/BUILD.bazel b/google/datastore/v1/BUILD.bazel index 30f787ba..9ad3644b 100644 --- a/google/datastore/v1/BUILD.bazel +++ b/google/datastore/v1/BUILD.bazel @@ -24,7 +24,10 @@ proto_library( proto_library_with_info( name = "datastore_proto_with_info", - deps = [":datastore_proto"], + deps = [ + ":datastore_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +39,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "datastore_java_proto", deps = [":datastore_proto"], @@ -52,13 +50,7 @@ java_proto_library( java_grpc_library( name = "datastore_java_grpc", srcs = [":datastore_proto"], - deps = [":datastore_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "datastore_resource_name_java_proto", - gapic_yaml = "datastore_gapic.yaml", - deps = [":datastore_proto"], + deps = [":datastore_java_proto"], ) java_gapic_library( @@ -67,36 +59,26 @@ java_gapic_library( gapic_yaml = "datastore_gapic.yaml", service_yaml = "//google/datastore:datastore.yaml", test_deps = [":datastore_java_grpc"], - deps = [ - ":datastore_java_proto", - ":datastore_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":datastore_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":datastore_java_gapic_test", +java_gapic_test( + name = "datastore_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.datastore.v1.DatastoreClientTest", ], -) for test_name in [ - "com.google.cloud.datastore.v1.DatastoreClientTest", -]] + runtime_deps = [":datastore_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-datastore-v1-java", - client_deps = [":datastore_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":datastore_java_gapic_test"], - grpc_deps = [":datastore_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":datastore_java_gapic", + ":datastore_java_grpc", ":datastore_java_proto", ":datastore_proto", - ":datastore_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/devtools/clouddebugger/v2/BUILD.bazel b/google/devtools/clouddebugger/v2/BUILD.bazel index 6b33ee4d..46bcca12 100644 --- a/google/devtools/clouddebugger/v2/BUILD.bazel +++ b/google/devtools/clouddebugger/v2/BUILD.bazel @@ -25,7 +25,10 @@ proto_library( proto_library_with_info( name = "debugger_proto_with_info", - deps = [":debugger_proto"], + deps = [ + ":debugger_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -37,14 +40,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "debugger_java_proto", deps = [":debugger_proto"], @@ -53,13 +51,7 @@ java_proto_library( java_grpc_library( name = "debugger_java_grpc", srcs = [":debugger_proto"], - deps = [":debugger_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "debugger_resource_name_java_proto", - gapic_yaml = "clouddebugger_gapic.yaml", - deps = [":debugger_proto"], + deps = [":debugger_java_proto"], ) java_gapic_library( @@ -68,39 +60,27 @@ java_gapic_library( gapic_yaml = "clouddebugger_gapic.yaml", service_yaml = "//google/devtools/clouddebugger:clouddebugger.yaml", test_deps = [":debugger_java_grpc"], - deps = [ - ":debugger_java_proto", - ":debugger_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":debugger_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":debugger_java_gapic_test", +java_gapic_test( + name = "debugger_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.debugger.v2.Debugger2ClientTest", + "com.google.cloud.debugger.v2.Controller2ClientTest", ], -) for test_name in [ - "com.google.cloud.debugger.v2.Debugger2ClientTest", - "com.google.cloud.debugger.v2.Controller2ClientTest", -]] + runtime_deps = [":debugger_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-debugger-v2-java", - client_deps = [":debugger_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":debugger_java_gapic_test"], - grpc_deps = [":debugger_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ - "//google/devtools/source/v1:source_java_proto", - "//google/devtools/source/v1:source_proto", + deps = [ + ":debugger_java_gapic", + ":debugger_java_grpc", ":debugger_java_proto", ":debugger_proto", - ":debugger_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel b/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel index 4b912abf..feab70b2 100644 --- a/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel +++ b/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel @@ -24,7 +24,10 @@ proto_library( proto_library_with_info( name = "clouderrorreporting_proto_with_info", - deps = [":clouderrorreporting_proto"], + deps = [ + ":clouderrorreporting_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,14 +39,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "clouderrorreporting_java_proto", deps = [":clouderrorreporting_proto"], @@ -52,13 +50,7 @@ java_proto_library( java_grpc_library( name = "clouderrorreporting_java_grpc", srcs = [":clouderrorreporting_proto"], - deps = [":clouderrorreporting_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "clouderrorreporting_resource_name_java_proto", - gapic_yaml = "errorreporting_gapic.yaml", - deps = [":clouderrorreporting_proto"], + deps = [":clouderrorreporting_java_proto"], ) java_gapic_library( @@ -67,38 +59,28 @@ java_gapic_library( gapic_yaml = "errorreporting_gapic.yaml", service_yaml = "//google/devtools/clouderrorreporting:errorreporting.yaml", test_deps = [":clouderrorreporting_java_grpc"], - deps = [ - ":clouderrorreporting_java_proto", - ":clouderrorreporting_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":clouderrorreporting_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":clouderrorreporting_java_gapic_test", +java_gapic_test( + name = "clouderrorreporting_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.errorreporting.v1beta1.ErrorGroupServiceClientTest", + "com.google.cloud.errorreporting.v1beta1.ErrorStatsServiceClientTest", + "com.google.cloud.errorreporting.v1beta1.ReportErrorsServiceClientTest", ], -) for test_name in [ - "com.google.cloud.errorreporting.v1beta1.ErrorGroupServiceClientTest", - "com.google.cloud.errorreporting.v1beta1.ErrorStatsServiceClientTest", - "com.google.cloud.errorreporting.v1beta1.ReportErrorsServiceClientTest", -]] + runtime_deps = [":clouderrorreporting_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-error-reporting-v1beta1-java", - client_deps = [":clouderrorreporting_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":clouderrorreporting_java_gapic_test"], - grpc_deps = [":clouderrorreporting_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":clouderrorreporting_java_gapic", + ":clouderrorreporting_java_grpc", ":clouderrorreporting_java_proto", ":clouderrorreporting_proto", - ":clouderrorreporting_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/devtools/cloudtrace/v1/BUILD.bazel b/google/devtools/cloudtrace/v1/BUILD.bazel index 1626d051..e6ac1c39 100644 --- a/google/devtools/cloudtrace/v1/BUILD.bazel +++ b/google/devtools/cloudtrace/v1/BUILD.bazel @@ -20,7 +20,10 @@ proto_library( proto_library_with_info( name = "trace_proto_with_info", - deps = [":trace_proto"], + deps = [ + ":trace_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -32,14 +35,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "trace_java_proto", deps = [":trace_proto"], @@ -48,13 +46,7 @@ java_proto_library( java_grpc_library( name = "trace_java_grpc", srcs = [":trace_proto"], - deps = [":trace_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "trace_resource_name_java_proto", - gapic_yaml = "cloudtrace_gapic.yaml", - deps = [":trace_proto"], + deps = [":trace_java_proto"], ) java_gapic_library( @@ -63,34 +55,26 @@ java_gapic_library( gapic_yaml = "cloudtrace_gapic.yaml", service_yaml = "//google/devtools/cloudtrace:cloudtrace_v1.yaml", test_deps = [":trace_java_grpc"], - deps = [ - ":trace_java_proto", - ":trace_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":trace_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "trace_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.trace.v1.TraceServiceClientTest", + ], runtime_deps = [":trace_java_gapic_test"], -) for test_name in [ - "com.google.cloud.trace.v1.TraceServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-trace-v1-java", - client_deps = [":trace_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":trace_java_gapic_test"], - grpc_deps = [":trace_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":trace_java_gapic", + ":trace_java_grpc", ":trace_java_proto", ":trace_proto", - ":trace_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/devtools/cloudtrace/v2/BUILD.bazel b/google/devtools/cloudtrace/v2/BUILD.bazel index 93e46a7e..dc60a0cd 100644 --- a/google/devtools/cloudtrace/v2/BUILD.bazel +++ b/google/devtools/cloudtrace/v2/BUILD.bazel @@ -23,7 +23,10 @@ proto_library( proto_library_with_info( name = "trace_proto_with_info", - deps = [":trace_proto"], + deps = [ + ":trace_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -35,14 +38,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "trace_java_proto", deps = [":trace_proto"], @@ -51,13 +49,7 @@ java_proto_library( java_grpc_library( name = "trace_java_grpc", srcs = [":trace_proto"], - deps = [":trace_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "trace_resource_name_java_proto", - gapic_yaml = "cloudtrace_gapic.yaml", - deps = [":trace_proto"], + deps = [":trace_java_proto"], ) java_gapic_library( @@ -66,34 +58,26 @@ java_gapic_library( gapic_yaml = "cloudtrace_gapic.yaml", service_yaml = "//google/devtools/cloudtrace:cloudtrace_v2.yaml", test_deps = [":trace_java_grpc"], - deps = [ - ":trace_java_proto", - ":trace_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":trace_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "trace_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.trace.v2.TraceServiceClientTest", + ], runtime_deps = [":trace_java_gapic_test"], -) for test_name in [ - "com.google.cloud.trace.v2.TraceServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-trace-v2-java", - client_deps = [":trace_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":trace_java_gapic_test"], - grpc_deps = [":trace_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":trace_java_gapic", + ":trace_java_grpc", ":trace_java_proto", ":trace_proto", - ":trace_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/BUILD.bazel index b5133a10..ea2c6288 100644 --- a/google/devtools/containeranalysis/v1beta1/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/BUILD.bazel @@ -36,6 +36,7 @@ proto_library( proto_library_with_info( name = "containeranalysis_proto_with_info", deps = [ + "//google/cloud:common_resources_proto", ":containeranalysis_proto", ] + _PROTO_SUBPACKAGE_DEPS, ) @@ -51,15 +52,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - _JAVA_PROTO_SUBPACKAGE_DEPS = [ "//google/devtools/containeranalysis/v1beta1/attestation:attestation_java_proto", "//google/devtools/containeranalysis/v1beta1/build:build_java_proto", @@ -88,20 +83,6 @@ _JAVA_GRPC_SUBPACKAGE_DEPS = [ "//google/devtools/containeranalysis/v1beta1/vulnerability:vulnerability_java_grpc", ] -_RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS = [ - "//google/devtools/containeranalysis/v1beta1/attestation:attestation_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/build:build_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/common:common_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/deployment:deployment_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/discovery:discovery_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/grafeas:grafeas_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/image:image_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/package:package_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/provenance:provenance_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/source:source_resource_name_java_proto", - "//google/devtools/containeranalysis/v1beta1/vulnerability:vulnerability_resource_name_java_proto", -] - java_proto_library( name = "containeranalysis_java_proto", deps = [":containeranalysis_proto"], @@ -110,13 +91,7 @@ java_proto_library( java_grpc_library( name = "containeranalysis_java_grpc", srcs = [":containeranalysis_proto"], - deps = [":containeranalysis_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "containeranalysis_resource_name_java_proto", - gapic_yaml = "containeranalysis_gapic.yaml", - deps = [":containeranalysis_proto"], + deps = [":containeranalysis_java_proto"], ) java_gapic_library( @@ -129,33 +104,28 @@ java_gapic_library( ] + _JAVA_GRPC_SUBPACKAGE_DEPS, deps = [ ":containeranalysis_java_proto", - ":containeranalysis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, + "//google/iam/v1:iam_java_proto", + ] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [":containeranalysis_java_gapic_test"], -) for test_name in [ - "com.google.cloud.devtools.containeranalysis.v1beta1.ContainerAnalysisV1Beta1ClientTest", - "com.google.cloud.devtools.containeranalysis.v1beta1.GrafeasV1Beta1ClientTest", -]] +java_gapic_test( + name = "containeranalysis_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.devtools.containeranalysis.v1beta1.ContainerAnalysisV1Beta1ClientTest", + "com.google.cloud.devtools.containeranalysis.v1beta1.GrafeasV1Beta1ClientTest", + ], + runtime_deps = ["containeranalysis_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-containeranalysis-v1-java", - client_deps = [":containeranalysis_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":containeranalysis_java_gapic_test"], - grpc_deps = [":containeranalysis_java_grpc"] + _JAVA_GRPC_SUBPACKAGE_DEPS, - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":containeranalysis_java_gapic", + ":containeranalysis_java_grpc", ":containeranalysis_java_proto", ":containeranalysis_proto", - ":containeranalysis_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS, - version = "0.0.0-SNAPSHOT", + ] + _JAVA_GRPC_SUBPACKAGE_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS, ) ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel index 05e1086f..ca228e4d 100644 --- a/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel @@ -26,7 +26,7 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", + ) java_proto_library( @@ -40,12 +40,6 @@ java_grpc_library( deps = [":attestation_java_proto"], ) -java_resource_name_proto_library( - name = "attestation_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":attestation_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/build/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/build/BUILD.bazel index fda8cda8..3652325e 100644 --- a/google/devtools/containeranalysis/v1beta1/build/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/build/BUILD.bazel @@ -27,7 +27,6 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -41,12 +40,6 @@ java_grpc_library( deps = [":build_java_proto"], ) -java_resource_name_proto_library( - name = "build_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":build_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/common/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/common/BUILD.bazel index 55758bb9..73b8bd85 100644 --- a/google/devtools/containeranalysis/v1beta1/common/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/common/BUILD.bazel @@ -26,7 +26,7 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", + ) java_proto_library( @@ -40,12 +40,6 @@ java_grpc_library( deps = [":common_java_proto"], ) -java_resource_name_proto_library( - name = "common_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":common_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/deployment/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/deployment/BUILD.bazel index 670c8c76..b66e2490 100644 --- a/google/devtools/containeranalysis/v1beta1/deployment/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/deployment/BUILD.bazel @@ -27,7 +27,7 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", - "java_resource_name_proto_library", + ) java_proto_library( @@ -41,12 +41,6 @@ java_grpc_library( deps = [":deployment_java_proto"], ) -java_resource_name_proto_library( - name = "deployment_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":deployment_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/discovery/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/discovery/BUILD.bazel index dfe0bae7..a2a28cea 100644 --- a/google/devtools/containeranalysis/v1beta1/discovery/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/discovery/BUILD.bazel @@ -29,7 +29,7 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", - "java_resource_name_proto_library", + ) java_proto_library( @@ -43,12 +43,6 @@ java_grpc_library( deps = [":discovery_java_proto"], ) -java_resource_name_proto_library( - name = "discovery_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":discovery_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/grafeas/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/grafeas/BUILD.bazel index 41e0d234..bdd897cf 100644 --- a/google/devtools/containeranalysis/v1beta1/grafeas/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/grafeas/BUILD.bazel @@ -41,7 +41,6 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -55,12 +54,6 @@ java_grpc_library( deps = [":grafeas_java_proto"], ) -java_resource_name_proto_library( - name = "grafeas_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":grafeas_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/image/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/image/BUILD.bazel index 99737d9d..c5703c0b 100644 --- a/google/devtools/containeranalysis/v1beta1/image/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/image/BUILD.bazel @@ -25,7 +25,6 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -39,12 +38,6 @@ java_grpc_library( deps = [":image_java_proto"], ) -java_resource_name_proto_library( - name = "image_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":image_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/package/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/package/BUILD.bazel index e3e3e001..4f415c17 100644 --- a/google/devtools/containeranalysis/v1beta1/package/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/package/BUILD.bazel @@ -26,7 +26,6 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -40,12 +39,6 @@ java_grpc_library( deps = [":package_java_proto"], ) -java_resource_name_proto_library( - name = "package_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":package_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/provenance/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/provenance/BUILD.bazel index a4fbdff4..2cda6fc2 100644 --- a/google/devtools/containeranalysis/v1beta1/provenance/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/provenance/BUILD.bazel @@ -29,7 +29,6 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -43,12 +42,6 @@ java_grpc_library( deps = [":provenance_java_proto"], ) -java_resource_name_proto_library( - name = "provenance_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":provenance_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/source/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/source/BUILD.bazel index 3e0b9c55..48cbb9ec 100644 --- a/google/devtools/containeranalysis/v1beta1/source/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/source/BUILD.bazel @@ -26,7 +26,6 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -40,12 +39,6 @@ java_grpc_library( deps = [":source_java_proto"], ) -java_resource_name_proto_library( - name = "source_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":source_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel b/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel index dcb12c53..61417edb 100644 --- a/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel +++ b/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel @@ -29,7 +29,6 @@ load( "@com_google_googleapis_imports//:imports.bzl", "java_grpc_library", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -43,12 +42,6 @@ java_grpc_library( deps = [":vulnerability_java_proto"], ) -java_resource_name_proto_library( - name = "vulnerability_resource_name_java_proto", - gapic_yaml = "//google/devtools/containeranalysis/v1beta1:containeranalysis_gapic.yaml", - deps = [":vulnerability_proto"], -) - ############################################################################## # Go ############################################################################## diff --git a/google/example/library/v1/BUILD.bazel b/google/example/library/v1/BUILD.bazel index d5f2b8c9..b8a9b839 100644 --- a/google/example/library/v1/BUILD.bazel +++ b/google/example/library/v1/BUILD.bazel @@ -20,7 +20,10 @@ proto_library( proto_library_with_info( name = "library_proto_with_info", - deps = [":library_proto"], + deps = [ + ":library_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -32,14 +35,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "library_java_proto", deps = [":library_proto"], @@ -48,13 +46,7 @@ java_proto_library( java_grpc_library( name = "library_java_grpc", srcs = [":library_proto"], - deps = [":library_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "library_resource_name_java_proto", - gapic_yaml = "library_example_gapic.yaml", - deps = [":library_proto"], + deps = [":library_java_proto"], ) java_gapic_library( @@ -63,34 +55,26 @@ java_gapic_library( gapic_yaml = "library_example_gapic.yaml", service_yaml = "//google/example/library:library_example_v1.yaml", test_deps = [":library_java_grpc"], - deps = [ - ":library_java_proto", - ":library_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":library_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "library_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.example.library.v1.LibraryServiceClientTest", + ], runtime_deps = [":library_java_gapic_test"], -) for test_name in [ - "com.google.cloud.example.library.v1.LibraryServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-library-v1-java", - client_deps = [":library_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":library_java_gapic_test"], - grpc_deps = [":library_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":library_java_gapic", + ":library_java_grpc", ":library_java_proto", ":library_proto", - ":library_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/firestore/v1beta1/BUILD.bazel b/google/firestore/v1beta1/BUILD.bazel index 8d4aa589..3b7aec65 100644 --- a/google/firestore/v1beta1/BUILD.bazel +++ b/google/firestore/v1beta1/BUILD.bazel @@ -17,6 +17,7 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", "//google/rpc:status_proto", "//google/type:latlng_proto", "@com_google_protobuf//:empty_proto", @@ -28,7 +29,10 @@ proto_library( proto_library_with_info( name = "firestore_proto_with_info", - deps = [":firestore_proto"], + deps = [ + ":firestore_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -40,14 +44,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "firestore_java_proto", deps = [":firestore_proto"], @@ -56,13 +55,7 @@ java_proto_library( java_grpc_library( name = "firestore_java_grpc", srcs = [":firestore_proto"], - deps = [":firestore_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "firestore_resource_name_java_proto", - gapic_yaml = "firestore_gapic.yaml", - deps = [":firestore_proto"], + deps = [":firestore_java_proto"], ) java_gapic_library( @@ -71,36 +64,26 @@ java_gapic_library( gapic_yaml = "firestore_gapic.yaml", service_yaml = "//google/firestore:firestore_v1beta1.yaml", test_deps = [":firestore_java_grpc"], - deps = [ - ":firestore_java_proto", - ":firestore_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":firestore_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":firestore_java_gapic_test", +java_gapic_test( + name = "firestore_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.firestore.v1beta1.FirestoreClientTest", ], -) for test_name in [ - "com.google.cloud.firestore.v1beta1.FirestoreClientTest", -]] + runtime_deps = [":firestore_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-firestore-v1beta1-java", - client_deps = [":firestore_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":firestore_java_gapic_test"], - grpc_deps = [":firestore_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":firestore_java_gapic", + ":firestore_java_grpc", ":firestore_java_proto", ":firestore_proto", - ":firestore_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/iam/credentials/v1/BUILD.bazel b/google/iam/credentials/v1/BUILD.bazel index d3ac16d3..0f72dd48 100644 --- a/google/iam/credentials/v1/BUILD.bazel +++ b/google/iam/credentials/v1/BUILD.bazel @@ -21,7 +21,10 @@ proto_library( proto_library_with_info( name = "iamcredentials_proto_with_info", - deps = [":iamcredentials_proto"], + deps = [ + ":iamcredentials_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -33,14 +36,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "iamcredentials_java_proto", deps = [":iamcredentials_proto"], @@ -49,13 +47,7 @@ java_proto_library( java_grpc_library( name = "iamcredentials_java_grpc", srcs = [":iamcredentials_proto"], - deps = [":iamcredentials_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "iamcredentials_resource_name_java_proto", - gapic_yaml = "iamcredentials_gapic.yaml", - deps = [":iamcredentials_proto"], + deps = [":iamcredentials_java_proto"], ) java_gapic_library( @@ -64,34 +56,26 @@ java_gapic_library( gapic_yaml = "iamcredentials_gapic.yaml", service_yaml = "//google/iam/credentials:iamcredentials_v1.yaml", test_deps = [":iamcredentials_java_grpc"], - deps = [ - ":iamcredentials_java_proto", - ":iamcredentials_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":iamcredentials_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "iamcredentials_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.iam.credentials.v1.IamCredentialsClientTest", + ], runtime_deps = [":iamcredentials_java_gapic_test"], -) for test_name in [ - "com.google.cloud.iam.credentials.v1.IamCredentialsClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-iamcredentials-v1-java", - client_deps = [":iamcredentials_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":iamcredentials_java_gapic_test"], - grpc_deps = [":iamcredentials_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ - ":iamcredentials_resource_name_java_proto", + deps = [ + ":iamcredentials_java_gapic", + ":iamcredentials_java_grpc", ":iamcredentials_java_proto", ":iamcredentials_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/iam/v1/BUILD.bazel b/google/iam/v1/BUILD.bazel index 1b20bbab..9ebff1f8 100644 --- a/google/iam/v1/BUILD.bazel +++ b/google/iam/v1/BUILD.bazel @@ -14,6 +14,7 @@ proto_library( ":policy_proto", "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", "//google/api:resource_proto", ], ) diff --git a/google/logging/type/BUILD.bazel b/google/logging/type/BUILD.bazel index 641e0239..20bf7d59 100644 --- a/google/logging/type/BUILD.bazel +++ b/google/logging/type/BUILD.bazel @@ -38,7 +38,6 @@ proto_library_with_info( load( "@com_google_googleapis_imports//:imports.bzl", "java_proto_library", - "java_resource_name_proto_library", ) java_proto_library( @@ -49,15 +48,6 @@ java_proto_library( ], ) -java_resource_name_proto_library( - name = "type_resource_name_java_proto", - gapic_yaml = "//google/logging/v2:logging_gapic.yaml", - deps = [ - ":http_request_proto", - ":log_severity_proto", - ], -) - ############################################################################## # Go ############################################################################## diff --git a/google/logging/v2/BUILD.bazel b/google/logging/v2/BUILD.bazel index b3051aa9..e43d318c 100644 --- a/google/logging/v2/BUILD.bazel +++ b/google/logging/v2/BUILD.bazel @@ -25,6 +25,7 @@ proto_library( "//google/api:distribution_proto", "//google/api:metric_proto", "//google/rpc:status_proto", + "//google/api:client_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:struct_proto", "@com_google_protobuf//:timestamp_proto", @@ -37,6 +38,7 @@ proto_library( proto_library_with_info( name = "logging_proto_with_info", deps = [ + "//google/cloud:common_resources_proto", ":logging_proto", ] + _PROTO_SUBPACKAGE_DEPS, ) @@ -52,13 +54,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", -) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] + "java_gapic_test", +) _JAVA_PROTO_SUBPACKAGE_DEPS = [ "//google/logging/type:type_java_proto", @@ -68,10 +66,6 @@ _JAVA_GRPC_SUBPACKAGE_DEPS = [ # "//google/logging/type:type_java_grpc", ] -_RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS = [ - "//google/logging/type:type_resource_name_java_proto", -] - java_proto_library( name = "logging_java_proto", deps = [":logging_proto"], @@ -80,13 +74,7 @@ java_proto_library( java_grpc_library( name = "logging_java_grpc", srcs = [":logging_proto"], - deps = [":logging_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "logging_resource_name_java_proto", - gapic_yaml = "logging_gapic.yaml", - deps = [":logging_proto"], + deps = [":logging_java_proto"], ) java_gapic_library( @@ -94,39 +82,32 @@ java_gapic_library( src = ":logging_proto_with_info", gapic_yaml = "logging_gapic.yaml", service_yaml = "//google/logging:logging.yaml", - test_deps = [ - ":logging_java_grpc", - ] + _JAVA_GRPC_SUBPACKAGE_DEPS, + test_deps = [":logging_java_grpc"] + _JAVA_GRPC_SUBPACKAGE_DEPS, deps = [ ":logging_java_proto", - ":logging_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, + "//google/api:api_java_proto", + ] + _JAVA_PROTO_SUBPACKAGE_DEPS, ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "logging_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.logging.v2.LoggingClientTest", + "com.google.cloud.logging.v2.ConfigClientTest", + "com.google.cloud.logging.v2.MetricsClientTest", + ], runtime_deps = [":logging_java_gapic_test"], -) for test_name in [ - "com.google.cloud.logging.v2.LoggingClientTest", - "com.google.cloud.logging.v2.ConfigClientTest", - "com.google.cloud.logging.v2.MetricsClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-logging-v2-java", - client_deps = [":logging_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":logging_java_gapic_test"], - grpc_deps = [":logging_java_grpc"] + _JAVA_GRPC_SUBPACKAGE_DEPS, - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":logging_java_gapic", + ":logging_java_grpc", ":logging_java_proto", ":logging_proto", - ":logging_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS + _RESOURCE_NAME_JAVA_PROTO_SUBPACKAGE_DEPS, - version = "0.0.0-SNAPSHOT", + ] + _JAVA_GRPC_SUBPACKAGE_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS, ) ############################################################################## diff --git a/google/monitoring/v3/BUILD.bazel b/google/monitoring/v3/BUILD.bazel index 56b53454..36ac30f0 100644 --- a/google/monitoring/v3/BUILD.bazel +++ b/google/monitoring/v3/BUILD.bazel @@ -44,7 +44,10 @@ proto_library( proto_library_with_info( name = "monitoring_proto_with_info", - deps = [":monitoring_proto"], + deps = [ + ":monitoring_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -56,14 +59,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "monitoring_java_proto", deps = [":monitoring_proto"], @@ -72,13 +70,7 @@ java_proto_library( java_grpc_library( name = "monitoring_java_grpc", srcs = [":monitoring_proto"], - deps = [":monitoring_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "monitoring_resource_name_java_proto", - gapic_yaml = "monitoring_gapic.yaml", - deps = [":monitoring_proto"], + deps = [":monitoring_java_proto"], ) java_gapic_library( @@ -89,38 +81,31 @@ java_gapic_library( test_deps = [":monitoring_java_grpc"], deps = [ ":monitoring_java_proto", - ":monitoring_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/api:api_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":monitoring_java_gapic_test", +java_gapic_test( + name = "monitoring_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.monitoring.v3.AlertPolicyServiceClientTest", + "com.google.cloud.monitoring.v3.GroupServiceClientTest", + "com.google.cloud.monitoring.v3.MetricServiceClientTest", + "com.google.cloud.monitoring.v3.NotificationChannelServiceClientTest", + "com.google.cloud.monitoring.v3.UptimeCheckServiceClientTest", ], -) for test_name in [ - "com.google.cloud.monitoring.v3.AlertPolicyServiceClientTest", - "com.google.cloud.monitoring.v3.GroupServiceClientTest", - "com.google.cloud.monitoring.v3.MetricServiceClientTest", - "com.google.cloud.monitoring.v3.NotificationChannelServiceClientTest", - "com.google.cloud.monitoring.v3.UptimeCheckServiceClientTest", -]] + runtime_deps = [":monitoring_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-monitoring-v3-java", - client_deps = [":monitoring_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":monitoring_java_gapic_test"], - grpc_deps = [":monitoring_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":monitoring_java_gapic", + ":monitoring_java_grpc", ":monitoring_java_proto", ":monitoring_proto", - ":monitoring_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/privacy/dlp/v2/BUILD.bazel b/google/privacy/dlp/v2/BUILD.bazel index 68d9e7cc..73292609 100644 --- a/google/privacy/dlp/v2/BUILD.bazel +++ b/google/privacy/dlp/v2/BUILD.bazel @@ -43,14 +43,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "dlp_java_proto", deps = [":dlp_proto"], @@ -59,13 +54,7 @@ java_proto_library( java_grpc_library( name = "dlp_java_grpc", srcs = [":dlp_proto"], - deps = [":dlp_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "dlp_resource_name_java_proto", - gapic_yaml = "dlp_gapic.yaml", - deps = [":dlp_proto"], + deps = [":dlp_java_proto"], ) java_gapic_library( @@ -73,37 +62,27 @@ java_gapic_library( src = ":dlp_proto_with_info", gapic_yaml = "dlp_gapic.yaml", service_yaml = "//google/privacy/dlp:dlp_v2.yaml", - test_deps = [ - ":dlp_java_grpc", - ], - deps = [ - ":dlp_java_proto", - ":dlp_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + test_deps = [":dlp_java_grpc"], + deps = [":dlp_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "dlp_java_gapic_test_suite", + test_classes = [ + # "com.google.cloud.dlp.v2.DlpServiceClientTest", + ], runtime_deps = [":dlp_java_gapic_test"], -) for test_name in [ - # "com.google.cloud.dlp.v2.DlpServiceClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-dlp-v2-java", - client_deps = [":dlp_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":dlp_java_gapic_test"], - grpc_deps = [":dlp_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":dlp_java_gapic", + ":dlp_java_grpc", ":dlp_java_proto", ":dlp_proto", - ":dlp_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/pubsub/v1/BUILD.bazel b/google/pubsub/v1/BUILD.bazel index b689d76d..b5128391 100644 --- a/google/pubsub/v1/BUILD.bazel +++ b/google/pubsub/v1/BUILD.bazel @@ -23,6 +23,7 @@ proto_library_with_info( name = "pubsub_proto_with_info", deps = [ ":pubsub_proto", + "//google/cloud:common_resources_proto", "//google/iam/v1:iam_policy_proto", "//google/iam/v1:policy_proto", ], @@ -38,14 +39,9 @@ load( "java_gapic_assembly_gradle_pkg", "java_proto_library", "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "pubsub_java_proto", deps = [":pubsub_proto"], @@ -54,53 +50,54 @@ java_proto_library( java_grpc_library( name = "pubsub_java_grpc", srcs = [":pubsub_proto"], - deps = [":pubsub_java_proto"] + _JAVA_GRPC_DEPS, + deps = [":pubsub_java_proto"], ) java_resource_name_proto_library( - name = "pubsub_resource_name_java_proto", + name = "pubsub_java_gapic_resource_name", gapic_yaml = "pubsub_gapic.yaml", - deps = [":pubsub_proto"], + deps = [ + ":pubsub_proto", + "//google/cloud:common_resources_proto", + ], ) java_gapic_library( name = "pubsub_java_gapic", src = ":pubsub_proto_with_info", gapic_yaml = "pubsub_gapic.yaml", + gen_resource_name = False, service_yaml = "//google/pubsub:pubsub.yaml", test_deps = [ ":pubsub_java_grpc", - "@com_google_api_grpc_grpc_google_iam_v1//jar", + "//google/iam/v1:iam_java_grpc", ], deps = [ + ":pubsub_java_gapic_resource_name", ":pubsub_java_proto", - ":pubsub_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, +java_gapic_test( + name = "pubsub_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.pubsub.v1.SubscriptionAdminClientTest", + "com.google.cloud.pubsub.v1.TopicAdminClientTest", + ], runtime_deps = [":pubsub_java_gapic_test"], -) for test_name in [ - "com.google.cloud.pubsub.v1.SubscriptionAdminClientTest", - "com.google.cloud.pubsub.v1.TopicAdminClientTest", -]] +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-pubsub-v1-java", - client_deps = [":pubsub_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":pubsub_java_gapic_test"], - grpc_deps = [":pubsub_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":pubsub_java_gapic", + ":pubsub_java_gapic_resource_name", + ":pubsub_java_grpc", ":pubsub_java_proto", ":pubsub_proto", - ":pubsub_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/spanner/admin/database/v1/BUILD.bazel b/google/spanner/admin/database/v1/BUILD.bazel index ff2e6e98..0025b418 100644 --- a/google/spanner/admin/database/v1/BUILD.bazel +++ b/google/spanner/admin/database/v1/BUILD.bazel @@ -23,22 +23,12 @@ proto_library( proto_library_with_info( name = "spanner_admin_database_proto_with_info", - deps = [":spanner_admin_database_proto"], + deps = [ + ":spanner_admin_database_proto", + "//google/cloud:common_resources_proto", + ], ) -#proto_library( -# name = "spanner_admin_database_proto_with_info", -# deps = [ -# ":spanner_admin_database_proto", -# "//google/api:annotations_proto", -# "//google/iam/v1:iam_policy_proto", -# "//google/iam/v1:policy_proto", -# "//google/longrunning:operations_proto", -# "@com_google_protobuf//:empty_proto", -# "@com_google_protobuf//:timestamp_proto", -# ], -#) - ############################################################################## # Java ############################################################################## @@ -48,15 +38,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "spanner_admin_database_java_proto", deps = [":spanner_admin_database_proto"], @@ -65,13 +49,7 @@ java_proto_library( java_grpc_library( name = "spanner_admin_database_java_grpc", srcs = [":spanner_admin_database_proto"], - deps = [":spanner_admin_database_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "spanner_admin_database_resource_name_java_proto", - gapic_yaml = "spanner_admin_database_gapic.yaml", - deps = [":spanner_admin_database_proto"], + deps = [":spanner_admin_database_java_proto"], ) java_gapic_library( @@ -79,37 +57,33 @@ java_gapic_library( src = ":spanner_admin_database_proto_with_info", gapic_yaml = "spanner_admin_database_gapic.yaml", service_yaml = "//google/spanner/admin/database:spanner_admin_database.yaml", - test_deps = [":spanner_admin_database_java_grpc"], + test_deps = [ + ":spanner_admin_database_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":spanner_admin_database_java_proto", - ":spanner_admin_database_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":spanner_admin_database_java_gapic_test", +java_gapic_test( + name = "spanner_admin_database_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.spanner.admin.database.v1.DatabaseAdminClientTest", ], -) for test_name in [ - "com.google.cloud.spanner.admin.database.v1.DatabaseAdminClientTest", -]] + runtime_deps = [":spanner_admin_database_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-spanner-admin-database-v1-java", - client_deps = [":spanner_admin_database_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":spanner_admin_database_java_gapic_test"], - grpc_deps = [":spanner_admin_database_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":spanner_admin_database_java_gapic", + ":spanner_admin_database_java_grpc", ":spanner_admin_database_java_proto", ":spanner_admin_database_proto", - ":spanner_admin_database_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/spanner/admin/instance/v1/BUILD.bazel b/google/spanner/admin/instance/v1/BUILD.bazel index 9736c7aa..6f44a654 100644 --- a/google/spanner/admin/instance/v1/BUILD.bazel +++ b/google/spanner/admin/instance/v1/BUILD.bazel @@ -13,6 +13,7 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:field_behavior_proto", "//google/iam/v1:iam_policy_proto", "//google/iam/v1:policy_proto", "//google/longrunning:operations_proto", @@ -24,7 +25,10 @@ proto_library( proto_library_with_info( name = "spanner_admin_instance_proto_with_info", - deps = [":spanner_admin_instance_proto"], + deps = [ + ":spanner_admin_instance_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -36,15 +40,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", - "@com_google_api_grpc_proto_google_iam_v1//jar", -] - java_proto_library( name = "spanner_admin_instance_java_proto", deps = [":spanner_admin_instance_proto"], @@ -53,13 +51,7 @@ java_proto_library( java_grpc_library( name = "spanner_admin_instance_java_grpc", srcs = [":spanner_admin_instance_proto"], - deps = [":spanner_admin_instance_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "spanner_admin_instance_resource_name_java_proto", - gapic_yaml = "spanner_admin_instance_gapic.yaml", - deps = [":spanner_admin_instance_proto"], + deps = [":spanner_admin_instance_java_proto"], ) java_gapic_library( @@ -67,37 +59,33 @@ java_gapic_library( src = ":spanner_admin_instance_proto_with_info", gapic_yaml = "spanner_admin_instance_gapic.yaml", service_yaml = "//google/spanner/admin/instance:spanner_admin_instance.yaml", - test_deps = [":spanner_admin_instance_java_grpc"], + test_deps = [ + ":spanner_admin_instance_java_grpc", + "//google/iam/v1:iam_java_grpc", + ], deps = [ ":spanner_admin_instance_java_proto", - ":spanner_admin_instance_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + "//google/iam/v1:iam_java_proto", + ], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":spanner_admin_instance_java_gapic_test", +java_gapic_test( + name = "spanner_admin_instance_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.spanner.admin.instance.v1.InstanceAdminClientTest", ], -) for test_name in [ - "com.google.cloud.spanner.admin.instance.v1.InstanceAdminClientTest", -]] + runtime_deps = [":spanner_admin_instance_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-spanner-admin-instance-v1-java", - client_deps = [":spanner_admin_instance_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":spanner_admin_instance_java_gapic_test"], - grpc_deps = [":spanner_admin_instance_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":spanner_admin_instance_java_gapic", + ":spanner_admin_instance_java_grpc", ":spanner_admin_instance_java_proto", ":spanner_admin_instance_proto", - ":spanner_admin_instance_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/google/spanner/v1/BUILD.bazel b/google/spanner/v1/BUILD.bazel index dee071b7..e34ce2ab 100644 --- a/google/spanner/v1/BUILD.bazel +++ b/google/spanner/v1/BUILD.bazel @@ -29,7 +29,10 @@ proto_library( proto_library_with_info( name = "spanner_proto_with_info", - deps = [":spanner_proto"], + deps = [ + ":spanner_proto", + "//google/cloud:common_resources_proto", + ], ) ############################################################################## @@ -41,14 +44,9 @@ load( "java_gapic_library", "java_gapic_assembly_gradle_pkg", "java_proto_library", - "java_resource_name_proto_library", - "java_test", + "java_gapic_test", ) -_JAVA_GRPC_DEPS = [ - "@com_google_api_grpc_proto_google_common_protos//jar", -] - java_proto_library( name = "spanner_java_proto", deps = [":spanner_proto"], @@ -57,13 +55,7 @@ java_proto_library( java_grpc_library( name = "spanner_java_grpc", srcs = [":spanner_proto"], - deps = [":spanner_java_proto"] + _JAVA_GRPC_DEPS, -) - -java_resource_name_proto_library( - name = "spanner_resource_name_java_proto", - gapic_yaml = "spanner_gapic.yaml", - deps = [":spanner_proto"], + deps = [":spanner_java_proto"], ) java_gapic_library( @@ -72,36 +64,26 @@ java_gapic_library( gapic_yaml = "spanner_gapic.yaml", service_yaml = "//google/spanner:spanner.yaml", test_deps = [":spanner_java_grpc"], - deps = [ - ":spanner_java_proto", - ":spanner_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, + deps = [":spanner_java_proto"], ) -[java_test( - name = test_name, - test_class = test_name, - runtime_deps = [ - ":spanner_java_gapic_test", +java_gapic_test( + name = "spanner_java_gapic_test_suite", + test_classes = [ + "com.google.cloud.spanner.v1.SpannerClientTest", ], -) for test_name in [ - "com.google.cloud.spanner.v1.SpannerClientTest", -]] + runtime_deps = [":spanner_java_gapic_test"], +) # Opensource Packages java_gapic_assembly_gradle_pkg( name = "google-cloud-spanner-v1-java", - client_deps = [":spanner_java_gapic"], - client_group = "com.google.cloud", - client_test_deps = [":spanner_java_gapic_test"], - grpc_deps = [":spanner_java_grpc"], - grpc_group = "com.google.api.grpc", - proto_deps = [ + deps = [ + ":spanner_java_gapic", + ":spanner_java_grpc", ":spanner_java_proto", ":spanner_proto", - ":spanner_resource_name_java_proto", - ] + _JAVA_GRPC_DEPS, - version = "0.0.0-SNAPSHOT", + ], ) ############################################################################## diff --git a/repository_rules.bzl b/repository_rules.bzl index f5617953..ba40eeaf 100644 --- a/repository_rules.bzl +++ b/repository_rules.bzl @@ -131,14 +131,14 @@ def switched_rules_by_language( java and grpc and gapic, "@com_google_api_codegen//rules_gapic/java:java_gapic.bzl", ) + rules["java_gapic_test"] = _switch( + java and grpc and gapic, + "@com_google_api_codegen//rules_gapic/java: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", ) - rules["java_test"] = _switch( - java and grpc and gapic, - "native.java_test", - ) # # Go