chore(bazel): remove all no-op go_test targets

PiperOrigin-RevId: 535010591
2 years ago · d0da39a25e
parent 73dca85d99
commit d0da39a25e
386 changed files with 189 additions and 3095 deletions
--- a/gapic/metadata/BUILD.bazel
+++ b/gapic/metadata/BUILD.bazel
@ -105,11 +105,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/actions/sdk/v2/conversation/BUILD.bazel
+++ b/google/actions/sdk/v2/conversation/BUILD.bazel
@ -23,8 +23,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/conversation/prompt/BUILD.bazel
+++ b/google/actions/sdk/v2/conversation/prompt/BUILD.bazel
@ -23,8 +23,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/conversation/prompt/content/BUILD.bazel
+++ b/google/actions/sdk/v2/conversation/prompt/content/BUILD.bazel
@ -30,8 +30,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/interactionmodel/BUILD.bazel
+++ b/google/actions/sdk/v2/interactionmodel/BUILD.bazel
@ -31,8 +31,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/interactionmodel/prompt/BUILD.bazel
+++ b/google/actions/sdk/v2/interactionmodel/prompt/BUILD.bazel
@ -25,8 +25,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/interactionmodel/prompt/content/BUILD.bazel
+++ b/google/actions/sdk/v2/interactionmodel/prompt/content/BUILD.bazel
@ -32,8 +32,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/sdk/v2/interactionmodel/type/BUILD.bazel
+++ b/google/actions/sdk/v2/interactionmodel/type/BUILD.bazel
@ -26,8 +26,3 @@ proto_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
--- a/google/actions/type/BUILD.bazel
+++ b/google/actions/type/BUILD.bazel
@ -6,7 +6,6 @@ package(default_visibility = ["//visibility:public"])
 ##############################################################################
 # Common
 ##############################################################################
