bazel: migrate all go_gapic_library targets to microgenerator implementation

* update rules_go and gazelle bazel dependencies * update gapic-generator bazel dependency (with build file generator changes) PiperOrigin-RevId: 302730217
5 years ago · 25a1781c09
parent 36c0febd0f
commit 25a1781c09
124 changed files with 476 additions and 650 deletions
--- a/47
+++ b/47
@ -61,10 +61,25 @@ rules_proto_toolchains()
 # section
 http_archive(
    name = "com_google_api_codegen",
-    strip_prefix = "gapic-generator-15ec21be63aac27b8f02d5e1d3816b48c83d9fbe",
-    urls = ["https://github.com/googleapis/gapic-generator/archive/15ec21be63aac27b8f02d5e1d3816b48c83d9fbe.zip"],
+    strip_prefix = "gapic-generator-0bf1e325040acab8bd0594555c71a0daad1c38dd",
+    urls = ["https://github.com/googleapis/gapic-generator/archive/0bf1e325040acab8bd0594555c71a0daad1c38dd.zip"],
 )

+# rules_go (support Golang under bazel)
+# This is not in the Go section because we override the same, older dependency brought in by gRPC.
+# TODO(ndietz): move this back to the Go section if gRPC is updated per https://github.com/grpc/grpc/issues/22172
+http_archive(
+    name = "io_bazel_rules_go",
+    sha256 = "e6a6c016b0663e06fa5fccf1cd8152eab8aa8180c583ec20c872f4f9953a7ac5",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
+)
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+
+go_rules_dependencies()
+
+go_register_toolchains()
+
 ##############################################################################
 # C++
 ##############################################################################
@ -177,32 +192,28 @@ protoc_docs_plugin_register_toolchains()
 # Go
 ##############################################################################

-# rules_go (support Golang under bazel)
+# bazel-gazelle (support Golang under bazel)
 http_archive(
-    name = "io_bazel_rules_go",
-    sha256 = "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz",
+    name = "bazel_gazelle",
+    urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz"],
 )

-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-
-go_rules_dependencies()
+load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

-go_register_toolchains()
+gazelle_dependencies()

-# bazel-gazelle (support Golang under bazel)
 http_archive(
-    name = "bazel_gazelle",
-    strip_prefix = "bazel-gazelle-0.17.0",
-    urls = ["https://github.com/bazelbuild/bazel-gazelle/archive/0.17.0.zip"],
+    name = "com_googleapis_gapic_generator_go",
+    sha256 = "948122351e8a8de2a5045ef57556767b231dd03102ec31a138b066a36472655f",
+    strip_prefix = "gapic-generator-go-0.12.1",
+    urls = ["https://github.com/googleapis/gapic-generator-go/archive/v0.12.1.tar.gz"],
 )

-load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
+load("@com_googleapis_gapic_generator_go//:repositories.bzl", "com_googleapis_gapic_generator_go_repositories")

-gazelle_dependencies()
+com_googleapis_gapic_generator_go_repositories()

-# go_gapic artifacts runtime dependencies (gax-go)
-load("@com_google_api_codegen//rules_gapic/go:go_gapic_repositories.bzl", "go_gapic_repositories")
+load("@com_googleapis_gapic_generator_go//rules_go_gapic:go_gapic_repositories.bzl", "go_gapic_repositories")

 go_gapic_repositories()

