diff --git a/.coveragerc b/.coveragerc index 2a66051..471fbbf 100644 --- a/.coveragerc +++ b/.coveragerc @@ -10,8 +10,3 @@ exclude_lines = pragma: NO COVER # Ignore debug-only repr def __repr__ - # Ignore pkg_resources exceptions. - # This is added at the module level as a safeguard for if someone - # generates the code and tries to run it without pip installing. This - # makes it virtually impossible to test properly. - except pkg_resources.DistributionNotFound diff --git a/google/cloud/managedidentities_v1/gapic_version.py b/google/cloud/managedidentities_v1/gapic_version.py new file mode 100644 index 0000000..afd6fcf --- /dev/null +++ b/google/cloud/managedidentities_v1/gapic_version.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2022 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. +# +__version__ = "1.5.4" # {x-release-please-version} diff --git a/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py b/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py index e19d67d..4cce019 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_service/async_client.py @@ -34,7 +34,8 @@ from google.api_core.client_options import ClientOptions from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.managedidentities_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -269,7 +270,7 @@ async def create_microsoft_ad_domain( domain_name: Optional[str] = None, domain: Optional[resource.Domain] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Creates a Microsoft AD domain. @@ -306,7 +307,7 @@ async def sample_create_microsoft_ad_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -425,7 +426,7 @@ async def reset_admin_password( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> managed_identities_service.ResetAdminPasswordResponse: r"""Resets a domain's administrator password. @@ -529,7 +530,7 @@ async def list_domains( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListDomainsAsyncPager: r"""Lists domains in a project. @@ -646,7 +647,7 @@ async def get_domain( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resource.Domain: r"""Gets information about a domain. @@ -751,7 +752,7 @@ async def update_domain( domain: Optional[resource.Domain] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Updates the metadata and configuration of a domain. @@ -786,7 +787,7 @@ async def sample_update_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -892,7 +893,7 @@ async def delete_domain( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Deletes a domain. @@ -922,7 +923,7 @@ async def sample_delete_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1019,7 +1020,7 @@ async def attach_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Adds an AD trust to a domain. @@ -1057,7 +1058,7 @@ async def sample_attach_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1156,7 +1157,7 @@ async def reconfigure_trust( target_domain_name: Optional[str] = None, target_dns_ip_addresses: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Updates the DNS conditional forwarder. @@ -1188,7 +1189,7 @@ async def sample_reconfigure_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1299,7 +1300,7 @@ async def detach_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Removes an AD trust. @@ -1337,7 +1338,7 @@ async def sample_detach_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1437,7 +1438,7 @@ async def validate_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: r"""Validates a trust state, that the target domain is @@ -1477,7 +1478,7 @@ async def sample_validate_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) @@ -1575,14 +1576,9 @@ async def __aexit__(self, exc_type, exc, tb): await self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-managed-identities", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("ManagedIdentitiesServiceAsyncClient",) diff --git a/google/cloud/managedidentities_v1/services/managed_identities_service/client.py b/google/cloud/managedidentities_v1/services/managed_identities_service/client.py index b84d762..d26f35b 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/client.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_service/client.py @@ -38,7 +38,8 @@ from google.auth.transport import mtls # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources + +from google.cloud.managedidentities_v1 import gapic_version as package_version try: OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault] @@ -491,7 +492,7 @@ def create_microsoft_ad_domain( domain_name: Optional[str] = None, domain: Optional[resource.Domain] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Creates a Microsoft AD domain. @@ -651,7 +652,7 @@ def reset_admin_password( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> managed_identities_service.ResetAdminPasswordResponse: r"""Resets a domain's administrator password. @@ -757,7 +758,7 @@ def list_domains( *, parent: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListDomainsPager: r"""Lists domains in a project. @@ -874,7 +875,7 @@ def get_domain( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> resource.Domain: r"""Gets information about a domain. @@ -979,7 +980,7 @@ def update_domain( domain: Optional[resource.Domain] = None, update_mask: Optional[field_mask_pb2.FieldMask] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Updates the metadata and configuration of a domain. @@ -1120,7 +1121,7 @@ def delete_domain( *, name: Optional[str] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Deletes a domain. @@ -1247,7 +1248,7 @@ def attach_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Adds an AD trust to a domain. @@ -1384,7 +1385,7 @@ def reconfigure_trust( target_domain_name: Optional[str] = None, target_dns_ip_addresses: Optional[MutableSequence[str]] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Updates the DNS conditional forwarder. @@ -1527,7 +1528,7 @@ def detach_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Removes an AD trust. @@ -1665,7 +1666,7 @@ def validate_trust( name: Optional[str] = None, trust: Optional[resource.Trust] = None, retry: OptionalRetry = gapic_v1.method.DEFAULT, - timeout: Optional[float] = None, + timeout: Union[float, object] = gapic_v1.method.DEFAULT, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: r"""Validates a trust state, that the target domain is @@ -1810,14 +1811,9 @@ def __exit__(self, type, value, traceback): self.transport.close() -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-managed-identities", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) __all__ = ("ManagedIdentitiesServiceClient",) diff --git a/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py index 3689cc3..08eea09 100644 --- a/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py +++ b/google/cloud/managedidentities_v1/services/managed_identities_service/transports/base.py @@ -24,18 +24,13 @@ from google.auth import credentials as ga_credentials # type: ignore from google.longrunning import operations_pb2 # type: ignore from google.oauth2 import service_account # type: ignore -import pkg_resources +from google.cloud.managedidentities_v1 import gapic_version as package_version from google.cloud.managedidentities_v1.types import managed_identities_service, resource -try: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution( - "google-cloud-managed-identities", - ).version, - ) -except pkg_resources.DistributionNotFound: - DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() +DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( + gapic_version=package_version.__version__ +) class ManagedIdentitiesServiceTransport(abc.ABC): diff --git a/release-please-config.json b/release-please-config.json index 68c802f..436487a 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -5,6 +5,7 @@ "release-type": "python", "extra-files": [ "google/cloud/managedidentities/gapic_version.py", + "google/cloud/managedidentities_v1/gapic_version.py", { "type": "json", "path": "samples/generated_samples/snippet_metadata_google.cloud.managedidentities.v1.json", diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_attach_trust_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_attach_trust_async.py index b99d9fe..75c8723 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_attach_trust_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_attach_trust_async.py @@ -56,7 +56,7 @@ async def sample_attach_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_create_microsoft_ad_domain_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_create_microsoft_ad_domain_async.py index 921156d..b672905 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_create_microsoft_ad_domain_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_create_microsoft_ad_domain_async.py @@ -55,7 +55,7 @@ async def sample_create_microsoft_ad_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_delete_domain_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_delete_domain_async.py index 499b2b3..1a6b7d0 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_delete_domain_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_delete_domain_async.py @@ -48,7 +48,7 @@ async def sample_delete_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_detach_trust_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_detach_trust_async.py index 78d02f3..dd4ef6f 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_detach_trust_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_detach_trust_async.py @@ -56,7 +56,7 @@ async def sample_detach_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_reconfigure_trust_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_reconfigure_trust_async.py index 7ef4bc2..6979c8c 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_reconfigure_trust_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_reconfigure_trust_async.py @@ -50,7 +50,7 @@ async def sample_reconfigure_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_update_domain_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_update_domain_async.py index 47c882f..78fbce9 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_update_domain_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_update_domain_async.py @@ -53,7 +53,7 @@ async def sample_update_domain(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_validate_trust_async.py b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_validate_trust_async.py index 2803135..91adadb 100644 --- a/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_validate_trust_async.py +++ b/samples/generated_samples/managedidentities_v1_generated_managed_identities_service_validate_trust_async.py @@ -56,7 +56,7 @@ async def sample_validate_trust(): print("Waiting for operation to complete...") - response = await operation.result() + response = (await operation).result() # Handle the response print(response) diff --git a/setup.py b/setup.py index c0530e9..d72fa6f 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ release_status = "Development Status :: 5 - Production/Stable" dependencies = [ - "google-api-core[grpc] >= 1.33.2, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", + "google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", "proto-plus >= 1.22.0, <2.0.0dev", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", ] diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 6f3158c..6c44adf 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -4,6 +4,6 @@ # Pin the version to the lower bound. # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev", # Then this file should have google-cloud-foo==1.14.0 -google-api-core==1.33.2 +google-api-core==1.34.0 proto-plus==1.22.0 protobuf==3.19.5