-load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")

 proto_library(
    name = "date_range_proto",
@ -57,7 +56,6 @@ go_proto_library(
    deps = ["//google/type:date_go_proto"],
 )

-
 go_proto_library(
    name = "datetime_range_go_proto",
    importpath = "google.golang.org/genproto/googleapis/type/datetime_range",
@ -107,7 +105,6 @@ php_proto_library(
 # Node.js
 ##############################################################################

-
 ##############################################################################
 # Ruby
 ##############################################################################
--- a/google/ads/admob/v1/BUILD.bazel
+++ b/google/ads/admob/v1/BUILD.bazel
@ -110,7 +110,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -137,13 +136,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "admob_go_gapic_test",
-    srcs = [":admob_go_gapic_srcjar_test"],
-    embed = [":admob_go_gapic"],
-    importpath = "google.golang.org/google/ads/admob/v1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-ads-admob-v1-go",
--- a/google/ai/generativelanguage/v1beta2/BUILD.bazel
+++ b/google/ai/generativelanguage/v1beta2/BUILD.bazel
@ -118,7 +118,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -146,13 +145,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "generativelanguage_go_gapic_test",
-    srcs = [":generativelanguage_go_gapic_srcjar_test"],
-    embed = [":generativelanguage_go_gapic"],
-    importpath = "google.golang.org/google/ai/generativelanguage/v1beta2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-ai-generativelanguage-v1beta2-go",
--- a/google/analytics/admin/v1alpha/BUILD.bazel
+++ b/google/analytics/admin/v1alpha/BUILD.bazel
@ -120,7 +120,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -149,13 +148,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "admin_go_gapic_test",
-    srcs = [":admin_go_gapic_srcjar_test"],
-    embed = [":admin_go_gapic"],
-    importpath = "cloud.google.com/go/analytics/admin/apiv1alpha",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-analytics-admin-v1alpha-go",
--- a/google/analytics/admin/v1beta/BUILD.bazel
+++ b/google/analytics/admin/v1beta/BUILD.bazel
@ -115,7 +115,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -143,13 +142,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "admin_go_gapic_test",
-    srcs = [":admin_go_gapic_srcjar_test"],
-    embed = [":admin_go_gapic"],
-    importpath = "google.golang.org/google/analytics/admin/v1beta",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-analytics-admin-v1beta-go",
@ -227,10 +219,10 @@ php_gapic_library(
    name = "admin_php_gapic",
    srcs = [":admin_proto_with_info"],
    grpc_service_config = "admin_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "analyticsadmin_v1beta.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":admin_php_grpc",
        ":admin_php_proto",
--- a/google/analytics/data/v1alpha/BUILD.bazel
+++ b/google/analytics/data/v1alpha/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -145,13 +144,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "data_go_gapic_test",
-    srcs = [":data_go_gapic_srcjar_test"],
-    embed = [":data_go_gapic"],
-    importpath = "google.golang.org/google/analytics/data/v1alpha",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-analytics-data-v1alpha-go",
--- a/google/analytics/data/v1beta/BUILD.bazel
+++ b/google/analytics/data/v1beta/BUILD.bazel
@ -110,7 +110,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -137,13 +136,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "data_go_gapic_test",
-    srcs = [":data_go_gapic_srcjar_test"],
-    embed = [":data_go_gapic"],
-    importpath = "google.golang.org/google/analytics/data/v1beta",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-analytics-data-v1beta-go",
@ -221,10 +213,10 @@ php_gapic_library(
    name = "data_php_gapic",
    srcs = [":data_proto_with_info"],
    grpc_service_config = "analytics_data_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "analyticsdata_v1beta.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":data_php_grpc",
        ":data_php_proto",
--- a/google/api/apikeys/v2/BUILD.bazel
+++ b/google/api/apikeys/v2/BUILD.bazel
@ -114,7 +114,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -146,13 +145,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "apikeys_go_gapic_test",
-    srcs = [":apikeys_go_gapic_srcjar_test"],
-    embed = [":apikeys_go_gapic"],
-    importpath = "cloud.google.com/go/api/apikeys/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-apikeys-v2-go",
@ -234,10 +226,10 @@ php_gapic_library(
    name = "apikeys_php_gapic",
    srcs = [":apikeys_proto_with_info"],
    grpc_service_config = "apikeys_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "apikeys_v2.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":apikeys_php_grpc",
        ":apikeys_php_proto",
--- a/google/api/servicecontrol/v1/BUILD.bazel
+++ b/google/api/servicecontrol/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -150,8 +149,8 @@ go_gapic_library(
    srcs = [":servicecontrol_proto_with_info"],
    grpc_service_config = "servicecontrol_grpc_service_config.json",
    importpath = "cloud.google.com/go/servicecontrol/apiv1;servicecontrol",
-    release_level = "ga",
    metadata = True,
+    release_level = "ga",
    rest_numeric_enums = True,
    service_yaml = "servicecontrol.yaml",
    transport = "grpc+rest",
@ -161,13 +160,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "servicecontrol_go_gapic_test",
-    srcs = [":servicecontrol_go_gapic_srcjar_test"],
-    embed = [":servicecontrol_go_gapic"],
-    importpath = "cloud.google.com/go/api/servicecontrol/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-servicecontrol-v1-go",
--- a/google/api/servicecontrol/v2/BUILD.bazel
+++ b/google/api/servicecontrol/v2/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -147,13 +146,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "servicecontrol_go_gapic_test",
-    srcs = [":servicecontrol_go_gapic_srcjar_test"],
-    embed = [":servicecontrol_go_gapic"],
-    importpath = "cloud.google.com/go/api/servicecontrol/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-servicecontrol-v2-go",
--- a/google/api/servicemanagement/v1/BUILD.bazel
+++ b/google/api/servicemanagement/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -39,7 +38,6 @@ load(
    "proto_library_with_info",
    "py_gapic_assembly_pkg",
    "py_gapic_library",
-    "py_test",
    "ruby_cloud_gapic_library",
    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
@ -144,8 +142,8 @@ go_gapic_library(
    srcs = [":servicemanagement_proto_with_info"],
    grpc_service_config = "servicemanagement_grpc_service_config.json",
    importpath = "cloud.google.com/go/servicemanagement/apiv1;servicemanagement",
-    release_level = "ga",
    metadata = True,
+    release_level = "ga",
    rest_numeric_enums = True,
    service_yaml = "servicemanagement_v1.yaml",
    transport = "grpc+rest",
@ -159,13 +157,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "servicemanagement_go_gapic_test",
-    srcs = [":servicemanagement_go_gapic_srcjar_test"],
-    embed = [":servicemanagement_go_gapic"],
-    importpath = "cloud.google.com/go/api/servicemanagement/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-servicemanagement-v1-go",
--- a/google/api/serviceusage/v1/BUILD.bazel
+++ b/google/api/serviceusage/v1/BUILD.bazel
@ -131,7 +131,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -152,33 +151,26 @@ go_gapic_library(
    srcs = [":serviceusage_proto_with_info"],
    grpc_service_config = "serviceusage_grpc_service_config.json",
    importpath = "cloud.google.com/go/serviceusage/apiv1;serviceusage",
+    metadata = True,
    release_level = "ga",
    service_yaml = "serviceusage_v1.yaml",
-    metadata = True,
    transport = "grpc+rest",
    deps = [
        ":serviceusage_go_proto",
        "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go_longrunning//autogen:go_default_library",
        "@com_google_cloud_go_longrunning//:go_default_library",
+        "@com_google_cloud_go_longrunning//autogen:go_default_library",
    ],
 )

-go_test(
-    name = "serviceusage_go_gapic_test",
-    srcs = [":serviceusage_go_gapic_srcjar_test"],
-    embed = [":serviceusage_go_gapic"],
-    importpath = "cloud.google.com/go/api/serviceusage/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-serviceusage-v1-go",
    deps = [
        ":serviceusage_go_gapic",
+        ":serviceusage_go_gapic_srcjar-metadata.srcjar",
        ":serviceusage_go_gapic_srcjar-snippets.srcjar",
        ":serviceusage_go_gapic_srcjar-test.srcjar",
-        ":serviceusage_go_gapic_srcjar-metadata.srcjar",
        ":serviceusage_go_proto",
    ],
 )
--- a/google/api/serviceusage/v1beta1/BUILD.bazel
+++ b/google/api/serviceusage/v1beta1/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -157,13 +156,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "serviceusage_go_gapic_test",
-    srcs = [":serviceusage_go_gapic_srcjar_test"],
-    embed = [":serviceusage_go_gapic"],
-    importpath = "cloud.google.com/go/api/serviceusage/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-api-serviceusage-v1beta1-go",
--- a/google/appengine/legacy/BUILD.bazel
+++ b/google/appengine/legacy/BUILD.bazel
@ -108,12 +108,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-

 ##############################################################################
 # Ruby
--- a/google/appengine/logging/v1/BUILD.bazel
+++ b/google/appengine/logging/v1/BUILD.bazel
@ -110,11 +110,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/appengine/v1/BUILD.bazel
+++ b/google/appengine/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -169,8 +168,8 @@ go_gapic_library(
    srcs = [":appengine_proto_with_info"],
    grpc_service_config = "appengine_grpc_service_config.json",
    importpath = "cloud.google.com/go/appengine/apiv1;appengine",
-    release_level = "ga",
    metadata = True,
+    release_level = "ga",
    rest_numeric_enums = True,
    service_yaml = "appengine_v1.yaml",
    transport = "grpc+rest",
@ -183,13 +182,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "appengine_go_gapic_test",
-    srcs = [":appengine_go_gapic_srcjar_test"],
-    embed = [":appengine_go_gapic"],
-    importpath = "cloud.google.com/go/appengine/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-appengine-v1-go",
--- a/google/appengine/v1beta/BUILD.bazel
+++ b/google/appengine/v1beta/BUILD.bazel
@ -139,12 +139,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-

 ##############################################################################
 # Ruby
--- a/google/apps/alertcenter/v1beta1/BUILD.bazel
+++ b/google/apps/alertcenter/v1beta1/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -144,13 +143,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "alertcenter_go_gapic_test",
-    srcs = [":alertcenter_go_gapic_srcjar_test"],
-    embed = [":alertcenter_go_gapic"],
-    importpath = "google.golang.org/google/apps/alertcenter/v1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-apps-alertcenter-v1beta1-go",
--- a/google/apps/drive/activity/v2/BUILD.bazel
+++ b/google/apps/drive/activity/v2/BUILD.bazel
@ -114,7 +114,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -141,13 +140,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "activity_go_gapic_test",
-    srcs = [":activity_go_gapic_srcjar_test"],
-    embed = [":activity_go_gapic"],
-    importpath = "google.golang.org/google/apps/drive/activity/v2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-apps-drive-activity-v2-go",
--- a/google/apps/drive/labels/v2/BUILD.bazel
+++ b/google/apps/drive/labels/v2/BUILD.bazel
@ -119,7 +119,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -148,13 +147,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "labels_go_gapic_test",
-    srcs = [":labels_go_gapic_srcjar_test"],
-    embed = [":labels_go_gapic"],
-    importpath = "google.golang.org/google/apps/drive/labels/v2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-drive-labels-v2-go",
--- a/google/apps/drive/labels/v2beta/BUILD.bazel
+++ b/google/apps/drive/labels/v2beta/BUILD.bazel
@ -124,7 +124,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -153,13 +152,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "labels_go_gapic_test",
-    srcs = [":labels_go_gapic_srcjar_test"],
-    embed = [":labels_go_gapic"],
-    importpath = "google.golang.org/google/apps/drive/labels/v2beta",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-drive-labels-v2beta-go",
--- a/google/apps/market/v2/BUILD.bazel
+++ b/google/apps/market/v2/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -142,13 +141,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "marketplace_go_gapic_test",
-    srcs = [":marketplace_go_gapic_srcjar_test"],
-    embed = [":marketplace_go_gapic"],
-    importpath = "google.golang.org/ccc/hosted/marketplace/v2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-hosted-marketplace-v2-go",
--- a/google/area120/tables/v1alpha1/BUILD.bazel
+++ b/google/area120/tables/v1alpha1/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -144,13 +143,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "tables_go_gapic_test",
-    srcs = [":tables_go_gapic_srcjar_test"],
-    embed = [":tables_go_gapic"],
-    importpath = "google.golang.org/google/area120/tables/v1alpha1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-area120-tables-v1alpha1-go",
--- a/google/bigtable/admin/v2/BUILD.bazel
+++ b/google/bigtable/admin/v2/BUILD.bazel
@ -15,7 +15,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -155,13 +154,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "admin_go_gapic_test",
-    srcs = [":admin_go_gapic_srcjar_test"],
-    embed = [":admin_go_gapic"],
-    importpath = "cloud.google.com/go/bigtable/admin/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigtable-admin-v2-go",
--- a/google/bigtable/v2/BUILD.bazel
+++ b/google/bigtable/v2/BUILD.bazel
@ -15,7 +15,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -142,13 +141,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "bigtable_go_gapic_test",
-    srcs = [":bigtable_go_gapic_srcjar_test"],
-    embed = [":bigtable_go_gapic"],
-    importpath = "cloud.google.com/go/bigtable/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigtable-v2-go",
--- a/google/chat/logging/v1/BUILD.bazel
+++ b/google/chat/logging/v1/BUILD.bazel
@ -108,12 +108,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-

 ##############################################################################
 # Ruby
--- a/google/chromeos/moblab/v1beta1/BUILD.bazel
+++ b/google/chromeos/moblab/v1beta1/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -150,13 +149,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "moblab_go_gapic_test",
-    srcs = [":moblab_go_gapic_srcjar_test"],
-    embed = [":moblab_go_gapic"],
-    importpath = "google.golang.org/google/chromeos/moblab/v1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-chromeos-moblab-v1beta1-go",
--- a/google/chromeos/uidetection/v1/BUILD.bazel
+++ b/google/chromeos/uidetection/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -143,13 +142,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "uidetection_go_gapic_test",
-    srcs = [":uidetection_go_gapic_srcjar_test"],
-    embed = [":uidetection_go_gapic"],
-    importpath = "google.golang.org/google/chromeos/uidetection/v1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-chromeos-uidetection-v1-go",
--- a/google/cloud/accessapproval/v1/BUILD.bazel
+++ b/google/cloud/accessapproval/v1/BUILD.bazel
@ -111,7 +111,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -139,13 +138,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "accessapproval_go_gapic_test",
-    srcs = [":accessapproval_go_gapic_srcjar_test"],
-    embed = [":accessapproval_go_gapic"],
-    importpath = "cloud.google.com/go/accessapproval/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-accessapproval-v1-go",
--- a/google/cloud/advisorynotifications/v1/BUILD.bazel
+++ b/google/cloud/advisorynotifications/v1/BUILD.bazel
@ -110,7 +110,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -138,13 +137,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "advisorynotifications_go_gapic_test",
-    srcs = [":advisorynotifications_go_gapic_srcjar_test"],
-    embed = [":advisorynotifications_go_gapic"],
-    importpath = "cloud.google.com/go/advisorynotifications/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-advisorynotifications-v1-go",
@ -222,10 +214,10 @@ php_gapic_library(
    name = "advisorynotifications_php_gapic",
    srcs = [":advisorynotifications_proto_with_info"],
    grpc_service_config = "advisorynotifications_v1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "advisorynotifications_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":advisorynotifications_php_grpc",
        ":advisorynotifications_php_proto",
--- a/google/cloud/aiplatform/logging/BUILD.bazel
+++ b/google/cloud/aiplatform/logging/BUILD.bazel
@ -108,12 +108,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-

 ##############################################################################
 # Ruby
--- a/google/cloud/aiplatform/v1/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/BUILD.bazel
@ -68,9 +68,9 @@ proto_library(
        "job_service.proto",
        "job_state.proto",
        "lineage_subgraph.proto",
-        "match_service.proto",
        "machine_resources.proto",
        "manual_batch_tuning_parameters.proto",
+        "match_service.proto",
        "metadata_schema.proto",
        "metadata_service.proto",
        "metadata_store.proto",
@ -236,7 +236,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -277,13 +276,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "aiplatform_go_gapic_test",
-    srcs = [":aiplatform_go_gapic_srcjar_test"],
-    embed = [":aiplatform_go_gapic"],
-    importpath = "cloud.google.com/go/aiplatform/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-aiplatform-v1-go",
@ -369,10 +361,10 @@ php_gapic_library(
    name = "aiplatform_php_gapic",
    srcs = [":aiplatform_proto_with_info"],
    grpc_service_config = "aiplatform_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = False,
    service_yaml = "aiplatform_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":aiplatform_php_grpc",
        ":aiplatform_php_proto",
--- a/google/cloud/aiplatform/v1/schema/predict/instance/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/instance/BUILD.bazel
@ -149,11 +149,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
@ -186,10 +181,10 @@ load(

 csharp_proto_library(
    name = "instance_csharp_proto",
-    deps = [":instance_proto"],
    extra_opts = [
-      "base_namespace=Google.Cloud.AIPlatform.V1",
+        "base_namespace=Google.Cloud.AIPlatform.V1",
    ],
+    deps = [":instance_proto"],
 )

 csharp_grpc_library(
--- a/google/cloud/aiplatform/v1/schema/predict/params/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/params/BUILD.bazel
@ -134,11 +134,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
@ -171,10 +166,10 @@ load(

 csharp_proto_library(
    name = "params_csharp_proto",
-    deps = [":params_proto"],
    extra_opts = [
-      "base_namespace=Google.Cloud.AIPlatform.V1",
+        "base_namespace=Google.Cloud.AIPlatform.V1",
    ],
+    deps = [":params_proto"],
 )

 csharp_grpc_library(
--- a/google/cloud/aiplatform/v1/schema/predict/prediction/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/predict/prediction/BUILD.bazel
@ -145,11 +145,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
@ -182,10 +177,10 @@ load(

 csharp_proto_library(
    name = "prediction_csharp_proto",
-    deps = [":prediction_proto"],
    extra_opts = [
-      "base_namespace=Google.Cloud.AIPlatform.V1",
+        "base_namespace=Google.Cloud.AIPlatform.V1",
    ],
+    deps = [":prediction_proto"],
 )

 csharp_grpc_library(
--- a/google/cloud/aiplatform/v1/schema/trainingjob/definition/BUILD.bazel
+++ b/google/cloud/aiplatform/v1/schema/trainingjob/definition/BUILD.bazel
@ -142,11 +142,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
@ -179,10 +174,10 @@ load(

 csharp_proto_library(
    name = "definition_csharp_proto",
-    deps = [":definition_proto"],
    extra_opts = [
-      "base_namespace=Google.Cloud.AIPlatform.V1",
+        "base_namespace=Google.Cloud.AIPlatform.V1",
    ],
+    deps = [":definition_proto"],
 )

 csharp_grpc_library(
--- a/google/cloud/aiplatform/v1beta1/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/BUILD.bazel
@ -235,7 +235,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -276,13 +275,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "aiplatform_go_gapic_test",
-    srcs = [":aiplatform_go_gapic_srcjar_test"],
-    embed = [":aiplatform_go_gapic"],
-    importpath = "cloud.google.com/go/aiplatform/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-aiplatform-v1beta1-go",
--- a/google/cloud/aiplatform/v1beta1/schema/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/BUILD.bazel
@ -123,12 +123,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)
-

 ##############################################################################
 # Ruby
--- a/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/predict/instance/BUILD.bazel
@ -137,11 +137,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/predict/params/BUILD.bazel
@ -134,11 +134,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/predict/prediction/BUILD.bazel
@ -148,11 +148,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel
+++ b/google/cloud/aiplatform/v1beta1/schema/trainingjob/definition/BUILD.bazel
@ -79,7 +79,6 @@ load(
    "py_gapic_library",
    "py_grpc_library",
    "py_proto_library",
-    "py_test",
 )

 moved_proto_library(
@ -144,11 +143,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/alloydb/v1/BUILD.bazel
+++ b/google/cloud/alloydb/v1/BUILD.bazel
@ -82,9 +82,9 @@ java_gapic_library(
    rest_numeric_enums = True,
    service_yaml = "alloydb_v1.yaml",
    test_deps = [
+        ":alloydb_java_grpc",
        "//google/cloud/location:location_java_grpc",
        "//google/iam/v1:iam_java_grpc",
-        ":alloydb_java_grpc",
    ],
    transport = "grpc+rest",
    deps = [
@ -125,7 +125,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -163,13 +162,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "alloydb_go_gapic_test",
-    srcs = [":alloydb_go_gapic_srcjar_test"],
-    embed = [":alloydb_go_gapic"],
-    importpath = "cloud.google.com/go/alloydb/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-alloydb-v1-go",
@ -248,10 +240,10 @@ php_gapic_library(
    name = "alloydb_php_gapic",
    srcs = [":alloydb_proto_with_info"],
    grpc_service_config = "alloydb_v1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "alloydb_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":alloydb_php_grpc",
        ":alloydb_php_proto",
--- a/google/cloud/alloydb/v1alpha/BUILD.bazel
+++ b/google/cloud/alloydb/v1alpha/BUILD.bazel
@ -82,9 +82,9 @@ java_gapic_library(
    rest_numeric_enums = True,
    service_yaml = "alloydb_v1alpha.yaml",
    test_deps = [
+        ":alloydb_java_grpc",
        "//google/cloud/location:location_java_grpc",
        "//google/iam/v1:iam_java_grpc",
-        ":alloydb_java_grpc",
    ],
    transport = "grpc+rest",
    deps = [
@ -125,7 +125,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -163,13 +162,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "alloydb_go_gapic_test",
-    srcs = [":alloydb_go_gapic_srcjar_test"],
-    embed = [":alloydb_go_gapic"],
-    importpath = "cloud.google.com/go/alloydb/apiv1alpha",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-alloydb-v1alpha-go",
--- a/google/cloud/alloydb/v1beta/BUILD.bazel
+++ b/google/cloud/alloydb/v1beta/BUILD.bazel
@ -82,9 +82,9 @@ java_gapic_library(
    rest_numeric_enums = True,
    service_yaml = "alloydb_v1beta.yaml",
    test_deps = [
+        ":alloydb_java_grpc",
        "//google/cloud/location:location_java_grpc",
        "//google/iam/v1:iam_java_grpc",
-        ":alloydb_java_grpc",
    ],
    transport = "grpc+rest",
    deps = [
@ -125,7 +125,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -163,13 +162,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "alloydb_go_gapic_test",
-    srcs = [":alloydb_go_gapic_srcjar_test"],
-    embed = [":alloydb_go_gapic"],
-    importpath = "cloud.google.com/go/alloydb/apiv1beta",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-alloydb-v1beta-go",
--- a/google/cloud/apigateway/v1/BUILD.bazel
+++ b/google/cloud/apigateway/v1/BUILD.bazel
@ -113,7 +113,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -145,13 +144,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "apigateway_go_gapic_test",
-    srcs = [":apigateway_go_gapic_srcjar_test"],
-    embed = [":apigateway_go_gapic"],
-    importpath = "cloud.google.com/go/apigateway/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-apigateway-v1-go",
--- a/google/cloud/apigeeconnect/v1/BUILD.bazel
+++ b/google/cloud/apigeeconnect/v1/BUILD.bazel
@ -111,7 +111,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -140,13 +139,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "apigeeconnect_go_gapic_test",
-    srcs = [":apigeeconnect_go_gapic_srcjar_test"],
-    embed = [":apigeeconnect_go_gapic"],
-    importpath = "cloud.google.com/go/apigeeconnect/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-apigeeconnect-v1-go",
--- a/google/cloud/apigeeregistry/v1/BUILD.bazel
+++ b/google/cloud/apigeeregistry/v1/BUILD.bazel
@ -124,7 +124,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -159,13 +158,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "apigeeregistry_go_gapic_test",
-    srcs = [":apigeeregistry_go_gapic_srcjar_test"],
-    embed = [":apigeeregistry_go_gapic"],
-    importpath = "cloud.google.com/go/apigeeregistry/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-apigeeregistry-v1-go",
@ -249,10 +241,10 @@ php_gapic_library(
    name = "apigeeregistry_php_gapic",
    srcs = [":apigeeregistry_proto_with_info"],
    grpc_service_config = "apigeeregistry_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "apigeeregistry_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":apigeeregistry_php_grpc",
        ":apigeeregistry_php_proto",
--- a/google/cloud/asset/v1/BUILD.bazel
+++ b/google/cloud/asset/v1/BUILD.bazel
@ -81,8 +81,8 @@ java_gapic_library(
    transport = "grpc+rest",
    deps = [
        ":asset_java_proto",
-        "//google/iam/v1:iam_java_proto",
        "//google/api:api_java_proto",
+        "//google/iam/v1:iam_java_proto",
    ],
 )

@ -116,7 +116,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -158,13 +157,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "asset_go_gapic_test",
-    srcs = [":asset_go_gapic_srcjar_test"],
-    embed = [":asset_go_gapic"],
-    importpath = "cloud.google.com/go/asset/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1-go",
@ -188,7 +180,7 @@ load(
 )

 py_import(
-    name="osconfig",
+    name = "osconfig",
    srcs = [
        "//google/cloud/osconfig/v1:osconfig_py_gapic",
    ],
@ -198,6 +190,7 @@ py_gapic_library(
    name = "asset_py_gapic",
    srcs = [":asset_proto"],
    grpc_service_config = "cloudasset_grpc_service_config.json",
+    opt_args = ["proto-plus-deps=google.cloud.osconfig.v1"],
    rest_numeric_enums = True,
    service_yaml = "cloudasset_v1.yaml",
    transport = "grpc+rest",
@ -210,7 +203,6 @@ py_gapic_library(
        "//google/identity/accesscontextmanager/v1:accesscontextmanager_py_gapic",
        "//google/identity/accesscontextmanager/v1:service_perimeter_py_proto",
    ],
-    opt_args = ["proto-plus-deps=google.cloud.osconfig.v1"],
 )

 py_gapic_assembly_pkg(
--- a/google/cloud/asset/v1p1beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p1beta1/BUILD.bazel
@ -101,7 +101,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -130,13 +129,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "asset_go_gapic_test",
-    srcs = [":asset_go_gapic_srcjar_test"],
-    embed = [":asset_go_gapic"],
-    importpath = "cloud.google.com/go/asset/apiv1p1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p1beta1-go",
--- a/google/cloud/asset/v1p2beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p2beta1/BUILD.bazel
@ -108,7 +108,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -143,13 +142,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "asset_go_gapic_test",
-    srcs = [":asset_go_gapic_srcjar_test"],
-    embed = [":asset_go_gapic"],
-    importpath = "cloud.google.com/go/asset/apiv1p2beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p2beta1-go",
@ -324,8 +316,6 @@ ruby_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "csharp_gapic_assembly_pkg",
-    "csharp_gapic_library",
    "csharp_grpc_library",
    "csharp_proto_library",
 )
--- a/google/cloud/asset/v1p5beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p5beta1/BUILD.bazel
@ -107,7 +107,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -138,13 +137,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "asset_go_gapic_test",
-    srcs = [":asset_go_gapic_srcjar_test"],
-    embed = [":asset_go_gapic"],
-    importpath = "cloud.google.com/go/asset/apiv1p5beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p5beta1-go",
@ -322,8 +314,6 @@ ruby_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "csharp_gapic_assembly_pkg",
-    "csharp_gapic_library",
    "csharp_grpc_library",
    "csharp_proto_library",
 )
--- a/google/cloud/asset/v1p7beta1/BUILD.bazel
+++ b/google/cloud/asset/v1p7beta1/BUILD.bazel
@ -20,7 +20,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -161,13 +160,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "asset_go_gapic_test",
-    srcs = [":asset_go_gapic_srcjar_test"],
-    embed = [":asset_go_gapic"],
-    importpath = "cloud.google.com/go/asset/apiv1p7beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-asset-v1p7beta1-go",
--- a/google/cloud/assuredworkloads/regulatoryintercept/logging/v1/BUILD.bazel
+++ b/google/cloud/assuredworkloads/regulatoryintercept/logging/v1/BUILD.bazel
@ -105,11 +105,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/assuredworkloads/v1/BUILD.bazel
+++ b/google/cloud/assuredworkloads/v1/BUILD.bazel
@ -114,7 +114,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -147,13 +146,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "assuredworkloads_go_gapic_test",
-    srcs = [":assuredworkloads_go_gapic_srcjar_test"],
-    embed = [":assuredworkloads_go_gapic"],
-    importpath = "cloud.google.com/go/assuredworkloads/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-assuredworkloads-v1-go",
@ -232,10 +224,10 @@ php_gapic_library(
    name = "assuredworkloads_php_gapic",
    srcs = [":assuredworkloads_proto_with_info"],
    grpc_service_config = "assuredworkloads_grpc_service_config.json",
+    migration_mode = "NEW_SURFACE_ONLY",
    rest_numeric_enums = True,
    service_yaml = "assuredworkloads_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "NEW_SURFACE_ONLY",
    deps = [
        ":assuredworkloads_php_grpc",
        ":assuredworkloads_php_proto",
--- a/google/cloud/assuredworkloads/v1beta1/BUILD.bazel
+++ b/google/cloud/assuredworkloads/v1beta1/BUILD.bazel
@ -115,7 +115,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -148,13 +147,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "assuredworkloads_go_gapic_test",
-    srcs = [":assuredworkloads_go_gapic_srcjar_test"],
-    embed = [":assuredworkloads_go_gapic"],
-    importpath = "cloud.google.com/go/assuredworkloads/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-assuredworkloads-v1beta1-go",
--- a/google/cloud/audit/BUILD.bazel
+++ b/google/cloud/audit/BUILD.bazel
@ -140,9 +140,9 @@ py_grpc_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
+    "php_gapic_assembly_pkg",
    "php_grpc_library",
    "php_proto_library",
-    "php_gapic_assembly_pkg",
 )

 php_proto_library(
@ -165,11 +165,6 @@ php_gapic_assembly_pkg(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/automl/v1/BUILD.bazel
+++ b/google/cloud/automl/v1/BUILD.bazel
@ -127,7 +127,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -163,13 +162,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "automl_go_gapic_test",
-    srcs = [":automl_go_gapic_srcjar_test"],
-    embed = [":automl_go_gapic"],
-    importpath = "cloud.google.com/go/automl/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-automl-v1-go",
--- a/google/cloud/automl/v1beta1/BUILD.bazel
+++ b/google/cloud/automl/v1beta1/BUILD.bazel
@ -136,7 +136,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -172,13 +171,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "automl_go_gapic_test",
-    srcs = [":automl_go_gapic_srcjar_test"],
-    embed = [":automl_go_gapic"],
-    importpath = "cloud.google.com/go/automl/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-automl-v1beta1-go",
--- a/google/cloud/backupdr/logging/v1/BUILD.bazel
+++ b/google/cloud/backupdr/logging/v1/BUILD.bazel
@ -46,11 +46,6 @@ load(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/baremetalsolution/v2/BUILD.bazel
+++ b/google/cloud/baremetalsolution/v2/BUILD.bazel
@ -118,7 +118,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -151,13 +150,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "baremetalsolution_go_gapic_test",
-    srcs = [":baremetalsolution_go_gapic_srcjar_test"],
-    embed = [":baremetalsolution_go_gapic"],
-    importpath = "cloud.google.com/go/baremetalsolution/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-baremetalsolution-v2-go",
@ -192,7 +184,7 @@ py_gapic_library(
    rest_numeric_enums = True,
    service_yaml = "baremetalsolution_v2.yaml",
    transport = "grpc+rest",
-    deps = ["//google/iam/v1:iam_policy_py_proto",]
+    deps = ["//google/iam/v1:iam_policy_py_proto"],
 )

 py_test(
@ -239,10 +231,10 @@ php_gapic_library(
    name = "baremetalsolution_php_gapic",
    srcs = [":baremetalsolution_proto_with_info"],
    grpc_service_config = "baremetalsolution_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "baremetalsolution_v2.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":baremetalsolution_php_grpc",
        ":baremetalsolution_php_proto",
--- a/google/cloud/batch/v1/BUILD.bazel
+++ b/google/cloud/batch/v1/BUILD.bazel
@ -122,7 +122,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -157,13 +156,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "batch_go_gapic_test",
-    srcs = [":batch_go_gapic_srcjar_test"],
-    embed = [":batch_go_gapic"],
-    importpath = "cloud.google.com/go/batch/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-batch-v1-go",
@ -242,10 +234,10 @@ php_gapic_library(
    name = "batch_php_gapic",
    srcs = [":batch_proto_with_info"],
    grpc_service_config = "batch_v1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "batch_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":batch_php_grpc",
        ":batch_php_proto",
--- a/google/cloud/batch/v1alpha/BUILD.bazel
+++ b/google/cloud/batch/v1alpha/BUILD.bazel
@ -122,7 +122,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -157,13 +156,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "batch_go_gapic_test",
-    srcs = [":batch_go_gapic_srcjar_test"],
-    embed = [":batch_go_gapic"],
-    importpath = "cloud.google.com/go/batch/apiv1alpha",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-batch-v1alpha-go",
--- a/google/cloud/beyondcorp/appconnections/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appconnections/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -159,13 +158,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "appconnections_go_gapic_test",
-    srcs = [":appconnections_go_gapic_srcjar_test"],
-    embed = [":appconnections_go_gapic"],
-    importpath = "cloud.google.com/go/beyondcorp/appconnections/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-beyondcorp-appconnections-v1-go",
@ -228,10 +220,10 @@ php_gapic_library(
    name = "appconnections_php_gapic",
    srcs = [":appconnections_proto_with_info"],
    grpc_service_config = "beyondcorp-appconnections_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "beyondcorp_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":appconnections_php_grpc",
        ":appconnections_php_proto",
--- a/google/cloud/beyondcorp/appconnectors/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appconnectors/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -163,13 +162,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "appconnectors_go_gapic_test",
-    srcs = [":appconnectors_go_gapic_srcjar_test"],
-    embed = [":appconnectors_go_gapic"],
-    importpath = "cloud.google.com/go/beyondcorp/appconnectors/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-beyondcorp-appconnectors-v1-go",
@ -232,10 +224,10 @@ php_gapic_library(
    name = "appconnectors_php_gapic",
    srcs = [":appconnectors_proto_with_info"],
    grpc_service_config = "beyondcorp-appconnectors_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "beyondcorp_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":appconnectors_php_grpc",
        ":appconnectors_php_proto",
--- a/google/cloud/beyondcorp/appgateways/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/appgateways/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -158,13 +157,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "appgateways_go_gapic_test",
-    srcs = [":appgateways_go_gapic_srcjar_test"],
-    embed = [":appgateways_go_gapic"],
-    importpath = "cloud.google.com/go/beyondcorp/appgateways/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-beyondcorp-appgateways-v1-go",
@ -227,10 +219,10 @@ php_gapic_library(
    name = "appgateways_php_gapic",
    srcs = [":appgateways_proto_with_info"],
    grpc_service_config = "beyondcorp-appgateways_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "beyondcorp_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":appgateways_php_grpc",
        ":appgateways_php_proto",
--- a/google/cloud/beyondcorp/clientconnectorservices/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/clientconnectorservices/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -159,13 +158,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "clientconnectorservices_go_gapic_test",
-    srcs = [":clientconnectorservices_go_gapic_srcjar_test"],
-    embed = [":clientconnectorservices_go_gapic"],
-    importpath = "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-beyondcorp-clientconnectorservices-v1-go",
@ -228,10 +220,10 @@ php_gapic_library(
    name = "clientconnectorservices_php_gapic",
    srcs = [":clientconnectorservices_proto_with_info"],
    grpc_service_config = "beyondcorp-clientconnectorservices_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "beyondcorp_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":clientconnectorservices_php_grpc",
        ":clientconnectorservices_php_proto",
--- a/google/cloud/beyondcorp/clientgateways/v1/BUILD.bazel
+++ b/google/cloud/beyondcorp/clientgateways/v1/BUILD.bazel
@ -24,7 +24,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -158,13 +157,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "clientgateways_go_gapic_test",
-    srcs = [":clientgateways_go_gapic_srcjar_test"],
-    embed = [":clientgateways_go_gapic"],
-    importpath = "cloud.google.com/go/beyondcorp/clientgateways/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-beyondcorp-clientgateways-v1-go",
@ -227,10 +219,10 @@ php_gapic_library(
    name = "clientgateways_php_gapic",
    srcs = [":clientgateways_proto_with_info"],
    grpc_service_config = "beyondcorp-clientgateways_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "beyondcorp_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":clientgateways_php_grpc",
        ":clientgateways_php_proto",
--- a/google/cloud/bigquery/analyticshub/v1/BUILD.bazel
+++ b/google/cloud/bigquery/analyticshub/v1/BUILD.bazel
@ -116,7 +116,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -146,13 +145,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "analyticshub_go_gapic_test",
-    srcs = [":analyticshub_go_gapic_srcjar_test"],
-    embed = [":analyticshub_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/analyticshub/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-analyticshub-v1-go",
@ -231,10 +223,10 @@ php_gapic_library(
    name = "analyticshub_php_gapic",
    srcs = [":analyticshub_proto_with_info"],
    grpc_service_config = "analyticshub_v1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = False,
    service_yaml = "analyticshub_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":analyticshub_php_grpc",
        ":analyticshub_php_proto",
--- a/google/cloud/bigquery/biglake/v1/BUILD.bazel
+++ b/google/cloud/bigquery/biglake/v1/BUILD.bazel
@ -93,6 +93,7 @@ java_gapic_test(
 # Open Source Packages
 java_gapic_assembly_gradle_pkg(
    name = "google-cloud-bigquery-biglake-v1-java",
+    include_samples = True,
    transport = "grpc+rest",
    deps = [
        ":biglake_java_gapic",
@ -100,7 +101,6 @@ java_gapic_assembly_gradle_pkg(
        ":biglake_java_proto",
        ":biglake_proto",
    ],
-    include_samples = True,
 )

 ##############################################################################
@ -111,7 +111,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -139,21 +138,14 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "biglake_go_gapic_test",
-    srcs = [":biglake_go_gapic_srcjar_test"],
-    embed = [":biglake_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/biglake/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-biglake-v1-go",
    deps = [
        ":biglake_go_gapic",
+        ":biglake_go_gapic_srcjar-metadata.srcjar",
        ":biglake_go_gapic_srcjar-snippets.srcjar",
        ":biglake_go_gapic_srcjar-test.srcjar",
-        ":biglake_go_gapic_srcjar-metadata.srcjar",
        ":biglake_go_proto",
    ],
 )
@ -277,8 +269,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
    "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
    "ruby_grpc_library",
    "ruby_proto_library",
 )
--- a/google/cloud/bigquery/biglake/v1alpha1/BUILD.bazel
+++ b/google/cloud/bigquery/biglake/v1alpha1/BUILD.bazel
@ -112,7 +112,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -140,13 +139,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "biglake_go_gapic_test",
-    srcs = [":biglake_go_gapic_srcjar_test"],
-    embed = [":biglake_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/biglake/apiv1alpha1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-biglake-v1alpha1-go",
--- a/google/cloud/bigquery/connection/v1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1/BUILD.bazel
@ -106,7 +106,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -136,13 +135,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "connection_go_gapic_test",
-    srcs = [":connection_go_gapic_srcjar_test"],
-    embed = [":connection_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/connection/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-connection-v1-go",
--- a/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/connection/v1beta1/BUILD.bazel
@ -105,7 +105,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -135,13 +134,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "connection_go_gapic_test",
-    srcs = [":connection_go_gapic_srcjar_test"],
-    embed = [":connection_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/connection/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-connection-v1beta1-go",
--- a/google/cloud/bigquery/dataexchange/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/dataexchange/v1beta1/BUILD.bazel
@ -119,7 +119,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -150,13 +149,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "dataexchange_go_gapic_test",
-    srcs = [":dataexchange_go_gapic_srcjar_test"],
-    embed = [":dataexchange_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/dataexchange/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-dataexchange-v1beta1-go",
@ -240,10 +232,10 @@ php_gapic_library(
    name = "dataexchange_php_gapic",
    srcs = [":dataexchange_proto_with_info"],
    grpc_service_config = "analyticshub_v1beta1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = False,
    service_yaml = "analyticshub_v1beta1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":dataexchange_php_grpc",
        ":dataexchange_php_proto",
--- a/google/cloud/bigquery/datapolicies/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datapolicies/v1/BUILD.bazel
@ -115,7 +115,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -145,13 +144,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "datapolicies_go_gapic_test",
-    srcs = [":datapolicies_go_gapic_srcjar_test"],
-    embed = [":datapolicies_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/datapolicies/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-datapolicies-v1-go",
@ -230,10 +222,10 @@ php_gapic_library(
    name = "datapolicies_php_gapic",
    srcs = [":datapolicies_proto_with_info"],
    grpc_service_config = "datapolicies_v1_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "bigquerydatapolicy_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":datapolicies_php_grpc",
        ":datapolicies_php_proto",
--- a/google/cloud/bigquery/datapolicies/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/datapolicies/v1beta1/BUILD.bazel
@ -115,7 +115,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -145,13 +144,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "datapolicies_go_gapic_test",
-    srcs = [":datapolicies_go_gapic_srcjar_test"],
-    embed = [":datapolicies_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/datapolicies/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-datapolicies-v1beta1-go",
--- a/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
+++ b/google/cloud/bigquery/datatransfer/v1/BUILD.bazel
@ -120,7 +120,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -151,13 +150,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "datatransfer_go_gapic_test",
-    srcs = [":datatransfer_go_gapic_srcjar_test"],
-    embed = [":datatransfer_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/datatransfer/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-datatransfer-v1-go",
--- a/google/cloud/bigquery/logging/v1/BUILD.bazel
+++ b/google/cloud/bigquery/logging/v1/BUILD.bazel
@ -113,11 +113,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/bigquery/migration/v2/BUILD.bazel
+++ b/google/cloud/bigquery/migration/v2/BUILD.bazel
@ -119,7 +119,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -151,13 +150,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "migration_go_gapic_test",
-    srcs = [":migration_go_gapic_srcjar_test"],
-    embed = [":migration_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/migration/apiv2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-migration-v2-go",
@ -237,10 +229,10 @@ php_gapic_library(
    name = "migration_php_gapic",
    srcs = [":migration_proto_with_info"],
    grpc_service_config = "bigquerymigration_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = False,
    service_yaml = "bigquerymigration_v2.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":migration_php_grpc",
        ":migration_php_proto",
--- a/google/cloud/bigquery/migration/v2alpha/BUILD.bazel
+++ b/google/cloud/bigquery/migration/v2alpha/BUILD.bazel
@ -120,7 +120,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -151,13 +150,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "migration_go_gapic_test",
-    srcs = [":migration_go_gapic_srcjar_test"],
-    embed = [":migration_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/migration/apiv2alpha",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-migration-v2alpha-go",
--- a/google/cloud/bigquery/reservation/v1/BUILD.bazel
+++ b/google/cloud/bigquery/reservation/v1/BUILD.bazel
@ -113,7 +113,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -142,13 +141,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "reservation_go_gapic_test",
-    srcs = [":reservation_go_gapic_srcjar_test"],
-    embed = [":reservation_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/reservation/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-reservation-v1-go",
--- a/google/cloud/bigquery/storage/v1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1/BUILD.bazel
@ -13,7 +13,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -143,13 +142,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "storage_go_gapic_test",
-    srcs = [":storage_go_gapic_srcjar_test"],
-    embed = [":storage_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1-go",
--- a/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta1/BUILD.bazel
@ -15,7 +15,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -140,13 +139,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "storage_go_gapic_test",
-    srcs = [":storage_go_gapic_srcjar_test"],
-    embed = [":storage_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1beta1-go",
--- a/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
+++ b/google/cloud/bigquery/storage/v1beta2/BUILD.bazel
@ -106,7 +106,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -135,13 +134,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "storage_go_gapic_test",
-    srcs = [":storage_go_gapic_srcjar_test"],
-    embed = [":storage_go_gapic"],
-    importpath = "cloud.google.com/go/bigquery/storage/apiv1beta2",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-bigquery-storage-v1beta2-go",
--- a/google/cloud/billing/budgets/v1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1/BUILD.bazel
@ -22,7 +22,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
    "java_gapic_assembly_gradle_pkg",
    "java_gapic_library",
    "java_gapic_test",
@ -149,13 +148,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "budgets_go_gapic_test",
-    srcs = [":budgets_go_gapic_srcjar_test"],
-    embed = [":budgets_go_gapic"],
-    importpath = "cloud.google.com/go/billing/budgets/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-billing-budgets-v1-go",
--- a/google/cloud/billing/budgets/v1beta1/BUILD.bazel
+++ b/google/cloud/billing/budgets/v1beta1/BUILD.bazel
@ -112,7 +112,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -142,13 +141,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "budgets_go_gapic_test",
-    srcs = [":budgets_go_gapic_srcjar_test"],
-    embed = [":budgets_go_gapic"],
-    importpath = "cloud.google.com/go/billing/budgets/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-billing-budgets-v1beta1-go",
--- a/google/cloud/billing/v1/BUILD.bazel
+++ b/google/cloud/billing/v1/BUILD.bazel
@ -119,7 +119,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -150,13 +149,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "billing_go_gapic_test",
-    srcs = [":billing_go_gapic_srcjar_test"],
-    embed = [":billing_go_gapic"],
-    importpath = "cloud.google.com/go/billing/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-billing-v1-go",
--- a/google/cloud/binaryauthorization/v1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1/BUILD.bazel
@ -118,7 +118,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -147,13 +146,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "binaryauthorization_go_gapic_test",
-    srcs = [":binaryauthorization_go_gapic_srcjar_test"],
-    embed = [":binaryauthorization_go_gapic"],
-    importpath = "cloud.google.com/go/binaryauthorization/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-binaryauthorization-v1-go",
@ -235,10 +227,10 @@ php_gapic_library(
    name = "binaryauthorization_php_gapic",
    srcs = [":binaryauthorization_proto_with_info"],
    grpc_service_config = "binaryauthorization_grpc_service_config.json",
+    migration_mode = "NEW_SURFACE_ONLY",
    rest_numeric_enums = True,
    service_yaml = "binaryauthorization_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "NEW_SURFACE_ONLY",
    deps = [
        ":binaryauthorization_php_grpc",
        ":binaryauthorization_php_proto",
--- a/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
+++ b/google/cloud/binaryauthorization/v1beta1/BUILD.bazel
@ -111,7 +111,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -139,13 +138,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "binaryauthorization_go_gapic_test",
-    srcs = [":binaryauthorization_go_gapic_srcjar_test"],
-    embed = [":binaryauthorization_go_gapic"],
-    importpath = "cloud.google.com/go/binaryauthorization/apiv1beta1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-binaryauthorization-v1beta1-go",
--- a/google/cloud/certificatemanager/logging/v1/BUILD.bazel
+++ b/google/cloud/certificatemanager/logging/v1/BUILD.bazel
@ -107,11 +107,6 @@ php_grpc_library(
 ##############################################################################
 # Node.js
 ##############################################################################
-load(
-    "@com_google_googleapis_imports//:imports.bzl",
-    "nodejs_gapic_assembly_pkg",
-    "nodejs_gapic_library",
-)

 ##############################################################################
 # Ruby
--- a/google/cloud/certificatemanager/v1/BUILD.bazel
+++ b/google/cloud/certificatemanager/v1/BUILD.bazel
@ -118,7 +118,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -152,13 +151,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "certificatemanager_go_gapic_test",
-    srcs = [":certificatemanager_go_gapic_srcjar_test"],
-    embed = [":certificatemanager_go_gapic"],
-    importpath = "cloud.google.com/go/certificatemanager/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-certificatemanager-v1-go",
@ -241,10 +233,10 @@ php_gapic_library(
    name = "certificatemanager_php_gapic",
    srcs = [":certificatemanager_proto_with_info"],
    grpc_service_config = "certificatemanager_grpc_service_config.json",
+    migration_mode = "MIGRATING",
    rest_numeric_enums = True,
    service_yaml = "certificatemanager_v1.yaml",
    transport = "grpc+rest",
-    migration_mode = "MIGRATING",
    deps = [
        ":certificatemanager_php_grpc",
        ":certificatemanager_php_proto",
--- a/google/cloud/channel/v1/BUILD.bazel
+++ b/google/cloud/channel/v1/BUILD.bazel
@ -24,6 +24,7 @@ proto_library(
        "channel_partner_links.proto",
        "common.proto",
        "customers.proto",
+        "entitlement_changes.proto",
        "entitlements.proto",
        "offers.proto",
        "operations.proto",
@ -32,7 +33,6 @@ proto_library(
        "repricing.proto",
        "service.proto",
        "subscriber_event.proto",
-        "entitlement_changes.proto",
    ],
    deps = [
        "//google/api:annotations_proto",
@ -130,7 +130,6 @@ load(
    "go_gapic_assembly_pkg",
    "go_gapic_library",
    "go_proto_library",
-    "go_test",
 )

 go_proto_library(
@ -168,13 +167,6 @@ go_gapic_library(
    ],
 )

-go_test(
-    name = "channel_go_gapic_test",
-    srcs = [":channel_go_gapic_srcjar_test"],
-    embed = [":channel_go_gapic"],
-    importpath = "cloud.google.com/go/channel/apiv1",
-)
-
 # Open Source Packages
 go_gapic_assembly_pkg(
    name = "gapi-cloud-channel-v1-go",
--- a/Show More
+++ b/Show More