suguo
/
googleapis
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bazel: Fix build 

1) Update to latest gapic-generator (has iam resource names fix for java).
2) Fix non-trivial issues with oslogin (resources defined in sibling package to the one they are used from) and monitoring.
3) Fix trivial missing dependencies in proto_library targets for other apis.

This is to prepare the repository to being populated with BUILD.bazel files for all supported apis (101 API) in all 7 languages.

PiperOrigin-RevId: 281618750
This commit is contained in:
Google APIs 2019-11-20 15:32:20 -08:00 committed by Copybara-Service
parent 0aa77cbe45
commit 5364a19284
9 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WORKSPACE
View File

@ -61,11 +61,10 @@ rules_proto_toolchains()
# section
http_archive(
name = "com_google_api_codegen",
strip_prefix = "gapic-generator-34da60e810b93ca7556df6ba21d16b771baaae32",
urls = ["https://github.com/googleapis/gapic-generator/archive/34da60e810b93ca7556df6ba21d16b771baaae32.zip"],
strip_prefix = "gapic-generator-95b181cd7193bd6d10f345d53312630f07dcc951",
urls = ["https://github.com/googleapis/gapic-generator/archive/95b181cd7193bd6d10f345d53312630f07dcc951.zip"],
)
##############################################################################
# C++
##############################################################################
@ -166,8 +165,8 @@ http_archive(
load(
"@protoc_docs_plugin//:repositories.bzl",
"protoc_docs_plugin_repositories",
"protoc_docs_plugin_register_toolchains",
"protoc_docs_plugin_repositories",
)
protoc_docs_plugin_repositories()
@ -185,7 +184,7 @@ http_archive(
url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz",
)
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
go_rules_dependencies()

7
google/bigtable/v2/BUILD.bazel
View File

@ -16,6 +16,9 @@ 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//:wrappers_proto",
],
@ -56,7 +59,7 @@ java_gapic_library(
name = "bigtable_java_gapic",
src = ":bigtable_proto_with_info",
gapic_yaml = "bigtable_gapic.yaml",
service_yaml = "//google/bigtable:bigtable.yaml",
service_yaml = "bigtable_v2.yaml",
test_deps = [":bigtable_java_grpc"],
deps = [":bigtable_java_proto"],
)
@ -107,7 +110,7 @@ go_gapic_library(
src = ":bigtable_proto_with_info",
gapic_yaml = "bigtable_gapic.yaml",
importpath = "cloud.google.com/go/bigtable/apiv2",
service_yaml = "//google/bigtable:bigtable.yaml",
service_yaml = "bigtable_v2.yaml",
deps = [":bigtable_go_proto"],
)

17
google/cloud/oslogin/v1/BUILD.bazel
View File

@ -45,6 +45,7 @@ load(
"java_gapic_test",
"java_grpc_library",
"java_proto_library",
"java_resource_name_proto_library",
)
_JAVA_PROTO_SUBPACKAGE_DEPS = [
@ -55,10 +56,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"],
@ -70,10 +67,20 @@ java_grpc_library(
deps = [":oslogin_java_proto"] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
java_resource_name_proto_library(
name = "oslogin_java_gapic_resource_name",
gapic_yaml = "//google/cloud/oslogin/v1:oslogin_gapic.yaml",
deps = [
":oslogin_proto",
"//google/cloud:common_resources_proto",
] + _PROTO_SUBPACKAGE_DEPS,
)
java_gapic_library(
name = "oslogin_java_gapic",
src = ":oslogin_proto_with_info",
gapic_yaml = "oslogin_gapic.yaml",
gen_resource_name = False,
package = "google.cloud.oslogin.v1",
service_yaml = ":oslogin_v1.yaml",
test_deps = [
@ -81,6 +88,7 @@ java_gapic_library(
] + _JAVA_GRPC_SUBPACKAGE_DEPS,
deps = [
":oslogin_java_proto",
":oslogin_java_gapic_resource_name",
] + _JAVA_PROTO_SUBPACKAGE_DEPS,
)
@ -100,6 +108,7 @@ java_gapic_assembly_gradle_pkg(
":oslogin_java_grpc",
":oslogin_java_proto",
":oslogin_proto",
":oslogin_java_gapic_resource_name",
] + _JAVA_PROTO_SUBPACKAGE_DEPS + _PROTO_SUBPACKAGE_DEPS,
)

7
google/container/v1/BUILD.bazel
View File

@ -13,7 +13,10 @@ proto_library(
srcs = ["cluster_service.proto"],
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"@com_google_protobuf//:empty_proto",
"@com_google_protobuf//:timestamp_proto",
],
)
@ -52,7 +55,7 @@ java_gapic_library(
name = "container_java_gapic",
src = ":container_proto_with_info",
gapic_yaml = "container_gapic.yaml",
service_yaml = "//google/container:container_v1.yaml",
service_yaml = "container_v1.yaml",
test_deps = [":container_java_grpc"],
deps = [":container_java_proto"],
)
@ -100,7 +103,7 @@ go_gapic_library(
src = ":container_proto_with_info",
gapic_yaml = "container_gapic.yaml",
importpath = "cloud.google.com/go/container/apiv1",
service_yaml = "//google/container:container_v1.yaml",
service_yaml = "container_v1.yaml",
deps = [":container_go_proto"],
)

7
google/devtools/clouderrorreporting/v1beta1/BUILD.bazel
View File

@ -18,7 +18,10 @@ proto_library(
],
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/api:monitored_resource_proto",
"//google/api:resource_proto",
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:timestamp_proto",
],
@ -59,7 +62,7 @@ java_gapic_library(
name = "clouderrorreporting_java_gapic",
src = ":clouderrorreporting_proto_with_info",
gapic_yaml = "errorreporting_gapic.yaml",
service_yaml = "//google/devtools/clouderrorreporting:errorreporting.yaml",
service_yaml = "clouderrorreporting_v1beta1.yaml",
test_deps = [":clouderrorreporting_java_grpc"],
deps = [":clouderrorreporting_java_proto"],
)
@ -112,7 +115,7 @@ go_gapic_library(
src = ":clouderrorreporting_proto_with_info",
gapic_yaml = "errorreporting_gapic.yaml",
importpath = "cloud.google.com/go/errorreporting/apiv1beta1",
service_yaml = "//google/devtools/clouderrorreporting:errorreporting.yaml",
service_yaml = "clouderrorreporting_v1beta1.yaml",
deps = [":clouderrorreporting_go_proto"],
)

