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

Fix bazel build. 

Update gapic-generator and protoc-java-resource-name plugin dependencies to the latest versions.

The following clients remain broken because of bugs in gapic-generator and/or corresponding configs

google/cloud/iot/v1
google/cloud/oslogin/v1
google/spanner/admin/instance/v1
google/cloud/oslogin/v1

PiperOrigin-RevId: 279171061
This commit is contained in:
Google APIs 2019-11-07 14:40:10 -08:00 committed by Copybara-Service
parent 0ed34e9fdf
commit a34950f968
8 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WORKSPACE
View File

@ -44,8 +44,8 @@ protobuf_deps()
# section
http_archive(
name = "com_google_api_codegen",
strip_prefix = "gapic-generator-48288a4abc4a55161f13ac0f0a73b840cf037817",
urls = ["https://github.com/googleapis/gapic-generator/archive/48288a4abc4a55161f13ac0f0a73b840cf037817.zip"],
strip_prefix = "gapic-generator-c857a66d20ec00e739eb6334b7a95e27113397c7",
urls = ["https://github.com/googleapis/gapic-generator/archive/c857a66d20ec00e739eb6334b7a95e27113397c7.zip"],
)
##############################################################################
@ -127,8 +127,8 @@ load("@com_google_api_codegen//:repositories.bzl", "com_google_api_codegen_repos
http_archive(
name = "com_google_protoc_java_resource_names_plugin",
strip_prefix = "protoc-java-resource-names-plugin-10f4e3d48d6501efdf29009b7437f506903f6d61",
urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/10f4e3d48d6501efdf29009b7437f506903f6d61.zip"],
strip_prefix = "protoc-java-resource-names-plugin-f3f2b834340fcd2932f2354e77249ff7d76528d8",
urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/f3f2b834340fcd2932f2354e77249ff7d76528d8.zip"],
)
com_google_api_codegen_repositories()

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

@ -72,6 +72,7 @@ java_gapic_library(
name = "oslogin_java_gapic",
src = ":oslogin_proto_with_info",
gapic_yaml = "oslogin_gapic.yaml",
package = "google.cloud.oslogin.v1",
service_yaml = ":oslogin_v1.yaml",
test_deps = [
":oslogin_java_grpc",
@ -127,6 +128,7 @@ go_gapic_library(
src = ":oslogin_proto_with_info",
gapic_yaml = "oslogin_gapic.yaml",
importpath = "cloud.google.com/go/oslogin/apiv1",
package = "google.cloud.oslogin.v1",
service_yaml = ":oslogin_v1.yaml",
deps = [
":oslogin_go_proto",

6
google/cloud/scheduler/v1beta1/BUILD.bazel
View File

@ -62,7 +62,8 @@ java_gapic_library(
name = "scheduler_java_gapic",
src = ":scheduler_proto_with_info",
gapic_yaml = "cloudscheduler_gapic.yaml",
service_yaml = "//google/cloud/scheduler:cloudscheduler_v1beta1.yaml",
package = "google.cloud.scheduler.v1beta1",
service_yaml = "cloudscheduler_v1beta1.yaml",
test_deps = [":scheduler_java_grpc"],
deps = [":scheduler_java_proto"],
)
@ -113,7 +114,8 @@ go_gapic_library(
src = ":scheduler_proto_with_info",
gapic_yaml = "cloudscheduler_gapic.yaml",
importpath = "cloud.google.com/go/scheduler/apiv1beta1",
service_yaml = "//google/cloud/scheduler:cloudscheduler_v1beta1.yaml",
package = "google.cloud.scheduler.v1beta1",
service_yaml = "cloudscheduler_v1beta1.yaml",
deps = [":scheduler_go_proto"],
)

2
google/cloud/videointelligence/v1p3beta1/BUILD.bazel
View File

@ -15,6 +15,8 @@ proto_library(
"//google/api:annotations_proto",
"//google/longrunning:operations_proto",
"//google/rpc:status_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"@com_google_protobuf//:duration_proto",
"@com_google_protobuf//:timestamp_proto",
],

4
google/cloud/vision/v1p4beta1/BUILD.bazel
View File

@ -9,6 +9,7 @@ load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
proto_library(
name = "vision_proto",
srcs = [
"face.proto",
"geometry.proto",
"image_annotator.proto",
"product_search.proto",
@ -18,6 +19,9 @@ proto_library(
],
deps = [
"//google/api:annotations_proto",
"//google/api:resource_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/longrunning:operations_proto",
"//google/rpc:status_proto",
"//google/type:color_proto",

7
google/spanner/admin/database/v1/BUILD.bazel
View File

@ -13,6 +13,9 @@ proto_library(
],
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/api:resource_proto",
"//google/iam/v1:iam_policy_proto",
"//google/iam/v1:policy_proto",
"//google/longrunning:operations_proto",
@ -56,7 +59,7 @@ java_gapic_library(
name = "spanner_admin_database_java_gapic",
src = ":spanner_admin_database_proto_with_info",
gapic_yaml = "spanner_admin_database_gapic.yaml",
service_yaml = "//google/spanner/admin/database:spanner_admin_database.yaml",
service_yaml = "spanner_admin_database.yaml",
test_deps = [
":spanner_admin_database_java_grpc",
"//google/iam/v1:iam_java_grpc",
@ -114,7 +117,7 @@ go_gapic_library(
src = ":spanner_admin_database_proto_with_info",
gapic_yaml = "spanner_admin_database_gapic.yaml",
importpath = "cloud.google.com/go/spanner/admin/database/apiv1",
service_yaml = "//google/spanner/admin/database:spanner_admin_database.yaml",
service_yaml = "spanner_admin_database.yaml",
deps = [
":spanner_admin_database_go_proto",
"//google/iam/v1:iam_go_proto",

6
google/spanner/admin/instance/v1/BUILD.bazel
View File

@ -13,7 +13,9 @@ proto_library(
],
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/api:resource_proto",
"//google/iam/v1:iam_policy_proto",
"//google/iam/v1:policy_proto",
"//google/longrunning:operations_proto",
@ -58,7 +60,7 @@ java_gapic_library(
name = "spanner_admin_instance_java_gapic",
src = ":spanner_admin_instance_proto_with_info",
gapic_yaml = "spanner_admin_instance_gapic.yaml",
service_yaml = "//google/spanner/admin/instance:spanner_admin_instance.yaml",
service_yaml = "spanner_admin_instance.yaml",
test_deps = [
":spanner_admin_instance_java_grpc",
"//google/iam/v1:iam_java_grpc",
@ -116,7 +118,7 @@ go_gapic_library(
src = ":spanner_admin_instance_proto_with_info",
gapic_yaml = "spanner_admin_instance_gapic.yaml",
importpath = "cloud.google.com/go/spanner/admin/instance/apiv1",
service_yaml = "//google/spanner/admin/instance:spanner_admin_instance.yaml",
service_yaml = "spanner_admin_instance.yaml",
deps = [
":spanner_admin_instance_go_proto",
"//google/iam/v1:iam_go_proto",

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

@ -19,6 +19,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//:duration_proto",
"@com_google_protobuf//:empty_proto",
@ -62,7 +65,7 @@ java_gapic_library(
name = "spanner_java_gapic",
src = ":spanner_proto_with_info",
gapic_yaml = "spanner_gapic.yaml",
service_yaml = "//google/spanner:spanner.yaml",
service_yaml = "spanner.yaml",
test_deps = [":spanner_java_grpc"],
deps = [":spanner_java_proto"],
)
@ -113,7 +116,7 @@ go_gapic_library(
src = ":spanner_proto_with_info",
gapic_yaml = "spanner_gapic.yaml",
importpath = "cloud.google.com/go/spanner/apiv1",
service_yaml = "//google/spanner:spanner.yaml",
service_yaml = "spanner.yaml",
deps = [":spanner_go_proto"],
)