fix: add dependencies for google/cloud/gkehub

Committer: @parthea PiperOrigin-RevId: 381971413
4 years ago · b6b4b89cae
parent 5babb4bc70
commit b6b4b89cae
14 changed files with 46 additions and 197 deletions
--- a/google/cloud/gkehub/v1/BUILD.bazel
+++ b/google/cloud/gkehub/v1/BUILD.bazel
@ -170,6 +170,7 @@ py_gapic_library(
    name = "gkehub_py_gapic",
    srcs = [":gkehub_proto"],
    grpc_service_config = "v1_grpc_service_config.json",
+    opt_args = ["warehouse-package-name=google-cloud-gke-hub"],
 )

 # Open Source Packages
@ -177,6 +178,8 @@ py_gapic_assembly_pkg(
    name = "gkehub-v1-py",
    deps = [
        ":gkehub_py_gapic",
+        "//google/cloud/gkehub/v1/configmanagement:configmanagement_py_gapic",
+        "//google/cloud/gkehub/v1/multiclusteringress:multiclusteringress_py_gapic",
    ],
 )

--- a/google/cloud/gkehub/v1/configmanagement/BUILD.bazel
+++ b/google/cloud/gkehub/v1/configmanagement/BUILD.bazel
@ -62,29 +62,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "configmanagement_moved_proto",
+py_gapic_library(
+    name = "configmanagement_py_gapic",
    srcs = [":configmanagement_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
-)
-
-py_proto_library(
-    name = "configmanagement_py_proto",
-    deps = [":configmanagement_moved_proto"],
-)
-
-py_grpc_library(
-    name = "configmanagement_py_grpc",
-    srcs = [":configmanagement_moved_proto"],
-    deps = [":configmanagement_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1/multiclusteringress/BUILD.bazel
+++ b/google/cloud/gkehub/v1/multiclusteringress/BUILD.bazel
@ -61,28 +61,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "multiclusteringress_moved_proto",
+py_gapic_library(
+    name = "multiclusteringress_py_gapic",
    srcs = [":multiclusteringress_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-    ],
-)
-
-py_proto_library(
-    name = "multiclusteringress_py_proto",
-    deps = [":multiclusteringress_moved_proto"],
-)
-
-py_grpc_library(
-    name = "multiclusteringress_py_grpc",
-    srcs = [":multiclusteringress_moved_proto"],
-    deps = [":multiclusteringress_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/BUILD.bazel
@ -175,6 +175,7 @@ py_gapic_library(
    name = "gkehub_py_gapic",
    srcs = [":gkehub_proto"],
    grpc_service_config = "v1alpha_grpc_service_config.json",
+    opt_args = ["warehouse-package-name=google-cloud-gke-hub"],
 )

 # Open Source Packages
@ -182,6 +183,11 @@ py_gapic_assembly_pkg(
    name = "gkehub-v1alpha-py",
    deps = [
        ":gkehub_py_gapic",
+        "//google/cloud/gkehub/v1alpha/cloudauditlogging:cloudauditlogging_py_gapic",
+        "//google/cloud/gkehub/v1alpha/configmanagement:configmanagement_py_gapic",
+        "//google/cloud/gkehub/v1alpha/metering:metering_py_gapic",
+        "//google/cloud/gkehub/v1alpha/multiclusteringress:multiclusteringress_py_gapic",
+        "//google/cloud/gkehub/v1alpha/servicemesh:servicemesh_py_gapic",
    ],
 )

--- a/google/cloud/gkehub/v1alpha/cloudauditlogging/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/cloudauditlogging/BUILD.bazel
@ -61,28 +61,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "cloudauditlogging_moved_proto",
+py_gapic_library(
+    name = "cloudauditlogging_py_gapic",
    srcs = [":cloudauditlogging_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-    ],
-)
-
-py_proto_library(
-    name = "cloudauditlogging_py_proto",
-    deps = [":cloudauditlogging_moved_proto"],
-)
-
-py_grpc_library(
-    name = "cloudauditlogging_py_grpc",
-    srcs = [":cloudauditlogging_moved_proto"],
-    deps = [":cloudauditlogging_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha/configmanagement/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/configmanagement/BUILD.bazel
@ -62,29 +62,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "configmanagement_moved_proto",
+py_gapic_library(
+    name = "configmanagement_py_gapic",
    srcs = [":configmanagement_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
-)
-
-py_proto_library(
-    name = "configmanagement_py_proto",
-    deps = [":configmanagement_moved_proto"],
-)
-
-py_grpc_library(
-    name = "configmanagement_py_grpc",
-    srcs = [":configmanagement_moved_proto"],
-    deps = [":configmanagement_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha/metering/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/metering/BUILD.bazel
@ -62,29 +62,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "metering_moved_proto",
+py_gapic_library(
+    name = "metering_py_gapic",
    srcs = [":metering_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
-)
-
-py_proto_library(
-    name = "metering_py_proto",
-    deps = [":metering_moved_proto"],
-)
-
-py_grpc_library(
-    name = "metering_py_grpc",
-    srcs = [":metering_moved_proto"],
-    deps = [":metering_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha/multiclusteringress/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/multiclusteringress/BUILD.bazel
@ -61,28 +61,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "multiclusteringress_moved_proto",
+py_gapic_library(
+    name = "multiclusteringress_py_gapic",
    srcs = [":multiclusteringress_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-    ],
-)
-
-py_proto_library(
-    name = "multiclusteringress_py_proto",
-    deps = [":multiclusteringress_moved_proto"],
-)
-
-py_grpc_library(
-    name = "multiclusteringress_py_grpc",
-    srcs = [":multiclusteringress_moved_proto"],
-    deps = [":multiclusteringress_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha/servicemesh/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha/servicemesh/BUILD.bazel
@ -63,30 +63,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "servicemesh_moved_proto",
+py_gapic_library(
+    name = "servicemesh_py_gapic",
    srcs = [":servicemesh_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "//google/api:field_behavior_proto",
-        "@com_google_protobuf//:struct_proto",
-    ],
-)
-
-py_proto_library(
-    name = "servicemesh_py_proto",
-    deps = [":servicemesh_moved_proto"],
-)
-
-py_grpc_library(
-    name = "servicemesh_py_grpc",
-    srcs = [":servicemesh_moved_proto"],
-    deps = [":servicemesh_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1alpha2/BUILD.bazel
+++ b/google/cloud/gkehub/v1alpha2/BUILD.bazel
@ -164,6 +164,7 @@ py_gapic_library(
    name = "gkehub_py_gapic",
    srcs = [":gkehub_proto"],
    grpc_service_config = "membership_grpc_service_config.json",
+    opt_args = ["warehouse-package-name=google-cloud-gke-hub"],
 )

 # Open Source Packages
--- a/google/cloud/gkehub/v1beta/BUILD.bazel
+++ b/google/cloud/gkehub/v1beta/BUILD.bazel
@ -171,6 +171,9 @@ py_gapic_library(
    name = "gkehub_py_gapic",
    srcs = [":gkehub_proto"],
    grpc_service_config = "v1beta_grpc_service_config.json",
+    opt_args = [
+        "warehouse-package-name=google-cloud-gke-hub",
+    ],
 )

 # Open Source Packages
@ -178,6 +181,9 @@ py_gapic_assembly_pkg(
    name = "gkehub-v1beta-py",
    deps = [
        ":gkehub_py_gapic",
+        "//google/cloud/gkehub/v1beta/configmanagement:configmanagement_py_gapic",
+        "//google/cloud/gkehub/v1beta/metering:metering_py_gapic",
+        "//google/cloud/gkehub/v1beta/multiclusteringress:multiclusteringress_py_gapic",
    ],
 )

--- a/google/cloud/gkehub/v1beta/configmanagement/BUILD.bazel
+++ b/google/cloud/gkehub/v1beta/configmanagement/BUILD.bazel
@ -62,29 +62,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "configmanagement_moved_proto",
+py_gapic_library(
+    name = "configmanagement_py_gapic",
    srcs = [":configmanagement_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
-)
-
-py_proto_library(
-    name = "configmanagement_py_proto",
-    deps = [":configmanagement_moved_proto"],
-)
-
-py_grpc_library(
-    name = "configmanagement_py_grpc",
-    srcs = [":configmanagement_moved_proto"],
-    deps = [":configmanagement_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1beta/metering/BUILD.bazel
+++ b/google/cloud/gkehub/v1beta/metering/BUILD.bazel
@ -62,29 +62,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "metering_moved_proto",
+py_gapic_library(
+    name = "metering_py_gapic",
    srcs = [":metering_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-        "@com_google_protobuf//:timestamp_proto",
-    ],
-)
-
-py_proto_library(
-    name = "metering_py_proto",
-    deps = [":metering_moved_proto"],
-)
-
-py_grpc_library(
-    name = "metering_py_grpc",
-    srcs = [":metering_moved_proto"],
-    deps = [":metering_py_proto"],
 )

 ##############################################################################
--- a/google/cloud/gkehub/v1beta/multiclusteringress/BUILD.bazel
+++ b/google/cloud/gkehub/v1beta/multiclusteringress/BUILD.bazel
@ -61,28 +61,12 @@ go_proto_library(
 ##############################################################################
 load(
    "@com_google_googleapis_imports//:imports.bzl",
-    "moved_proto_library",
-    "py_grpc_library",
-    "py_proto_library",
+    "py_gapic_library",
 )

-moved_proto_library(
-    name = "multiclusteringress_moved_proto",
+py_gapic_library(
+    name = "multiclusteringress_py_gapic",
    srcs = [":multiclusteringress_proto"],
-    deps = [
-        "//google/api:annotations_proto",
-    ],
-)
-
-py_proto_library(
-    name = "multiclusteringress_py_proto",
-    deps = [":multiclusteringress_moved_proto"],
-)
-
-py_grpc_library(
-    name = "multiclusteringress_py_grpc",
-    srcs = [":multiclusteringress_moved_proto"],
-    deps = [":multiclusteringress_py_proto"],
 )

 ##############################################################################