From 4543762b23a57fc3c53d409efc3a9affd47b6ab3 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Fri, 10 Jan 2020 12:17:55 -0800 Subject: [PATCH] Fix Bazel build billing/v1 and dialogflow/v2 remain broken (not bazel-related issues). Billing has wrong configuration, dialogflow failure is caused by a bug in documentation plugin. PiperOrigin-RevId: 289140194 --- google/api/servicemanagement/v1/BUILD.bazel | 25 +++++++++++-------- .../bigquery/connection/v1beta1/BUILD.bazel | 4 +++ google/cloud/kms/v1/BUILD.bazel | 6 +++-- google/cloud/recommender/v1beta1/BUILD.bazel | 9 ++----- .../devtools/containeranalysis/v1/BUILD.bazel | 14 ++++++----- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/google/api/servicemanagement/v1/BUILD.bazel b/google/api/servicemanagement/v1/BUILD.bazel index 359d9f19..70c0fb51 100644 --- a/google/api/servicemanagement/v1/BUILD.bazel +++ b/google/api/servicemanagement/v1/BUILD.bazel @@ -17,14 +17,16 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", "//google/api:config_change_proto", + "//google/api:field_behavior_proto", "//google/api:metric_proto", + "//google/api:quota_proto", "//google/api:service_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:struct_proto", "@com_google_protobuf//:timestamp_proto", ], ) @@ -65,9 +67,9 @@ java_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", test_deps = [ - ":servicemanagement_java_grpc" + ":servicemanagement_java_grpc", ], deps = [ ":servicemanagement_java_proto", @@ -126,7 +128,7 @@ go_gapic_library( gapic_yaml = "servicemanagement_gapic.yaml", importpath = "cloud.google.com/go/api/servicemanagement/apiv1", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [ ":servicemanagement_go_proto", "//google/api:serviceconfig_go_proto", @@ -134,7 +136,6 @@ go_gapic_library( "//google/longrunning:longrunning_go_proto", "@com_google_cloud_go//longrunning:go_default_library", "@io_bazel_rules_go//proto/wkt:any_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", ], ) @@ -173,14 +174,16 @@ moved_proto_library( srcs = [":servicemanagement_proto"], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", "//google/api:config_change_proto", + "//google/api:field_behavior_proto", "//google/api:metric_proto", + "//google/api:quota_proto", "//google/api:service_proto", "//google/longrunning:operations_proto", "//google/rpc:status_proto", "@com_google_protobuf//:any_proto", "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:struct_proto", "@com_google_protobuf//:timestamp_proto", ], ) @@ -202,7 +205,7 @@ py_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [ ":servicemanagement_py_grpc", ":servicemanagement_py_proto", @@ -246,7 +249,7 @@ php_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [ ":servicemanagement_php_grpc", ":servicemanagement_php_proto", @@ -277,7 +280,7 @@ nodejs_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [], ) @@ -316,7 +319,7 @@ ruby_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [ ":servicemanagement_ruby_grpc", ":servicemanagement_ruby_proto", @@ -360,7 +363,7 @@ csharp_gapic_library( src = ":servicemanagement_proto_with_info", gapic_yaml = "servicemanagement_gapic.yaml", package = "google.api.servicemanagement.v1", - service_yaml = "//google/api/servicemanagement:servicemanagement_v1.yaml", + service_yaml = "servicemanagement_v1.yaml", deps = [ ":servicemanagement_csharp_grpc", ":servicemanagement_csharp_proto", diff --git a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel index f11a0568..f2ccafc2 100644 --- a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel +++ b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel @@ -17,6 +17,8 @@ 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", "@com_google_protobuf//:empty_proto", @@ -162,6 +164,8 @@ moved_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", "@com_google_protobuf//:empty_proto", diff --git a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel index 48a4f8e1..63ccaaa9 100644 --- a/google/cloud/kms/v1/BUILD.bazel +++ b/google/cloud/kms/v1/BUILD.bazel @@ -17,6 +17,8 @@ proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", + "//google/api:field_behavior_proto", + "//google/api:resource_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:field_mask_proto", "@com_google_protobuf//:struct_proto", @@ -73,7 +75,7 @@ java_gapic_library( src = ":kms_proto_with_info", gapic_yaml = "cloudkms_gapic.yaml", gen_resource_name = False, - service_yaml = "//google/cloud/kms:cloudkms.yaml", + service_yaml = "cloudkms_v1.yaml", test_deps = [ ":kms_java_grpc", "//google/iam/v1:iam_java_grpc", @@ -132,7 +134,7 @@ go_gapic_library( src = ":kms_proto_with_info", gapic_yaml = "cloudkms_gapic.yaml", importpath = "cloud.google.com/go/kms/apiv1", - service_yaml = "//google/cloud/kms:cloudkms.yaml", + service_yaml = "cloudkms_v1.yaml", deps = [ ":kms_go_proto", "//google/iam/v1:iam_go_proto", diff --git a/google/cloud/recommender/v1beta1/BUILD.bazel b/google/cloud/recommender/v1beta1/BUILD.bazel index 2c28d4b1..0292ba37 100644 --- a/google/cloud/recommender/v1beta1/BUILD.bazel +++ b/google/cloud/recommender/v1beta1/BUILD.bazel @@ -19,7 +19,7 @@ proto_library( "//google/api:annotations_proto", "//google/api:client_proto", "//google/api:field_behavior_proto", - "//google/longrunning:operations_proto", + "//google/api:resource_proto", "//google/type:money_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:struct_proto", @@ -109,7 +109,6 @@ go_proto_library( protos = [":recommender_proto"], deps = [ "//google/api:annotations_go_proto", - "//google/longrunning:longrunning_go_proto", "//google/type:money_go_proto", ], ) @@ -123,11 +122,7 @@ go_gapic_library( service_yaml = "recommender_v1beta1.yaml", deps = [ ":recommender_go_proto", - "//google/longrunning:longrunning_go_gapic", - "//google/longrunning:longrunning_go_proto", - "@com_google_cloud_go//longrunning:go_default_library", "@io_bazel_rules_go//proto/wkt:duration_go_proto", - "@io_bazel_rules_go//proto/wkt:struct_go_proto", ], ) @@ -167,8 +162,8 @@ moved_proto_library( deps = [ "//google/api:annotations_proto", "//google/api:client_proto", - "//google/longrunning:operations_proto", "//google/api:field_behavior_proto", + "//google/api:resource_proto", "//google/type:money_proto", "@com_google_protobuf//:duration_proto", "@com_google_protobuf//:struct_proto", diff --git a/google/devtools/containeranalysis/v1/BUILD.bazel b/google/devtools/containeranalysis/v1/BUILD.bazel index 47c23fc2..ee1615f3 100644 --- a/google/devtools/containeranalysis/v1/BUILD.bazel +++ b/google/devtools/containeranalysis/v1/BUILD.bazel @@ -16,6 +16,7 @@ proto_library( ], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", "//google/iam/v1:iam_policy_proto", "//google/iam/v1:policy_proto", "@com_google_protobuf//:timestamp_proto", @@ -58,7 +59,7 @@ java_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", test_deps = [ ":containeranalysis_java_grpc", "//google/iam/v1:iam_java_grpc", @@ -159,6 +160,7 @@ moved_proto_library( srcs = [":containeranalysis_proto"], deps = [ "//google/api:annotations_proto", + "//google/api:client_proto", "//google/iam/v1:iam_policy_proto", "//google/iam/v1:policy_proto", "@com_google_protobuf//:timestamp_proto", @@ -182,7 +184,7 @@ py_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", deps = [ ":containeranalysis_py_grpc", ":containeranalysis_py_proto", @@ -226,7 +228,7 @@ php_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", deps = [ ":containeranalysis_php_grpc", ":containeranalysis_php_proto", @@ -257,7 +259,7 @@ nodejs_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", deps = [], ) @@ -296,7 +298,7 @@ ruby_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", deps = [ ":containeranalysis_ruby_grpc", ":containeranalysis_ruby_proto", @@ -340,7 +342,7 @@ csharp_gapic_library( src = ":containeranalysis_proto_with_info", gapic_yaml = "containeranalysis_gapic.yaml", package = "google.devtools.containeranalysis.v1", - service_yaml = "//google/devtools/containeranalysis:containeranalysis_v1.yaml", + service_yaml = "containeranalysis_v1.yaml", deps = [ ":containeranalysis_csharp_grpc", ":containeranalysis_csharp_proto",