chore: refactor BUILD

PiperOrigin-RevId: 570077450
googleapis · Oct 2, 2023 · 615270f · 615270f
1 parent 522f79c
commit 615270f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/google/cloud/gkehub/v1/BUILD.bazel b/google/cloud/gkehub/v1/BUILD.bazel
@@ -18,6 +18,11 @@ package(default_visibility = ["//visibility:public"])
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 
+_PROTO_SUBPACKAGE_DEPS = [
+    "//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress_proto",
+    "//google/cloud/gkehub/v1/configmanagement:configmanagement_proto",
+]
+
 proto_library(
     name = "gkehub_proto",
     srcs = [
@@ -30,13 +35,11 @@ proto_library(
         "//google/api:client_proto",
         "//google/api:field_behavior_proto",
         "//google/api:resource_proto",
-        "//google/cloud/gkehub/v1/configmanagement:configmanagement_proto",
-        "//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress_proto",
         "//google/longrunning:operations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
-    ],
+    ] + _PROTO_SUBPACKAGE_DEPS,
 )
 
 proto_library_with_info(
@@ -115,7 +118,7 @@ java_gapic_assembly_gradle_pkg(
         ":gkehub_java_grpc",
         ":gkehub_java_proto",
         ":gkehub_proto",
-    ] + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
+    ] + _PROTO_SUBPACKAGE_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
 )
 
 ##############################################################################

diff --git a/google/cloud/gkehub/v1alpha/BUILD.bazel b/google/cloud/gkehub/v1alpha/BUILD.bazel
@@ -18,6 +18,14 @@ package(default_visibility = ["//visibility:public"])
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 
+_PROTO_SUBPACKAGE_DEPS = [
+    "//google/cloud/gkehub/v1alpha/multiclusteringress:multiclusteringress_proto",
+    "//google/cloud/gkehub/v1alpha/configmanagement:configmanagement_proto",
+    "//google/cloud/gkehub/v1alpha/metering:metering_proto",
+    "//google/cloud/gkehub/v1alpha/cloudauditlogging:cloudauditlogging_proto",
+    "//google/cloud/gkehub/v1alpha/servicemesh:servicemesh_proto",
+]
+
 proto_library(
     name = "gkehub_proto",
     srcs = [
@@ -29,16 +37,11 @@ proto_library(
         "//google/api:client_proto",
         "//google/api:field_behavior_proto",
         "//google/api:resource_proto",
-        "//google/cloud/gkehub/v1alpha/cloudauditlogging:cloudauditlogging_proto",
-        "//google/cloud/gkehub/v1alpha/configmanagement:configmanagement_proto",
-        "//google/cloud/gkehub/v1alpha/metering:metering_proto",
-        "//google/cloud/gkehub/v1alpha/multiclusteringress:multiclusteringress_proto",
-        "//google/cloud/gkehub/v1alpha/servicemesh:servicemesh_proto",
         "//google/longrunning:operations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
-    ],
+    ] + _PROTO_SUBPACKAGE_DEPS,
 )
 
 proto_library_with_info(
@@ -122,7 +125,7 @@ java_gapic_assembly_gradle_pkg(
         ":gkehub_java_grpc",
         ":gkehub_java_proto",
         ":gkehub_proto",
-    ] + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
+    ] + _PROTO_SUBPACKAGE_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
 )
 
 ##############################################################################

diff --git a/google/cloud/gkehub/v1beta/BUILD.bazel b/google/cloud/gkehub/v1beta/BUILD.bazel
@@ -18,6 +18,12 @@ package(default_visibility = ["//visibility:public"])
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
 
+_PROTO_SUBPACKAGE_DEPS = [
+    "//google/cloud/gkehub/v1beta/multiclusteringress:multiclusteringress_proto",
+    "//google/cloud/gkehub/v1beta/configmanagement:configmanagement_proto",
+    "//google/cloud/gkehub/v1beta/metering:metering_proto",
+]
+
 proto_library(
     name = "gkehub_proto",
     srcs = [
@@ -29,14 +35,11 @@ proto_library(
         "//google/api:client_proto",
         "//google/api:field_behavior_proto",
         "//google/api:resource_proto",
-        "//google/cloud/gkehub/v1beta/configmanagement:configmanagement_proto",
-        "//google/cloud/gkehub/v1beta/metering:metering_proto",
-        "//google/cloud/gkehub/v1beta/multiclusteringress:multiclusteringress_proto",
         "//google/longrunning:operations_proto",
         "@com_google_protobuf//:empty_proto",
         "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
-    ],
+    ] + _PROTO_SUBPACKAGE_DEPS,
 )
 
 proto_library_with_info(
@@ -116,7 +119,7 @@ java_gapic_assembly_gradle_pkg(
         ":gkehub_java_grpc",
         ":gkehub_java_proto",
         ":gkehub_proto",
-    ] + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
+    ] + _PROTO_SUBPACKAGE_DEPS + _JAVA_PROTO_SUBPACKAGE_DEPS + _JAVA_GRPC_SUBPACKAGE_DEPS,
 )
 
 ##############################################################################

diff --git a/google/cloud/location/BUILD.bazel b/google/cloud/location/BUILD.bazel
@@ -59,6 +59,7 @@ java_gapic_assembly_gradle_pkg(
     deps = [
         ":location_java_grpc",
         ":location_java_proto",
+        ":location_proto",
     ],
 )
 

diff --git a/google/iam/v1/BUILD.bazel b/google/iam/v1/BUILD.bazel
@@ -93,8 +93,9 @@ java_gapic_assembly_gradle_pkg(
     include_samples = True,
     transport = "grpc+rest",
     deps = [
-        "iam_java_grpc",
-        "iam_java_proto",
+        ":iam_java_grpc",
+        ":iam_java_proto",
+        ":iam_policy_proto",
     ],
 )