--- a/google/ads/admob/v1/BUILD.bazel
+++ b/google/ads/admob/v1/BUILD.bazel
@ -110,10 +110,9 @@ go_proto_library(

 go_gapic_library(
    name = "admob_go_gapic",
-    src = ":admob_proto_with_info",
-    gapic_yaml = "admob_gapic.yaml",
-    importpath = "cloud.google.com/go/ads/admob/apiv1",
-    package = "google.ads.admob.v1",
+    srcs = [":admob_proto_with_info"],
+    grpc_service_config = "",
+    importpath = "cloud.google.com/go/ads/admob/apiv1;admob",
    service_yaml = "//google/ads/admob:admob_v1.yaml",
    deps = [
        ":admob_go_proto",
@ -132,7 +131,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-ads-admob-v1-go",
    deps = [
        ":admob_go_gapic",
-        ":admob_go_gapic_srcjar-smoke-test.srcjar",
        ":admob_go_gapic_srcjar-test.srcjar",
        ":admob_go_proto",
    ],
--- a/google/api/expr/v1alpha1/BUILD.bazel
+++ b/google/api/expr/v1alpha1/BUILD.bazel
@ -187,10 +187,9 @@ go_proto_library(

 go_gapic_library(
    name = "expr_go_gapic",
-    src = ":expr_proto_with_info",
-    gapic_yaml = "cel_gapic.yaml",
-    importpath = "cloud.google.com/go/expr/apiv1alpha1",
-    package = "google.api.expr.v1alpha1",
+    srcs = [":expr_proto_with_info"],
+    grpc_service_config = "cel_grpc_service_config.json",
+    importpath = "cloud.google.com/go/expr/apiv1alpha1;expr",
    service_yaml = "//google/api/expr:cel.yaml",
    deps = [
        ":expr_go_proto",
@ -209,7 +208,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-api-expr-v1alpha1-go",
    deps = [
        ":expr_go_gapic",
-        ":expr_go_gapic_srcjar-smoke-test.srcjar",
        ":expr_go_gapic_srcjar-test.srcjar",
        ":expr_go_proto",
    ],
--- a/google/api/servicemanagement/v1/BUILD.bazel
+++ b/google/api/servicemanagement/v1/BUILD.bazel
@ -124,10 +124,9 @@ go_proto_library(

 go_gapic_library(
    name = "servicemanagement_go_gapic",
-    src = ":servicemanagement_proto_with_info",
-    gapic_yaml = "servicemanagement_gapic.yaml",
-    importpath = "cloud.google.com/go/api/servicemanagement/apiv1",
-    package = "google.api.servicemanagement.v1",
+    srcs = [":servicemanagement_proto_with_info"],
+    grpc_service_config = "servicemanagement_grpc_service_config.json",
+    importpath = "cloud.google.com/go/api/servicemanagement/apiv1;servicemanagement",
    service_yaml = "servicemanagement_v1.yaml",
    deps = [
        ":servicemanagement_go_proto",
@ -135,6 +134,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
    ],
 )
@ -151,7 +151,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-api-servicemanagement-v1-go",
    deps = [
        ":servicemanagement_go_gapic",
-        ":servicemanagement_go_gapic_srcjar-smoke-test.srcjar",
        ":servicemanagement_go_gapic_srcjar-test.srcjar",
        ":servicemanagement_go_proto",
    ],
--- a/google/bigtable/admin/v2/BUILD.bazel
+++ b/google/bigtable/admin/v2/BUILD.bazel
@ -125,10 +125,9 @@ go_proto_library(

 go_gapic_library(
    name = "admin_go_gapic",
-    src = ":admin_proto_with_info",
-    gapic_yaml = "bigtableadmin_gapic.yaml",
-    importpath = "cloud.google.com/go/bigtable/admin/apiv2",
-    package = "google.bigtable.admin.v2",
+    srcs = [":admin_proto_with_info"],
+    grpc_service_config = "bigtableadmin_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigtable/admin/apiv2;admin",
    service_yaml = "bigtableadmin_v2.yaml",
    deps = [
        ":admin_go_proto",
@ -136,6 +135,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -152,7 +152,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigtable-admin-v2-go",
    deps = [
        ":admin_go_gapic",
-        ":admin_go_gapic_srcjar-smoke-test.srcjar",
        ":admin_go_gapic_srcjar-test.srcjar",
        ":admin_go_proto",
    ],
--- a/google/bigtable/v2/BUILD.bazel
+++ b/google/bigtable/v2/BUILD.bazel
@ -113,10 +113,9 @@ go_proto_library(

 go_gapic_library(
    name = "bigtable_go_gapic",
-    src = ":bigtable_proto_with_info",
-    gapic_yaml = "bigtable_gapic.yaml",
-    importpath = "cloud.google.com/go/bigtable/apiv2",
-    package = "google.bigtable.v2",
+    srcs = [":bigtable_proto_with_info"],
+    grpc_service_config = "bigtable_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigtable/apiv2;bigtable",
    service_yaml = "bigtable_v2.yaml",
    deps = [
        ":bigtable_go_proto",
@ -135,7 +134,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigtable-v2-go",
    deps = [
        ":bigtable_go_gapic",
-        ":bigtable_go_gapic_srcjar-smoke-test.srcjar",
        ":bigtable_go_gapic_srcjar-test.srcjar",
        ":bigtable_go_proto",
    ],
--- a/google/chromeos/moblab/v1beta1/BUILD.bazel
+++ b/google/chromeos/moblab/v1beta1/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "moblab_go_gapic",
-    src = ":moblab_proto_with_info",
-    gapic_yaml = "chromeos_moblab_gapic.yaml",
-    importpath = "google.golang.org/api/chromeos/moblab/apiv1beta1",
-    package = "google.chromeos.moblab.v1beta1",
+    srcs = [":moblab_proto_with_info"],
+    grpc_service_config = "moblab_grpc_service_config.json",
+    importpath = "google.golang.org/api/chromeos/moblab/apiv1beta1;moblab",
    service_yaml = "chromeos_moblab_v1beta1.yaml",
    deps = [
        ":moblab_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -139,7 +139,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-chromeos-moblab-v1beta1-go",
    deps = [
        ":moblab_go_gapic",
-        ":moblab_go_gapic_srcjar-smoke-test.srcjar",
        ":moblab_go_gapic_srcjar-test.srcjar",
        ":moblab_go_proto",
    ],
--- a/google/cloud/accessapproval/v1/BUILD.bazel
+++ b/google/cloud/accessapproval/v1/BUILD.bazel
@ -111,10 +111,9 @@ go_proto_library(

 go_gapic_library(
    name = "accessapproval_go_gapic",
-    src = ":accessapproval_proto_with_info",
-    gapic_yaml = "accessapproval_gapic.yaml",
-    importpath = "cloud.google.com/go/accessapproval/apiv1",
-    package = "google.cloud.accessapproval.v1",
+    srcs = [":accessapproval_proto_with_info"],
+    grpc_service_config = "",
+    importpath = "cloud.google.com/go/accessapproval/apiv1;accessapproval",
    service_yaml = "accessapproval_v1.yaml",
    deps = [
        ":accessapproval_go_proto",
@ -133,7 +132,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-accessapproval-v1-go",
    deps = [
        ":accessapproval_go_gapic",
-        ":accessapproval_go_gapic_srcjar-smoke-test.srcjar",
        ":accessapproval_go_gapic_srcjar-test.srcjar",
        ":accessapproval_go_proto",
    ],
--- a/google/cloud/asset/v1/BUILD.bazel
+++ b/google/cloud/asset/v1/BUILD.bazel
@ -124,10 +124,9 @@ go_proto_library(

 go_gapic_library(
    name = "asset_go_gapic",
-    src = ":asset_proto_with_info",
-    gapic_yaml = "cloudasset_gapic.yaml",
-    importpath = "cloud.google.com/go/asset/apiv1",
-    package = "google.cloud.asset.v1",
+    srcs = [":asset_proto_with_info"],
+    grpc_service_config = "cloudasset_grpc_service_config.json",
+    importpath = "cloud.google.com/go/asset/apiv1;asset",
    service_yaml = "cloudasset_v1.yaml",
    deps = [
        ":asset_go_proto",
@ -135,6 +134,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
@ -152,7 +152,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1-go",
    deps = [
        ":asset_go_gapic",
-        ":asset_go_gapic_srcjar-smoke-test.srcjar",
        ":asset_go_gapic_srcjar-test.srcjar",
        ":asset_go_proto",
    ],
--- a/google/cloud/asset/v1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1beta1/BUILD.bazel
@ -122,10 +122,9 @@ go_proto_library(

 go_gapic_library(
    name = "asset_go_gapic",
-    src = ":asset_proto_with_info",
-    gapic_yaml = "cloudasset_gapic.yaml",
-    importpath = "cloud.google.com/go/asset/apiv1beta1",
-    package = "google.cloud.asset.v1beta1",
+    srcs = [":asset_proto_with_info"],
+    grpc_service_config = "cloudasset_grpc_service_config.json",
+    importpath = "cloud.google.com/go/asset/apiv1beta1;asset",
    service_yaml = "//google/cloud/asset:asset_v1beta1.yaml",
    deps = [
        ":asset_go_proto",
@ -133,6 +132,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
@ -150,7 +150,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1beta1-go",
    deps = [
        ":asset_go_gapic",
-        ":asset_go_gapic_srcjar-smoke-test.srcjar",
        ":asset_go_gapic_srcjar-test.srcjar",
        ":asset_go_proto",
    ],
--- a/google/cloud/asset/v1p1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p1beta1/BUILD.bazel
@ -113,10 +113,9 @@ go_proto_library(

 go_gapic_library(
    name = "asset_go_gapic",
-    src = ":asset_proto_with_info",
-    gapic_yaml = "cloudasset_gapic.yaml",
-    importpath = "cloud.google.com/go/asset/apiv1p1beta1",
-    package = "google.cloud.asset.v1p1beta1",
+    srcs = [":asset_proto_with_info"],
+    grpc_service_config = "cloudasset_grpc_service_config.json",
+    importpath = "cloud.google.com/go/asset/apiv1p1beta1;asset",
    service_yaml = "cloudasset_v1p1beta1.yaml",
    deps = [
        ":asset_go_proto",
@ -136,7 +135,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p1beta1-go",
    deps = [
        ":asset_go_gapic",
-        ":asset_go_gapic_srcjar-smoke-test.srcjar",
        ":asset_go_gapic_srcjar-test.srcjar",
        ":asset_go_proto",
    ],
--- a/google/cloud/asset/v1p2beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p2beta1/BUILD.bazel
@ -121,10 +121,9 @@ go_proto_library(

 go_gapic_library(
    name = "asset_go_gapic",
-    src = ":asset_proto_with_info",
-    gapic_yaml = "cloudasset_gapic.yaml",
-    importpath = "cloud.google.com/go/asset/apiv1p2beta1",
-    package = "google.cloud.asset.v1p2beta1",
+    srcs = [":asset_proto_with_info"],
+    grpc_service_config = "cloudasset_grpc_service_config.json",
+    importpath = "cloud.google.com/go/asset/apiv1p2beta1;asset",
    service_yaml = "//google/cloud/asset:asset_v1p2beta1.yaml",
    deps = [
        ":asset_go_proto",
@ -132,6 +131,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
@ -149,7 +149,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p2beta1-go",
    deps = [
        ":asset_go_gapic",
-        ":asset_go_gapic_srcjar-smoke-test.srcjar",
        ":asset_go_gapic_srcjar-test.srcjar",
        ":asset_go_proto",
    ],
--- a/google/cloud/asset/v1p4beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p4beta1/BUILD.bazel
@ -118,10 +118,9 @@ go_proto_library(

 go_gapic_library(
    name = "asset_go_gapic",
-    src = ":asset_proto_with_info",
-    gapic_yaml = "cloudasset_gapic.yaml",
-    importpath = "cloud.google.com/go/asset/apiv1p4beta1",
-    package = "google.cloud.asset.v1p4beta1",
+    srcs = [":asset_proto_with_info"],
+    grpc_service_config = "cloudasset_grpc_service_config.json",
+    importpath = "cloud.google.com/go/asset/apiv1p4beta1;asset",
    service_yaml = "cloudasset_v1p4beta1.yaml",
    deps = [
        ":asset_go_proto",
@ -129,6 +128,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -145,7 +145,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p4beta1-go",
    deps = [
        ":asset_go_gapic",
-        ":asset_go_gapic_srcjar-smoke-test.srcjar",
        ":asset_go_gapic_srcjar-test.srcjar",
        ":asset_go_proto",
    ],
--- a/google/cloud/automl/v1/BUILD.bazel
+++ b/google/cloud/automl/v1/BUILD.bazel
@ -138,16 +138,16 @@ go_proto_library(

 go_gapic_library(
    name = "automl_go_gapic",
-    src = ":automl_proto_with_info",
-    gapic_yaml = "automl_gapic.yaml",
-    importpath = "cloud.google.com/go/automl/apiv1",
-    package = "google.cloud.automl.v1",
+    srcs = [":automl_proto_with_info"],
+    grpc_service_config = "automl_grpc_service_config.json",
+    importpath = "cloud.google.com/go/automl/apiv1;automl",
    service_yaml = "automl_v1.yaml",
    deps = [
        ":automl_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
@ -166,7 +166,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-automl-v1-go",
    deps = [
        ":automl_go_gapic",
-        ":automl_go_gapic_srcjar-smoke-test.srcjar",
        ":automl_go_gapic_srcjar-test.srcjar",
        ":automl_go_proto",
    ],
--- a/google/cloud/automl/v1beta1/BUILD.bazel
+++ b/google/cloud/automl/v1beta1/BUILD.bazel
@ -147,16 +147,16 @@ go_proto_library(

 go_gapic_library(
    name = "automl_go_gapic",
-    src = ":automl_proto_with_info",
-    gapic_yaml = "automl_gapic.yaml",
-    importpath = "cloud.google.com/go/automl/apiv1beta1",
-    package = "google.cloud.automl.v1beta1",
+    srcs = [":automl_proto_with_info"],
+    grpc_service_config = "automl_grpc_service_config.json",
+    importpath = "cloud.google.com/go/automl/apiv1beta1;automl",
    service_yaml = "automl_v1beta1.yaml",
    deps = [
        ":automl_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
@ -175,7 +175,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-automl-v1beta1-go",
    deps = [
        ":automl_go_gapic",
-        ":automl_go_gapic_srcjar-smoke-test.srcjar",
        ":automl_go_gapic_srcjar-test.srcjar",
        ":automl_go_proto",
    ],
--- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
@ -120,10 +120,9 @@ go_proto_library(

 go_gapic_library(
    name = "datatransfer_go_gapic",
-    src = ":datatransfer_proto_with_info",
-    gapic_yaml = "bigquerydatatransfer_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/datatransfer/apiv1",
-    package = "google.cloud.bigquery.datatransfer.v1",
+    srcs = [":datatransfer_proto_with_info"],
+    grpc_service_config = "bigquerydatatransfer_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/datatransfer/apiv1;datatransfer",
    service_yaml = "bigquerydatatransfer_v1.yaml",
    deps = [
        ":datatransfer_go_proto",
@ -142,7 +141,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-datatransfer-v1-go",
    deps = [
        ":datatransfer_go_gapic",
-        ":datatransfer_go_gapic_srcjar-smoke-test.srcjar",
        ":datatransfer_go_gapic_srcjar-test.srcjar",
        ":datatransfer_go_proto",
    ],
--- a/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/reservation/v1beta1/BUILD.bazel
@ -114,10 +114,9 @@ go_proto_library(

 go_gapic_library(
    name = "reservation_go_gapic",
-    src = ":reservation_proto_with_info",
-    gapic_yaml = "bigqueryreservation_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/reservation/apiv1beta1",
-    package = "google.cloud.bigquery.reservation.v1beta1",
+    srcs = [":reservation_proto_with_info"],
+    grpc_service_config = "bigqueryreservation_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/reservation/apiv1beta1;reservation",
    service_yaml = "bigqueryreservation_v1beta1.yaml",
    deps = [
        ":reservation_go_proto",
@ -136,7 +135,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-reservation-v1beta1-go",
    deps = [
        ":reservation_go_gapic",
-        ":reservation_go_gapic_srcjar-smoke-test.srcjar",
        ":reservation_go_gapic_srcjar-test.srcjar",
        ":reservation_go_proto",
    ],
--- a/google/cloud/bigquery/storage/v1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1/BUILD.bazel
@ -111,10 +111,9 @@ go_proto_library(

 go_gapic_library(
    name = "storage_go_gapic",
-    src = ":storage_proto_with_info",
-    gapic_yaml = "bigquerystorage_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1",
-    package = "google.cloud.bigquery.storage.v1",
+    srcs = [":storage_proto_with_info"],
+    grpc_service_config = "bigquerystorage_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/storage/apiv1;storage",
    service_yaml = "bigquerystorage_v1.yaml",
    deps = [
        ":storage_go_proto",
@ -133,7 +132,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1-go",
    deps = [
        ":storage_go_gapic",
-        ":storage_go_gapic_srcjar-smoke-test.srcjar",
        ":storage_go_gapic_srcjar-test.srcjar",
        ":storage_go_proto",
    ],
--- a/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1alpha2/BUILD.bazel
@ -117,10 +117,9 @@ go_proto_library(

 go_gapic_library(
    name = "storage_go_gapic",
-    src = ":storage_proto_with_info",
-    gapic_yaml = "bigquerystorage_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1alpha2",
-    package = "google.cloud.bigquery.storage.v1alpha2",
+    srcs = [":storage_proto_with_info"],
+    grpc_service_config = "bigquerystorage_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/storage/apiv1alpha2;storage",
    service_yaml = "bigquerystorage_v1alpha2.yaml",
    deps = [
        ":storage_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1alpha2-go",
    deps = [
        ":storage_go_gapic",
-        ":storage_go_gapic_srcjar-smoke-test.srcjar",
        ":storage_go_gapic_srcjar-test.srcjar",
        ":storage_go_proto",
    ],
--- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
@ -115,10 +115,9 @@ go_proto_library(

 go_gapic_library(
    name = "storage_go_gapic",
-    src = ":storage_proto_with_info",
-    gapic_yaml = "bigquerystorage_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta1",
-    package = "google.cloud.bigquery.storage.v1beta1",
+    srcs = [":storage_proto_with_info"],
+    grpc_service_config = "bigquerystorage_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta1;storage",
    service_yaml = "bigquerystorage_v1beta1.yaml",
    deps = [
        ":storage_go_proto",
@ -137,7 +136,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1beta1-go",
    deps = [
        ":storage_go_gapic",
-        ":storage_go_gapic_srcjar-smoke-test.srcjar",
        ":storage_go_gapic_srcjar-test.srcjar",
        ":storage_go_proto",
    ],
--- a/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
@ -111,10 +111,9 @@ go_proto_library(

 go_gapic_library(
    name = "storage_go_gapic",
-    src = ":storage_proto_with_info",
-    gapic_yaml = "bigquerystorage_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta2",
-    package = "google.cloud.bigquery.storage.v1beta2",
+    srcs = [":storage_proto_with_info"],
+    grpc_service_config = "bigquerystorage_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta2;storage",
    service_yaml = "bigquerystorage_v1beta2.yaml",
    deps = [
        ":storage_go_proto",
@ -133,7 +132,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1beta2-go",
    deps = [
        ":storage_go_gapic",
-        ":storage_go_gapic_srcjar-smoke-test.srcjar",
        ":storage_go_gapic_srcjar-test.srcjar",
        ":storage_go_proto",
    ],
--- a/google/cloud/bigquery/v2/BUILD.bazel
+++ b/google/cloud/bigquery/v2/BUILD.bazel
@ -114,10 +114,9 @@ go_proto_library(

 go_gapic_library(
    name = "bigquery_go_gapic",
-    src = ":bigquery_proto_with_info",
-    gapic_yaml = "bigquery_gapic.yaml",
-    importpath = "cloud.google.com/go/bigquery/apiv2",
-    package = "google.cloud.bigquery.v2",
+    srcs = [":bigquery_proto_with_info"],
+    grpc_service_config = "bigquery_grpc_service_config.json",
+    importpath = "cloud.google.com/go/bigquery/apiv2;bigquery",
    service_yaml = "bigquery_v2.yaml",
    deps = [
        ":bigquery_go_proto",
@ -136,7 +135,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-v2-go",
    deps = [
        ":bigquery_go_gapic",
-        ":bigquery_go_gapic_srcjar-smoke-test.srcjar",
        ":bigquery_go_gapic_srcjar-test.srcjar",
        ":bigquery_go_proto",
    ],
--- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
@ -114,10 +114,9 @@ go_proto_library(

 go_gapic_library(
    name = "budgets_go_gapic",
-    src = ":budgets_proto_with_info",
-    gapic_yaml = "billingbudgets_gapic.yaml",
-    importpath = "cloud.google.com/go/billing/budgets/apiv1beta1",
-    package = "google.cloud.billing.budgets.v1beta1",
+    srcs = [":budgets_proto_with_info"],
+    grpc_service_config = "billingbudgets_grpc_service_config.json",
+    importpath = "cloud.google.com/go/billing/budgets/apiv1beta1;budgets",
    service_yaml = "billingbudgets.yaml",
    deps = [
        ":budgets_go_proto",
@ -136,7 +135,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-billing-budgets-v1beta1-go",
    deps = [
        ":budgets_go_gapic",
-        ":budgets_go_gapic_srcjar-smoke-test.srcjar",
        ":budgets_go_gapic_srcjar-test.srcjar",
        ":budgets_go_proto",
    ],
--- a/google/cloud/billing/v1/BUILD.bazel
+++ b/google/cloud/billing/v1/BUILD.bazel
@ -120,10 +120,9 @@ go_proto_library(

 go_gapic_library(
    name = "billing_go_gapic",
-    src = ":billing_proto_with_info",
-    gapic_yaml = "cloud_billing_gapic.yaml",
-    importpath = "cloud.google.com/go/billing/apiv1",
-    package = "google.cloud.billing.v1",
+    srcs = [":billing_proto_with_info"],
+    grpc_service_config = "cloud_billing_grpc_service_config.json",
+    importpath = "cloud.google.com/go/billing/apiv1;billing",
    service_yaml = "cloudbilling.yaml",
    deps = [
        ":billing_go_proto",
@ -143,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-billing-v1-go",
    deps = [
        ":billing_go_gapic",
-        ":billing_go_gapic_srcjar-smoke-test.srcjar",
        ":billing_go_gapic_srcjar-test.srcjar",
        ":billing_go_proto",
    ],
--- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
@ -113,10 +113,9 @@ go_proto_library(

 go_gapic_library(
    name = "binaryauthorization_go_gapic",
-    src = ":binaryauthorization_proto_with_info",
-    gapic_yaml = "binaryauthorization_gapic.yaml",
-    importpath = "cloud.google.com/go/binaryauthorization/apiv1beta1",
-    package = "google.cloud.binaryauthorization.v1beta1",
+    srcs = [":binaryauthorization_proto_with_info"],
+    grpc_service_config = "binaryauthorization_grpc_service_config.json",
+    importpath = "cloud.google.com/go/binaryauthorization/apiv1beta1;binaryauthorization",
    service_yaml = "binaryauthorization_v1beta1.yaml",
    deps = [
        ":binaryauthorization_go_proto",
@ -135,7 +134,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-binaryauthorization-v1beta1-go",
    deps = [
        ":binaryauthorization_go_gapic",
-        ":binaryauthorization_go_gapic_srcjar-smoke-test.srcjar",
        ":binaryauthorization_go_gapic_srcjar-test.srcjar",
        ":binaryauthorization_go_proto",
    ],
--- a/google/cloud/datacatalog/v1beta1/BUILD.bazel
+++ b/google/cloud/datacatalog/v1beta1/BUILD.bazel
@ -128,10 +128,9 @@ go_proto_library(

 go_gapic_library(
    name = "datacatalog_go_gapic",
-    src = ":datacatalog_proto_with_info",
-    gapic_yaml = "datacatalog_gapic.yaml",
-    importpath = "cloud.google.com/go/datacatalog/apiv1beta1",
-    package = "google.cloud.datacatalog.v1beta1",
+    srcs = [":datacatalog_proto_with_info"],
+    grpc_service_config = "datacatalog_grpc_service_config.json",
+    importpath = "cloud.google.com/go/datacatalog/apiv1beta1;datacatalog",
    service_yaml = "datacatalog_v1beta1.yaml",
    deps = [
        ":datacatalog_go_proto",
@ -151,7 +150,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-datacatalog-v1beta1-go",
    deps = [
        ":datacatalog_go_gapic",
-        ":datacatalog_go_gapic_srcjar-smoke-test.srcjar",
        ":datacatalog_go_gapic_srcjar-test.srcjar",
        ":datacatalog_go_proto",
    ],
--- a/google/cloud/datalabeling/v1beta1/BUILD.bazel
+++ b/google/cloud/datalabeling/v1beta1/BUILD.bazel
@ -126,16 +126,16 @@ go_proto_library(

 go_gapic_library(
    name = "datalabeling_go_gapic",
-    src = ":datalabeling_proto_with_info",
-    gapic_yaml = "datalabeling_gapic.yaml",
-    importpath = "cloud.google.com/go/datalabeling/apiv1beta1",
-    package = "google.cloud.datalabeling.v1beta1",
+    srcs = [":datalabeling_proto_with_info"],
+    grpc_service_config = "datalabeling_grpc_service_config.json",
+    importpath = "cloud.google.com/go/datalabeling/apiv1beta1;datalabeling",
    service_yaml = "datalabeling_v1beta1.yaml",
    deps = [
        ":datalabeling_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -152,7 +152,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-datalabeling-v1beta1-go",
    deps = [
        ":datalabeling_go_gapic",
-        ":datalabeling_go_gapic_srcjar-smoke-test.srcjar",
        ":datalabeling_go_gapic_srcjar-test.srcjar",
        ":datalabeling_go_proto",
    ],
--- a/google/cloud/dataproc/v1/BUILD.bazel
+++ b/google/cloud/dataproc/v1/BUILD.bazel
@ -124,16 +124,16 @@ go_proto_library(

 go_gapic_library(
    name = "dataproc_go_gapic",
-    src = ":dataproc_proto_with_info",
-    gapic_yaml = "dataproc_gapic.yaml",
-    importpath = "cloud.google.com/go/dataproc/apiv1",
-    package = "google.cloud.dataproc.v1",
+    srcs = [":dataproc_proto_with_info"],
+    grpc_service_config = "dataproc_grpc_service_config.json",
+    importpath = "cloud.google.com/go/dataproc/apiv1;dataproc",
    service_yaml = "dataproc_v1.yaml",
    deps = [
        ":dataproc_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -150,7 +150,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-dataproc-v1-go",
    deps = [
        ":dataproc_go_gapic",
-        ":dataproc_go_gapic_srcjar-smoke-test.srcjar",
        ":dataproc_go_gapic_srcjar-test.srcjar",
        ":dataproc_go_proto",
    ],
--- a/google/cloud/dataproc/v1beta2/BUILD.bazel
+++ b/google/cloud/dataproc/v1beta2/BUILD.bazel
@ -123,16 +123,16 @@ go_proto_library(

 go_gapic_library(
    name = "dataproc_go_gapic",
-    src = ":dataproc_proto_with_info",
-    gapic_yaml = "dataproc_gapic.yaml",
-    importpath = "cloud.google.com/go/dataproc/apiv1beta2",
-    package = "google.cloud.dataproc.v1beta2",
+    srcs = [":dataproc_proto_with_info"],
+    grpc_service_config = "dataproc_grpc_service_config.json",
+    importpath = "cloud.google.com/go/dataproc/apiv1beta2;dataproc",
    service_yaml = "dataproc_v1beta2.yaml",
    deps = [
        ":dataproc_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -149,7 +149,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-dataproc-v1beta2-go",
    deps = [
        ":dataproc_go_gapic",
-        ":dataproc_go_gapic_srcjar-smoke-test.srcjar",
        ":dataproc_go_gapic_srcjar-test.srcjar",
        ":dataproc_go_proto",
    ],
--- a/google/cloud/dialogflow/v2/BUILD.bazel
+++ b/google/cloud/dialogflow/v2/BUILD.bazel
@ -132,16 +132,16 @@ go_proto_library(

 go_gapic_library(
    name = "dialogflow_go_gapic",
-    src = ":dialogflow_proto_with_info",
-    gapic_yaml = "dialogflow_gapic.yaml",
-    importpath = "cloud.google.com/go/dialogflow/apiv2",
-    package = "google.cloud.dialogflow.v2",
+    srcs = [":dialogflow_proto_with_info"],
+    grpc_service_config = "dialogflow_grpc_service_config.json",
+    importpath = "cloud.google.com/go/dialogflow/apiv2;dialogflow",
    service_yaml = "dialogflow_v2.yaml",
    deps = [
        ":dialogflow_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
@ -159,7 +159,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-dialogflow-v2-go",
    deps = [
        ":dialogflow_go_gapic",
-        ":dialogflow_go_gapic_srcjar-smoke-test.srcjar",
        ":dialogflow_go_gapic_srcjar-test.srcjar",
        ":dialogflow_go_proto",
    ],
--- a/google/cloud/dialogflow/v2beta1/BUILD.bazel
+++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel
@ -136,40 +136,39 @@ go_proto_library(
    ],
 )

-go_gapic_library(
-    name = "dialogflow_go_gapic",
-    src = ":dialogflow_proto_with_info",
-    gapic_yaml = "dialogflow_gapic.yaml",
-    importpath = "cloud.google.com/go/cloud/dialogflow/apiv2beta1",
-    package = "google.cloud.dialogflow.v2beta1",
-    service_yaml = "dialogflow_v2beta1.yaml",
-    deps = [
-        ":dialogflow_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",
-    ],
-)
-
-go_test(
-    name = "dialogflow_go_gapic_test",
-    srcs = [":dialogflow_go_gapic_srcjar_test"],
-    embed = [":dialogflow_go_gapic"],
-    importpath = "cloud.google.com/go/cloud/dialogflow/apiv2beta1",
-)
-
-# Open Source Packages
-go_gapic_assembly_pkg(
-    name = "gapi-cloud-dialogflow-v2beta1-go",
-    deps = [
-        ":dialogflow_go_gapic",
-        ":dialogflow_go_gapic_srcjar-smoke-test.srcjar",
-        ":dialogflow_go_gapic_srcjar-test.srcjar",
-        ":dialogflow_go_proto",
-    ],
-)
+# go_gapic_library(
+#     name = "dialogflow_go_gapic",
+#     srcs = [":dialogflow_proto_with_info"],
+#     grpc_service_config = "dialogflow_grpc_service_config.json",
+#     importpath = "cloud.google.com/go/cloud/dialogflow/apiv2beta1;dialogflow",
+#     service_yaml = "dialogflow_v2beta1.yaml",
+#     deps = [
+#         ":dialogflow_go_proto",
+#         "//google/longrunning:longrunning_go_gapic",
+#         "//google/longrunning:longrunning_go_proto",
+#         "@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",
+#     ],
+# )
+#
+# go_test(
+#     name = "dialogflow_go_gapic_test",
+#     srcs = [":dialogflow_go_gapic_srcjar_test"],
+#     embed = [":dialogflow_go_gapic"],
+#     importpath = "cloud.google.com/go/cloud/dialogflow/apiv2beta1",
+# )
+#
+# # Open Source Packages
+# go_gapic_assembly_pkg(
+#     name = "gapi-cloud-dialogflow-v2beta1-go",
+#     deps = [
+#         ":dialogflow_go_gapic",
+#         ":dialogflow_go_gapic_srcjar-test.srcjar",
+#         ":dialogflow_go_proto",
+#     ],
+# )

 ##############################################################################
 # Python
--- a/google/cloud/documentai/v1beta1/BUILD.bazel
+++ b/google/cloud/documentai/v1beta1/BUILD.bazel
@ -117,16 +117,16 @@ go_proto_library(

 go_gapic_library(
    name = "documentai_go_gapic",
-    src = ":documentai_proto_with_info",
-    gapic_yaml = "documentai_gapic.yaml",
-    importpath = "cloud.google.com/go/documentai/apiv1beta1",
-    package = "google.cloud.documentai.v1beta1",
+    srcs = [":documentai_proto_with_info"],
+    grpc_service_config = "documentai_grpc_service_config.json",
+    importpath = "cloud.google.com/go/documentai/apiv1beta1;documentai",
    service_yaml = "//google/cloud/documentai:documentai_v1beta1.yaml",
    deps = [
        ":documentai_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-documentai-v1beta1-go",
    deps = [
        ":documentai_go_gapic",
-        ":documentai_go_gapic_srcjar-smoke-test.srcjar",
        ":documentai_go_gapic_srcjar-test.srcjar",
        ":documentai_go_proto",
    ],
--- a/google/cloud/documentai/v1beta2/BUILD.bazel
+++ b/google/cloud/documentai/v1beta2/BUILD.bazel
@ -117,16 +117,16 @@ go_proto_library(

 go_gapic_library(
    name = "documentai_go_gapic",
-    src = ":documentai_proto_with_info",
-    gapic_yaml = "documentai_gapic.yaml",
-    importpath = "cloud.google.com/go/documentai/apiv1beta2",
-    package = "google.cloud.documentai.v1beta2",
+    srcs = [":documentai_proto_with_info"],
+    grpc_service_config = "documentai_v1beta2_grpc_service_config.json",
+    importpath = "cloud.google.com/go/documentai/apiv1beta2;documentai",
    service_yaml = "documentai_v1beta2.yaml",
    deps = [
        ":documentai_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-documentai-v1beta2-go",
    deps = [
        ":documentai_go_gapic",
-        ":documentai_go_gapic_srcjar-smoke-test.srcjar",
        ":documentai_go_gapic_srcjar-test.srcjar",
        ":documentai_go_proto",
    ],
--- a/google/cloud/functions/v1beta2/BUILD.bazel
+++ b/google/cloud/functions/v1beta2/BUILD.bazel
@ -115,16 +115,16 @@ go_proto_library(

 go_gapic_library(
    name = "functions_go_gapic",
-    src = ":functions_proto_with_info",
-    gapic_yaml = "functions_gapic.yaml",
-    importpath = "cloud.google.com/go/cloud/functions/apiv1beta2",
-    package = "google.cloud.functions.v1beta2",
+    srcs = [":functions_proto_with_info"],
+    grpc_service_config = "functions_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloud/functions/apiv1beta2;functions",
    service_yaml = "cloudfunctions_v1beta2.yaml",
    deps = [
        ":functions_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-functions-v1beta2-go",
    deps = [
        ":functions_go_gapic",
-        ":functions_go_gapic_srcjar-smoke-test.srcjar",
        ":functions_go_gapic_srcjar-test.srcjar",
        ":functions_go_proto",
    ],
--- a/google/cloud/gaming/v1beta/BUILD.bazel
+++ b/google/cloud/gaming/v1beta/BUILD.bazel
@ -125,16 +125,16 @@ go_proto_library(

 go_gapic_library(
    name = "gaming_go_gapic",
-    src = ":gaming_proto_with_info",
-    gapic_yaml = "gaming_gapic.yaml",
-    importpath = "cloud.google.com/go/gaming/apiv1beta",
-    package = "google.cloud.gaming.v1beta",
+    srcs = [":gaming_proto_with_info"],
+    grpc_service_config = "",
+    importpath = "cloud.google.com/go/gaming/apiv1beta;gaming",
    service_yaml = "gameservices_v1beta.yaml",
    deps = [
        ":gaming_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -151,7 +151,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-gaming-v1beta-go",
    deps = [
        ":gaming_go_gapic",
-        ":gaming_go_gapic_srcjar-smoke-test.srcjar",
        ":gaming_go_gapic_srcjar-test.srcjar",
        ":gaming_go_proto",
    ],
--- a/google/cloud/iot/v1/BUILD.bazel
+++ b/google/cloud/iot/v1/BUILD.bazel
@ -120,10 +120,9 @@ go_proto_library(

 go_gapic_library(
    name = "iot_go_gapic",
-    src = ":iot_proto_with_info",
-    gapic_yaml = "cloudiot_gapic.yaml",
-    importpath = "cloud.google.com/go/iot/apiv1",
-    package = "google.cloud.iot.v1",
+    srcs = [":iot_proto_with_info"],
+    grpc_service_config = "cloudiot_grpc_service_config.json",
+    importpath = "cloud.google.com/go/iot/apiv1;iot",
    service_yaml = "cloudiot_v1.yaml",
    deps = [
        ":iot_go_proto",
@ -143,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-iot-v1-go",
    deps = [
        ":iot_go_gapic",
-        ":iot_go_gapic_srcjar-smoke-test.srcjar",
        ":iot_go_gapic_srcjar-test.srcjar",
        ":iot_go_proto",
    ],
--- a/google/cloud/irm/v1alpha2/BUILD.bazel
+++ b/google/cloud/irm/v1alpha2/BUILD.bazel
@ -113,10 +113,9 @@ go_proto_library(

 go_gapic_library(
    name = "irm_go_gapic",
-    src = ":irm_proto_with_info",
-    gapic_yaml = "irm_gapic.yaml",
-    importpath = "cloud.google.com/go/irm/apiv1alpha2",
-    package = "google.cloud.irm.v1alpha2",
+    srcs = [":irm_proto_with_info"],
+    grpc_service_config = "irm_grpc_service_config.json",
+    importpath = "cloud.google.com/go/irm/apiv1alpha2;irm",
    service_yaml = "//google/cloud/irm:irm_v1alpha2.yaml",
    deps = [
        ":irm_go_proto",
@ -135,7 +134,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-irm-v1alpha2-go",
    deps = [
        ":irm_go_gapic",
-        ":irm_go_gapic_srcjar-smoke-test.srcjar",
        ":irm_go_gapic_srcjar-test.srcjar",
        ":irm_go_proto",
    ],
--- a/google/cloud/kms/v1/BUILD.bazel
+++ b/google/cloud/kms/v1/BUILD.bazel
@ -131,9 +131,9 @@ go_proto_library(

 go_gapic_library(
    name = "kms_go_gapic",
-    src = ":kms_proto_with_info",
-    gapic_yaml = "cloudkms_gapic.yaml",
-    importpath = "cloud.google.com/go/kms/apiv1",
+    srcs = [":kms_proto_with_info"],
+    grpc_service_config = "cloudkms_grpc_service_config.json",
+    importpath = "cloud.google.com/go/kms/apiv1;kms",
    service_yaml = "cloudkms_v1.yaml",
    deps = [
        ":kms_go_proto",
@ -154,7 +154,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-kms-v1-go",
    deps = [
        ":kms_go_gapic",
-        ":kms_go_gapic_srcjar-smoke-test.srcjar",
        ":kms_go_gapic_srcjar-test.srcjar",
        ":kms_go_proto",
    ],
--- a/google/cloud/language/v1/BUILD.bazel
+++ b/google/cloud/language/v1/BUILD.bazel
@ -108,10 +108,9 @@ go_proto_library(

 go_gapic_library(
    name = "language_go_gapic",
-    src = ":language_proto_with_info",
-    gapic_yaml = "language_gapic.yaml",
-    importpath = "cloud.google.com/go/language/apiv1",
-    package = "google.cloud.language.v1",
+    srcs = [":language_proto_with_info"],
+    grpc_service_config = "language_grpc_service_config.json",
+    importpath = "cloud.google.com/go/language/apiv1;language",
    service_yaml = "//google/cloud/language:language_v1.yaml",
    deps = [
        ":language_go_proto",
@ -130,7 +129,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-language-v1-go",
    deps = [
        ":language_go_gapic",
-        ":language_go_gapic_srcjar-smoke-test.srcjar",
        ":language_go_gapic_srcjar-test.srcjar",
        ":language_go_proto",
    ],
--- a/google/cloud/language/v1beta2/BUILD.bazel
+++ b/google/cloud/language/v1beta2/BUILD.bazel
@ -109,10 +109,9 @@ go_proto_library(

 go_gapic_library(
    name = "language_go_gapic",
-    src = ":language_proto_with_info",
-    gapic_yaml = "language_gapic.yaml",
-    importpath = "cloud.google.com/go/language/apiv1beta2",
-    package = "google.cloud.language.v1beta2",
+    srcs = [":language_proto_with_info"],
+    grpc_service_config = "language_grpc_service_config.json",
+    importpath = "cloud.google.com/go/language/apiv1beta2;language",
    service_yaml = "language_v1beta2.yaml",
    deps = [
        ":language_go_proto",
@ -131,7 +130,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-language-v1beta2-go",
    deps = [
        ":language_go_gapic",
-        ":language_go_gapic_srcjar-smoke-test.srcjar",
        ":language_go_gapic_srcjar-test.srcjar",
        ":language_go_proto",
    ],
--- a/google/cloud/managedidentities/v1/BUILD.bazel
+++ b/google/cloud/managedidentities/v1/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "managedidentities_go_gapic",
-    src = ":managedidentities_proto_with_info",
-    gapic_yaml = "managedidentities_gapic.yaml",
-    importpath = "cloud.google.com/go/managedidentities/apiv1",
-    package = "google.cloud.managedidentities.v1",
+    srcs = [":managedidentities_proto_with_info"],
+    grpc_service_config = "managedidentities_grpc_service_config.json",
+    importpath = "cloud.google.com/go/managedidentities/apiv1;managedidentities",
    service_yaml = "managedidentities_v1.yaml",
    deps = [
        ":managedidentities_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -139,7 +139,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-managedidentities-v1-go",
    deps = [
        ":managedidentities_go_gapic",
-        ":managedidentities_go_gapic_srcjar-smoke-test.srcjar",
        ":managedidentities_go_gapic_srcjar-test.srcjar",
        ":managedidentities_go_proto",
    ],
--- a/google/cloud/managedidentities/v1beta1/BUILD.bazel
+++ b/google/cloud/managedidentities/v1beta1/BUILD.bazel
@ -113,16 +113,16 @@ go_proto_library(

 go_gapic_library(
    name = "managedidentities_go_gapic",
-    src = ":managedidentities_proto_with_info",
-    gapic_yaml = "managedidentities_gapic.yaml",
-    importpath = "cloud.google.com/go/managedidentities/apiv1beta1",
-    package = "google.cloud.managedidentities.v1beta1",
+    srcs = [":managedidentities_proto_with_info"],
+    grpc_service_config = "",
+    importpath = "cloud.google.com/go/managedidentities/apiv1beta1;managedidentities",
    service_yaml = "managedidentities_v1beta1.yaml",
    deps = [
        ":managedidentities_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -138,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-managedidentities-v1beta1-go",
    deps = [
        ":managedidentities_go_gapic",
-        ":managedidentities_go_gapic_srcjar-smoke-test.srcjar",
        ":managedidentities_go_gapic_srcjar-test.srcjar",
        ":managedidentities_go_proto",
    ],
--- a/google/cloud/mediatranslation/v1beta1/BUILD.bazel
+++ b/google/cloud/mediatranslation/v1beta1/BUILD.bazel
@ -109,10 +109,9 @@ go_proto_library(

 go_gapic_library(
    name = "mediatranslation_go_gapic",
-    src = ":mediatranslation_proto_with_info",
-    gapic_yaml = "mediatranslation_gapic.yaml",
-    importpath = "cloud.google.com/go/mediatranslation/apiv1beta1",
-    package = "google.cloud.mediatranslation.v1beta1",
+    srcs = [":mediatranslation_proto_with_info"],
+    grpc_service_config = "mediatranslation_grpc_service_config.json",
+    importpath = "cloud.google.com/go/mediatranslation/apiv1beta1;mediatranslation",
    service_yaml = "mediatranslation_v1beta1.yaml",
    deps = [
        ":mediatranslation_go_proto",
@ -131,7 +130,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-mediatranslation-v1beta1-go",
    deps = [
        ":mediatranslation_go_gapic",
-        ":mediatranslation_go_gapic_srcjar-smoke-test.srcjar",
        ":mediatranslation_go_gapic_srcjar-test.srcjar",
        ":mediatranslation_go_proto",
    ],
--- a/google/cloud/memcache/v1beta2/BUILD.bazel
+++ b/google/cloud/memcache/v1beta2/BUILD.bazel
@ -113,16 +113,16 @@ go_proto_library(

 go_gapic_library(
    name = "memcache_go_gapic",
-    src = ":memcache_proto_with_info",
-    gapic_yaml = "memcache_gapic.yaml",
-    importpath = "cloud.google.com/go/memcache/apiv1beta2",
-    package = "google.cloud.memcache.v1beta2",
+    srcs = [":memcache_proto_with_info"],
+    grpc_service_config = "memcache_grpc_service_config.json",
+    importpath = "cloud.google.com/go/memcache/apiv1beta2;memcache",
    service_yaml = "memcache_v1beta2.yaml",
    deps = [
        ":memcache_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -138,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-memcache-v1beta2-go",
    deps = [
        ":memcache_go_gapic",
-        ":memcache_go_gapic_srcjar-smoke-test.srcjar",
        ":memcache_go_gapic_srcjar-test.srcjar",
        ":memcache_go_proto",
    ],
--- a/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel
+++ b/google/cloud/osconfig/agentendpoint/v1beta/BUILD.bazel
@ -110,10 +110,9 @@ go_proto_library(

 go_gapic_library(
    name = "agentendpoint_go_gapic",
-    src = ":agentendpoint_proto_with_info",
-    gapic_yaml = "osconfig_gapic.yaml",
-    importpath = "cloud.google.com/go/osconfig/agentendpoint/apiv1beta",
-    package = "google.cloud.osconfig.agentendpoint.v1beta",
+    srcs = [":agentendpoint_proto_with_info"],
+    grpc_service_config = "agentendpoint_grpc_service_config.json",
+    importpath = "cloud.google.com/go/osconfig/agentendpoint/apiv1beta;agentendpoint",
    service_yaml = "osconfig_v1beta.yaml",
    deps = [
        ":agentendpoint_go_proto",
@ -132,7 +131,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-osconfig-agentendpoint-v1beta-go",
    deps = [
        ":agentendpoint_go_gapic",
-        ":agentendpoint_go_gapic_srcjar-smoke-test.srcjar",
        ":agentendpoint_go_gapic_srcjar-test.srcjar",
        ":agentendpoint_go_proto",
    ],
--- a/google/cloud/osconfig/v1beta/BUILD.bazel
+++ b/google/cloud/osconfig/v1beta/BUILD.bazel
@ -122,10 +122,9 @@ go_proto_library(

 go_gapic_library(
    name = "osconfig_go_gapic",
-    src = ":osconfig_proto_with_info",
-    gapic_yaml = "osconfig_gapic.yaml",
-    importpath = "cloud.google.com/go/osconfig/apiv1beta",
-    package = "google.cloud.osconfig.v1beta",
+    srcs = [":osconfig_proto_with_info"],
+    grpc_service_config = "osconfig_grpc_service_config.json",
+    importpath = "cloud.google.com/go/osconfig/apiv1beta;osconfig",
    service_yaml = "osconfig_v1beta.yaml",
    deps = [
        ":osconfig_go_proto",
@ -145,7 +144,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-osconfig-v1beta-go",
    deps = [
        ":osconfig_go_gapic",
-        ":osconfig_go_gapic_srcjar-smoke-test.srcjar",
        ":osconfig_go_gapic_srcjar-test.srcjar",
        ":osconfig_go_proto",
    ],
--- a/google/cloud/oslogin/v1/BUILD.bazel
+++ b/google/cloud/oslogin/v1/BUILD.bazel
@ -137,10 +137,9 @@ go_proto_library(

 go_gapic_library(
    name = "oslogin_go_gapic",
-    src = ":oslogin_proto_with_info",
-    gapic_yaml = "oslogin_gapic.yaml",
-    importpath = "cloud.google.com/go/oslogin/apiv1",
-    package = "google.cloud.oslogin.v1",
+    srcs = [":oslogin_proto_with_info"],
+    grpc_service_config = "oslogin_grpc_service_config.json",
+    importpath = "cloud.google.com/go/oslogin/apiv1;oslogin",
    service_yaml = "oslogin_v1.yaml",
    deps = [
        ":oslogin_go_proto",
@ -160,7 +159,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-oslogin-v1-go",
    deps = [
        ":oslogin_go_gapic",
-        ":oslogin_go_gapic_srcjar-smoke-test.srcjar",
        ":oslogin_go_gapic_srcjar-test.srcjar",
        ":oslogin_go_proto",
        "//google/cloud/oslogin/common:common_go_proto",
--- a/google/cloud/oslogin/v1beta/BUILD.bazel
+++ b/google/cloud/oslogin/v1beta/BUILD.bazel
@ -120,9 +120,9 @@ go_proto_library(

 go_gapic_library(
    name = "oslogin_go_gapic",
-    src = ":oslogin_proto_with_info",
-    gapic_yaml = "oslogin_gapic.yaml",
-    importpath = "cloud.google.com/go/oslogin/apiv1beta",
+    srcs = [":oslogin_proto_with_info"],
+    grpc_service_config = "oslogin_grpc_service_config.json",
+    importpath = "cloud.google.com/go/oslogin/apiv1beta;oslogin",
    service_yaml = "//google/cloud/oslogin:oslogin_v1beta.yaml",
    deps = [
        ":oslogin_go_proto",
@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-oslogin-v1beta-go",
    deps = [
        ":oslogin_go_gapic",
-        ":oslogin_go_gapic_srcjar-smoke-test.srcjar",
        ":oslogin_go_gapic_srcjar-test.srcjar",
        ":oslogin_go_proto",
        "//google/cloud/oslogin/common:common_go_proto",
--- a/google/cloud/phishingprotection/v1beta1/BUILD.bazel
+++ b/google/cloud/phishingprotection/v1beta1/BUILD.bazel
@ -109,10 +109,9 @@ go_proto_library(

 go_gapic_library(
    name = "phishingprotection_go_gapic",
-    src = ":phishingprotection_proto_with_info",
-    gapic_yaml = "phishingprotection_gapic.yaml",
-    importpath = "cloud.google.com/go/phishingprotection/apiv1beta1",
-    package = "google.cloud.phishingprotection.v1beta1",
+    srcs = [":phishingprotection_proto_with_info"],
+    grpc_service_config = "phishingprotection_grpc_service_config.json",
+    importpath = "cloud.google.com/go/phishingprotection/apiv1beta1;phishingprotection",
    service_yaml = "phishingprotection_v1beta1.yaml",
    deps = [
        ":phishingprotection_go_proto",
@ -131,7 +130,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-phishingprotection-v1beta1-go",
    deps = [
        ":phishingprotection_go_gapic",
-        ":phishingprotection_go_gapic_srcjar-smoke-test.srcjar",
        ":phishingprotection_go_gapic_srcjar-test.srcjar",
        ":phishingprotection_go_proto",
    ],
--- a/google/cloud/recaptchaenterprise/v1/BUILD.bazel
+++ b/google/cloud/recaptchaenterprise/v1/BUILD.bazel
@ -112,10 +112,9 @@ go_proto_library(

 go_gapic_library(
    name = "recaptchaenterprise_go_gapic",
-    src = ":recaptchaenterprise_proto_with_info",
-    gapic_yaml = "recaptchaenterprise_gapic.yaml",
-    importpath = "cloud.google.com/go/recaptchaenterprise/apiv1",
-    package = "google.cloud.recaptchaenterprise.v1",
+    srcs = [":recaptchaenterprise_proto_with_info"],
+    grpc_service_config = "recaptchaenterprise_grpc_service_config.json",
+    importpath = "cloud.google.com/go/recaptchaenterprise/apiv1;recaptchaenterprise",
    service_yaml = "recaptchaenterprise_v1.yaml",
    deps = [
        ":recaptchaenterprise_go_proto",
@ -134,7 +133,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-recaptchaenterprise-v1-go",
    deps = [
        ":recaptchaenterprise_go_gapic",
-        ":recaptchaenterprise_go_gapic_srcjar-smoke-test.srcjar",
        ":recaptchaenterprise_go_gapic_srcjar-test.srcjar",
        ":recaptchaenterprise_go_proto",
    ],
--- a/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel
+++ b/google/cloud/recaptchaenterprise/v1beta1/BUILD.bazel
@ -112,10 +112,9 @@ go_proto_library(

 go_gapic_library(
    name = "recaptchaenterprise_go_gapic",
-    src = ":recaptchaenterprise_proto_with_info",
-    gapic_yaml = "recaptchaenterprise_gapic.yaml",
-    importpath = "cloud.google.com/go/recaptchaenterprise/apiv1beta1",
-    package = "google.cloud.recaptchaenterprise.v1beta1",
+    srcs = [":recaptchaenterprise_proto_with_info"],
+    grpc_service_config = "recaptchaenterprise_grpc_service_config.json",
+    importpath = "cloud.google.com/go/recaptchaenterprise/apiv1beta1;recaptchaenterprise",
    service_yaml = "recaptchaenterprise_v1beta1.yaml",
    deps = [
        ":recaptchaenterprise_go_proto",
@ -134,7 +133,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-recaptchaenterprise-v1beta1-go",
    deps = [
        ":recaptchaenterprise_go_gapic",
-        ":recaptchaenterprise_go_gapic_srcjar-smoke-test.srcjar",
        ":recaptchaenterprise_go_gapic_srcjar-test.srcjar",
        ":recaptchaenterprise_go_proto",
    ],
--- a/google/cloud/recommendationengine/v1beta1/BUILD.bazel
+++ b/google/cloud/recommendationengine/v1beta1/BUILD.bazel
@ -142,10 +142,9 @@ go_proto_library(

 go_gapic_library(
    name = "recommendationengine_go_gapic",
-    src = ":recommendationengine_proto_with_info",
-    gapic_yaml = "recommendationengine_gapic.yaml",
-    importpath = "cloud.google.com/go/recommendationengine/apiv1beta1",
-    package = "google.cloud.recommendationengine.v1beta1",
+    srcs = [":recommendationengine_proto_with_info"],
+    grpc_service_config = "recommendationengine_grpc_service_config.json",
+    importpath = "cloud.google.com/go/recommendationengine/apiv1beta1;recommendationengine",
    service_yaml = "recommendationengine_v1beta1.yaml",
    deps = [
        ":recommendationengine_go_proto",
@ -153,6 +152,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:struct_go_proto",
    ],
 )
@ -169,7 +169,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-recommendationengine-v1beta1-go",
    deps = [
        ":recommendationengine_go_gapic",
-        ":recommendationengine_go_gapic_srcjar-smoke-test.srcjar",
        ":recommendationengine_go_gapic_srcjar-test.srcjar",
        ":recommendationengine_go_proto",
    ],
--- a/google/cloud/recommender/v1/BUILD.bazel
+++ b/google/cloud/recommender/v1/BUILD.bazel
@ -115,10 +115,9 @@ go_proto_library(

 go_gapic_library(
    name = "recommender_go_gapic",
-    src = ":recommender_proto_with_info",
-    gapic_yaml = "recommender_gapic.yaml",
-    importpath = "cloud.google.com/go/recommender/apiv1",
-    package = "google.cloud.recommender.v1",
+    srcs = [":recommender_proto_with_info"],
+    grpc_service_config = "recommender_grpc_service_config.json",
+    importpath = "cloud.google.com/go/recommender/apiv1;recommender",
    service_yaml = "recommender_v1.yaml",
    deps = [
        ":recommender_go_proto",
@ -138,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-recommender-v1-go",
    deps = [
        ":recommender_go_gapic",
-        ":recommender_go_gapic_srcjar-smoke-test.srcjar",
        ":recommender_go_gapic_srcjar-test.srcjar",
        ":recommender_go_proto",
    ],
--- a/google/cloud/recommender/v1beta1/BUILD.bazel
+++ b/google/cloud/recommender/v1beta1/BUILD.bazel
@ -116,10 +116,9 @@ go_proto_library(

 go_gapic_library(
    name = "recommender_go_gapic",
-    src = ":recommender_proto_with_info",
-    gapic_yaml = "recommender_gapic.yaml",
-    importpath = "cloud.google.com/go/recommender/apiv1beta1",
-    package = "google.cloud.recommender.v1beta1",
+    srcs = [":recommender_proto_with_info"],
+    grpc_service_config = "recommender_grpc_service_config.json",
+    importpath = "cloud.google.com/go/recommender/apiv1beta1;recommender",
    service_yaml = "recommender_v1beta1.yaml",
    deps = [
        ":recommender_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-recommender-v1beta1-go",
    deps = [
        ":recommender_go_gapic",
-        ":recommender_go_gapic_srcjar-smoke-test.srcjar",
        ":recommender_go_gapic_srcjar-test.srcjar",
        ":recommender_go_proto",
    ],
--- a/google/cloud/redis/v1/BUILD.bazel
+++ b/google/cloud/redis/v1/BUILD.bazel
@ -113,16 +113,16 @@ go_proto_library(

 go_gapic_library(
    name = "redis_go_gapic",
-    src = ":redis_proto_with_info",
-    gapic_yaml = "redis_gapic.yaml",
-    importpath = "cloud.google.com/go/redis/apiv1",
-    package = "google.cloud.redis.v1",
+    srcs = [":redis_proto_with_info"],
+    grpc_service_config = "redis_grpc_service_config.json",
+    importpath = "cloud.google.com/go/redis/apiv1;redis",
    service_yaml = "redis_v1.yaml",
    deps = [
        ":redis_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -138,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-redis-v1-go",
    deps = [
        ":redis_go_gapic",
-        ":redis_go_gapic_srcjar-smoke-test.srcjar",
        ":redis_go_gapic_srcjar-test.srcjar",
        ":redis_go_proto",
    ],
--- a/google/cloud/redis/v1beta1/BUILD.bazel
+++ b/google/cloud/redis/v1beta1/BUILD.bazel
@ -113,16 +113,16 @@ go_proto_library(

 go_gapic_library(
    name = "redis_go_gapic",
-    src = ":redis_proto_with_info",
-    gapic_yaml = "redis_gapic.yaml",
-    importpath = "cloud.google.com/go/redis/apiv1beta1",
-    package = "google.cloud.redis.v1beta1",
+    srcs = [":redis_proto_with_info"],
+    grpc_service_config = "redis_grpc_service_config.json",
+    importpath = "cloud.google.com/go/redis/apiv1beta1;redis",
    service_yaml = "redis_v1beta1.yaml",
    deps = [
        ":redis_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
    ],
 )
@ -139,7 +139,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-redis-v1beta1-go",
    deps = [
        ":redis_go_gapic",
-        ":redis_go_gapic_srcjar-smoke-test.srcjar",
        ":redis_go_gapic_srcjar-test.srcjar",
        ":redis_go_proto",
    ],
--- a/google/cloud/resourcemanager/v2/BUILD.bazel
+++ b/google/cloud/resourcemanager/v2/BUILD.bazel
@ -118,10 +118,9 @@ go_proto_library(

 go_gapic_library(
    name = "resourcemanager_go_gapic",
-    src = ":resourcemanager_proto_with_info",
-    gapic_yaml = "cloudresourcemanager_gapic.yaml",
-    importpath = "cloud.google.com/go/resourcemanager/apiv2",
-    package = "google.cloud.resourcemanager.v2",
+    srcs = [":resourcemanager_proto_with_info"],
+    grpc_service_config = "",
+    importpath = "cloud.google.com/go/resourcemanager/apiv2;resourcemanager",
    service_yaml = "cloudresourcemanager_v2.yaml",
    deps = [
        ":resourcemanager_go_proto",
@ -129,6 +128,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -144,7 +144,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-resourcemanager-v2-go",
    deps = [
        ":resourcemanager_go_gapic",
-        ":resourcemanager_go_gapic_srcjar-smoke-test.srcjar",
        ":resourcemanager_go_gapic_srcjar-test.srcjar",
        ":resourcemanager_go_proto",
    ],
--- a/google/cloud/scheduler/v1/BUILD.bazel
+++ b/google/cloud/scheduler/v1/BUILD.bazel
@ -117,10 +117,9 @@ go_proto_library(

 go_gapic_library(
    name = "scheduler_go_gapic",
-    src = ":scheduler_proto_with_info",
-    gapic_yaml = "cloudscheduler_gapic.yaml",
-    importpath = "cloud.google.com/go/scheduler/apiv1",
-    package = "google.cloud.scheduler.v1",
+    srcs = [":scheduler_proto_with_info"],
+    grpc_service_config = "cloudscheduler_grpc_service_config.json",
+    importpath = "cloud.google.com/go/scheduler/apiv1;scheduler",
    service_yaml = "cloudscheduler_v1.yaml",
    deps = [
        ":scheduler_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-scheduler-v1-go",
    deps = [
        ":scheduler_go_gapic",
-        ":scheduler_go_gapic_srcjar-smoke-test.srcjar",
        ":scheduler_go_gapic_srcjar-test.srcjar",
        ":scheduler_go_proto",
    ],
--- a/google/cloud/scheduler/v1beta1/BUILD.bazel
+++ b/google/cloud/scheduler/v1beta1/BUILD.bazel
@ -117,10 +117,9 @@ go_proto_library(

 go_gapic_library(
    name = "scheduler_go_gapic",
-    src = ":scheduler_proto_with_info",
-    gapic_yaml = "cloudscheduler_gapic.yaml",
-    importpath = "cloud.google.com/go/scheduler/apiv1beta1",
-    package = "google.cloud.scheduler.v1beta1",
+    srcs = [":scheduler_proto_with_info"],
+    grpc_service_config = "cloudscheduler_grpc_service_config.json",
+    importpath = "cloud.google.com/go/scheduler/apiv1beta1;scheduler",
    service_yaml = "cloudscheduler_v1beta1.yaml",
    deps = [
        ":scheduler_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-scheduler-v1beta1-go",
    deps = [
        ":scheduler_go_gapic",
-        ":scheduler_go_gapic_srcjar-smoke-test.srcjar",
        ":scheduler_go_gapic_srcjar-test.srcjar",
        ":scheduler_go_proto",
    ],
--- a/google/cloud/secretmanager/v1/BUILD.bazel
+++ b/google/cloud/secretmanager/v1/BUILD.bazel
@ -118,10 +118,9 @@ go_proto_library(

 go_gapic_library(
    name = "secretmanager_go_gapic",
-    src = ":secretmanager_proto_with_info",
-    gapic_yaml = "secretmanager_gapic.yaml",
-    importpath = "cloud.google.com/go/secretmanager/apiv1",
-    package = "google.cloud.secretmanager.v1",
+    srcs = [":secretmanager_proto_with_info"],
+    grpc_service_config = "secretmanager_grpc_service_config.json",
+    importpath = "cloud.google.com/go/secretmanager/apiv1;secretmanager",
    service_yaml = "secretmanager_v1.yaml",
    deps = [
        ":secretmanager_go_proto",
@ -141,7 +140,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-secretmanager-v1-go",
    deps = [
        ":secretmanager_go_gapic",
-        ":secretmanager_go_gapic_srcjar-smoke-test.srcjar",
        ":secretmanager_go_gapic_srcjar-test.srcjar",
        ":secretmanager_go_proto",
    ],
--- a/google/cloud/secrets/v1beta1/BUILD.bazel
+++ b/google/cloud/secrets/v1beta1/BUILD.bazel
@ -116,10 +116,9 @@ go_proto_library(

 go_gapic_library(
    name = "secretmanager_go_gapic",
-    src = ":secretmanager_proto_with_info",
-    gapic_yaml = "secretmanager_gapic.yaml",
-    importpath = "cloud.google.com/go/secretmanager/apiv1beta1",
-    package = "google.cloud.secrets.v1beta1",
+    srcs = [":secretmanager_proto_with_info"],
+    grpc_service_config = "secretmanager_grpc_service_config.json",
+    importpath = "cloud.google.com/go/secretmanager/apiv1beta1;secretmanager",
    service_yaml = "//google/cloud/secrets/v1beta1:secretmanager_v1beta1.yaml",
    deps = [
        ":secretmanager_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-secretmanager-v1beta1-go",
    deps = [
        ":secretmanager_go_gapic",
-        ":secretmanager_go_gapic_srcjar-smoke-test.srcjar",
        ":secretmanager_go_gapic_srcjar-test.srcjar",
        ":secretmanager_go_proto",
    ],
--- a/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel
+++ b/google/cloud/securitycenter/settings/v1beta1/BUILD.bazel
@ -117,10 +117,9 @@ go_proto_library(

 go_gapic_library(
    name = "settings_go_gapic",
-    src = ":settings_proto_with_info",
-    gapic_yaml = "securitycenter_settings_gapic.yaml",
-    importpath = "cloud.google.com/go/securitycenter/settings/apiv1beta1",
-    package = "google.cloud.securitycenter.settings.v1beta1",
+    srcs = [":settings_proto_with_info"],
+    grpc_service_config = "securitycenter_settings_grpc_service_config.json",
+    importpath = "cloud.google.com/go/securitycenter/settings/apiv1beta1;settings",
    service_yaml = "securitycenter_settings.yaml",
    deps = [
        ":settings_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-securitycenter-settings-v1beta1-go",
    deps = [
        ":settings_go_gapic",
-        ":settings_go_gapic_srcjar-smoke-test.srcjar",
        ":settings_go_gapic_srcjar-test.srcjar",
        ":settings_go_proto",
    ],
--- a/google/cloud/securitycenter/v1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1/BUILD.bazel
@ -129,10 +129,9 @@ go_proto_library(

 go_gapic_library(
    name = "securitycenter_go_gapic",
-    src = ":securitycenter_proto_with_info",
-    gapic_yaml = "securitycenter_gapic.yaml",
-    importpath = "cloud.google.com/go/securitycenter/apiv1",
-    package = "google.cloud.securitycenter.v1",
+    srcs = [":securitycenter_proto_with_info"],
+    grpc_service_config = "securitycenter_grpc_service_config.json",
+    importpath = "cloud.google.com/go/securitycenter/apiv1;securitycenter",
    service_yaml = "securitycenter_v1.yaml",
    deps = [
        ":securitycenter_go_proto",
@ -140,6 +139,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
@ -157,7 +157,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-securitycenter-v1-go",
    deps = [
        ":securitycenter_go_gapic",
-        ":securitycenter_go_gapic_srcjar-smoke-test.srcjar",
        ":securitycenter_go_gapic_srcjar-test.srcjar",
        ":securitycenter_go_proto",
    ],
--- a/google/cloud/securitycenter/v1beta1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1beta1/BUILD.bazel
@ -127,10 +127,9 @@ go_proto_library(

 go_gapic_library(
    name = "securitycenter_go_gapic",
-    src = ":securitycenter_proto_with_info",
-    gapic_yaml = "securitycenter_gapic.yaml",
-    importpath = "cloud.google.com/go/securitycenter/apiv1beta1",
-    package = "google.cloud.securitycenter.v1beta1",
+    srcs = [":securitycenter_proto_with_info"],
+    grpc_service_config = "securitycenter_grpc_service_config.json",
+    importpath = "cloud.google.com/go/securitycenter/apiv1beta1;securitycenter",
    service_yaml = "securitycenter_v1beta1.yaml",
    deps = [
        ":securitycenter_go_proto",
@ -138,6 +137,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
@ -155,7 +155,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-securitycenter-v1beta1-go",
    deps = [
        ":securitycenter_go_gapic",
-        ":securitycenter_go_gapic_srcjar-smoke-test.srcjar",
        ":securitycenter_go_gapic_srcjar-test.srcjar",
        ":securitycenter_go_proto",
    ],
--- a/google/cloud/securitycenter/v1p1beta1/BUILD.bazel
+++ b/google/cloud/securitycenter/v1p1beta1/BUILD.bazel
@ -129,10 +129,9 @@ go_proto_library(

 go_gapic_library(
    name = "securitycenter_go_gapic",
-    src = ":securitycenter_proto_with_info",
-    gapic_yaml = "securitycenter_gapic.yaml",
-    importpath = "cloud.google.com/go/securitycenter/apiv1p1beta1",
-    package = "google.cloud.securitycenter.v1p1beta1",
+    srcs = [":securitycenter_proto_with_info"],
+    grpc_service_config = "securitycenter_grpc_service_config.json",
+    importpath = "cloud.google.com/go/securitycenter/apiv1p1beta1;securitycenter",
    service_yaml = "securitycenter_v1p1beta1.yaml",
    deps = [
        ":securitycenter_go_proto",
@ -140,6 +139,7 @@ go_gapic_library(
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
@ -157,7 +157,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-securitycenter-v1p1beta1-go",
    deps = [
        ":securitycenter_go_gapic",
-        ":securitycenter_go_gapic_srcjar-smoke-test.srcjar",
        ":securitycenter_go_gapic_srcjar-test.srcjar",
        ":securitycenter_go_proto",
    ],
--- a/google/cloud/servicedirectory/v1beta1/BUILD.bazel
+++ b/google/cloud/servicedirectory/v1beta1/BUILD.bazel
@ -121,10 +121,9 @@ go_proto_library(

 go_gapic_library(
    name = "servicedirectory_go_gapic",
-    src = ":servicedirectory_proto_with_info",
-    gapic_yaml = "servicedirectory_gapic.yaml",
-    importpath = "cloud.google.com/go/servicedirectory/apiv1beta1",
-    package = "google.cloud.servicedirectory.v1beta1",
+    srcs = [":servicedirectory_proto_with_info"],
+    grpc_service_config = "servicedirectory_grpc_service_config.json",
+    importpath = "cloud.google.com/go/servicedirectory/apiv1beta1;servicedirectory",
    service_yaml = "servicedirectory_v1beta1.yaml",
    deps = [
        ":servicedirectory_go_proto",
@ -144,7 +143,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-servicedirectory-v1beta1-go",
    deps = [
        ":servicedirectory_go_gapic",
-        ":servicedirectory_go_gapic_srcjar-smoke-test.srcjar",
        ":servicedirectory_go_gapic_srcjar-test.srcjar",
        ":servicedirectory_go_proto",
    ],
--- a/google/cloud/speech/v1/BUILD.bazel
+++ b/google/cloud/speech/v1/BUILD.bazel
@ -115,16 +115,16 @@ go_proto_library(

 go_gapic_library(
    name = "speech_go_gapic",
-    src = ":speech_proto_with_info",
-    gapic_yaml = "speech_gapic.yaml",
-    importpath = "cloud.google.com/go/speech/apiv1",
-    package = "google.cloud.speech.v1",
+    srcs = [":speech_proto_with_info"],
+    grpc_service_config = "speech_grpc_service_config.json",
+    importpath = "cloud.google.com/go/speech/apiv1;speech",
    service_yaml = "speech_v1.yaml",
    deps = [
        ":speech_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-speech-v1-go",
    deps = [
        ":speech_go_gapic",
-        ":speech_go_gapic_srcjar-smoke-test.srcjar",
        ":speech_go_gapic_srcjar-test.srcjar",
        ":speech_go_proto",
    ],
--- a/google/cloud/speech/v1p1beta1/BUILD.bazel
+++ b/google/cloud/speech/v1p1beta1/BUILD.bazel
@ -115,16 +115,16 @@ go_proto_library(

 go_gapic_library(
    name = "speech_go_gapic",
-    src = ":speech_proto_with_info",
-    gapic_yaml = "speech_gapic.yaml",
-    importpath = "cloud.google.com/go/speech/apiv1p1beta1",
-    package = "google.cloud.speech.v1p1beta1",
+    srcs = [":speech_proto_with_info"],
+    grpc_service_config = "speech_grpc_service_config.json",
+    importpath = "cloud.google.com/go/speech/apiv1p1beta1;speech",
    service_yaml = "speech_v1p1beta1.yaml",
    deps = [
        ":speech_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
@ -142,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-speech-v1p1beta1-go",
    deps = [
        ":speech_go_gapic",
-        ":speech_go_gapic_srcjar-smoke-test.srcjar",
        ":speech_go_gapic_srcjar-test.srcjar",
        ":speech_go_proto",
    ],
--- a/google/cloud/talent/v4beta1/BUILD.bazel
+++ b/google/cloud/talent/v4beta1/BUILD.bazel
@ -151,16 +151,16 @@ go_proto_library(

 go_gapic_library(
    name = "talent_go_gapic",
-    src = ":talent_proto_with_info",
-    gapic_yaml = "talent_gapic.yaml",
-    importpath = "cloud.google.com/go/talent/apiv4beta1",
-    package = "google.cloud.talent.v4beta1",
+    srcs = [":talent_proto_with_info"],
+    grpc_service_config = "talent_grpc_service_config.json",
+    importpath = "cloud.google.com/go/talent/apiv4beta1;talent",
    service_yaml = "//google/cloud/talent:talent_v4beta1.yaml",
    deps = [
        ":talent_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
        "@io_bazel_rules_go//proto/wkt:any_go_proto",
        "@io_bazel_rules_go//proto/wkt:duration_go_proto",
    ],
@ -178,7 +178,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-talent-v4beta1-go",
    deps = [
        ":talent_go_gapic",
-        ":talent_go_gapic_srcjar-smoke-test.srcjar",
        ":talent_go_gapic_srcjar-test.srcjar",
        ":talent_go_proto",
    ],
--- a/google/cloud/tasks/v2/BUILD.bazel
+++ b/google/cloud/tasks/v2/BUILD.bazel
@ -123,10 +123,9 @@ go_proto_library(

 go_gapic_library(
    name = "tasks_go_gapic",
-    src = ":tasks_proto_with_info",
-    gapic_yaml = "cloudtasks_gapic.yaml",
-    importpath = "cloud.google.com/go/cloudtasks/apiv2",
-    package = "google.cloud.tasks.v2",
+    srcs = [":tasks_proto_with_info"],
+    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloudtasks/apiv2;tasks",
    service_yaml = "cloudtasks_v2.yaml",
    deps = [
        ":tasks_go_proto",
@ -146,7 +145,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-tasks-v2-go",
    deps = [
        ":tasks_go_gapic",
-        ":tasks_go_gapic_srcjar-smoke-test.srcjar",
        ":tasks_go_gapic_srcjar-test.srcjar",
        ":tasks_go_proto",
    ],
--- a/google/cloud/tasks/v2beta2/BUILD.bazel
+++ b/google/cloud/tasks/v2beta2/BUILD.bazel
@ -123,10 +123,9 @@ go_proto_library(

 go_gapic_library(
    name = "tasks_go_gapic",
-    src = ":tasks_proto_with_info",
-    gapic_yaml = "cloudtasks_gapic.yaml",
-    importpath = "cloud.google.com/go/cloudtasks/apiv2beta2",
-    package = "google.cloud.tasks.v2beta2",
+    srcs = [":tasks_proto_with_info"],
+    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloudtasks/apiv2beta2;tasks",
    service_yaml = "cloudtasks_v2beta2.yaml",
    deps = [
        ":tasks_go_proto",
@ -147,7 +146,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-tasks-v2beta2-go",
    deps = [
        ":tasks_go_gapic",
-        ":tasks_go_gapic_srcjar-smoke-test.srcjar",
        ":tasks_go_gapic_srcjar-test.srcjar",
        ":tasks_go_proto",
    ],
--- a/google/cloud/tasks/v2beta3/BUILD.bazel
+++ b/google/cloud/tasks/v2beta3/BUILD.bazel
@ -123,10 +123,9 @@ go_proto_library(

 go_gapic_library(
    name = "tasks_go_gapic",
-    src = ":tasks_proto_with_info",
-    gapic_yaml = "cloudtasks_gapic.yaml",
-    importpath = "cloud.google.com/go/cloudtasks/apiv2beta3",
-    package = "google.cloud.tasks.v2beta3",
+    srcs = [":tasks_proto_with_info"],
+    grpc_service_config = "cloudtasks_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloudtasks/apiv2beta3;tasks",
    service_yaml = "cloudtasks_v2beta3.yaml",
    deps = [
        ":tasks_go_proto",
@ -147,7 +146,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-tasks-v2beta3-go",
    deps = [
        ":tasks_go_gapic",
-        ":tasks_go_gapic_srcjar-smoke-test.srcjar",
        ":tasks_go_gapic_srcjar-test.srcjar",
        ":tasks_go_proto",
    ],
--- a/google/cloud/texttospeech/v1/BUILD.bazel
+++ b/google/cloud/texttospeech/v1/BUILD.bazel
@ -108,10 +108,9 @@ go_proto_library(

 go_gapic_library(
    name = "texttospeech_go_gapic",
-    src = ":texttospeech_proto_with_info",
-    gapic_yaml = "texttospeech_gapic.yaml",
-    importpath = "cloud.google.com/go/texttospeech/apiv1",
-    package = "google.cloud.texttospeech.v1",
+    srcs = [":texttospeech_proto_with_info"],
+    grpc_service_config = "texttospeech_grpc_service_config.json",
+    importpath = "cloud.google.com/go/texttospeech/apiv1;texttospeech",
    service_yaml = "texttospeech_v1.yaml",
    deps = [
        ":texttospeech_go_proto",
@ -130,7 +129,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-texttospeech-v1-go",
    deps = [
        ":texttospeech_go_gapic",
-        ":texttospeech_go_gapic_srcjar-smoke-test.srcjar",
        ":texttospeech_go_gapic_srcjar-test.srcjar",
        ":texttospeech_go_proto",
    ],
--- a/google/cloud/texttospeech/v1beta1/BUILD.bazel
+++ b/google/cloud/texttospeech/v1beta1/BUILD.bazel
@ -108,10 +108,9 @@ go_proto_library(

 go_gapic_library(
    name = "texttospeech_go_gapic",
-    src = ":texttospeech_proto_with_info",
-    gapic_yaml = "texttospeech_gapic.yaml",
-    importpath = "cloud.google.com/go/texttospeech/apiv1beta1",
-    package = "google.cloud.texttospeech.v1beta1",
+    srcs = [":texttospeech_proto_with_info"],
+    grpc_service_config = "texttospeech_grpc_service_config.json",
+    importpath = "cloud.google.com/go/texttospeech/apiv1beta1;texttospeech",
    service_yaml = "texttospeech_v1beta1.yaml",
    deps = [
        ":texttospeech_go_proto",
@ -130,7 +129,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-texttospeech-v1beta1-go",
    deps = [
        ":texttospeech_go_gapic",
-        ":texttospeech_go_gapic_srcjar-smoke-test.srcjar",
        ":texttospeech_go_gapic_srcjar-test.srcjar",
        ":texttospeech_go_proto",
    ],
--- a/google/cloud/translate/v3/BUILD.bazel
+++ b/google/cloud/translate/v3/BUILD.bazel
@ -112,16 +112,16 @@ go_proto_library(

 go_gapic_library(
    name = "translation_go_gapic",
-    src = ":translation_proto_with_info",
-    gapic_yaml = "translate_gapic.yaml",
-    importpath = "cloud.google.com/go/translate/apiv3",
-    package = "google.cloud.translation.v3",
+    srcs = [":translation_proto_with_info"],
+    grpc_service_config = "translate_grpc_service_config.json",
+    importpath = "cloud.google.com/go/translate/apiv3;translate",
    service_yaml = "translate_v3.yaml",
    deps = [
        ":translation_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -137,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-translation-v3-go",
    deps = [
        ":translation_go_gapic",
-        ":translation_go_gapic_srcjar-smoke-test.srcjar",
        ":translation_go_gapic_srcjar-test.srcjar",
        ":translation_go_proto",
    ],
--- a/google/cloud/translate/v3beta1/BUILD.bazel
+++ b/google/cloud/translate/v3beta1/BUILD.bazel
@ -112,16 +112,16 @@ go_proto_library(

 go_gapic_library(
    name = "translation_go_gapic",
-    src = ":translation_proto_with_info",
-    gapic_yaml = "translate_gapic.yaml",
-    importpath = "cloud.google.com/go/translate/apiv3beta1",
-    package = "google.cloud.translation.v3beta1",
+    srcs = [":translation_proto_with_info"],
+    grpc_service_config = "translate_grpc_service_config.json",
+    importpath = "cloud.google.com/go/translate/apiv3beta1;translate",
    service_yaml = "translate_v3beta1.yaml",
    deps = [
        ":translation_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -137,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-translation-v3beta1-go",
    deps = [
        ":translation_go_gapic",
-        ":translation_go_gapic_srcjar-smoke-test.srcjar",
        ":translation_go_gapic_srcjar-test.srcjar",
        ":translation_go_proto",
    ],
--- a/google/cloud/videointelligence/v1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "videointelligence_go_gapic",
-    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
-    importpath = "cloud.google.com/go/videointelligence/apiv1",
-    package = "google.cloud.videointelligence.v1",
+    srcs = [":videointelligence_proto_with_info"],
+    grpc_service_config = "videointelligence_grpc_service_config.json",
+    importpath = "cloud.google.com/go/videointelligence/apiv1;videointelligence",
    service_yaml = "videointelligence_v1.yaml",
    deps = [
        ":videointelligence_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -140,7 +140,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-videointelligence-v1-go",
    deps = [
        ":videointelligence_go_gapic",
-        ":videointelligence_go_gapic_srcjar-smoke-test.srcjar",
        ":videointelligence_go_gapic_srcjar-test.srcjar",
        ":videointelligence_go_proto",
    ],
--- a/google/cloud/videointelligence/v1beta2/BUILD.bazel
+++ b/google/cloud/videointelligence/v1beta2/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "videointelligence_go_gapic",
-    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
-    importpath = "cloud.google.com/go/videointelligence/apiv1beta2",
-    package = "google.cloud.videointelligence.v1beta2",
+    srcs = [":videointelligence_proto_with_info"],
+    grpc_service_config = "videointelligence_grpc_service_config.json",
+    importpath = "cloud.google.com/go/videointelligence/apiv1beta2;videointelligence",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1beta2.yaml",
    deps = [
        ":videointelligence_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -140,7 +140,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-videointelligence-v1beta2-go",
    deps = [
        ":videointelligence_go_gapic",
-        ":videointelligence_go_gapic_srcjar-smoke-test.srcjar",
        ":videointelligence_go_gapic_srcjar-test.srcjar",
        ":videointelligence_go_proto",
    ],
--- a/google/cloud/videointelligence/v1p1beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p1beta1/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "videointelligence_go_gapic",
-    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
-    importpath = "cloud.google.com/go/videointelligence/apiv1p1beta1",
-    package = "google.cloud.videointelligence.v1p1beta1",
+    srcs = [":videointelligence_proto_with_info"],
+    grpc_service_config = "videointelligence_grpc_service_config.json",
+    importpath = "cloud.google.com/go/videointelligence/apiv1p1beta1;videointelligence",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p1beta1.yaml",
    deps = [
        ":videointelligence_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -140,7 +140,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-videointelligence-v1p1beta1-go",
    deps = [
        ":videointelligence_go_gapic",
-        ":videointelligence_go_gapic_srcjar-smoke-test.srcjar",
        ":videointelligence_go_gapic_srcjar-test.srcjar",
        ":videointelligence_go_proto",
    ],
--- a/google/cloud/videointelligence/v1p2beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p2beta1/BUILD.bazel
@ -114,16 +114,16 @@ go_proto_library(

 go_gapic_library(
    name = "videointelligence_go_gapic",
-    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
-    importpath = "cloud.google.com/go/videointelligence/apiv1p2beta1",
-    package = "google.cloud.videointelligence.v1p2beta1",
+    srcs = [":videointelligence_proto_with_info"],
+    grpc_service_config = "videointelligence_grpc_service_config.json",
+    importpath = "cloud.google.com/go/videointelligence/apiv1p2beta1;videointelligence",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p2beta1.yaml",
    deps = [
        ":videointelligence_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -140,7 +140,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-videointelligence-v1p2beta1-go",
    deps = [
        ":videointelligence_go_gapic",
-        ":videointelligence_go_gapic_srcjar-smoke-test.srcjar",
        ":videointelligence_go_gapic_srcjar-test.srcjar",
        ":videointelligence_go_proto",
    ],
--- a/google/cloud/videointelligence/v1p3beta1/BUILD.bazel
+++ b/google/cloud/videointelligence/v1p3beta1/BUILD.bazel
@ -115,16 +115,16 @@ go_proto_library(

 go_gapic_library(
    name = "videointelligence_go_gapic",
-    src = ":videointelligence_proto_with_info",
-    gapic_yaml = "videointelligence_gapic.yaml",
-    importpath = "cloud.google.com/go/videointelligence/apiv1p3beta1",
-    package = "google.cloud.videointelligence.v1p3beta1",
+    srcs = [":videointelligence_proto_with_info"],
+    grpc_service_config = "videointelligence_grpc_service_config.json",
+    importpath = "cloud.google.com/go/videointelligence/apiv1p3beta1;videointelligence",
    service_yaml = "//google/cloud/videointelligence:videointelligence_v1p3beta1.yaml",
    deps = [
        ":videointelligence_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -141,7 +141,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-videointelligence-v1p3beta1-go",
    deps = [
        ":videointelligence_go_gapic",
-        ":videointelligence_go_gapic_srcjar-smoke-test.srcjar",
        ":videointelligence_go_gapic_srcjar-test.srcjar",
        ":videointelligence_go_proto",
    ],
--- a/google/cloud/vision/v1/BUILD.bazel
+++ b/google/cloud/vision/v1/BUILD.bazel
@ -126,16 +126,16 @@ go_proto_library(

 go_gapic_library(
    name = "vision_go_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
-    importpath = "cloud.google.com/go/vision/apiv1",
-    package = "google.cloud.vision.v1",
+    srcs = [":vision_proto_with_info"],
+    grpc_service_config = "vision_grpc_service_config.json",
+    importpath = "cloud.google.com/go/vision/apiv1;vision",
    service_yaml = "vision_v1.yaml",
    deps = [
        ":vision_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -151,7 +151,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-vision-v1-go",
    deps = [
        ":vision_go_gapic",
-        ":vision_go_gapic_srcjar-smoke-test.srcjar",
        ":vision_go_gapic_srcjar-test.srcjar",
        ":vision_go_proto",
    ],
--- a/google/cloud/vision/v1p1beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p1beta1/BUILD.bazel
@ -117,10 +117,9 @@ go_proto_library(

 go_gapic_library(
    name = "vision_go_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
-    importpath = "cloud.google.com/go/vision/apiv1p1beta1",
-    package = "google.cloud.vision.v1p1beta1",
+    srcs = [":vision_proto_with_info"],
+    grpc_service_config = "vision_grpc_service_config.json",
+    importpath = "cloud.google.com/go/vision/apiv1p1beta1;vision",
    service_yaml = "//google/cloud/vision:vision_v1p1beta1.yaml",
    deps = [
        ":vision_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-vision-v1p1beta1-go",
    deps = [
        ":vision_go_gapic",
-        ":vision_go_gapic_srcjar-smoke-test.srcjar",
        ":vision_go_gapic_srcjar-test.srcjar",
        ":vision_go_proto",
    ],
--- a/google/cloud/vision/v1p2beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p2beta1/BUILD.bazel
@ -120,16 +120,16 @@ go_proto_library(

 go_gapic_library(
    name = "vision_go_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
-    importpath = "cloud.google.com/go/vision/apiv1p2beta1",
-    package = "google.cloud.vision.v1p2beta1",
+    srcs = [":vision_proto_with_info"],
+    grpc_service_config = "vision_grpc_service_config.json",
+    importpath = "cloud.google.com/go/vision/apiv1p2beta1;vision",
    service_yaml = "//google/cloud/vision:vision_v1p2beta1.yaml",
    deps = [
        ":vision_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -145,7 +145,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-vision-v1p2beta1-go",
    deps = [
        ":vision_go_gapic",
-        ":vision_go_gapic_srcjar-smoke-test.srcjar",
        ":vision_go_gapic_srcjar-test.srcjar",
        ":vision_go_proto",
    ],
--- a/google/cloud/vision/v1p3beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p3beta1/BUILD.bazel
@ -126,16 +126,16 @@ go_proto_library(

 go_gapic_library(
    name = "vision_go_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
-    importpath = "cloud.google.com/go/vision/apiv1p3beta1",
-    package = "google.cloud.vision.v1p3beta1",
+    srcs = [":vision_proto_with_info"],
+    grpc_service_config = "vision_grpc_service_config.json",
+    importpath = "cloud.google.com/go/vision/apiv1p3beta1;vision",
    service_yaml = "//google/cloud/vision:vision_v1p3beta1.yaml",
    deps = [
        ":vision_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -151,7 +151,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-vision-v1p3beta1-go",
    deps = [
        ":vision_go_gapic",
-        ":vision_go_gapic_srcjar-smoke-test.srcjar",
        ":vision_go_gapic_srcjar-test.srcjar",
        ":vision_go_proto",
    ],
--- a/google/cloud/vision/v1p4beta1/BUILD.bazel
+++ b/google/cloud/vision/v1p4beta1/BUILD.bazel
@ -127,16 +127,16 @@ go_proto_library(

 go_gapic_library(
    name = "vision_go_gapic",
-    src = ":vision_proto_with_info",
-    gapic_yaml = "vision_gapic.yaml",
-    importpath = "cloud.google.com/go/vision/apiv1p4beta1",
-    package = "google.cloud.vision.v1p4beta1",
+    srcs = [":vision_proto_with_info"],
+    grpc_service_config = "vision_grpc_service_config.json",
+    importpath = "cloud.google.com/go/vision/apiv1p4beta1;vision",
    service_yaml = "//google/cloud/vision:vision_v1p4beta1.yaml",
    deps = [
        ":vision_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -152,7 +152,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-vision-v1p4beta1-go",
    deps = [
        ":vision_go_gapic",
-        ":vision_go_gapic_srcjar-smoke-test.srcjar",
        ":vision_go_gapic_srcjar-test.srcjar",
        ":vision_go_proto",
    ],
--- a/google/cloud/webrisk/v1/BUILD.bazel
+++ b/google/cloud/webrisk/v1/BUILD.bazel
@ -110,10 +110,9 @@ go_proto_library(

 go_gapic_library(
    name = "webrisk_go_gapic",
-    src = ":webrisk_proto_with_info",
-    gapic_yaml = "webrisk_gapic.yaml",
-    importpath = "cloud.google.com/go/webrisk/apiv1",
-    package = "google.cloud.webrisk.v1",
+    srcs = [":webrisk_proto_with_info"],
+    grpc_service_config = "webrisk_grpc_service_config.json",
+    importpath = "cloud.google.com/go/webrisk/apiv1;webrisk",
    service_yaml = "webrisk_v1.yaml",
    deps = [
        ":webrisk_go_proto",
@ -132,7 +131,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-webrisk-v1-go",
    deps = [
        ":webrisk_go_gapic",
-        ":webrisk_go_gapic_srcjar-smoke-test.srcjar",
        ":webrisk_go_gapic_srcjar-test.srcjar",
        ":webrisk_go_proto",
    ],
--- a/google/cloud/webrisk/v1beta1/BUILD.bazel
+++ b/google/cloud/webrisk/v1beta1/BUILD.bazel
@ -109,10 +109,9 @@ go_proto_library(

 go_gapic_library(
    name = "webrisk_go_gapic",
-    src = ":webrisk_proto_with_info",
-    gapic_yaml = "webrisk_gapic.yaml",
-    importpath = "cloud.google.com/go/webrisk/apiv1beta1",
-    package = "google.cloud.webrisk.v1beta1",
+    srcs = [":webrisk_proto_with_info"],
+    grpc_service_config = "webrisk_grpc_service_config.json",
+    importpath = "cloud.google.com/go/webrisk/apiv1beta1;webrisk",
    service_yaml = "webrisk_v1beta1.yaml",
    deps = [
        ":webrisk_go_proto",
@ -131,7 +130,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-webrisk-v1beta1-go",
    deps = [
        ":webrisk_go_gapic",
-        ":webrisk_go_gapic_srcjar-smoke-test.srcjar",
        ":webrisk_go_gapic_srcjar-test.srcjar",
        ":webrisk_go_proto",
    ],
--- a/google/cloud/websecurityscanner/v1alpha/BUILD.bazel
+++ b/google/cloud/websecurityscanner/v1alpha/BUILD.bazel
@ -118,10 +118,9 @@ go_proto_library(

 go_gapic_library(
    name = "websecurityscanner_go_gapic",
-    src = ":websecurityscanner_proto_with_info",
-    gapic_yaml = "websecurityscanner_gapic.yaml",
-    importpath = "cloud.google.com/go/cloud/websecurityscanner/apiv1alpha",
-    package = "google.cloud.websecurityscanner.v1alpha",
+    srcs = [":websecurityscanner_proto_with_info"],
+    grpc_service_config = "websecurityscanner_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloud/websecurityscanner/apiv1alpha;websecurityscanner",
    service_yaml = "websecurityscanner_v1alpha.yaml",
    deps = [
        ":websecurityscanner_go_proto",
@ -140,7 +139,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-websecurityscanner-v1alpha-go",
    deps = [
        ":websecurityscanner_go_gapic",
-        ":websecurityscanner_go_gapic_srcjar-smoke-test.srcjar",
        ":websecurityscanner_go_gapic_srcjar-test.srcjar",
        ":websecurityscanner_go_proto",
    ],
--- a/google/cloud/websecurityscanner/v1beta/BUILD.bazel
+++ b/google/cloud/websecurityscanner/v1beta/BUILD.bazel
@ -121,10 +121,9 @@ go_proto_library(

 go_gapic_library(
    name = "websecurityscanner_go_gapic",
-    src = ":websecurityscanner_proto_with_info",
-    gapic_yaml = "websecurityscanner_gapic.yaml",
-    importpath = "cloud.google.com/go/websecurityscanner/apiv1beta",
-    package = "google.cloud.websecurityscanner.v1beta",
+    srcs = [":websecurityscanner_proto_with_info"],
+    grpc_service_config = "websecurityscanner_grpc_service_config.json",
+    importpath = "cloud.google.com/go/websecurityscanner/apiv1beta;websecurityscanner",
    service_yaml = "websecurityscanner_v1beta.yaml",
    deps = [
        ":websecurityscanner_go_proto",
@ -143,7 +142,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-websecurityscanner-v1beta-go",
    deps = [
        ":websecurityscanner_go_gapic",
-        ":websecurityscanner_go_gapic_srcjar-smoke-test.srcjar",
        ":websecurityscanner_go_gapic_srcjar-test.srcjar",
        ":websecurityscanner_go_proto",
    ],
--- a/google/container/v1/BUILD.bazel
+++ b/google/container/v1/BUILD.bazel
@ -110,10 +110,9 @@ go_proto_library(

 go_gapic_library(
    name = "container_go_gapic",
-    src = ":container_proto_with_info",
-    gapic_yaml = "container_gapic.yaml",
-    importpath = "cloud.google.com/go/container/apiv1",
-    package = "google.container.v1",
+    srcs = [":container_proto_with_info"],
+    grpc_service_config = "container_grpc_service_config.json",
+    importpath = "cloud.google.com/go/container/apiv1;container",
    service_yaml = "container_v1.yaml",
    deps = [
        ":container_go_proto",
@ -132,7 +131,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-container-v1-go",
    deps = [
        ":container_go_gapic",
-        ":container_go_gapic_srcjar-smoke-test.srcjar",
        ":container_go_gapic_srcjar-test.srcjar",
        ":container_go_proto",
    ],
--- a/google/container/v1beta1/BUILD.bazel
+++ b/google/container/v1beta1/BUILD.bazel
@ -110,10 +110,9 @@ go_proto_library(

 go_gapic_library(
    name = "container_go_gapic",
-    src = ":container_proto_with_info",
-    gapic_yaml = "container_gapic.yaml",
-    importpath = "cloud.google.com/go/container/apiv1beta1",
-    package = "google.container.v1beta1",
+    srcs = [":container_proto_with_info"],
+    grpc_service_config = "container_grpc_service_config.json",
+    importpath = "cloud.google.com/go/container/apiv1beta1;container",
    service_yaml = "container_v1beta1.yaml",
    deps = [
        ":container_go_proto",
@ -132,7 +131,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-container-v1beta1-go",
    deps = [
        ":container_go_gapic",
-        ":container_go_gapic_srcjar-smoke-test.srcjar",
        ":container_go_gapic_srcjar-test.srcjar",
        ":container_go_proto",
    ],
--- a/google/datastore/admin/v1/BUILD.bazel
+++ b/google/datastore/admin/v1/BUILD.bazel
@ -112,16 +112,16 @@ go_proto_library(

 go_gapic_library(
    name = "admin_go_gapic",
-    src = ":admin_proto_with_info",
-    gapic_yaml = "datastore_admin_gapic.yaml",
-    importpath = "cloud.google.com/go/datastore/admin/apiv1",
-    package = "google.datastore.admin.v1",
+    srcs = [":admin_proto_with_info"],
+    grpc_service_config = "datastore_admin_grpc_service_config.json",
+    importpath = "cloud.google.com/go/datastore/admin/apiv1;admin",
    service_yaml = "datastore_admin_v1.yaml",
    deps = [
        ":admin_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
    ],
 )

@ -137,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-datastore-admin-v1-go",
    deps = [
        ":admin_go_gapic",
-        ":admin_go_gapic_srcjar-smoke-test.srcjar",
        ":admin_go_gapic_srcjar-test.srcjar",
        ":admin_go_proto",
    ],
--- a/google/datastore/v1/BUILD.bazel
+++ b/google/datastore/v1/BUILD.bazel
@ -115,10 +115,9 @@ go_proto_library(

 go_gapic_library(
    name = "datastore_go_gapic",
-    src = ":datastore_proto_with_info",
-    gapic_yaml = "datastore_gapic.yaml",
-    importpath = "cloud.google.com/go/datastore/apiv1",
-    package = "google.datastore.v1",
+    srcs = [":datastore_proto_with_info"],
+    grpc_service_config = "datastore_grpc_service_config.json",
+    importpath = "cloud.google.com/go/datastore/apiv1;datastore",
    service_yaml = "datastore_v1.yaml",
    deps = [
        ":datastore_go_proto",
@ -137,7 +136,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-datastore-v1-go",
    deps = [
        ":datastore_go_gapic",
-        ":datastore_go_gapic_srcjar-smoke-test.srcjar",
        ":datastore_go_gapic_srcjar-test.srcjar",
        ":datastore_go_proto",
    ],
--- a/google/devtools/build/v1/BUILD.bazel
+++ b/google/devtools/build/v1/BUILD.bazel
@ -115,10 +115,9 @@ go_proto_library(

 go_gapic_library(
    name = "build_go_gapic",
-    src = ":build_proto_with_info",
-    gapic_yaml = "buildeventservice_gapic.yaml",
-    importpath = "cloud.google.com/go/devtools/build/apiv1",
-    package = "google.devtools.build.v1",
+    srcs = [":build_proto_with_info"],
+    grpc_service_config = "buildeventservice_grpc_service_config.json",
+    importpath = "cloud.google.com/go/devtools/build/apiv1;build",
    service_yaml = "buildeventservice_v1.yaml",
    deps = [
        ":build_go_proto",
@ -138,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-build-v1-go",
    deps = [
        ":build_go_gapic",
-        ":build_go_gapic_srcjar-smoke-test.srcjar",
        ":build_go_gapic_srcjar-test.srcjar",
        ":build_go_proto",
    ],
--- a/google/devtools/cloudbuild/v1/BUILD.bazel
+++ b/google/devtools/cloudbuild/v1/BUILD.bazel
@ -113,16 +113,16 @@ go_proto_library(

 go_gapic_library(
    name = "cloudbuild_go_gapic",
-    src = ":cloudbuild_proto_with_info",
-    gapic_yaml = "cloudbuild_gapic.yaml",
-    importpath = "cloud.google.com/go/cloudbuild/apiv1",
-    package = "google.devtools.cloudbuild.v1",
+    srcs = [":cloudbuild_proto_with_info"],
+    grpc_service_config = "cloudbuild_grpc_service_config.json",
+    importpath = "cloud.google.com/go/cloudbuild/apiv1;cloudbuild",
    service_yaml = "cloudbuild_v1.yaml",
    deps = [
        ":cloudbuild_go_proto",
        "//google/longrunning:longrunning_go_gapic",
        "//google/longrunning:longrunning_go_proto",
        "@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",
    ],
 )
@ -139,7 +139,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-cloudbuild-v1-go",
    deps = [
        ":cloudbuild_go_gapic",
-        ":cloudbuild_go_gapic_srcjar-smoke-test.srcjar",
        ":cloudbuild_go_gapic_srcjar-test.srcjar",
        ":cloudbuild_go_proto",
    ],
--- a/google/devtools/clouddebugger/v2/BUILD.bazel
+++ b/google/devtools/clouddebugger/v2/BUILD.bazel
@ -116,10 +116,9 @@ go_proto_library(

 go_gapic_library(
    name = "clouddebugger_go_gapic",
-    src = ":clouddebugger_proto_with_info",
-    gapic_yaml = "clouddebugger_gapic.yaml",
-    importpath = "cloud.google.com/go/debugger/apiv2",
-    package = "google.devtools.clouddebugger.v2",
+    srcs = [":clouddebugger_proto_with_info"],
+    grpc_service_config = "clouddebugger_grpc_service_config.json",
+    importpath = "cloud.google.com/go/debugger/apiv2;clouddebugger",
    service_yaml = "clouddebugger_v2.yaml",
    deps = [
        ":clouddebugger_go_proto",
@ -138,7 +137,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-clouddebugger-v2-go",
    deps = [
        ":clouddebugger_go_gapic",
-        ":clouddebugger_go_gapic_srcjar-smoke-test.srcjar",
        ":clouddebugger_go_gapic_srcjar-test.srcjar",
        ":clouddebugger_go_proto",
    ],
--- a/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel
+++ b/google/devtools/clouderrorreporting/v1beta1/BUILD.bazel
@ -116,10 +116,9 @@ go_proto_library(

 go_gapic_library(
    name = "clouderrorreporting_go_gapic",
-    src = ":clouderrorreporting_proto_with_info",
-    gapic_yaml = "errorreporting_gapic.yaml",
-    importpath = "cloud.google.com/go/errorreporting/apiv1beta1",
-    package = "google.devtools.clouderrorreporting.v1beta1",
+    srcs = [":clouderrorreporting_proto_with_info"],
+    grpc_service_config = "errorreporting_grpc_service_config.json",
+    importpath = "cloud.google.com/go/errorreporting/apiv1beta1;clouderrorreporting",
    service_yaml = "clouderrorreporting_v1beta1.yaml",
    deps = [
        ":clouderrorreporting_go_proto",
@ -139,7 +138,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-clouderrorreporting-v1beta1-go",
    deps = [
        ":clouderrorreporting_go_gapic",
-        ":clouderrorreporting_go_gapic_srcjar-smoke-test.srcjar",
        ":clouderrorreporting_go_gapic_srcjar-test.srcjar",
        ":clouderrorreporting_go_proto",
    ],
--- a/google/devtools/cloudtrace/v1/BUILD.bazel
+++ b/google/devtools/cloudtrace/v1/BUILD.bazel
@ -111,10 +111,9 @@ go_proto_library(

 go_gapic_library(
    name = "cloudtrace_go_gapic",
-    src = ":cloudtrace_proto_with_info",
-    gapic_yaml = "cloudtrace_gapic.yaml",
-    importpath = "cloud.google.com/go/trace/apiv1",
-    package = "google.devtools.cloudtrace.v1",
+    srcs = [":cloudtrace_proto_with_info"],
+    grpc_service_config = "cloudtrace_grpc_service_config.json",
+    importpath = "cloud.google.com/go/trace/apiv1;trace",
    service_yaml = "cloudtrace_v1.yaml",
    deps = [
        ":cloudtrace_go_proto",
@ -133,7 +132,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-cloudtrace-v1-go",
    deps = [
        ":cloudtrace_go_gapic",
-        ":cloudtrace_go_gapic_srcjar-smoke-test.srcjar",
        ":cloudtrace_go_gapic_srcjar-test.srcjar",
        ":cloudtrace_go_proto",
    ],
--- a/google/devtools/cloudtrace/v2/BUILD.bazel
+++ b/google/devtools/cloudtrace/v2/BUILD.bazel
@ -115,10 +115,9 @@ go_proto_library(

 go_gapic_library(
    name = "cloudtrace_go_gapic",
-    src = ":cloudtrace_proto_with_info",
-    gapic_yaml = "cloudtrace_gapic.yaml",
-    importpath = "cloud.google.com/go/trace/apiv2",
-    package = "google.devtools.cloudtrace.v2",
+    srcs = [":cloudtrace_proto_with_info"],
+    grpc_service_config = "cloudtrace_grpc_service_config.json",
+    importpath = "cloud.google.com/go/trace/apiv2;trace",
    service_yaml = "cloudtrace_v2.yaml",
    deps = [
        ":cloudtrace_go_proto",
@ -137,7 +136,6 @@ go_gapic_assembly_pkg(
    name = "gapi-cloud-devtools-cloudtrace-v2-go",
    deps = [
        ":cloudtrace_go_gapic",
-        ":cloudtrace_go_gapic_srcjar-smoke-test.srcjar",
        ":cloudtrace_go_gapic_srcjar-test.srcjar",
        ":cloudtrace_go_proto",
    ],
--- a/Show More
+++ b/Show More