Fix bazel build (versions 1.x)

Bump gapic-generator and resource names plugins to the latest version. PiperOrigin-RevId: 286469287
5 years ago · d9e328eaf7
parent 0ca305403d
commit d9e328eaf7
12 changed files with 106 additions and 63 deletions
--- a/12
+++ b/12
@ -61,8 +61,8 @@ rules_proto_toolchains()
 # section
 http_archive(
    name = "com_google_api_codegen",
-    strip_prefix = "gapic-generator-95b181cd7193bd6d10f345d53312630f07dcc951",
-    urls = ["https://github.com/googleapis/gapic-generator/archive/95b181cd7193bd6d10f345d53312630f07dcc951.zip"],
+    strip_prefix = "gapic-generator-e4c0fcaf2b2e2016a468b341283a260581c2ee74",
+    urls = ["https://github.com/googleapis/gapic-generator/archive/e4c0fcaf2b2e2016a468b341283a260581c2ee74.zip"],
 )

 ##############################################################################
@ -135,8 +135,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-f3f2b834340fcd2932f2354e77249ff7d76528d8",
-    urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/f3f2b834340fcd2932f2354e77249ff7d76528d8.zip"],
+    strip_prefix = "protoc-java-resource-names-plugin-2e002340bb689744adf0e537617a3885155ee024",
+    urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/2e002340bb689744adf0e537617a3885155ee024.zip"],
 )

 com_google_api_codegen_repositories()
@ -159,8 +159,8 @@ py_gapic_repositories()

 http_archive(
    name = "protoc_docs_plugin",
-    strip_prefix = "protoc-docs-plugin-54363302011e25ff83455bbcb8e5ae802dab6354",
-    urls = ["https://github.com/googleapis/protoc-docs-plugin/archive/54363302011e25ff83455bbcb8e5ae802dab6354.zip"],
+    strip_prefix = "protoc-docs-plugin-abe1eff656bfdba4a5d5f9d9bb803e530fb61a03",
+    urls = ["https://github.com/googleapis/protoc-docs-plugin/archive/abe1eff656bfdba4a5d5f9d9bb803e530fb61a03.zip"],
 )

 load(
--- a/google/ads/admob/v1/BUILD.bazel
+++ b/google/ads/admob/v1/BUILD.bazel
@ -1,4 +1,5 @@
-# This file was automatically generated.
+# This file was automatically generated by BuildFileGenerator
+
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])

@ -17,7 +18,6 @@ proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
-        "//google/api:field_behavior_proto",
        "//google/type:date_proto",
    ],
 )
@ -26,6 +26,7 @@ proto_library_with_info(
    name = "admob_proto_with_info",
    deps = [
        ":admob_proto",
+        "//google/cloud:common_resources_proto",
    ],
 )

@ -34,11 +35,11 @@ proto_library_with_info(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "java_grpc_library",
-    "java_gapic_library",
    "java_gapic_assembly_gradle_pkg",
-    "java_proto_library",
+    "java_gapic_library",
    "java_gapic_test",
+    "java_grpc_library",
+    "java_proto_library",
 )

 java_proto_library(
@ -58,21 +59,25 @@ java_gapic_library(
    gapic_yaml = "admob_gapic.yaml",
    package = "google.ads.admob.v1",
    service_yaml = "//google/ads/admob:admob_v1.yaml",
-    test_deps = [":admob_java_grpc"],
-    deps = [":admob_java_proto"],
+    test_deps = [
+        ":admob_java_grpc",
+    ],
+    deps = [
+        ":admob_java_proto",
+    ],
 )

 java_gapic_test(
    name = "admob_java_gapic_test_suite",
    test_classes = [
-        "com.google.ads.admob.v1.AdMobServiceClientTest",
+        "com.google.cloud.ads.admob.v1.AdMobApiClientTest",
    ],
    runtime_deps = [":admob_java_gapic_test"],
 )

-# Opensource Packages
+# Open Source Packages
 java_gapic_assembly_gradle_pkg(
-    name = "google-cloud-admob-v1-java",
+    name = "google-cloud-ads-admob-v1-java",
    deps = [
        ":admob_java_gapic",
        ":admob_java_grpc",
@ -100,7 +105,7 @@ go_proto_library(
    deps = [
        "//google/api:annotations_go_proto",
        "//google/type:date_go_proto",
-    ]
+    ],
 )

 go_gapic_library(
@ -124,7 +129,7 @@ go_test(

 # Open Source Packages
 go_gapic_assembly_pkg(
-    name = "gapi-cloud-admob-v1-go",
+    name = "gapi-cloud-ads-admob-v1-go",
    deps = [
        ":admob_go_gapic",
        ":admob_go_gapic_srcjar-smoke-test.srcjar",
@ -151,7 +156,6 @@ moved_proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
-        "//google/api:field_behavior_proto",
        "//google/type:date_proto",
    ],
 )
@ -182,7 +186,7 @@ py_gapic_library(

 # Open Source Packages
 py_gapic_assembly_pkg(
-    name = "admob-v1-py",
+    name = "ads-admob-v1-py",
    deps = [
        ":admob_py_gapic",
        ":admob_py_grpc",
@ -212,7 +216,6 @@ php_grpc_library(
    deps = [":admob_php_proto"],
 )

-
 php_gapic_library(
    name = "admob_php_gapic",
    src = ":admob_proto_with_info",
@ -227,7 +230,7 @@ php_gapic_library(

 # Open Source Packages
 php_gapic_assembly_pkg(
-    name = "google-cloud-admob-v1-php",
+    name = "google-cloud-ads-admob-v1-php",
    deps = [
        ":admob_php_gapic",
        ":admob_php_grpc",
@ -254,7 +257,7 @@ nodejs_gapic_library(
 )

 nodejs_gapic_assembly_pkg(
-    name = "admob-v1-nodejs",
+    name = "ads-admob-v1-nodejs",
    deps = [
        ":admob_nodejs_gapic",
        ":admob_proto",
@ -297,7 +300,7 @@ ruby_gapic_library(

 # Open Source Packages
 ruby_gapic_assembly_pkg(
-    name = "google-cloud-admob-v1-ruby",
+    name = "google-cloud-ads-admob-v1-ruby",
    deps = [
        ":admob_ruby_gapic",
        ":admob_ruby_grpc",
@ -341,7 +344,7 @@ csharp_gapic_library(

 # Open Source Packages
 csharp_gapic_assembly_pkg(
-    name = "google-cloud-admob-v1-csharp",
+    name = "google-cloud-ads-admob-v1-csharp",
    deps = [
        ":admob_csharp_gapic",
        ":admob_csharp_grpc",
@ -352,20 +355,4 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 # C++
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "cc_grpc_library",
-    "cc_proto_library",
-)
-
-cc_proto_library(
-    name = "admob_cc_proto",
-    deps = [":admob_proto"],
-)
-
-cc_grpc_library(
-    name = "admobcc_grpc",
-    srcs = [":admob_proto"],
-    grpc_only = True,
-    deps = [":admob_cc_proto"],
-)
+# Put your C++ rules here
--- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
@ -12,7 +12,6 @@ load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 proto_library(
    name = "datatransfer_proto",
    srcs = [
-        "datasource.proto",
        "datatransfer.proto",
        "transfer.proto",
    ],
--- a/google/cloud/osconfig/v1beta/BUILD.bazel
+++ b/google/cloud/osconfig/v1beta/BUILD.bazel
@ -1,3 +1,5 @@
+# This file was automatically generated by BuildFileGenerator
+
 # This is an API workspace, having public visibility by default makes perfect sense.
 package(default_visibility = ["//visibility:public"])

@ -10,8 +12,8 @@ load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 proto_library(
    name = "osconfig_proto",
    srcs = [
-        "osconfig_service.proto",
        "guest_policies.proto",
+        "osconfig_service.proto",
        "patch_deployments.proto",
        "patch_jobs.proto",
    ],
@ -78,7 +80,7 @@ java_gapic_library(
 java_gapic_test(
    name = "osconfig_java_gapic_test_suite",
    test_classes = [
-        "com.google.cloud.osconfig.v1beta.osconfigServiceClientTest",
+        "com.google.cloud.osconfig.v1beta.OsConfigServiceClientTest",
    ],
    runtime_deps = [":osconfig_java_gapic_test"],
 )
@ -140,7 +142,7 @@ go_test(

 # Open Source Packages
 go_gapic_assembly_pkg(
-    name = "gapi-cloud-osconfig-osconfig-v1beta-go",
+    name = "gapi-cloud-osconfig-v1beta-go",
    deps = [
        ":osconfig_go_gapic",
        ":osconfig_go_gapic_srcjar-smoke-test.srcjar",
@ -169,7 +171,6 @@ moved_proto_library(
        "//google/api:client_proto",
        "//google/api:field_behavior_proto",
        "//google/api:resource_proto",
-        "//google/iam/v1:policy_proto",
        "//google/type:datetime_proto",
        "//google/type:dayofweek_proto",
        "//google/type:timeofday_proto",
@ -214,6 +215,50 @@ py_gapic_assembly_pkg(
    ],
 )

+##############################################################################
+# PHP
+##############################################################################
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "php_gapic_assembly_pkg",
+    "php_gapic_library",
+    "php_grpc_library",
+    "php_proto_library",
+)
+
+php_proto_library(
+    name = "osconfig_php_proto",
+    deps = [":osconfig_proto"],
+)
+
+php_grpc_library(
+    name = "osconfig_php_grpc",
+    srcs = [":osconfig_proto"],
+    deps = [":osconfig_php_proto"],
+)
+
+php_gapic_library(
+    name = "osconfig_php_gapic",
+    src = ":osconfig_proto_with_info",
+    gapic_yaml = "osconfig_gapic.yaml",
+    package = "google.cloud.osconfig.v1beta",
+    service_yaml = "osconfig_v1beta.yaml",
+    deps = [
+        ":osconfig_php_grpc",
+        ":osconfig_php_proto",
+    ],
+)
+
+# Open Source Packages
+php_gapic_assembly_pkg(
+    name = "google-cloud-osconfig-v1beta-php",
+    deps = [
+        ":osconfig_php_gapic",
+        ":osconfig_php_grpc",
+        ":osconfig_php_proto",
+    ],
+)
+
 ##############################################################################
 # Node.js
 ##############################################################################
@ -327,3 +372,8 @@ csharp_gapic_assembly_pkg(
        ":osconfig_csharp_proto",
    ],
 )
+
+##############################################################################
+# C++
+##############################################################################
+# Put your C++ rules here
--- a/google/cloud/secrets/v1beta1/BUILD.bazel
+++ b/google/cloud/secrets/v1beta1/BUILD.bazel
@ -106,7 +106,7 @@ load(
 go_proto_library(
    name = "secretmanager_go_proto",
    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
-    importpath = "google.golang.org/genproto/googleapis/cloud/secrets/v1beta1",
+    importpath = "google.golang.org/genproto/googleapis/cloud/secretmanager/v1beta1",
    protos = [":secretmanager_proto"],
    deps = [
        "//google/api:annotations_go_proto",
--- a/google/cloud/securitycenter/v1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1/BUILD.bazel
@ -72,7 +72,7 @@ java_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    test_deps = [
        ":securitycenter_java_grpc",
        "//google/iam/v1:iam_java_grpc",
@ -131,7 +131,7 @@ go_gapic_library(
    gapic_yaml = "securitycenter_gapic.yaml",
    importpath = "cloud.google.com/go/securitycenter/apiv1",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_go_proto",
        "//google/iam/v1:iam_go_proto",
@ -209,7 +209,7 @@ py_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_py_grpc",
        ":securitycenter_py_proto",
@ -253,7 +253,7 @@ php_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_php_grpc",
        ":securitycenter_php_proto",
@ -284,7 +284,7 @@ nodejs_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [],
 )

@ -323,7 +323,7 @@ ruby_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_ruby_grpc",
        ":securitycenter_ruby_proto",
@ -367,7 +367,7 @@ csharp_gapic_library(
    src = ":securitycenter_proto_with_info",
    gapic_yaml = "securitycenter_gapic.yaml",
    package = "google.cloud.securitycenter.v1",
-    service_yaml = "//google/cloud/securitycenter:securitycenter_v1.yaml",
+    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_csharp_grpc",
        ":securitycenter_csharp_proto",
--- a/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel
+++ b/google/devtools/containeranalysis/v1beta1/attestation/BUILD.bazel
@ -54,6 +54,6 @@ go_proto_library(
    importpath = "google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1/attestation",
    protos = [":attestation_proto"],
    deps = [
-        "//google/devtools/containeranalysis/v1beta1/common:common_proto",
+        "//google/devtools/containeranalysis/v1beta1/common:common_go_proto",
    ],
 )
--- a/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel
+++ b/google/devtools/containeranalysis/v1beta1/vulnerability/BUILD.bazel
@ -58,8 +58,7 @@ go_proto_library(
    protos = [":vulnerability_proto"],
    deps = [
        "//google/devtools/containeranalysis/v1beta1/common:common_go_proto",
-        "//google/devtools/containeranalysis/v1beta1/cvss:cvss_proto",
+        "//google/devtools/containeranalysis/v1beta1/cvss:cvss_go_proto",
        "//google/devtools/containeranalysis/v1beta1/package:package_go_proto",
-        "@com_google_protobuf//:timestamp_proto",
    ],
 )
--- a/google/firestore/admin/v1/BUILD.bazel
+++ b/google/firestore/admin/v1/BUILD.bazel
@ -21,6 +21,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/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
@ -167,6 +169,8 @@ moved_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/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
--- a/google/firestore/v1/BUILD.bazel
+++ b/google/firestore/v1/BUILD.bazel
@ -21,6 +21,7 @@ proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
        "//google/rpc:status_proto",
        "//google/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
@ -165,6 +166,7 @@ moved_proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
        "//google/rpc:status_proto",
        "//google/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
--- a/google/firestore/v1beta1/BUILD.bazel
+++ b/google/firestore/v1beta1/BUILD.bazel
@ -21,6 +21,7 @@ proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
        "//google/rpc:status_proto",
        "//google/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
@ -165,6 +166,7 @@ moved_proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
        "//google/rpc:status_proto",
        "//google/type:latlng_proto",
        "@com_google_protobuf//:empty_proto",
--- a/google/monitoring/dashboard/v1/BUILD.bazel
+++ b/google/monitoring/dashboard/v1/BUILD.bazel
@ -28,9 +28,9 @@ proto_library(
        "//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//:empty_proto",
+        "@com_google_protobuf//:field_mask_proto",
    ],
 )

@ -76,14 +76,14 @@ java_gapic_library(
    ],
    deps = [
        ":dashboard_java_proto",
-        "//google/api:api_java_proto",
    ],
 )

 java_gapic_test(
    name = "dashboard_java_gapic_test_suite",
    test_classes = [
-        "com.google.cloud.monitoring.dashboard.v1.DashboardsServiceClientTest",
+        # Add flattening to DashboardsServiceClient service to enable tests
+        #"com.google.cloud.monitoring.dashboard.v1.DashboardsServiceClientTest",
    ],
    runtime_deps = [":dashboard_java_gapic_test"],
 )
@ -117,7 +117,6 @@ go_proto_library(
    protos = [":dashboard_proto"],
    deps = [
        "//google/api:annotations_go_proto",
-        "//google/api:api_go_proto",
    ],
 )

@ -130,6 +129,7 @@ go_gapic_library(
    service_yaml = "monitoring.yaml",
    deps = [
        ":dashboard_go_proto",
+        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
 )

@ -170,9 +170,9 @@ moved_proto_library(
        "//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//:empty_proto",
+        "@com_google_protobuf//:field_mask_proto",
    ],
 )