build: move gapic-generator-typescript parameters to BUILD.bazel files.

PiperOrigin-RevId: 318386808
5 years ago · d13e2da372
parent a2cf7d0df2
commit d13e2da372
78 changed files with 146 additions and 30 deletions
--- a/google/bigtable/admin/v2/BUILD.bazel
+++ b/google/bigtable/admin/v2/BUILD.bazel
@ -276,8 +276,10 @@ load(

 nodejs_gapic_library(
    name = "admin_nodejs_gapic",
+    package_name = "@google-cloud/bigtable",
    src = ":admin_proto_with_info",
    grpc_service_config = "bigtableadmin_grpc_service_config.json",
+    main_service = "bigtable",
    package = "google.bigtable.admin.v2",
    service_yaml = "bigtableadmin_v2.yaml",
    deps = [],
@ -388,7 +390,8 @@ csharp_gapic_assembly_pkg(
 load(
    "@com_google_googleapis_imports//:imports.bzl",
    "cc_grpc_library",
-    "cc_proto_library")
+    "cc_proto_library",
+)

 cc_proto_library(
    name = "admin_cc_proto",
--- a/google/bigtable/v2/BUILD.bazel
+++ b/google/bigtable/v2/BUILD.bazel
@ -253,8 +253,10 @@ load(

 nodejs_gapic_library(
    name = "bigtable_nodejs_gapic",
+    package_name = "@google-cloud/bigtable",
    src = ":bigtable_proto_with_info",
    grpc_service_config = "bigtable_grpc_service_config.json",
+    main_service = "bigtable",
    package = "google.bigtable.v2",
    service_yaml = "bigtable_v2.yaml",
    deps = [],
@ -362,7 +364,8 @@ csharp_gapic_assembly_pkg(
 load(
    "@com_google_googleapis_imports//:imports.bzl",
    "cc_grpc_library",
-    "cc_proto_library")
+    "cc_proto_library",
+)

 cc_proto_library(
    name = "bigtable_cc_proto",
--- a/google/cloud/asset/v1/BUILD.bazel
+++ b/google/cloud/asset/v1/BUILD.bazel
@ -290,6 +290,7 @@ load(

 nodejs_gapic_library(
    name = "asset_nodejs_gapic",
+    package_name = "@google-cloud/asset",
    src = ":asset_proto_with_info",
    grpc_service_config = "cloudasset_grpc_service_config.json",
    package = "google.cloud.asset.v1",
--- a/google/cloud/asset/v1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1beta1/BUILD.bazel
@ -274,6 +274,7 @@ load(

 nodejs_gapic_library(
    name = "asset_nodejs_gapic",
+    package_name = "@google-cloud/asset",
    src = ":asset_proto_with_info",
    grpc_service_config = "cloudasset_grpc_service_config.json",
    package = "google.cloud.asset.v1beta1",
--- a/google/cloud/asset/v1p1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p1beta1/BUILD.bazel
@ -255,6 +255,7 @@ load(

 nodejs_gapic_library(
    name = "asset_nodejs_gapic",
+    package_name = "@google-cloud/asset",
    src = ":asset_proto_with_info",
    grpc_service_config = "cloudasset_grpc_service_config.json",
    package = "google.cloud.asset.v1p1beta1",
--- a/google/cloud/asset/v1p2beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p2beta1/BUILD.bazel
@ -275,6 +275,7 @@ load(

 nodejs_gapic_library(
    name = "asset_nodejs_gapic",
+    package_name = "@google-cloud/asset",
    src = ":asset_proto_with_info",
    grpc_service_config = "cloudasset_grpc_service_config.json",
    package = "google.cloud.asset.v1p2beta1",
--- a/google/cloud/asset/v1p4beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p4beta1/BUILD.bazel
@ -267,6 +267,7 @@ load(

 nodejs_gapic_library(
    name = "asset_nodejs_gapic",
+    package_name = "@google-cloud/asset",
    src = ":asset_proto_with_info",
    grpc_service_config = "cloudasset_grpc_service_config.json",
    package = "google.cloud.asset.v1p4beta1",
--- a/google/cloud/automl/v1/BUILD.bazel
+++ b/google/cloud/automl/v1/BUILD.bazel
@ -293,8 +293,10 @@ load(

 nodejs_gapic_library(
    name = "automl_nodejs_gapic",
+    package_name = "@google-cloud/automl",
    src = ":automl_proto_with_info",
    grpc_service_config = "automl_grpc_service_config.json",
+    main_service = "automl",
    package = "google.cloud.automl.v1",
    service_yaml = "automl_v1.yaml",
    deps = [],
--- a/google/cloud/automl/v1beta1/BUILD.bazel
+++ b/google/cloud/automl/v1beta1/BUILD.bazel
@ -302,8 +302,10 @@ load(

 nodejs_gapic_library(
    name = "automl_nodejs_gapic",
+    package_name = "@google-cloud/automl",
    src = ":automl_proto_with_info",
    grpc_service_config = "automl_grpc_service_config.json",
+    main_service = "automl",
    package = "google.cloud.automl.v1beta1",
    service_yaml = "automl_v1beta1.yaml",
    deps = [],
--- a/google/cloud/bigquery/connection/v1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1/BUILD.bazel
@ -261,6 +261,7 @@ load(

 nodejs_gapic_library(
    name = "connection_nodejs_gapic",
+    package_name = "@google-cloud/bigquery-connection",
    src = ":connection_proto_with_info",
    gapic_yaml = "connection_gapic.yaml",
    grpc_service_config = "bigqueryconnection_grpc_service_config.json",
--- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
@ -264,6 +264,7 @@ load(

 nodejs_gapic_library(
    name = "datatransfer_nodejs_gapic",
+    package_name = "@google-cloud/bigquery-data-transfer",
    src = ":datatransfer_proto_with_info",
    grpc_service_config = "bigquerydatatransfer_grpc_service_config.json",
    package = "google.cloud.bigquery.datatransfer.v1",
--- a/google/cloud/bigquery/storage/v1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1/BUILD.bazel
@ -121,10 +121,10 @@ go_gapic_library(
 )

 go_test(
-   name = "storage_go_gapic_test",
-   srcs = [":storage_go_gapic_srcjar_test"],
-   embed = [":storage_go_gapic"],
-   importpath = "cloud.google.com/go/bigquery/storage/apiv1",
+    name = "storage_go_gapic_test",
+    srcs = [":storage_go_gapic_srcjar_test"],
+    embed = [":storage_go_gapic"],
+    importpath = "cloud.google.com/go/bigquery/storage/apiv1",
 )

 # Open Source Packages
@ -251,6 +251,7 @@ load(

 nodejs_gapic_library(
    name = "storage_nodejs_gapic",
+    package_name = "@google-cloud/bigquery-storage",
    src = ":storage_proto_with_info",
    grpc_service_config = "bigquerystorage_grpc_service_config.json",
    package = "google.cloud.bigquery.storage.v1",
--- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
@ -255,6 +255,7 @@ load(

 nodejs_gapic_library(
    name = "storage_nodejs_gapic",
+    package_name = "@google-cloud/bigquery-storage",
    src = ":storage_proto_with_info",
    grpc_service_config = "bigquerystorage_grpc_service_config.json",
    package = "google.cloud.bigquery.storage.v1beta1",
@ -379,4 +380,3 @@ cc_grpc_library(
    grpc_only = True,
    deps = [":storage_cc_proto"],
 )
-
--- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
@ -260,6 +260,7 @@ load(

 nodejs_gapic_library(
    name = "budgets_nodejs_gapic",
+    package_name = "@google-cloud/billing-budgets",
    src = ":budgets_proto_with_info",
    grpc_service_config = "billingbudgets_grpc_service_config.json",
    package = "google.cloud.billing.budgets.v1beta1",
--- a/google/cloud/billing/v1/BUILD.bazel
+++ b/google/cloud/billing/v1/BUILD.bazel
@ -264,6 +264,7 @@ load(

 nodejs_gapic_library(
    name = "billing_nodejs_gapic",
+    package_name = "@google-cloud/billing",
    src = ":billing_proto_with_info",
    grpc_service_config = "cloud_billing_grpc_service_config.json",
    package = "google.cloud.billing.v1",
--- a/google/cloud/datacatalog/v1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1/BUILD.bazel
@ -271,8 +271,10 @@ load(

 nodejs_gapic_library(
    name = "datacatalog_nodejs_gapic",
+    package_name = "@google-cloud/datacatalog",
    src = ":datacatalog_proto_with_info",
    grpc_service_config = "datacatalog_grpc_service_config.json",
+    main_service = "DataCatalog",
    package = "google.cloud.datacatalog.v1",
    service_yaml = "datacatalog_v1.yaml",
    deps = [],
--- a/google/cloud/datacatalog/v1beta1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel
@ -275,8 +275,10 @@ load(

 nodejs_gapic_library(
    name = "datacatalog_nodejs_gapic",
+    package_name = "@google-cloud/datacatalog",
    src = ":datacatalog_proto_with_info",
    grpc_service_config = "datacatalog_grpc_service_config.json",
+    main_service = "DataCatalog",
    package = "google.cloud.datacatalog.v1beta1",
    service_yaml = "datacatalog_v1beta1.yaml",
    deps = [],
--- a/google/cloud/datalabeling/v1beta1/BUILD.bazel
+++ b/google/cloud/datalabeling/v1beta1/BUILD.bazel
@ -277,8 +277,10 @@ load(

 nodejs_gapic_library(
    name = "datalabeling_nodejs_gapic",
+    package_name = "@google-cloud/datalabeling",
    src = ":datalabeling_proto_with_info",
    grpc_service_config = "datalabeling_grpc_service_config.json",
+    main_service = "datalabeling",
    package = "google.cloud.datalabeling.v1beta1",
    service_yaml = "datalabeling_v1beta1.yaml",
    deps = [],
--- a/google/cloud/dataproc/v1/BUILD.bazel
+++ b/google/cloud/dataproc/v1/BUILD.bazel
@ -271,8 +271,10 @@ load(

 nodejs_gapic_library(
    name = "dataproc_nodejs_gapic",
+    package_name = "@google-cloud/dataproc",
    src = ":dataproc_proto_with_info",
    grpc_service_config = "dataproc_grpc_service_config.json",
+    main_service = "dataproc",
    package = "google.cloud.dataproc.v1",
    service_yaml = "dataproc_v1.yaml",
    deps = [],
--- a/google/cloud/dataproc/v1beta2/BUILD.bazel
+++ b/google/cloud/dataproc/v1beta2/BUILD.bazel
@ -270,8 +270,10 @@ load(

 nodejs_gapic_library(
    name = "dataproc_nodejs_gapic",
+    package_name = "@google-cloud/dataproc",
    src = ":dataproc_proto_with_info",
    grpc_service_config = "dataproc_grpc_service_config.json",
+    main_service = "dataproc",
    package = "google.cloud.dataproc.v1beta2",
    service_yaml = "dataproc_v1beta2.yaml",
    deps = [],
--- a/google/cloud/dialogflow/v2/BUILD.bazel
+++ b/google/cloud/dialogflow/v2/BUILD.bazel
@ -289,8 +289,10 @@ load(

 nodejs_gapic_library(
    name = "dialogflow_nodejs_gapic",
+    package_name = "@google-cloud/dialogflow",
    src = ":dialogflow_proto_with_info",
    grpc_service_config = "dialogflow_grpc_service_config.json",
+    main_service = "dialogflow",
    package = "google.cloud.dialogflow.v2",
    service_yaml = "dialogflow_v2.yaml",
    deps = [],
--- a/google/cloud/dialogflow/v2beta1/BUILD.bazel
+++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel
@ -294,8 +294,10 @@ load(

 nodejs_gapic_library(
    name = "dialogflow_nodejs_gapic",
+    package_name = "@google-cloud/dialogflow",
    src = ":dialogflow_proto_with_info",
    grpc_service_config = "dialogflow_grpc_service_config.json",
+    main_service = "dialogflow",
    package = "google.cloud.dialogflow.v2beta1",
    service_yaml = "dialogflow_v2beta1.yaml",
    deps = [],
--- a/google/cloud/documentai/v1beta2/BUILD.bazel
+++ b/google/cloud/documentai/v1beta2/BUILD.bazel
@ -226,6 +226,7 @@ load(

 nodejs_gapic_library(
    name = "documentai_nodejs_gapic",
+    package_name = "@google-cloud/documentai",
    src = ":documentai_proto_with_info",
    grpc_service_config = "documentai_v1beta2_grpc_service_config.json",
    package = "google.cloud.documentai.v1beta2",
--- a/google/cloud/gaming/v1beta/BUILD.bazel
+++ b/google/cloud/gaming/v1beta/BUILD.bazel
@ -271,6 +271,7 @@ load(

 nodejs_gapic_library(
    name = "gaming_nodejs_gapic",
+    package_name = "@google-cloud/game-servers",
    src = ":gaming_proto_with_info",
    grpc_service_config = "gaming_grpc_service_config.json",
    package = "google.cloud.gaming.v1beta",
--- a/google/cloud/iot/v1/BUILD.bazel
+++ b/google/cloud/iot/v1/BUILD.bazel
@ -265,8 +265,10 @@ load(

 nodejs_gapic_library(
    name = "iot_nodejs_gapic",
+    package_name = "@google-cloud/iot",
    src = ":iot_proto_with_info",
    grpc_service_config = "cloudiot_grpc_service_config.json",
+    main_service = "iot",
    package = "google.cloud.iot.v1",
    service_yaml = "cloudiot_v1.yaml",
    deps = [],
--- a/google/cloud/irm/v1alpha2/BUILD.bazel
+++ b/google/cloud/irm/v1alpha2/BUILD.bazel
@ -254,6 +254,7 @@ load(

 nodejs_gapic_library(
    name = "irm_nodejs_gapic",
+    package_name = "@google-cloud/irm",
    src = ":irm_proto_with_info",
    grpc_service_config = "irm_grpc_service_config.json",
    package = "google.cloud.irm.v1alpha2",
--- a/google/cloud/kms/v1/BUILD.bazel
+++ b/google/cloud/kms/v1/BUILD.bazel
@ -74,8 +74,8 @@ java_gapic_library(
    name = "kms_java_gapic",
    src = ":kms_proto_with_info",
    gapic_yaml = "cloudkms_gapic.yaml",
-    grpc_service_config = "cloudkms_grpc_service_config.json",
    gen_resource_name = False,
+    grpc_service_config = "cloudkms_grpc_service_config.json",
    package = "google.cloud.kms.v1",
    service_yaml = "cloudkms_v1.yaml",
    test_deps = [
@ -278,8 +278,10 @@ load(

 nodejs_gapic_library(
    name = "kms_nodejs_gapic",
+    package_name = "@google-cloud/kms",
    src = ":kms_proto_with_info",
    grpc_service_config = "cloudkms_grpc_service_config.json",
+    iam_service = "true",
    package = "google.cloud.kms.v1",
    service_yaml = "cloudkms_v1.yaml",
    deps = [],
--- a/google/cloud/mediatranslation/v1beta1/BUILD.bazel
+++ b/google/cloud/mediatranslation/v1beta1/BUILD.bazel
@ -249,6 +249,7 @@ load(

 nodejs_gapic_library(
    name = "mediatranslation_nodejs_gapic",
+    package_name = "@google-cloud/media-translation",
    src = ":mediatranslation_proto_with_info",
    grpc_service_config = "mediatranslation_grpc_service_config.json",
    package = "google.cloud.mediatranslation.v1beta1",
--- a/google/cloud/memcache/v1beta2/BUILD.bazel
+++ b/google/cloud/memcache/v1beta2/BUILD.bazel
@ -260,6 +260,7 @@ load(

 nodejs_gapic_library(
    name = "memcache_nodejs_gapic",
+    package_name = "@google-cloud/memcache",
    src = ":memcache_proto_with_info",
    grpc_service_config = "memcache_grpc_service_config.json",
    package = "google.cloud.memcache.v1beta2",
--- a/google/cloud/osconfig/v1/BUILD.bazel
+++ b/google/cloud/osconfig/v1/BUILD.bazel
@ -268,8 +268,10 @@ load(

 nodejs_gapic_library(
    name = "osconfig_nodejs_gapic",
+    package_name = "@google-cloud/os-config",
    src = ":osconfig_proto_with_info",
    grpc_service_config = "osconfig_grpc_service_config.json",
+    main_service = "OsConfigServiceClient",
    package = "google.cloud.osconfig.v1",
    service_yaml = "osconfig_v1.yaml",
    deps = [],
--- a/google/cloud/oslogin/v1/BUILD.bazel
+++ b/google/cloud/oslogin/v1/BUILD.bazel
@ -81,8 +81,8 @@ java_gapic_library(
    name = "oslogin_java_gapic",
    src = ":oslogin_proto_with_info",
    gapic_yaml = "oslogin_gapic.yaml",
-    grpc_service_config = "oslogin_grpc_service_config.json",
    gen_resource_name = False,
+    grpc_service_config = "oslogin_grpc_service_config.json",
    package = "google.cloud.oslogin.v1",
    service_yaml = ":oslogin_v1.yaml",
    test_deps = [
@ -292,6 +292,7 @@ load(

 nodejs_gapic_library(
    name = "oslogin_nodejs_gapic",
+    package_name = "@google-cloud/os-login",
    src = ":oslogin_proto_with_info",
    grpc_service_config = "oslogin_grpc_service_config.json",
    package = "google.cloud.oslogin.v1",
--- a/google/cloud/oslogin/v1beta/BUILD.bazel
+++ b/google/cloud/oslogin/v1beta/BUILD.bazel
@ -80,8 +80,8 @@ java_gapic_library(
    name = "oslogin_java_gapic",
    src = ":oslogin_proto_with_info",
    gapic_yaml = "oslogin_gapic.yaml",
-    grpc_service_config = "oslogin_grpc_service_config.json",
    gen_resource_name = False,
+    grpc_service_config = "oslogin_grpc_service_config.json",
    service_yaml = "//google/cloud/oslogin:oslogin_v1beta.yaml",
    test_deps = [":oslogin_java_grpc"],
    deps = [
@ -287,6 +287,7 @@ load(

 nodejs_gapic_library(
    name = "oslogin_nodejs_gapic",
+    package_name = "@google-cloud/os-login",
    src = ":oslogin_proto_with_info",
    grpc_service_config = "oslogin_grpc_service_config.json",
    package = "google.cloud.oslogin.v1beta",
--- a/google/cloud/phishingprotection/v1beta1/BUILD.bazel
+++ b/google/cloud/phishingprotection/v1beta1/BUILD.bazel
@ -250,6 +250,7 @@ load(

 nodejs_gapic_library(
    name = "phishingprotection_nodejs_gapic",
+    package_name = "@google-cloud/phishing-protection",
    src = ":phishingprotection_proto_with_info",
    grpc_service_config = "phishingprotection_grpc_service_config.json",
    package = "google.cloud.phishingprotection.v1beta1",
--- a/google/cloud/recaptchaenterprise/v1/BUILD.bazel
+++ b/google/cloud/recaptchaenterprise/v1/BUILD.bazel
@ -256,6 +256,7 @@ load(

 nodejs_gapic_library(
    name = "recaptchaenterprise_nodejs_gapic",
+    package_name = "@google-cloud/recaptcha-enterprise",
    src = ":recaptchaenterprise_proto_with_info",
    grpc_service_config = "recaptchaenterprise_grpc_service_config.json",
    package = "google.cloud.recaptchaenterprise.v1",
--- a/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel
+++ b/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel
@ -256,6 +256,7 @@ load(

 nodejs_gapic_library(
    name = "recaptchaenterprise_nodejs_gapic",
+    package_name = "@google-cloud/recaptcha-enterprise",
    src = ":recaptchaenterprise_proto_with_info",
    grpc_service_config = "recaptchaenterprise_grpc_service_config.json",
    package = "google.cloud.recaptchaenterprise.v1beta1",
--- a/google/cloud/recommender/v1/BUILD.bazel
+++ b/google/cloud/recommender/v1/BUILD.bazel
@ -261,6 +261,7 @@ load(

 nodejs_gapic_library(
    name = "recommender_nodejs_gapic",
+    package_name = "@google-cloud/recommender",
    src = ":recommender_proto_with_info",
    grpc_service_config = "recommender_grpc_service_config.json",
    package = "google.cloud.recommender.v1",
--- a/google/cloud/redis/v1/BUILD.bazel
+++ b/google/cloud/redis/v1/BUILD.bazel
@ -260,6 +260,7 @@ load(

 nodejs_gapic_library(
    name = "redis_nodejs_gapic",
+    package_name = "@google-cloud/redis",
    src = ":redis_proto_with_info",
    grpc_service_config = "redis_grpc_service_config.json",
    package = "google.cloud.redis.v1",
--- a/google/cloud/redis/v1beta1/BUILD.bazel
+++ b/google/cloud/redis/v1beta1/BUILD.bazel
@ -261,6 +261,7 @@ load(

 nodejs_gapic_library(
    name = "redis_nodejs_gapic",
+    package_name = "@google-cloud/redis",
    src = ":redis_proto_with_info",
    grpc_service_config = "redis_grpc_service_config.json",
    package = "google.cloud.redis.v1beta1",
--- a/google/cloud/scheduler/v1/BUILD.bazel
+++ b/google/cloud/scheduler/v1/BUILD.bazel
@ -263,8 +263,10 @@ load(

 nodejs_gapic_library(
    name = "scheduler_nodejs_gapic",
+    package_name = "@google-cloud/scheduler",
    src = ":scheduler_proto_with_info",
    grpc_service_config = "cloudscheduler_grpc_service_config.json",
+    main_service = "scheduler",
    package = "google.cloud.scheduler.v1",
    service_yaml = "cloudscheduler_v1.yaml",
    deps = [],
--- a/google/cloud/scheduler/v1beta1/BUILD.bazel
+++ b/google/cloud/scheduler/v1beta1/BUILD.bazel
@ -263,8 +263,10 @@ load(

 nodejs_gapic_library(
    name = "scheduler_nodejs_gapic",
+    package_name = "@google-cloud/scheduler",
    src = ":scheduler_proto_with_info",
    grpc_service_config = "cloudscheduler_grpc_service_config.json",
+    main_service = "scheduler",
    package = "google.cloud.scheduler.v1beta1",
    service_yaml = "cloudscheduler_v1beta1.yaml",
    deps = [],
--- a/google/cloud/secretmanager/v1/BUILD.bazel
+++ b/google/cloud/secretmanager/v1/BUILD.bazel
@ -265,6 +265,7 @@ load(

 nodejs_gapic_library(
    name = "secretmanager_nodejs_gapic",
+    package_name = "@google-cloud/secret-manager",
    src = ":secretmanager_proto_with_info",
    grpc_service_config = "secretmanager_grpc_service_config.json",
    package = "google.cloud.secretmanager.v1",
--- a/google/cloud/secrets/v1beta1/BUILD.bazel
+++ b/google/cloud/secrets/v1beta1/BUILD.bazel
@ -10,16 +10,16 @@ load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 proto_library(
    name = "secretmanager_proto",
    srcs = [
-        "service.proto",
        "resources.proto",
+        "service.proto",
    ],
    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/api:resource_proto",
        "@com_google_protobuf//:empty_proto",
        "@com_google_protobuf//:field_mask_proto",
        "@com_google_protobuf//:timestamp_proto",
@ -160,15 +160,15 @@ moved_proto_library(
    name = "secretmanager_moved_proto",
    srcs = [":secretmanager_proto"],
    deps = [
-      "//google/api:annotations_proto",
-      "//google/api:client_proto",
-      "//google/api:field_behavior_proto",
-      "//google/iam/v1:iam_policy_proto",
-      "//google/iam/v1:policy_proto",
-      "//google/api:resource_proto",
-      "@com_google_protobuf//:empty_proto",
-      "@com_google_protobuf//:field_mask_proto",
-      "@com_google_protobuf//:timestamp_proto",
+        "//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",
+        "@com_google_protobuf//:field_mask_proto",
+        "@com_google_protobuf//:timestamp_proto",
    ],
 )

@ -263,6 +263,7 @@ load(

 nodejs_gapic_library(
    name = "secretmanager_nodejs_gapic",
+    package_name = "@google-cloud/secret-manager",
    src = ":secretmanager_proto_with_info",
    grpc_service_config = "secretmanager_grpc_service_config.json",
    package = "google.cloud.secrets.v1beta1",
--- a/google/cloud/securitycenter/v1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1/BUILD.bazel
@ -138,8 +138,8 @@ go_gapic_library(
        ":securitycenter_go_proto",
        "//google/iam/v1:iam_go_proto",
        "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
@ -282,6 +282,7 @@ load(

 nodejs_gapic_library(
    name = "securitycenter_nodejs_gapic",
+    package_name = "@google-cloud/security-center",
    src = ":securitycenter_proto_with_info",
    grpc_service_config = "securitycenter_grpc_service_config.json",
    package = "google.cloud.securitycenter.v1",
--- a/google/cloud/securitycenter/v1beta1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1beta1/BUILD.bazel
@ -279,6 +279,7 @@ load(

 nodejs_gapic_library(
    name = "securitycenter_nodejs_gapic",
+    package_name = "@google-cloud/security-center",
    src = ":securitycenter_proto_with_info",
    grpc_service_config = "securitycenter_grpc_service_config.json",
    package = "google.cloud.securitycenter.v1beta1",
--- a/google/cloud/securitycenter/v1p1beta1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1p1beta1/BUILD.bazel
@ -138,8 +138,8 @@ go_gapic_library(
        ":securitycenter_go_proto",
        "//google/iam/v1:iam_go_proto",
        "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
@ -282,6 +282,7 @@ load(

 nodejs_gapic_library(
    name = "securitycenter_nodejs_gapic",
+    package_name = "@google-cloud/security-center",
    src = ":securitycenter_proto_with_info",
    grpc_service_config = "securitycenter_grpc_service_config.json",
    package = "google.cloud.securitycenter.v1p1beta1",
--- a/google/cloud/servicedirectory/v1beta1/BUILD.bazel
+++ b/google/cloud/servicedirectory/v1beta1/BUILD.bazel
@ -264,8 +264,10 @@ load(

 nodejs_gapic_library(
    name = "servicedirectory_nodejs_gapic",
+    package_name = "@google-cloud/service-directory",
    src = ":servicedirectory_proto_with_info",
    grpc_service_config = "servicedirectory_grpc_service_config.json",
+    main_service = "ServiceDirectory",
    package = "google.cloud.servicedirectory.v1beta1",
    service_yaml = "servicedirectory_v1beta1.yaml",
    deps = [],
--- a/google/cloud/speech/v1/BUILD.bazel
+++ b/google/cloud/speech/v1/BUILD.bazel
@ -265,6 +265,7 @@ load(

 nodejs_gapic_library(
    name = "speech_nodejs_gapic",
+    package_name = "@google-cloud/speech",
    src = ":speech_proto_with_info",
    grpc_service_config = "speech_grpc_service_config.json",
    package = "google.cloud.speech.v1",
--- a/google/cloud/speech/v1p1beta1/BUILD.bazel
+++ b/google/cloud/speech/v1p1beta1/BUILD.bazel
@ -268,6 +268,7 @@ load(

 nodejs_gapic_library(
    name = "speech_nodejs_gapic",
+    package_name = "@google-cloud/speech",
    src = ":speech_proto_with_info",
    grpc_service_config = "speech_grpc_service_config.json",
    package = "google.cloud.speech.v1p1beta1",
--- a/google/cloud/talent/v4beta1/BUILD.bazel
+++ b/google/cloud/talent/v4beta1/BUILD.bazel
@ -310,8 +310,10 @@ load(

 nodejs_gapic_library(
    name = "talent_nodejs_gapic",
+    package_name = "@google-cloud/talent",
    src = ":talent_proto_with_info",
    grpc_service_config = "talent_grpc_service_config.json",
+    main_service = "talent",
    package = "google.cloud.talent.v4beta1",
    service_yaml = "//google/cloud/talent:talent_v4beta1.yaml",
    deps = [],
--- a/google/cloud/tasks/v2/BUILD.bazel
+++ b/google/cloud/tasks/v2/BUILD.bazel
@ -272,8 +272,10 @@ load(

 nodejs_gapic_library(
    name = "tasks_nodejs_gapic",
+    package_name = "@google-cloud/tasks",
    src = ":tasks_proto_with_info",
    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    main_service = "tasks",
    package = "google.cloud.tasks.v2",
    service_yaml = "cloudtasks_v2.yaml",
    deps = [],
--- a/google/cloud/tasks/v2beta2/BUILD.bazel
+++ b/google/cloud/tasks/v2beta2/BUILD.bazel
@ -273,8 +273,10 @@ load(

 nodejs_gapic_library(
    name = "tasks_nodejs_gapic",
+    package_name = "@google-cloud/tasks",
    src = ":tasks_proto_with_info",
    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    main_service = "tasks",
    package = "google.cloud.tasks.v2beta2",
    service_yaml = "cloudtasks_v2beta2.yaml",
    deps = [],
--- a/google/cloud/tasks/v2beta3/BUILD.bazel
+++ b/google/cloud/tasks/v2beta3/BUILD.bazel
@ -273,8 +273,10 @@ load(

 nodejs_gapic_library(
    name = "tasks_nodejs_gapic",
+    package_name = "@google-cloud/tasks",
    src = ":tasks_proto_with_info",
    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    main_service = "tasks",
    package = "google.cloud.tasks.v2beta3",
    service_yaml = "cloudtasks_v2beta3.yaml",
    deps = [],
--- a/google/cloud/texttospeech/v1/BUILD.bazel
+++ b/google/cloud/texttospeech/v1/BUILD.bazel
@ -248,6 +248,7 @@ load(

 nodejs_gapic_library(
    name = "texttospeech_nodejs_gapic",
+    package_name = "@google-cloud/text-to-speech",
    src = ":texttospeech_proto_with_info",
    grpc_service_config = "texttospeech_grpc_service_config.json",
    package = "google.cloud.texttospeech.v1",
--- a/google/cloud/texttospeech/v1beta1/BUILD.bazel
+++ b/google/cloud/texttospeech/v1beta1/BUILD.bazel
@ -248,6 +248,7 @@ load(

 nodejs_gapic_library(
    name = "texttospeech_nodejs_gapic",
+    package_name = "@google-cloud/text-to-speech",
    src = ":texttospeech_proto_with_info",
    grpc_service_config = "texttospeech_grpc_service_config.json",
    package = "google.cloud.texttospeech.v1beta1",
--- a/google/cloud/translate/v3/BUILD.bazel
+++ b/google/cloud/translate/v3/BUILD.bazel
@ -258,6 +258,7 @@ load(

 nodejs_gapic_library(
    name = "translation_nodejs_gapic",
+    package_name = "@google-cloud/translate",
    src = ":translation_proto_with_info",
    grpc_service_config = "translate_grpc_service_config.json",
    package = "google.cloud.translation.v3",
--- a/google/cloud/translate/v3beta1/BUILD.bazel
+++ b/google/cloud/translate/v3beta1/BUILD.bazel
@ -258,6 +258,7 @@ load(

 nodejs_gapic_library(
    name = "translation_nodejs_gapic",
+    package_name = "@google-cloud/translate",
    src = ":translation_proto_with_info",
    grpc_service_config = "translate_grpc_service_config.json",
    package = "google.cloud.translation.v3beta1",
--- a/google/cloud/videointelligence/v1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1/BUILD.bazel
@ -262,8 +262,10 @@ load(

 nodejs_gapic_library(
    name = "videointelligence_nodejs_gapic",
+    package_name = "@google-cloud/video-intelligence",
    src = ":videointelligence_proto_with_info",
    grpc_service_config = "videointelligence_grpc_service_config.json",
+    main_service = "videointelligence",
    package = "google.cloud.videointelligence.v1",
    service_yaml = "videointelligence_v1.yaml",
    deps = [],
--- a/google/cloud/videointelligence/v1beta2/BUILD.bazel
+++ b/google/cloud/videointelligence/v1beta2/BUILD.bazel
@ -262,8 +262,10 @@ load(

 nodejs_gapic_library(
    name = "videointelligence_nodejs_gapic",
+    package_name = "@google-cloud/video-intelligence",
    src = ":videointelligence_proto_with_info",
    grpc_service_config = "videointelligence_grpc_service_config.json",
+    main_service = "videointelligence",
    package = "google.cloud.videointelligence.v1beta2",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1beta2.yaml",
    deps = [],
--- a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel
@ -262,8 +262,10 @@ load(

 nodejs_gapic_library(
    name = "videointelligence_nodejs_gapic",
+    package_name = "@google-cloud/video-intelligence",
    src = ":videointelligence_proto_with_info",
    grpc_service_config = "videointelligence_grpc_service_config.json",
+    main_service = "videointelligence",
    package = "google.cloud.videointelligence.v1p1beta1",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p1beta1.yaml",
    deps = [],
--- a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel
@ -262,8 +262,10 @@ load(

 nodejs_gapic_library(
    name = "videointelligence_nodejs_gapic",
+    package_name = "@google-cloud/video-intelligence",
    src = ":videointelligence_proto_with_info",
    grpc_service_config = "videointelligence_grpc_service_config.json",
+    main_service = "videointelligence",
    package = "google.cloud.videointelligence.v1p2beta1",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p2beta1.yaml",
    deps = [],
--- a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel
@ -263,8 +263,10 @@ load(

 nodejs_gapic_library(
    name = "videointelligence_nodejs_gapic",
+    package_name = "@google-cloud/video-intelligence",
    src = ":videointelligence_proto_with_info",
    grpc_service_config = "videointelligence_grpc_service_config.json",
+    main_service = "videointelligence",
    package = "google.cloud.videointelligence.v1p3beta1",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p3beta1.yaml",
    deps = [],
--- a/google/cloud/vision/v1/BUILD.bazel
+++ b/google/cloud/vision/v1/BUILD.bazel
@ -277,8 +277,10 @@ load(

 nodejs_gapic_library(
    name = "vision_nodejs_gapic",
+    package_name = "@google-cloud/vision",
    src = ":vision_proto_with_info",
    grpc_service_config = "vision_grpc_service_config.json",
+    main_service = "vision",
    package = "google.cloud.vision.v1",
    service_yaml = "vision_v1.yaml",
    deps = [],
--- a/google/cloud/vision/v1p1beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p1beta1/BUILD.bazel
@ -260,8 +260,10 @@ load(

 nodejs_gapic_library(
    name = "vision_nodejs_gapic",
+    package_name = "@google-cloud/vision",
    src = ":vision_proto_with_info",
    grpc_service_config = "vision_grpc_service_config.json",
+    main_service = "vision",
    package = "google.cloud.vision.v1p1beta1",
    service_yaml = "//google/cloud/vision:vision_v1p1beta1.yaml",
    deps = [],
--- a/google/cloud/vision/v1p2beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p2beta1/BUILD.bazel
@ -268,8 +268,10 @@ load(

 nodejs_gapic_library(
    name = "vision_nodejs_gapic",
+    package_name = "@google-cloud/vision",
    src = ":vision_proto_with_info",
    grpc_service_config = "vision_grpc_service_config.json",
+    main_service = "vision",
    package = "google.cloud.vision.v1p2beta1",
    service_yaml = "//google/cloud/vision:vision_v1p2beta1.yaml",
    deps = [],
--- a/google/cloud/vision/v1p3beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p3beta1/BUILD.bazel
@ -277,8 +277,10 @@ load(

 nodejs_gapic_library(
    name = "vision_nodejs_gapic",
+    package_name = "@google-cloud/vision",
    src = ":vision_proto_with_info",
    grpc_service_config = "vision_grpc_service_config.json",
+    main_service = "vision",
    package = "google.cloud.vision.v1p3beta1",
    service_yaml = "//google/cloud/vision:vision_v1p3beta1.yaml",
    deps = [],
--- a/google/cloud/vision/v1p4beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p4beta1/BUILD.bazel
@ -278,8 +278,10 @@ load(

 nodejs_gapic_library(
    name = "vision_nodejs_gapic",
+    package_name = "@google-cloud/vision",
    src = ":vision_proto_with_info",
    grpc_service_config = "vision_grpc_service_config.json",
+    main_service = "vision",
    package = "google.cloud.vision.v1p4beta1",
    service_yaml = "//google/cloud/vision:vision_v1p4beta1.yaml",
    deps = [],
--- a/google/cloud/webrisk/v1/BUILD.bazel
+++ b/google/cloud/webrisk/v1/BUILD.bazel
@ -252,6 +252,7 @@ load(

 nodejs_gapic_library(
    name = "webrisk_nodejs_gapic",
+    package_name = "@google-cloud/web-risk",
    src = ":webrisk_proto_with_info",
    grpc_service_config = "webrisk_grpc_service_config.json",
    package = "google.cloud.webrisk.v1",
--- a/google/cloud/webrisk/v1beta1/BUILD.bazel
+++ b/google/cloud/webrisk/v1beta1/BUILD.bazel
@ -250,6 +250,7 @@ load(

 nodejs_gapic_library(
    name = "webrisk_nodejs_gapic",
+    package_name = "@google-cloud/web-risk",
    src = ":webrisk_proto_with_info",
    grpc_service_config = "webrisk_grpc_service_config.json",
    package = "google.cloud.webrisk.v1beta1",
--- a/google/container/v1/BUILD.bazel
+++ b/google/container/v1/BUILD.bazel
@ -252,6 +252,7 @@ load(

 nodejs_gapic_library(
    name = "container_nodejs_gapic",
+    package_name = "@google-cloud/container",
    src = ":container_proto_with_info",
    grpc_service_config = "container_grpc_service_config.json",
    package = "google.container.v1",
--- a/google/datastore/v1/BUILD.bazel
+++ b/google/datastore/v1/BUILD.bazel
@ -257,8 +257,10 @@ load(

 nodejs_gapic_library(
    name = "datastore_nodejs_gapic",
+    package_name = "@google-cloud/datastore",
    src = ":datastore_proto_with_info",
    grpc_service_config = "datastore_grpc_service_config.json",
+    main_service = "datastore",
    package = "google.datastore.v1",
    service_yaml = "datastore_v1.yaml",
    deps = [],
--- a/google/devtools/cloudbuild/v1/BUILD.bazel
+++ b/google/devtools/cloudbuild/v1/BUILD.bazel
@ -259,6 +259,7 @@ load(

 nodejs_gapic_library(
    name = "cloudbuild_nodejs_gapic",
+    package_name = "@google-cloud/cloudbuild",
    src = ":cloudbuild_proto_with_info",
    grpc_service_config = "cloudbuild_grpc_service_config.json",
    package = "google.devtools.cloudbuild.v1",
--- a/google/devtools/containeranalysis/v1/BUILD.bazel
+++ b/google/devtools/containeranalysis/v1/BUILD.bazel
@ -259,8 +259,10 @@ load(

 nodejs_gapic_library(
    name = "containeranalysis_nodejs_gapic",
+    package_name = "@google-cloud/containeranalysis",
    src = ":containeranalysis_proto_with_info",
    grpc_service_config = "containeranalysis_grpc_service_config.json",
+    main_service = "containeranalysis",
    package = "google.devtools.containeranalysis.v1",
    service_yaml = "containeranalysis_v1.yaml",
    deps = [],
--- a/google/logging/v2/BUILD.bazel
+++ b/google/logging/v2/BUILD.bazel
@ -136,8 +136,8 @@ go_gapic_library(
    importpath = "cloud.google.com/go/logging/apiv2;logging",
    service_yaml = "logging.yaml",
    deps = [
-        "//google/api:monitoredres_go_proto",
        ":logging_go_proto",
+        "//google/api:monitoredres_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
 )
@ -282,8 +282,11 @@ load(

 nodejs_gapic_library(
    name = "logging_nodejs_gapic",
+    package_name = "@google-cloud/logging",
    src = ":logging_proto_with_info",
+    bundle_config = "logging_gapic.yaml",
    grpc_service_config = "logging_grpc_service_config.json",
+    main_service = "logging",
    package = "google.logging.v2",
    service_yaml = "logging.yaml",
    deps = [],
--- a/google/monitoring/dashboard/v1/BUILD.bazel
+++ b/google/monitoring/dashboard/v1/BUILD.bazel
@ -268,6 +268,7 @@ load(

 nodejs_gapic_library(
    name = "dashboard_nodejs_gapic",
+    package_name = "@google-cloud/monitoring-dashboards",
    src = ":dashboard_proto_with_info",
    grpc_service_config = "dashboards_grpc_service_config.json",
    package = "google.monitoring.dashboard.v1",
--- a/google/monitoring/v3/BUILD.bazel
+++ b/google/monitoring/v3/BUILD.bazel
@ -32,13 +32,13 @@ proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
-        "//google/api:field_behavior_proto",
-        "//google/api:resource_proto",
        "//google/api:distribution_proto",
+        "//google/api:field_behavior_proto",
        "//google/api:label_proto",
        "//google/api:launch_stage_proto",
        "//google/api:metric_proto",
        "//google/api:monitored_resource_proto",
+        "//google/api:resource_proto",
        "//google/rpc:status_proto",
        "//google/type:calendar_period_proto",
        "@com_google_protobuf//:duration_proto",
@ -197,13 +197,13 @@ moved_proto_library(
    deps = [
        "//google/api:annotations_proto",
        "//google/api:client_proto",
-        "//google/api:field_behavior_proto",
-        "//google/api:resource_proto",
        "//google/api:distribution_proto",
+        "//google/api:field_behavior_proto",
        "//google/api:label_proto",
        "//google/api:launch_stage_proto",
        "//google/api:metric_proto",
        "//google/api:monitored_resource_proto",
+        "//google/api:resource_proto",
        "//google/rpc:status_proto",
        "//google/type:calendar_period_proto",
        "@com_google_protobuf//:duration_proto",
@ -304,8 +304,10 @@ load(

 nodejs_gapic_library(
    name = "monitoring_nodejs_gapic",
+    package_name = "@google-cloud/monitoring",
    src = ":monitoring_proto_with_info",
    grpc_service_config = "monitoring_grpc_service_config.json",
+    main_service = "monitoring",
    package = "google.monitoring.v3",
    service_yaml = "monitoring.yaml",
    deps = [],
@ -428,4 +430,3 @@ cc_grpc_library(
    grpc_only = True,
    deps = [":monitoring_cc_proto"],
 )
-
--- a/google/privacy/dlp/v2/BUILD.bazel
+++ b/google/privacy/dlp/v2/BUILD.bazel
@ -269,6 +269,7 @@ load(

 nodejs_gapic_library(
    name = "dlp_nodejs_gapic",
+    package_name = "@google-cloud/dlp",
    src = ":dlp_proto_with_info",
    grpc_service_config = "dlp_grpc_service_config.json",
    package = "google.privacy.dlp.v2",
--- a/google/spanner/v1/BUILD.bazel
+++ b/google/spanner/v1/BUILD.bazel
@ -265,8 +265,10 @@ load(

 nodejs_gapic_library(
    name = "spanner_nodejs_gapic",
+    package_name = "@google-cloud/spanner",
    src = ":spanner_proto_with_info",
    grpc_service_config = "spanner_grpc_service_config.json",
+    main_service = "spanner",
    package = "google.spanner.v1",
    service_yaml = "spanner.yaml",
    deps = [],
@ -374,7 +376,8 @@ csharp_gapic_assembly_pkg(
 load(
    "@com_google_googleapis_imports//:imports.bzl",
    "cc_grpc_library",
-    "cc_proto_library")
+    "cc_proto_library",
+)

 cc_proto_library(
    name = "spanner_cc_proto",
--- a/grafeas/v1/BUILD.bazel
+++ b/grafeas/v1/BUILD.bazel
@ -270,6 +270,7 @@ load(

 nodejs_gapic_library(
    name = "grafeas_nodejs_gapic",
+    package_name = "@google-cloud/grafeas",
    src = ":grafeas_proto_with_info",
    grpc_service_config = "grafeas_grpc_service_config.json",
    package = "grafeas.v1",