diff --git a/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py b/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py index 357bbf8..0110c4b 100644 --- a/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py +++ b/google/cloud/artifactregistry_v1/services/artifact_registry/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.artifactregistry_v1.services.artifact_registry import pagers from google.cloud.artifactregistry_v1.types import artifact from google.cloud.artifactregistry_v1.types import repository @@ -182,17 +184,17 @@ def __init__( async def list_docker_images( self, - request: artifact.ListDockerImagesRequest = None, + request: Union[artifact.ListDockerImagesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListDockerImagesAsyncPager: r"""Lists docker images. Args: - request (:class:`google.cloud.artifactregistry_v1.types.ListDockerImagesRequest`): + request (Union[google.cloud.artifactregistry_v1.types.ListDockerImagesRequest, dict]): The request object. The request to list docker images. parent (:class:`str`): Required. The name of the parent @@ -262,17 +264,17 @@ async def list_docker_images( async def list_repositories( self, - request: repository.ListRepositoriesRequest = None, + request: Union[repository.ListRepositoriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRepositoriesAsyncPager: r"""Lists repositories. Args: - request (:class:`google.cloud.artifactregistry_v1.types.ListRepositoriesRequest`): + request (Union[google.cloud.artifactregistry_v1.types.ListRepositoriesRequest, dict]): The request object. The request to list repositories. parent (:class:`str`): Required. The name of the parent @@ -342,17 +344,17 @@ async def list_repositories( async def get_repository( self, - request: repository.GetRepositoryRequest = None, + request: Union[repository.GetRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> repository.Repository: r"""Gets a repository. Args: - request (:class:`google.cloud.artifactregistry_v1.types.GetRepositoryRequest`): + request (Union[google.cloud.artifactregistry_v1.types.GetRepositoryRequest, dict]): The request object. The request to retrieve a repository. name (:class:`str`): diff --git a/google/cloud/artifactregistry_v1/services/artifact_registry/client.py b/google/cloud/artifactregistry_v1/services/artifact_registry/client.py index ab51f6b..614ae28 100644 --- a/google/cloud/artifactregistry_v1/services/artifact_registry/client.py +++ b/google/cloud/artifactregistry_v1/services/artifact_registry/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.cloud.artifactregistry_v1.services.artifact_registry import pagers from google.cloud.artifactregistry_v1.types import artifact from google.cloud.artifactregistry_v1.types import repository @@ -388,7 +390,7 @@ def list_docker_images( request: Union[artifact.ListDockerImagesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListDockerImagesPager: @@ -468,7 +470,7 @@ def list_repositories( request: Union[repository.ListRepositoriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRepositoriesPager: @@ -548,7 +550,7 @@ def get_repository( request: Union[repository.GetRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> repository.Repository: diff --git a/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py b/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py index 75ea1e4..ca97fcc 100644 --- a/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py +++ b/google/cloud/artifactregistry_v1/services/artifact_registry/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -38,15 +37,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class ArtifactRegistryTransport(abc.ABC): """Abstract transport class for ArtifactRegistry.""" @@ -99,7 +89,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -132,29 +122,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { diff --git a/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py b/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py index adbc940..bb194bf 100644 --- a/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py +++ b/google/cloud/artifactregistry_v1/services/artifact_registry/transports/grpc_asyncio.py @@ -20,7 +20,6 @@ from google.api_core import grpc_helpers_async # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore diff --git a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py index ac8db1b..3e86960 100644 --- a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py +++ b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/async_client.py @@ -19,13 +19,15 @@ from typing import Dict, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core.client_options import ClientOptions # type: ignore from google.api_core import exceptions as core_exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers @@ -192,17 +194,17 @@ def __init__( async def list_repositories( self, - request: repository.ListRepositoriesRequest = None, + request: Union[repository.ListRepositoriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRepositoriesAsyncPager: r"""Lists repositories. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.ListRepositoriesRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.ListRepositoriesRequest, dict]): The request object. The request to list repositories. parent (:class:`str`): The name of the parent resource whose @@ -280,17 +282,17 @@ async def list_repositories( async def get_repository( self, - request: repository.GetRepositoryRequest = None, + request: Union[repository.GetRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> repository.Repository: r"""Gets a repository. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.GetRepositoryRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.GetRepositoryRequest, dict]): The request object. The request to retrieve a repository. name (:class:`str`): @@ -360,12 +362,12 @@ async def get_repository( async def create_repository( self, - request: gda_repository.CreateRepositoryRequest = None, + request: Union[gda_repository.CreateRepositoryRequest, dict] = None, *, parent: str = None, repository: gda_repository.Repository = None, repository_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -374,7 +376,7 @@ async def create_repository( response will be the created Repository. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.CreateRepositoryRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.CreateRepositoryRequest, dict]): The request object. The request to create a new repository. parent (:class:`str`): @@ -463,18 +465,18 @@ async def create_repository( async def update_repository( self, - request: gda_repository.UpdateRepositoryRequest = None, + request: Union[gda_repository.UpdateRepositoryRequest, dict] = None, *, repository: gda_repository.Repository = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_repository.Repository: r"""Updates a repository. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.UpdateRepositoryRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.UpdateRepositoryRequest, dict]): The request object. The request to update a repository. repository (:class:`google.cloud.artifactregistry_v1beta2.types.Repository`): The repository that replaces the @@ -546,10 +548,10 @@ async def update_repository( async def delete_repository( self, - request: repository.DeleteRepositoryRequest = None, + request: Union[repository.DeleteRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -559,7 +561,7 @@ async def delete_repository( and will return a google.protobuf.Empty response. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.DeleteRepositoryRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.DeleteRepositoryRequest, dict]): The request object. The request to delete a repository. name (:class:`str`): The name of the repository to delete. @@ -647,17 +649,17 @@ async def delete_repository( async def list_packages( self, - request: package.ListPackagesRequest = None, + request: Union[package.ListPackagesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPackagesAsyncPager: r"""Lists packages. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.ListPackagesRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.ListPackagesRequest, dict]): The request object. The request to list packages. parent (:class:`str`): The name of the parent resource whose @@ -734,17 +736,17 @@ async def list_packages( async def get_package( self, - request: package.GetPackageRequest = None, + request: Union[package.GetPackageRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> package.Package: r"""Gets a package. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.GetPackageRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.GetPackageRequest, dict]): The request object. The request to retrieve a package. name (:class:`str`): The name of the package to retrieve. @@ -811,10 +813,10 @@ async def get_package( async def delete_package( self, - request: package.DeletePackageRequest = None, + request: Union[package.DeletePackageRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -823,7 +825,7 @@ async def delete_package( has been deleted. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.DeletePackageRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.DeletePackageRequest, dict]): The request object. The request to delete a package. name (:class:`str`): The name of the package to delete. @@ -911,17 +913,17 @@ async def delete_package( async def list_versions( self, - request: version.ListVersionsRequest = None, + request: Union[version.ListVersionsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListVersionsAsyncPager: r"""Lists versions. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.ListVersionsRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.ListVersionsRequest, dict]): The request object. The request to list versions. parent (:class:`str`): The name of the parent resource whose @@ -998,17 +1000,17 @@ async def list_versions( async def get_version( self, - request: version.GetVersionRequest = None, + request: Union[version.GetVersionRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> version.Version: r"""Gets a version Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.GetVersionRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.GetVersionRequest, dict]): The request object. The request to retrieve a version. name (:class:`str`): The name of the version to retrieve. @@ -1078,10 +1080,10 @@ async def get_version( async def delete_version( self, - request: version.DeleteVersionRequest = None, + request: Union[version.DeleteVersionRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation_async.AsyncOperation: @@ -1090,7 +1092,7 @@ async def delete_version( been deleted. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.DeleteVersionRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.DeleteVersionRequest, dict]): The request object. The request to delete a version. name (:class:`str`): The name of the version to delete. @@ -1178,17 +1180,17 @@ async def delete_version( async def list_files( self, - request: file.ListFilesRequest = None, + request: Union[file.ListFilesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFilesAsyncPager: r"""Lists files. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.ListFilesRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.ListFilesRequest, dict]): The request object. The request to list files. parent (:class:`str`): The name of the parent resource whose @@ -1265,17 +1267,17 @@ async def list_files( async def get_file( self, - request: file.GetFileRequest = None, + request: Union[file.GetFileRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> file.File: r"""Gets a file. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.GetFileRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.GetFileRequest, dict]): The request object. The request to retrieve a file. name (:class:`str`): The name of the file to retrieve. @@ -1343,17 +1345,17 @@ async def get_file( async def list_tags( self, - request: tag.ListTagsRequest = None, + request: Union[tag.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsAsyncPager: r"""Lists tags. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.ListTagsRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.ListTagsRequest, dict]): The request object. The request to list tags. parent (:class:`str`): The name of the parent resource whose @@ -1430,17 +1432,17 @@ async def list_tags( async def get_tag( self, - request: tag.GetTagRequest = None, + request: Union[tag.GetTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tag.Tag: r"""Gets a tag. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.GetTagRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.GetTagRequest, dict]): The request object. The request to retrieve a tag. name (:class:`str`): The name of the tag to retrieve. @@ -1508,19 +1510,19 @@ async def get_tag( async def create_tag( self, - request: gda_tag.CreateTagRequest = None, + request: Union[gda_tag.CreateTagRequest, dict] = None, *, parent: str = None, tag: gda_tag.Tag = None, tag_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_tag.Tag: r"""Creates a tag. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.CreateTagRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.CreateTagRequest, dict]): The request object. The request to create a new tag. parent (:class:`str`): The name of the parent resource where @@ -1597,18 +1599,18 @@ async def create_tag( async def update_tag( self, - request: gda_tag.UpdateTagRequest = None, + request: Union[gda_tag.UpdateTagRequest, dict] = None, *, tag: gda_tag.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_tag.Tag: r"""Updates a tag. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.UpdateTagRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.UpdateTagRequest, dict]): The request object. The request to create or update a tag. tag (:class:`google.cloud.artifactregistry_v1beta2.types.Tag`): @@ -1680,17 +1682,17 @@ async def update_tag( async def delete_tag( self, - request: tag.DeleteTagRequest = None, + request: Union[tag.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: r"""Deletes a tag. Args: - request (:class:`google.cloud.artifactregistry_v1beta2.types.DeleteTagRequest`): + request (Union[google.cloud.artifactregistry_v1beta2.types.DeleteTagRequest, dict]): The request object. The request to delete a tag. name (:class:`str`): The name of the tag to delete. @@ -1750,16 +1752,16 @@ async def delete_tag( async def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Updates the IAM policy for a given resource. Args: - request (:class:`google.iam.v1.iam_policy_pb2.SetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1855,16 +1857,16 @@ async def set_iam_policy( async def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: r"""Gets the IAM policy for a given resource. Args: - request (:class:`google.iam.v1.iam_policy_pb2.GetIamPolicyRequest`): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1969,9 +1971,9 @@ async def get_iam_policy( async def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: @@ -1979,7 +1981,7 @@ async def test_iam_permissions( resource. Args: - request (:class:`google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest`): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py index 02cbfe7..0e49fe9 100644 --- a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py +++ b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/client.py @@ -30,6 +30,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore +OptionalRetry = Union[retries.Retry, object] + from google.api_core import operation # type: ignore from google.api_core import operation_async # type: ignore from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers @@ -395,7 +397,7 @@ def list_repositories( request: Union[repository.ListRepositoriesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListRepositoriesPager: @@ -474,7 +476,7 @@ def get_repository( request: Union[repository.GetRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> repository.Repository: @@ -547,7 +549,7 @@ def create_repository( parent: str = None, repository: gda_repository.Repository = None, repository_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -649,7 +651,7 @@ def update_repository( *, repository: gda_repository.Repository = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_repository.Repository: @@ -731,7 +733,7 @@ def delete_repository( request: Union[repository.DeleteRepositoryRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -823,7 +825,7 @@ def list_packages( request: Union[package.ListPackagesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListPackagesPager: @@ -901,7 +903,7 @@ def get_package( request: Union[package.GetPackageRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> package.Package: @@ -969,7 +971,7 @@ def delete_package( request: Union[package.DeletePackageRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1060,7 +1062,7 @@ def list_versions( request: Union[version.ListVersionsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListVersionsPager: @@ -1138,7 +1140,7 @@ def get_version( request: Union[version.GetVersionRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> version.Version: @@ -1209,7 +1211,7 @@ def delete_version( request: Union[version.DeleteVersionRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> operation.Operation: @@ -1300,7 +1302,7 @@ def list_files( request: Union[file.ListFilesRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFilesPager: @@ -1378,7 +1380,7 @@ def get_file( request: Union[file.GetFileRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> file.File: @@ -1447,7 +1449,7 @@ def list_tags( request: Union[tag.ListTagsRequest, dict] = None, *, parent: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListTagsPager: @@ -1525,7 +1527,7 @@ def get_tag( request: Union[tag.GetTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> tag.Tag: @@ -1596,7 +1598,7 @@ def create_tag( parent: str = None, tag: gda_tag.Tag = None, tag_id: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_tag.Tag: @@ -1684,7 +1686,7 @@ def update_tag( *, tag: gda_tag.Tag = None, update_mask: field_mask_pb2.FieldMask = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gda_tag.Tag: @@ -1766,7 +1768,7 @@ def delete_tag( request: Union[tag.DeleteTagRequest, dict] = None, *, name: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -1826,7 +1828,7 @@ def set_iam_policy( self, request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -1930,7 +1932,7 @@ def get_iam_policy( self, request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> policy_pb2.Policy: @@ -2034,7 +2036,7 @@ def test_iam_permissions( self, request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> iam_policy_pb2.TestIamPermissionsResponse: diff --git a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py index 4ca4c89..70e1eba 100644 --- a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py +++ b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/base.py @@ -15,7 +15,6 @@ # import abc from typing import Awaitable, Callable, Dict, Optional, Sequence, Union -import packaging.version import pkg_resources import google.auth # type: ignore @@ -48,15 +47,6 @@ except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() -try: - # google.auth.__version__ was added in 1.26.0 - _GOOGLE_AUTH_VERSION = google.auth.__version__ -except AttributeError: - try: # try pkg_resources if it is available - _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version - except pkg_resources.DistributionNotFound: # pragma: NO COVER - _GOOGLE_AUTH_VERSION = None - class ArtifactRegistryTransport(abc.ABC): """Abstract transport class for ArtifactRegistry.""" @@ -109,7 +99,7 @@ def __init__( host += ":443" self._host = host - scopes_kwargs = self._get_scopes_kwargs(self._host, scopes) + scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES} # Save the scopes. self._scopes = scopes @@ -142,29 +132,6 @@ def __init__( # Save the credentials. self._credentials = credentials - # TODO(busunkim): This method is in the base transport - # to avoid duplicating code across the transport classes. These functions - # should be deleted once the minimum required versions of google-auth is increased. - - # TODO: Remove this function once google-auth >= 1.25.0 is required - @classmethod - def _get_scopes_kwargs( - cls, host: str, scopes: Optional[Sequence[str]] - ) -> Dict[str, Optional[Sequence[str]]]: - """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version""" - - scopes_kwargs = {} - - if _GOOGLE_AUTH_VERSION and ( - packaging.version.parse(_GOOGLE_AUTH_VERSION) - >= packaging.version.parse("1.25.0") - ): - scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES} - else: - scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES} - - return scopes_kwargs - def _prep_wrapped_messages(self, client_info): # Precompute the wrapped methods. self._wrapped_methods = { @@ -410,7 +377,7 @@ def close(self): raise NotImplementedError() @property - def operations_client(self) -> operations_v1.OperationsClient: + def operations_client(self): """Return the client designed to process long-running operations.""" raise NotImplementedError() diff --git a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py index 41d82fe..8119308 100644 --- a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py +++ b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc.py @@ -133,7 +133,7 @@ def __init__( self._grpc_channel = None self._ssl_channel_credentials = ssl_channel_credentials self._stubs: Dict[str, Callable] = {} - self._operations_client = None + self._operations_client: Optional[operations_v1.OperationsClient] = None if api_mtls_endpoint: warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning) diff --git a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py index 936bd40..ee4add3 100644 --- a/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py +++ b/google/cloud/artifactregistry_v1beta2/services/artifact_registry/transports/grpc_asyncio.py @@ -21,7 +21,6 @@ from google.api_core import operations_v1 # type: ignore from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -import packaging.version import grpc # type: ignore from grpc.experimental import aio # type: ignore @@ -180,7 +179,7 @@ def __init__( self._grpc_channel = None self._ssl_channel_credentials = ssl_channel_credentials self._stubs: Dict[str, Callable] = {} - self._operations_client = None + self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None if api_mtls_endpoint: warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning) diff --git a/setup.py b/setup.py index 4b6428c..c739c90 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,9 @@ # NOTE: Maintainers, please do not require google-api-core>=2.x.x # Until this issue is closed # https://github.com/googleapis/google-cloud-python/issues/10566 - "google-api-core[grpc] >= 1.26.0, <3.0.0dev", + "google-api-core[grpc] >= 1.28.0, <3.0.0dev", "libcst >= 0.2.5", "proto-plus >= 1.4.0", - "packaging >= 14.3", "grpc-google-iam-v1", ] diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 34cdc7c..487a718 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -19,9 +19,7 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -google-api-core==1.26.0 +google-api-core==1.28.0 grpc-google-iam-v1==0.12.3 libcst==0.2.5 proto-plus==1.4.0 -packaging==14.3 -google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 si transitively required through google-api-core diff --git a/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py b/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py index cb62d65..bcd3ad4 100644 --- a/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py +++ b/tests/unit/gapic/artifactregistry_v1/test_artifact_registry.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -40,9 +39,6 @@ ) from google.cloud.artifactregistry_v1.services.artifact_registry import pagers from google.cloud.artifactregistry_v1.services.artifact_registry import transports -from google.cloud.artifactregistry_v1.services.artifact_registry.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.artifactregistry_v1.types import artifact from google.cloud.artifactregistry_v1.types import repository from google.oauth2 import service_account @@ -50,20 +46,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -221,7 +203,7 @@ def test_artifact_registry_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -238,7 +220,7 @@ def test_artifact_registry_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -255,7 +237,7 @@ def test_artifact_registry_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -284,7 +266,7 @@ def test_artifact_registry_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -353,7 +335,7 @@ def test_artifact_registry_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -395,7 +377,7 @@ def test_artifact_registry_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -417,7 +399,7 @@ def test_artifact_registry_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -448,7 +430,7 @@ def test_artifact_registry_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -479,7 +461,7 @@ def test_artifact_registry_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -1585,7 +1567,6 @@ def test_artifact_registry_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_artifact_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -1609,29 +1590,6 @@ def test_artifact_registry_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.artifactregistry_v1.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.ArtifactRegistryTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id="octopus", - ) - - def test_artifact_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -1643,7 +1601,6 @@ def test_artifact_registry_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_artifact_registry_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -1659,21 +1616,6 @@ def test_artifact_registry_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - ArtifactRegistryClient() - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -1681,7 +1623,6 @@ def test_artifact_registry_auth_adc_old_google_auth(): transports.ArtifactRegistryGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_artifact_registry_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -1698,29 +1639,6 @@ def test_artifact_registry_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.ArtifactRegistryGrpcTransport, - transports.ArtifactRegistryGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py b/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py index 17e14b8..3b3183f 100644 --- a/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py +++ b/tests/unit/gapic/artifactregistry_v1beta2/test_artifact_registry.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -43,9 +42,6 @@ ) from google.cloud.artifactregistry_v1beta2.services.artifact_registry import pagers from google.cloud.artifactregistry_v1beta2.services.artifact_registry import transports -from google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.artifactregistry_v1beta2.types import file from google.cloud.artifactregistry_v1beta2.types import package from google.cloud.artifactregistry_v1beta2.types import repository @@ -65,20 +61,6 @@ import google.auth -# TODO(busunkim): Once google-auth >= 1.25.0 is required transitively -# through google-api-core: -# - Delete the auth "less than" test cases -# - Delete these pytest markers (Make the "greater than or equal to" tests the default). -requires_google_auth_lt_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) >= packaging.version.parse("1.25.0"), - reason="This test requires google-auth < 1.25.0", -) -requires_google_auth_gte_1_25_0 = pytest.mark.skipif( - packaging.version.parse(_GOOGLE_AUTH_VERSION) < packaging.version.parse("1.25.0"), - reason="This test requires google-auth >= 1.25.0", -) - - def client_cert_source_callback(): return b"cert bytes", b"key bytes" @@ -236,7 +218,7 @@ def test_artifact_registry_client_client_options( options = client_options.ClientOptions(api_endpoint="squid.clam.whelk") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -253,7 +235,7 @@ def test_artifact_registry_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -270,7 +252,7 @@ def test_artifact_registry_client_client_options( with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}): with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -299,7 +281,7 @@ def test_artifact_registry_client_client_options( options = client_options.ClientOptions(quota_project_id="octopus") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -368,7 +350,7 @@ def test_artifact_registry_client_mtls_env_auto( ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) if use_client_cert_env == "false": expected_client_cert_source = None @@ -410,7 +392,7 @@ def test_artifact_registry_client_mtls_env_auto( expected_client_cert_source = client_cert_source_callback patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -432,7 +414,7 @@ def test_artifact_registry_client_mtls_env_auto( return_value=False, ): patched.return_value = None - client = client_class() + client = client_class(transport=transport_name) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -463,7 +445,7 @@ def test_artifact_registry_client_client_options_scopes( options = client_options.ClientOptions(scopes=["1", "2"],) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file=None, @@ -494,7 +476,7 @@ def test_artifact_registry_client_client_options_credentials_file( options = client_options.ClientOptions(credentials_file="credentials.json") with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None - client = client_class(client_options=options) + client = client_class(transport=transport_name, client_options=options) patched.assert_called_once_with( credentials=None, credentials_file="credentials.json", @@ -5507,7 +5489,6 @@ def test_artifact_registry_base_transport(): transport.operations_client -@requires_google_auth_gte_1_25_0 def test_artifact_registry_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -5531,29 +5512,6 @@ def test_artifact_registry_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_base_transport_with_credentials_file_old_google_auth(): - # Instantiate the base transport with a credentials file - with mock.patch.object( - google.auth, "load_credentials_from_file", autospec=True - ) as load_creds, mock.patch( - "google.cloud.artifactregistry_v1beta2.services.artifact_registry.transports.ArtifactRegistryTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.ArtifactRegistryTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id="octopus", - ) - - def test_artifact_registry_base_transport_with_adc(): # Test the default credentials are used if credentials and credentials_file are None. with mock.patch.object(google.auth, "default", autospec=True) as adc, mock.patch( @@ -5565,7 +5523,6 @@ def test_artifact_registry_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_artifact_registry_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -5581,21 +5538,6 @@ def test_artifact_registry_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_auth_adc_old_google_auth(): - # If no credentials are provided, we should use ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - ArtifactRegistryClient() - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -5603,7 +5545,6 @@ def test_artifact_registry_auth_adc_old_google_auth(): transports.ArtifactRegistryGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_artifact_registry_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -5620,29 +5561,6 @@ def test_artifact_registry_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.ArtifactRegistryGrpcTransport, - transports.ArtifactRegistryGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_artifact_registry_transport_auth_adc_old_google_auth(transport_class): - # If credentials and host are not provided, the transport class should use - # ADC credentials. - with mock.patch.object(google.auth, "default", autospec=True) as adc: - adc.return_value = (ga_credentials.AnonymousCredentials(), None) - transport_class(quota_project_id="octopus") - adc.assert_called_once_with( - scopes=( - "https://www.googleapis.com/auth/cloud-platform", - "https://www.googleapis.com/auth/cloud-platform.read-only", - ), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [