From 729c511e74fe2433e4a18e7904de16596c52797c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 13:44:14 +0000 Subject: [PATCH] chore: release 0.2.0 (#46) :robot: I have created a release \*beep\* \*boop\* --- ## [0.2.0](https://www.github.com/googleapis/python-gke-hub/compare/v0.1.2...v0.2.0) (2021-07-24) ### Features * add always_use_jwt_access ([f11dcfd](https://www.github.com/googleapis/python-gke-hub/commit/f11dcfdf34ce4fa26de2fc4779b5b4f46a5c52bd)) * add always_use_jwt_access ([#45](https://www.github.com/googleapis/python-gke-hub/issues/45)) ([225d132](https://www.github.com/googleapis/python-gke-hub/commit/225d13235789a5d778658c2938e2c07df847a0cd)) * add v1 ([#51](https://www.github.com/googleapis/python-gke-hub/issues/51)) ([f11dcfd](https://www.github.com/googleapis/python-gke-hub/commit/f11dcfdf34ce4fa26de2fc4779b5b4f46a5c52bd)) ### Bug Fixes * **deps:** pin 'google-{api,cloud}-core', 'google-auth' to allow 2.x versions ([#55](https://www.github.com/googleapis/python-gke-hub/issues/55)) ([7035364](https://www.github.com/googleapis/python-gke-hub/commit/703536465a766c452a8c27a6ee951dec35cf3c4f)) * enable self signed jwt for grpc ([#58](https://www.github.com/googleapis/python-gke-hub/issues/58)) ([66f14c9](https://www.github.com/googleapis/python-gke-hub/commit/66f14c93978f97f8180ca8f0a02856d4d633a2bf)) * **v1beta1:** disable always_use_jwt_access ([#52](https://www.github.com/googleapis/python-gke-hub/issues/52)) ([100f72e](https://www.github.com/googleapis/python-gke-hub/commit/100f72e7181f4faeb04a76e106888ffd766ed9ef)) ### Documentation * omit mention of Python 2.7 in 'CONTRIBUTING.rst' ([#1127](https://www.github.com/googleapis/python-gke-hub/issues/1127)) ([#40](https://www.github.com/googleapis/python-gke-hub/issues/40)) ([8f703d7](https://www.github.com/googleapis/python-gke-hub/commit/8f703d74ad3d9b3ea31b2136ed4e97594b52f832)), closes [#1126](https://www.github.com/googleapis/python-gke-hub/issues/1126) * add Samples section to CONTRIBUTING.rst ([#56](https://www.github.com/googleapis/python-gke-hub/issues/56)) ([b08cf7e](https://www.github.com/googleapis/python-gke-hub/commit/b08cf7e5f2dbb1f3615f5b652c2d69f991d8aa69)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- packages/google-cloud-gke-hub/CHANGELOG.md | 22 +++++ .../google/cloud/gkehub/__init__.py | 84 +++++++++++++++++ .../cloud/gkehub/configmanagement/__init__.py | 94 ------------------- .../cloud/gkehub/configmanagement/py.typed | 2 - .../types/configmanagement.py | 2 +- .../gkehub/multiclusteringress/__init__.py | 22 ----- .../cloud/gkehub/multiclusteringress/py.typed | 2 - .../types/multiclusteringress.py | 2 +- .../services/gke_hub/async_client.py | 4 +- .../gkehub_v1/services/gke_hub/client.py | 4 +- .../services/gke_hub/transports/grpc.py | 26 ++--- .../gke_hub/transports/grpc_asyncio.py | 26 ++--- .../google/cloud/gkehub_v1/types/feature.py | 12 +-- .../cloud/gkehub_v1/types/membership.py | 2 +- .../google/cloud/gkehub_v1/types/service.py | 2 +- packages/google-cloud-gke-hub/owlbot.py | 25 +---- packages/google-cloud-gke-hub/setup.py | 2 +- .../unit/gapic/gkehub_v1/test_gke_hub.py | 4 +- 18 files changed, 152 insertions(+), 185 deletions(-) create mode 100644 packages/google-cloud-gke-hub/google/cloud/gkehub/__init__.py delete mode 100644 packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/__init__.py delete mode 100644 packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/py.typed delete mode 100644 packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/__init__.py delete mode 100644 packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/py.typed diff --git a/packages/google-cloud-gke-hub/CHANGELOG.md b/packages/google-cloud-gke-hub/CHANGELOG.md index 47934e4f78e3..5eab68f3bd6f 100644 --- a/packages/google-cloud-gke-hub/CHANGELOG.md +++ b/packages/google-cloud-gke-hub/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/python-gke-hub/compare/v0.1.2...v0.2.0) (2021-07-24) + + +### Features + +* add always_use_jwt_access ([f11dcfd](https://www.github.com/googleapis/python-gke-hub/commit/f11dcfdf34ce4fa26de2fc4779b5b4f46a5c52bd)) +* add always_use_jwt_access ([#45](https://www.github.com/googleapis/python-gke-hub/issues/45)) ([225d132](https://www.github.com/googleapis/python-gke-hub/commit/225d13235789a5d778658c2938e2c07df847a0cd)) +* add v1 ([#51](https://www.github.com/googleapis/python-gke-hub/issues/51)) ([f11dcfd](https://www.github.com/googleapis/python-gke-hub/commit/f11dcfdf34ce4fa26de2fc4779b5b4f46a5c52bd)) + + +### Bug Fixes + +* **deps:** pin 'google-{api,cloud}-core', 'google-auth' to allow 2.x versions ([#55](https://www.github.com/googleapis/python-gke-hub/issues/55)) ([7035364](https://www.github.com/googleapis/python-gke-hub/commit/703536465a766c452a8c27a6ee951dec35cf3c4f)) +* enable self signed jwt for grpc ([#58](https://www.github.com/googleapis/python-gke-hub/issues/58)) ([66f14c9](https://www.github.com/googleapis/python-gke-hub/commit/66f14c93978f97f8180ca8f0a02856d4d633a2bf)) +* **v1beta1:** disable always_use_jwt_access ([#52](https://www.github.com/googleapis/python-gke-hub/issues/52)) ([100f72e](https://www.github.com/googleapis/python-gke-hub/commit/100f72e7181f4faeb04a76e106888ffd766ed9ef)) + + +### Documentation + +* omit mention of Python 2.7 in 'CONTRIBUTING.rst' ([#1127](https://www.github.com/googleapis/python-gke-hub/issues/1127)) ([#40](https://www.github.com/googleapis/python-gke-hub/issues/40)) ([8f703d7](https://www.github.com/googleapis/python-gke-hub/commit/8f703d74ad3d9b3ea31b2136ed4e97594b52f832)), closes [#1126](https://www.github.com/googleapis/python-gke-hub/issues/1126) +* add Samples section to CONTRIBUTING.rst ([#56](https://www.github.com/googleapis/python-gke-hub/issues/56)) ([b08cf7e](https://www.github.com/googleapis/python-gke-hub/commit/b08cf7e5f2dbb1f3615f5b652c2d69f991d8aa69)) + ### [0.1.2](https://www.github.com/googleapis/python-gke-hub/compare/v0.1.1...v0.1.2) (2021-06-16) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/__init__.py new file mode 100644 index 000000000000..3faab2a18cd5 --- /dev/null +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub/__init__.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from google.cloud.gkehub_v1.services.gke_hub.client import GkeHubClient +from google.cloud.gkehub_v1.services.gke_hub.async_client import GkeHubAsyncClient + +from google.cloud.gkehub_v1.types.feature import CommonFeatureSpec +from google.cloud.gkehub_v1.types.feature import CommonFeatureState +from google.cloud.gkehub_v1.types.feature import Feature +from google.cloud.gkehub_v1.types.feature import FeatureResourceState +from google.cloud.gkehub_v1.types.feature import FeatureState +from google.cloud.gkehub_v1.types.feature import MembershipFeatureSpec +from google.cloud.gkehub_v1.types.feature import MembershipFeatureState +from google.cloud.gkehub_v1.types.membership import Authority +from google.cloud.gkehub_v1.types.membership import GkeCluster +from google.cloud.gkehub_v1.types.membership import KubernetesMetadata +from google.cloud.gkehub_v1.types.membership import Membership +from google.cloud.gkehub_v1.types.membership import MembershipEndpoint +from google.cloud.gkehub_v1.types.membership import MembershipState +from google.cloud.gkehub_v1.types.service import ConnectAgentResource +from google.cloud.gkehub_v1.types.service import CreateFeatureRequest +from google.cloud.gkehub_v1.types.service import CreateMembershipRequest +from google.cloud.gkehub_v1.types.service import DeleteFeatureRequest +from google.cloud.gkehub_v1.types.service import DeleteMembershipRequest +from google.cloud.gkehub_v1.types.service import GenerateConnectManifestRequest +from google.cloud.gkehub_v1.types.service import GenerateConnectManifestResponse +from google.cloud.gkehub_v1.types.service import GetFeatureRequest +from google.cloud.gkehub_v1.types.service import GetMembershipRequest +from google.cloud.gkehub_v1.types.service import ListFeaturesRequest +from google.cloud.gkehub_v1.types.service import ListFeaturesResponse +from google.cloud.gkehub_v1.types.service import ListMembershipsRequest +from google.cloud.gkehub_v1.types.service import ListMembershipsResponse +from google.cloud.gkehub_v1.types.service import OperationMetadata +from google.cloud.gkehub_v1.types.service import TypeMeta +from google.cloud.gkehub_v1.types.service import UpdateFeatureRequest +from google.cloud.gkehub_v1.types.service import UpdateMembershipRequest + +__all__ = ( + "GkeHubClient", + "GkeHubAsyncClient", + "CommonFeatureSpec", + "CommonFeatureState", + "Feature", + "FeatureResourceState", + "FeatureState", + "MembershipFeatureSpec", + "MembershipFeatureState", + "Authority", + "GkeCluster", + "KubernetesMetadata", + "Membership", + "MembershipEndpoint", + "MembershipState", + "ConnectAgentResource", + "CreateFeatureRequest", + "CreateMembershipRequest", + "DeleteFeatureRequest", + "DeleteMembershipRequest", + "GenerateConnectManifestRequest", + "GenerateConnectManifestResponse", + "GetFeatureRequest", + "GetMembershipRequest", + "ListFeaturesRequest", + "ListFeaturesResponse", + "ListMembershipsRequest", + "ListMembershipsResponse", + "OperationMetadata", + "TypeMeta", + "UpdateFeatureRequest", + "UpdateMembershipRequest", +) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/__init__.py deleted file mode 100644 index f17044687164..000000000000 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/__init__.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ConfigSync -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - ConfigSyncDeploymentState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - ConfigSyncState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - ConfigSyncVersion, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ErrorResource -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - GatekeeperDeploymentState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import GitConfig -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - GroupVersionKind, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - HierarchyControllerConfig, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - HierarchyControllerDeploymentState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - HierarchyControllerState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - HierarchyControllerVersion, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import InstallError -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - MembershipSpec, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - MembershipState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import OperatorState -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - PolicyController, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - PolicyControllerState, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - PolicyControllerVersion, -) -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import SyncError -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import SyncState -from google.cloud.gkehub.configmanagement_v1.types.configmanagement import ( - DeploymentState, -) - -__all__ = ( - "ConfigSync", - "ConfigSyncDeploymentState", - "ConfigSyncState", - "ConfigSyncVersion", - "ErrorResource", - "GatekeeperDeploymentState", - "GitConfig", - "GroupVersionKind", - "HierarchyControllerConfig", - "HierarchyControllerDeploymentState", - "HierarchyControllerState", - "HierarchyControllerVersion", - "InstallError", - "MembershipSpec", - "MembershipState", - "OperatorState", - "PolicyController", - "PolicyControllerState", - "PolicyControllerVersion", - "SyncError", - "SyncState", - "DeploymentState", -) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/py.typed b/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/py.typed deleted file mode 100644 index 5d21684e0e7a..000000000000 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement/py.typed +++ /dev/null @@ -1,2 +0,0 @@ -# Marker file for PEP 561. -# The google-cloud-gkehub-configmanagement package uses inline types. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement_v1/types/configmanagement.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement_v1/types/configmanagement.py index 2e8013755087..81afa63963ba 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement_v1/types/configmanagement.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub/configmanagement_v1/types/configmanagement.py @@ -19,7 +19,7 @@ __protobuf__ = proto.module( - package="google.cloud.gkehub.configmanagement_v1", + package="google.cloud.gkehub.configmanagement.v1", manifest={ "DeploymentState", "MembershipState", diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/__init__.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/__init__.py deleted file mode 100644 index a05e215ac18d..000000000000 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -from google.cloud.gkehub.multiclusteringress_v1.types.multiclusteringress import ( - FeatureSpec, -) - -__all__ = ("FeatureSpec",) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/py.typed b/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/py.typed deleted file mode 100644 index 298daf2790ee..000000000000 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress/py.typed +++ /dev/null @@ -1,2 +0,0 @@ -# Marker file for PEP 561. -# The google-cloud-gkehub-multiclusteringress package uses inline types. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress_v1/types/multiclusteringress.py b/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress_v1/types/multiclusteringress.py index ef30a0bdfb42..740be665b600 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress_v1/types/multiclusteringress.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub/multiclusteringress_v1/types/multiclusteringress.py @@ -17,7 +17,7 @@ __protobuf__ = proto.module( - package="google.cloud.gkehub.multiclusteringress_v1", manifest={"FeatureSpec",}, + package="google.cloud.gkehub.multiclusteringress.v1", manifest={"FeatureSpec",}, ) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py index d56e4b57bdf8..632ae320ed86 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/async_client.py @@ -47,8 +47,8 @@ class GkeHubAsyncClient: The GKE Hub service operates on the following resources: - - [Membership][google.cloud.gkehub_v1.Membership] - - [Feature][google.cloud.gkehub_v1.Feature] + - [Membership][google.cloud.gkehub.v1.Membership] + - [Feature][google.cloud.gkehub.v1.Feature] GKE Hub is currently only available in the global region. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py index 4a62ea0387a1..f3ed8f7ffb39 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/client.py @@ -82,8 +82,8 @@ class GkeHubClient(metaclass=GkeHubClientMeta): The GKE Hub service operates on the following resources: - - [Membership][google.cloud.gkehub_v1.Membership] - - [Feature][google.cloud.gkehub_v1.Feature] + - [Membership][google.cloud.gkehub.v1.Membership] + - [Feature][google.cloud.gkehub.v1.Feature] GKE Hub is currently only available in the global region. diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py index 0614912f57f3..0d1dff545524 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc.py @@ -41,8 +41,8 @@ class GkeHubGrpcTransport(GkeHubTransport): The GKE Hub service operates on the following resources: - - [Membership][google.cloud.gkehub_v1.Membership] - - [Feature][google.cloud.gkehub_v1.Feature] + - [Membership][google.cloud.gkehub.v1.Membership] + - [Feature][google.cloud.gkehub.v1.Feature] GKE Hub is currently only available in the global region. @@ -277,7 +277,7 @@ def list_memberships( # to pass in the functions for each. if "list_memberships" not in self._stubs: self._stubs["list_memberships"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/ListMemberships", + "/google.cloud.gkehub.v1.GkeHub/ListMemberships", request_serializer=service.ListMembershipsRequest.serialize, response_deserializer=service.ListMembershipsResponse.deserialize, ) @@ -303,7 +303,7 @@ def list_features( # to pass in the functions for each. if "list_features" not in self._stubs: self._stubs["list_features"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/ListFeatures", + "/google.cloud.gkehub.v1.GkeHub/ListFeatures", request_serializer=service.ListFeaturesRequest.serialize, response_deserializer=service.ListFeaturesResponse.deserialize, ) @@ -329,7 +329,7 @@ def get_membership( # to pass in the functions for each. if "get_membership" not in self._stubs: self._stubs["get_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GetMembership", + "/google.cloud.gkehub.v1.GkeHub/GetMembership", request_serializer=service.GetMembershipRequest.serialize, response_deserializer=membership.Membership.deserialize, ) @@ -353,7 +353,7 @@ def get_feature(self) -> Callable[[service.GetFeatureRequest], feature.Feature]: # to pass in the functions for each. if "get_feature" not in self._stubs: self._stubs["get_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GetFeature", + "/google.cloud.gkehub.v1.GkeHub/GetFeature", request_serializer=service.GetFeatureRequest.serialize, response_deserializer=feature.Feature.deserialize, ) @@ -383,7 +383,7 @@ def create_membership( # to pass in the functions for each. if "create_membership" not in self._stubs: self._stubs["create_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/CreateMembership", + "/google.cloud.gkehub.v1.GkeHub/CreateMembership", request_serializer=service.CreateMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -409,7 +409,7 @@ def create_feature( # to pass in the functions for each. if "create_feature" not in self._stubs: self._stubs["create_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/CreateFeature", + "/google.cloud.gkehub.v1.GkeHub/CreateFeature", request_serializer=service.CreateFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -440,7 +440,7 @@ def delete_membership( # to pass in the functions for each. if "delete_membership" not in self._stubs: self._stubs["delete_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/DeleteMembership", + "/google.cloud.gkehub.v1.GkeHub/DeleteMembership", request_serializer=service.DeleteMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -466,7 +466,7 @@ def delete_feature( # to pass in the functions for each. if "delete_feature" not in self._stubs: self._stubs["delete_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/DeleteFeature", + "/google.cloud.gkehub.v1.GkeHub/DeleteFeature", request_serializer=service.DeleteFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -492,7 +492,7 @@ def update_membership( # to pass in the functions for each. if "update_membership" not in self._stubs: self._stubs["update_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/UpdateMembership", + "/google.cloud.gkehub.v1.GkeHub/UpdateMembership", request_serializer=service.UpdateMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -518,7 +518,7 @@ def update_feature( # to pass in the functions for each. if "update_feature" not in self._stubs: self._stubs["update_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/UpdateFeature", + "/google.cloud.gkehub.v1.GkeHub/UpdateFeature", request_serializer=service.UpdateFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -550,7 +550,7 @@ def generate_connect_manifest( # to pass in the functions for each. if "generate_connect_manifest" not in self._stubs: self._stubs["generate_connect_manifest"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GenerateConnectManifest", + "/google.cloud.gkehub.v1.GkeHub/GenerateConnectManifest", request_serializer=service.GenerateConnectManifestRequest.serialize, response_deserializer=service.GenerateConnectManifestResponse.deserialize, ) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py index 09e317351077..2b759381f54c 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/services/gke_hub/transports/grpc_asyncio.py @@ -43,8 +43,8 @@ class GkeHubGrpcAsyncIOTransport(GkeHubTransport): The GKE Hub service operates on the following resources: - - [Membership][google.cloud.gkehub_v1.Membership] - - [Feature][google.cloud.gkehub_v1.Feature] + - [Membership][google.cloud.gkehub.v1.Membership] + - [Feature][google.cloud.gkehub.v1.Feature] GKE Hub is currently only available in the global region. @@ -284,7 +284,7 @@ def list_memberships( # to pass in the functions for each. if "list_memberships" not in self._stubs: self._stubs["list_memberships"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/ListMemberships", + "/google.cloud.gkehub.v1.GkeHub/ListMemberships", request_serializer=service.ListMembershipsRequest.serialize, response_deserializer=service.ListMembershipsResponse.deserialize, ) @@ -312,7 +312,7 @@ def list_features( # to pass in the functions for each. if "list_features" not in self._stubs: self._stubs["list_features"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/ListFeatures", + "/google.cloud.gkehub.v1.GkeHub/ListFeatures", request_serializer=service.ListFeaturesRequest.serialize, response_deserializer=service.ListFeaturesResponse.deserialize, ) @@ -338,7 +338,7 @@ def get_membership( # to pass in the functions for each. if "get_membership" not in self._stubs: self._stubs["get_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GetMembership", + "/google.cloud.gkehub.v1.GkeHub/GetMembership", request_serializer=service.GetMembershipRequest.serialize, response_deserializer=membership.Membership.deserialize, ) @@ -364,7 +364,7 @@ def get_feature( # to pass in the functions for each. if "get_feature" not in self._stubs: self._stubs["get_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GetFeature", + "/google.cloud.gkehub.v1.GkeHub/GetFeature", request_serializer=service.GetFeatureRequest.serialize, response_deserializer=feature.Feature.deserialize, ) @@ -396,7 +396,7 @@ def create_membership( # to pass in the functions for each. if "create_membership" not in self._stubs: self._stubs["create_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/CreateMembership", + "/google.cloud.gkehub.v1.GkeHub/CreateMembership", request_serializer=service.CreateMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -422,7 +422,7 @@ def create_feature( # to pass in the functions for each. if "create_feature" not in self._stubs: self._stubs["create_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/CreateFeature", + "/google.cloud.gkehub.v1.GkeHub/CreateFeature", request_serializer=service.CreateFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -455,7 +455,7 @@ def delete_membership( # to pass in the functions for each. if "delete_membership" not in self._stubs: self._stubs["delete_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/DeleteMembership", + "/google.cloud.gkehub.v1.GkeHub/DeleteMembership", request_serializer=service.DeleteMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -481,7 +481,7 @@ def delete_feature( # to pass in the functions for each. if "delete_feature" not in self._stubs: self._stubs["delete_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/DeleteFeature", + "/google.cloud.gkehub.v1.GkeHub/DeleteFeature", request_serializer=service.DeleteFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -509,7 +509,7 @@ def update_membership( # to pass in the functions for each. if "update_membership" not in self._stubs: self._stubs["update_membership"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/UpdateMembership", + "/google.cloud.gkehub.v1.GkeHub/UpdateMembership", request_serializer=service.UpdateMembershipRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -535,7 +535,7 @@ def update_feature( # to pass in the functions for each. if "update_feature" not in self._stubs: self._stubs["update_feature"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/UpdateFeature", + "/google.cloud.gkehub.v1.GkeHub/UpdateFeature", request_serializer=service.UpdateFeatureRequest.serialize, response_deserializer=operations_pb2.Operation.FromString, ) @@ -567,7 +567,7 @@ def generate_connect_manifest( # to pass in the functions for each. if "generate_connect_manifest" not in self._stubs: self._stubs["generate_connect_manifest"] = self.grpc_channel.unary_unary( - "/google.cloud.gkehub_v1.GkeHub/GenerateConnectManifest", + "/google.cloud.gkehub.v1.GkeHub/GenerateConnectManifest", request_serializer=service.GenerateConnectManifestRequest.serialize, response_deserializer=service.GenerateConnectManifestResponse.deserialize, ) diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py index 0f919813f128..749a5882bdb7 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/feature.py @@ -15,13 +15,13 @@ # import proto # type: ignore -import google.cloud.gkehub.configmanagement_v1 as configmanagement_pb2 # type: ignore -import google.cloud.gkehub.multiclusteringress_v1 as multiclusteringress_pb2 # type: ignore +from google.cloud.gkehub import configmanagement_v1 as configmanagement_pb2 # type: ignore +from google.cloud.gkehub import multiclusteringress_v1 as multiclusteringress_pb2 # type: ignore from google.protobuf import timestamp_pb2 # type: ignore __protobuf__ = proto.module( - package="google.cloud.gkehub_v1", + package="google.cloud.gkehub.v1", manifest={ "Feature", "FeatureResourceState", @@ -175,7 +175,7 @@ class CommonFeatureSpec(proto.Message): r"""CommonFeatureSpec contains Hub-wide configuration informatio. Attributes: - multiclusteringress (google.cloud.gkehub.multiclusteringress_v1.multiclusteringress_pb2.FeatureSpec): + multiclusteringress (google.cloud.gkehub.multiclusteringress.v1.multiclusteringress_pb2.FeatureSpec): Multicluster Ingress-specific spec. """ @@ -205,7 +205,7 @@ class MembershipFeatureSpec(proto.Message): a single Membership. Attributes: - configmanagement (google.cloud.gkehub.configmanagement_v1.configmanagement_pb2.MembershipSpec): + configmanagement (google.cloud.gkehub.configmanagement.v1.configmanagement_pb2.MembershipSpec): Config Management-specific spec. """ @@ -222,7 +222,7 @@ class MembershipFeatureState(proto.Message): for a single Membership. Attributes: - configmanagement (google.cloud.gkehub.configmanagement_v1.configmanagement_pb2.MembershipState): + configmanagement (google.cloud.gkehub.configmanagement.v1.configmanagement_pb2.MembershipState): Config Management-specific state. state (google.cloud.gkehub_v1.types.FeatureState): The high-level state of this Feature for a diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py index 67c3d98a473c..f1ea88d4e9b7 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py @@ -19,7 +19,7 @@ __protobuf__ = proto.module( - package="google.cloud.gkehub_v1", + package="google.cloud.gkehub.v1", manifest={ "Membership", "MembershipEndpoint", diff --git a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py index 7c12ebd1e324..d0aec24b6bdf 100644 --- a/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py +++ b/packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/service.py @@ -22,7 +22,7 @@ __protobuf__ = proto.module( - package="google.cloud.gkehub_v1", + package="google.cloud.gkehub.v1", manifest={ "ListMembershipsRequest", "ListMembershipsResponse", diff --git a/packages/google-cloud-gke-hub/owlbot.py b/packages/google-cloud-gke-hub/owlbot.py index 1ce6b4c76d47..07d70f43b91f 100644 --- a/packages/google-cloud-gke-hub/owlbot.py +++ b/packages/google-cloud-gke-hub/owlbot.py @@ -30,16 +30,6 @@ "multiclusteringress", ] - # rename google.cloud.gkehub.vX to google.cloud.gkehub_vX - s.replace( - [ - library / f"google/cloud/gkehub_{library.name}/**/*.py", - library / f"tests/unit/gapic/gkehub_{library.name}/**/*.py", - ], - f"google.cloud.gkehub.{library.name}", - f"google.cloud.gkehub_{library.name}", - ) - # rename dependencies google.cloud.gkehub.dep.vX to google.cloud.gkehub.dep_vX for dep in dependencies: s.replace( @@ -49,17 +39,7 @@ library / f"google/cloud/gkehub/{dep}_{library.name}/**/*.py", ], f"from google.cloud.gkehub.{dep}.{library.name} import", - f"import google.cloud.gkehub.{dep}_{library.name} as" - ) - - s.replace( - [ - library / f"google/cloud/gkehub_{library.name}/**/*.py", - library / f"tests/unit/gapic/gkehub_{library.name}/**/*.py", - library / f"google/cloud/gkehub/{dep}_{library.name}/**/*.py", - ], - f"google.cloud.gkehub.{dep}.{library.name}", - f"google.cloud.gkehub.{dep}_{library.name}" + f"from google.cloud.gkehub import {dep}_{library.name} as" ) # Work around gapic generator bug https://github.com/googleapis/gapic-generator-python/issues/902 @@ -83,7 +63,8 @@ """the GKE cluster. For example: //container.googleapis.com/projects/my-""" ) - s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst","google/cloud/gkehub/__init__.py"]) + + s.move(library, excludes=["setup.py", "README.rst", "docs/index.rst", "google/cloud/gkehub/configmanagement", "google/cloud/gkehub/multiclusteringress"]) s.remove_staging_dirs() diff --git a/packages/google-cloud-gke-hub/setup.py b/packages/google-cloud-gke-hub/setup.py index cc386969dd19..ea41ed4ff505 100644 --- a/packages/google-cloud-gke-hub/setup.py +++ b/packages/google-cloud-gke-hub/setup.py @@ -20,7 +20,7 @@ import setuptools # type: ignore name = "google-cloud-gke-hub" -version = "0.1.2" +version = "0.2.0" description = "GKE Hub API client library" release_status = "Development Status :: 4 - Beta" url = "https://github.com/googleapis/python-gke-hub" diff --git a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py index ab4a52a26397..e2e15fa2fc74 100644 --- a/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py +++ b/packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py @@ -34,8 +34,8 @@ from google.api_core import operations_v1 from google.auth import credentials as ga_credentials from google.auth.exceptions import MutualTLSChannelError -import google.cloud.gkehub.configmanagement_v1 as configmanagement_pb2 # type: ignore -import google.cloud.gkehub.multiclusteringress_v1 as multiclusteringress_pb2 # type: ignore +from google.cloud.gkehub import configmanagement_v1 as configmanagement_pb2 # type: ignore +from google.cloud.gkehub import multiclusteringress_v1 as multiclusteringress_pb2 # type: ignore from google.cloud.gkehub_v1.services.gke_hub import GkeHubAsyncClient from google.cloud.gkehub_v1.services.gke_hub import GkeHubClient from google.cloud.gkehub_v1.services.gke_hub import pagers