7
google/devtools/cloudtrace/v1/BUILD.bazel
View File

@ -15,6 +15,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//:timestamp_proto",
],
@ -55,7 +58,7 @@ java_gapic_library(
name = "trace_java_gapic",
src = ":trace_proto_with_info",
gapic_yaml = "cloudtrace_gapic.yaml",
service_yaml = "//google/devtools/cloudtrace:cloudtrace_v1.yaml",
service_yaml = "cloudtrace_v1.yaml",
test_deps = [":trace_java_grpc"],
deps = [":trace_java_proto"],
)
@ -103,7 +106,7 @@ go_gapic_library(
src = ":trace_proto_with_info",
gapic_yaml = "cloudtrace_gapic.yaml",
importpath = "cloud.google.com/go/trace/apiv1",
service_yaml = "//google/devtools/cloudtrace:cloudtrace_v1.yaml",
service_yaml = "cloudtrace_v1.yaml",
deps = [":trace_go_proto"],
)

4
google/devtools/cloudtrace/v2/BUILD.bazel
View File

@ -61,7 +61,7 @@ java_gapic_library(
name = "trace_java_gapic",
src = ":trace_proto_with_info",
gapic_yaml = "cloudtrace_gapic.yaml",
service_yaml = "//google/devtools/cloudtrace:cloudtrace_v2.yaml",
service_yaml = "cloudtrace_v2.yaml",
test_deps = [":trace_java_grpc"],
deps = [":trace_java_proto"],
)
@ -112,7 +112,7 @@ go_gapic_library(
src = ":trace_proto_with_info",
gapic_yaml = "cloudtrace_gapic.yaml",
importpath = "cloud.google.com/go/trace/apiv2",
service_yaml = "//google/devtools/cloudtrace:cloudtrace_v2.yaml",
service_yaml = "cloudtrace_v2.yaml",
deps = [":trace_go_proto"],
)

9
google/monitoring/v3/BUILD.bazel
View File

@ -22,6 +22,8 @@ proto_library(
"mutation_record.proto",
"notification.proto",
"notification_service.proto",
"service.proto",
"service_service.proto",
"span_context.proto",
"uptime.proto",
"uptime_service.proto",
@ -36,6 +38,7 @@ proto_library(
"//google/api:monitored_resource_proto",
"//google/longrunning:operations_proto",
"//google/rpc:status_proto",
"//google/type:calendar_period_proto",
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:empty_proto",
"@com_google_protobuf//:field_mask_proto",
@ -80,7 +83,7 @@ java_gapic_library(
name = "monitoring_java_gapic",
src = ":monitoring_proto_with_info",
gapic_yaml = "monitoring_gapic.yaml",
service_yaml = "//google/monitoring:monitoring.yaml",
service_yaml = "monitoring.yaml",
test_deps = [":monitoring_java_grpc"],
deps = [
":monitoring_java_proto",
@ -129,12 +132,14 @@ go_proto_library(
protos = [":monitoring_proto"],
deps = [
"//google/api:annotations_go_proto",
"//google/api:api_go_proto",
"//google/api:distribution_go_proto",
"//google/api:label_go_proto",
"//google/api:metric_go_proto",
"//google/api:monitoredres_go_proto",
"//google/longrunning:longrunning_go_proto",
"//google/rpc:status_go_proto",
"//google/type:calendar_period_go_proto",
],
)
@ -143,7 +148,7 @@ go_gapic_library(
src = ":monitoring_proto_with_info",
gapic_yaml = "monitoring_gapic.yaml",
importpath = "cloud.google.com/go/monitoring/apiv3",
service_yaml = "//google/monitoring:monitoring.yaml",
service_yaml = "monitoring.yaml",
deps = [
":monitoring_go_proto",
"//google/api:metric_go_proto",

1
google/privacy/dlp/v2/BUILD.bazel
View File

@ -17,6 +17,7 @@ proto_library(
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/api:resource_proto",
"//google/rpc:status_proto",
"//google/type:date_proto",