diff --git a/google/cloud/websecurityscanner_v1/services/web_security_scanner/async_client.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/async_client.py index 3a6f8dd..0fa1636 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/async_client.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/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.websecurityscanner_v1.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1.types import crawled_url from google.cloud.websecurityscanner_v1.types import finding @@ -177,16 +179,16 @@ def __init__( async def create_scan_config( self, - request: web_security_scanner.CreateScanConfigRequest = None, + request: Union[web_security_scanner.CreateScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: r"""Creates a new ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.CreateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.CreateScanConfigRequest, dict]): The request object. Request for the `CreateScanConfig` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -226,9 +228,9 @@ async def create_scan_config( async def delete_scan_config( self, - request: web_security_scanner.DeleteScanConfigRequest = None, + request: Union[web_security_scanner.DeleteScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -236,7 +238,7 @@ async def delete_scan_config( resources. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.DeleteScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.DeleteScanConfigRequest, dict]): The request object. Request for the `DeleteScanConfig` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -279,16 +281,16 @@ async def delete_scan_config( async def get_scan_config( self, - request: web_security_scanner.GetScanConfigRequest = None, + request: Union[web_security_scanner.GetScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: r"""Gets a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.GetScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.GetScanConfigRequest, dict]): The request object. Request for the `GetScanConfig` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -338,16 +340,16 @@ async def get_scan_config( async def list_scan_configs( self, - request: web_security_scanner.ListScanConfigsRequest = None, + request: Union[web_security_scanner.ListScanConfigsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListScanConfigsAsyncPager: r"""Lists ScanConfigs under a given project. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.ListScanConfigsRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.ListScanConfigsRequest, dict]): The request object. Request for the `ListScanConfigs` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -405,9 +407,9 @@ async def list_scan_configs( async def update_scan_config( self, - request: web_security_scanner.UpdateScanConfigRequest = None, + request: Union[web_security_scanner.UpdateScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: @@ -415,7 +417,7 @@ async def update_scan_config( update of a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.UpdateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.UpdateScanConfigRequest, dict]): The request object. Request for the `UpdateScanConfigRequest` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -457,16 +459,16 @@ async def update_scan_config( async def start_scan_run( self, - request: web_security_scanner.StartScanRunRequest = None, + request: Union[web_security_scanner.StartScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: r"""Start a ScanRun according to the given ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.StartScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.StartScanRunRequest, dict]): The request object. Request for the `StartScanRun` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -507,16 +509,16 @@ async def start_scan_run( async def get_scan_run( self, - request: web_security_scanner.GetScanRunRequest = None, + request: Union[web_security_scanner.GetScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: r"""Gets a ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.GetScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.GetScanRunRequest, dict]): The request object. Request for the `GetScanRun` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -566,9 +568,9 @@ async def get_scan_run( async def list_scan_runs( self, - request: web_security_scanner.ListScanRunsRequest = None, + request: Union[web_security_scanner.ListScanRunsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListScanRunsAsyncPager: @@ -576,7 +578,7 @@ async def list_scan_runs( descending order of ScanRun stop time. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.ListScanRunsRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.ListScanRunsRequest, dict]): The request object. Request for the `ListScanRuns` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -634,16 +636,16 @@ async def list_scan_runs( async def stop_scan_run( self, - request: web_security_scanner.StopScanRunRequest = None, + request: Union[web_security_scanner.StopScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.StopScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.StopScanRunRequest, dict]): The request object. Request for the `StopScanRun` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -684,16 +686,16 @@ async def stop_scan_run( async def list_crawled_urls( self, - request: web_security_scanner.ListCrawledUrlsRequest = None, + request: Union[web_security_scanner.ListCrawledUrlsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCrawledUrlsAsyncPager: r"""List CrawledUrls under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.ListCrawledUrlsRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.ListCrawledUrlsRequest, dict]): The request object. Request for the `ListCrawledUrls` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -751,16 +753,16 @@ async def list_crawled_urls( async def get_finding( self, - request: web_security_scanner.GetFindingRequest = None, + request: Union[web_security_scanner.GetFindingRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> finding.Finding: r"""Gets a Finding. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.GetFindingRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.GetFindingRequest, dict]): The request object. Request for the `GetFinding` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -810,16 +812,16 @@ async def get_finding( async def list_findings( self, - request: web_security_scanner.ListFindingsRequest = None, + request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsAsyncPager: r"""List Findings under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.ListFindingsRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.ListFindingsRequest, dict]): The request object. Request for the `ListFindings` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -877,16 +879,16 @@ async def list_findings( async def list_finding_type_stats( self, - request: web_security_scanner.ListFindingTypeStatsRequest = None, + request: Union[web_security_scanner.ListFindingTypeStatsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: r"""List all FindingTypeStats under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1.types.ListFindingTypeStatsRequest`): + request (Union[google.cloud.websecurityscanner_v1.types.ListFindingTypeStatsRequest, dict]): The request object. Request for the `ListFindingTypeStats` method. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/websecurityscanner_v1/services/web_security_scanner/client.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/client.py index 48a7e6e..d903ef9 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/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.websecurityscanner_v1.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1.types import crawled_url from google.cloud.websecurityscanner_v1.types import finding @@ -371,7 +373,7 @@ def create_scan_config( self, request: Union[web_security_scanner.CreateScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: @@ -421,7 +423,7 @@ def delete_scan_config( self, request: Union[web_security_scanner.DeleteScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> None: @@ -465,7 +467,7 @@ def get_scan_config( self, request: Union[web_security_scanner.GetScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: @@ -515,7 +517,7 @@ def list_scan_configs( self, request: Union[web_security_scanner.ListScanConfigsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListScanConfigsPager: @@ -573,7 +575,7 @@ def update_scan_config( self, request: Union[web_security_scanner.UpdateScanConfigRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_config.ScanConfig: @@ -626,7 +628,7 @@ def start_scan_run( self, request: Union[web_security_scanner.StartScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: @@ -677,7 +679,7 @@ def get_scan_run( self, request: Union[web_security_scanner.GetScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: @@ -727,7 +729,7 @@ def list_scan_runs( self, request: Union[web_security_scanner.ListScanRunsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListScanRunsPager: @@ -786,7 +788,7 @@ def stop_scan_run( self, request: Union[web_security_scanner.StopScanRunRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> scan_run.ScanRun: @@ -837,7 +839,7 @@ def list_crawled_urls( self, request: Union[web_security_scanner.ListCrawledUrlsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListCrawledUrlsPager: @@ -895,7 +897,7 @@ def get_finding( self, request: Union[web_security_scanner.GetFindingRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> finding.Finding: @@ -945,7 +947,7 @@ def list_findings( self, request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsPager: @@ -1003,7 +1005,7 @@ def list_finding_type_stats( self, request: Union[web_security_scanner.ListFindingTypeStatsRequest, dict] = None, *, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: diff --git a/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/base.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/base.py index 2b93700..2fd62e6 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/base.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/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 @@ -41,15 +40,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 WebSecurityScannerTransport(abc.ABC): """Abstract transport class for WebSecurityScanner.""" @@ -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/websecurityscanner_v1/services/web_security_scanner/transports/grpc_asyncio.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc_asyncio.py index e668731..f7425b4 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc_asyncio.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/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/websecurityscanner_v1/types/scan_config.py b/google/cloud/websecurityscanner_v1/types/scan_config.py index 9cbdc2b..085bb67 100644 --- a/google/cloud/websecurityscanner_v1/types/scan_config.py +++ b/google/cloud/websecurityscanner_v1/types/scan_config.py @@ -98,14 +98,24 @@ class ExportToSecurityCommandCenter(proto.Enum): class Authentication(proto.Message): r"""Scan authentication configuration. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: google_account (google.cloud.websecurityscanner_v1.types.ScanConfig.Authentication.GoogleAccount): Authentication using a Google account. + This field is a member of `oneof`_ ``authentication``. custom_account (google.cloud.websecurityscanner_v1.types.ScanConfig.Authentication.CustomAccount): Authentication using a custom account. + This field is a member of `oneof`_ ``authentication``. iap_credential (google.cloud.websecurityscanner_v1.types.ScanConfig.Authentication.IapCredential): Authentication using Identity-Aware-Proxy (IAP). + This field is a member of `oneof`_ ``authentication``. """ class GoogleAccount(proto.Message): @@ -151,11 +161,15 @@ class IapCredential(proto.Message): r"""Describes authentication configuration for Identity-Aware- roxy (IAP). + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: iap_test_service_account_info (google.cloud.websecurityscanner_v1.types.ScanConfig.Authentication.IapCredential.IapTestServiceAccountInfo): Authentication configuration when Web- ecurity-Scanner service account is added in Identity-Aware-Proxy (IAP) access policies. + This field is a member of `oneof`_ ``iap_credentials``. """ class IapTestServiceAccountInfo(proto.Message): diff --git a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/async_client.py b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/async_client.py index c583dee..62df765 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/async_client.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/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.websecurityscanner_v1alpha.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1alpha.types import crawled_url from google.cloud.websecurityscanner_v1alpha.types import finding @@ -183,18 +185,18 @@ def __init__( async def create_scan_config( self, - request: web_security_scanner.CreateScanConfigRequest = None, + request: Union[web_security_scanner.CreateScanConfigRequest, dict] = None, *, parent: str = None, scan_config: gcw_scan_config.ScanConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcw_scan_config.ScanConfig: r"""Creates a new ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.CreateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.CreateScanConfigRequest, dict]): The request object. Request for the `CreateScanConfig` method. parent (:class:`str`): @@ -267,10 +269,10 @@ async def create_scan_config( async def delete_scan_config( self, - request: web_security_scanner.DeleteScanConfigRequest = None, + request: Union[web_security_scanner.DeleteScanConfigRequest, 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: @@ -278,7 +280,7 @@ async def delete_scan_config( resources. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.DeleteScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.DeleteScanConfigRequest, dict]): The request object. Request for the `DeleteScanConfig` method. name (:class:`str`): @@ -344,17 +346,17 @@ async def delete_scan_config( async def get_scan_config( self, - request: web_security_scanner.GetScanConfigRequest = None, + request: Union[web_security_scanner.GetScanConfigRequest, 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]] = (), ) -> scan_config.ScanConfig: r"""Gets a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.GetScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetScanConfigRequest, dict]): The request object. Request for the `GetScanConfig` method. name (:class:`str`): @@ -428,17 +430,17 @@ async def get_scan_config( async def list_scan_configs( self, - request: web_security_scanner.ListScanConfigsRequest = None, + request: Union[web_security_scanner.ListScanConfigsRequest, 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.ListScanConfigsAsyncPager: r"""Lists ScanConfigs under a given project. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.ListScanConfigsRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListScanConfigsRequest, dict]): The request object. Request for the `ListScanConfigs` method. parent (:class:`str`): @@ -518,11 +520,11 @@ async def list_scan_configs( async def update_scan_config( self, - request: web_security_scanner.UpdateScanConfigRequest = None, + request: Union[web_security_scanner.UpdateScanConfigRequest, dict] = None, *, scan_config: gcw_scan_config.ScanConfig = 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]] = (), ) -> gcw_scan_config.ScanConfig: @@ -530,7 +532,7 @@ async def update_scan_config( update of a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.UpdateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.UpdateScanConfigRequest, dict]): The request object. Request for the `UpdateScanConfigRequest` method. scan_config (:class:`google.cloud.websecurityscanner_v1alpha.types.ScanConfig`): @@ -607,17 +609,17 @@ async def update_scan_config( async def start_scan_run( self, - request: web_security_scanner.StartScanRunRequest = None, + request: Union[web_security_scanner.StartScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Start a ScanRun according to the given ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.StartScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.StartScanRunRequest, dict]): The request object. Request for the `StartScanRun` method. name (:class:`str`): @@ -680,17 +682,17 @@ async def start_scan_run( async def get_scan_run( self, - request: web_security_scanner.GetScanRunRequest = None, + request: Union[web_security_scanner.GetScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Gets a ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.GetScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetScanRunRequest, dict]): The request object. Request for the `GetScanRun` method. name (:class:`str`): Required. The resource name of the @@ -762,10 +764,10 @@ async def get_scan_run( async def list_scan_runs( self, - request: web_security_scanner.ListScanRunsRequest = None, + request: Union[web_security_scanner.ListScanRunsRequest, 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.ListScanRunsAsyncPager: @@ -773,7 +775,7 @@ async def list_scan_runs( descending order of ScanRun stop time. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.ListScanRunsRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListScanRunsRequest, dict]): The request object. Request for the `ListScanRuns` method. parent (:class:`str`): @@ -854,17 +856,17 @@ async def list_scan_runs( async def stop_scan_run( self, - request: web_security_scanner.StopScanRunRequest = None, + request: Union[web_security_scanner.StopScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.StopScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.StopScanRunRequest, dict]): The request object. Request for the `StopScanRun` method. name (:class:`str`): @@ -927,17 +929,17 @@ async def stop_scan_run( async def list_crawled_urls( self, - request: web_security_scanner.ListCrawledUrlsRequest = None, + request: Union[web_security_scanner.ListCrawledUrlsRequest, 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.ListCrawledUrlsAsyncPager: r"""List CrawledUrls under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.ListCrawledUrlsRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListCrawledUrlsRequest, dict]): The request object. Request for the `ListCrawledUrls` method. parent (:class:`str`): @@ -1018,17 +1020,17 @@ async def list_crawled_urls( async def get_finding( self, - request: web_security_scanner.GetFindingRequest = None, + request: Union[web_security_scanner.GetFindingRequest, 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]] = (), ) -> finding.Finding: r"""Gets a Finding. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.GetFindingRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetFindingRequest, dict]): The request object. Request for the `GetFinding` method. name (:class:`str`): Required. The resource name of the @@ -1101,18 +1103,18 @@ async def get_finding( async def list_findings( self, - request: web_security_scanner.ListFindingsRequest = None, + request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsAsyncPager: r"""List Findings under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.ListFindingsRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListFindingsRequest, dict]): The request object. Request for the `ListFindings` method. parent (:class:`str`): @@ -1203,17 +1205,17 @@ async def list_findings( async def list_finding_type_stats( self, - request: web_security_scanner.ListFindingTypeStatsRequest = None, + request: Union[web_security_scanner.ListFindingTypeStatsRequest, 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]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: r"""List all FindingTypeStats under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1alpha.types.ListFindingTypeStatsRequest`): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListFindingTypeStatsRequest, dict]): The request object. Request for the `ListFindingTypeStats` method. parent (:class:`str`): diff --git a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/client.py b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/client.py index c9e29b0..21d81cc 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/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.websecurityscanner_v1alpha.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1alpha.types import crawled_url from google.cloud.websecurityscanner_v1alpha.types import finding @@ -404,7 +406,7 @@ def create_scan_config( *, parent: str = None, scan_config: gcw_scan_config.ScanConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcw_scan_config.ScanConfig: @@ -487,7 +489,7 @@ def delete_scan_config( request: Union[web_security_scanner.DeleteScanConfigRequest, 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: @@ -554,7 +556,7 @@ def get_scan_config( request: Union[web_security_scanner.GetScanConfigRequest, 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]] = (), ) -> scan_config.ScanConfig: @@ -628,7 +630,7 @@ def list_scan_configs( request: Union[web_security_scanner.ListScanConfigsRequest, 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.ListScanConfigsPager: @@ -709,7 +711,7 @@ def update_scan_config( *, scan_config: gcw_scan_config.ScanConfig = 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]] = (), ) -> gcw_scan_config.ScanConfig: @@ -797,7 +799,7 @@ def start_scan_run( request: Union[web_security_scanner.StartScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -870,7 +872,7 @@ def get_scan_run( request: Union[web_security_scanner.GetScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -942,7 +944,7 @@ def list_scan_runs( request: Union[web_security_scanner.ListScanRunsRequest, 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.ListScanRunsPager: @@ -1024,7 +1026,7 @@ def stop_scan_run( request: Union[web_security_scanner.StopScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -1097,7 +1099,7 @@ def list_crawled_urls( request: Union[web_security_scanner.ListCrawledUrlsRequest, 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.ListCrawledUrlsPager: @@ -1178,7 +1180,7 @@ def get_finding( request: Union[web_security_scanner.GetFindingRequest, 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]] = (), ) -> finding.Finding: @@ -1252,7 +1254,7 @@ def list_findings( *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsPager: @@ -1343,7 +1345,7 @@ def list_finding_type_stats( request: Union[web_security_scanner.ListFindingTypeStatsRequest, 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]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: diff --git a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/base.py b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/base.py index fd96199..c0435e7 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/base.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/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 @@ -42,15 +41,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 WebSecurityScannerTransport(abc.ABC): """Abstract transport class for WebSecurityScanner.""" @@ -100,7 +90,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 @@ -133,29 +123,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/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc_asyncio.py b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc_asyncio.py index 8aaa757..e69a550 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc_asyncio.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/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/websecurityscanner_v1alpha/types/scan_config.py b/google/cloud/websecurityscanner_v1alpha/types/scan_config.py index 961efb0..a790aa1 100644 --- a/google/cloud/websecurityscanner_v1alpha/types/scan_config.py +++ b/google/cloud/websecurityscanner_v1alpha/types/scan_config.py @@ -80,11 +80,20 @@ class TargetPlatform(proto.Enum): class Authentication(proto.Message): r"""Scan authentication configuration. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: google_account (google.cloud.websecurityscanner_v1alpha.types.ScanConfig.Authentication.GoogleAccount): Authentication using a Google account. + This field is a member of `oneof`_ ``authentication``. custom_account (google.cloud.websecurityscanner_v1alpha.types.ScanConfig.Authentication.CustomAccount): Authentication using a custom account. + This field is a member of `oneof`_ ``authentication``. """ class GoogleAccount(proto.Message): diff --git a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/async_client.py b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/async_client.py index 22b8058..3d56423 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/async_client.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/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.websecurityscanner_v1beta.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1beta.types import crawled_url from google.cloud.websecurityscanner_v1beta.types import finding @@ -185,18 +187,18 @@ def __init__( async def create_scan_config( self, - request: web_security_scanner.CreateScanConfigRequest = None, + request: Union[web_security_scanner.CreateScanConfigRequest, dict] = None, *, parent: str = None, scan_config: gcw_scan_config.ScanConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcw_scan_config.ScanConfig: r"""Creates a new ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.CreateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.CreateScanConfigRequest, dict]): The request object. Request for the `CreateScanConfig` method. parent (:class:`str`): @@ -268,10 +270,10 @@ async def create_scan_config( async def delete_scan_config( self, - request: web_security_scanner.DeleteScanConfigRequest = None, + request: Union[web_security_scanner.DeleteScanConfigRequest, 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: @@ -279,7 +281,7 @@ async def delete_scan_config( resources. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.DeleteScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.DeleteScanConfigRequest, dict]): The request object. Request for the `DeleteScanConfig` method. name (:class:`str`): @@ -345,17 +347,17 @@ async def delete_scan_config( async def get_scan_config( self, - request: web_security_scanner.GetScanConfigRequest = None, + request: Union[web_security_scanner.GetScanConfigRequest, 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]] = (), ) -> scan_config.ScanConfig: r"""Gets a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.GetScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetScanConfigRequest, dict]): The request object. Request for the `GetScanConfig` method. name (:class:`str`): @@ -428,17 +430,17 @@ async def get_scan_config( async def list_scan_configs( self, - request: web_security_scanner.ListScanConfigsRequest = None, + request: Union[web_security_scanner.ListScanConfigsRequest, 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.ListScanConfigsAsyncPager: r"""Lists ScanConfigs under a given project. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.ListScanConfigsRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListScanConfigsRequest, dict]): The request object. Request for the `ListScanConfigs` method. parent (:class:`str`): @@ -518,11 +520,11 @@ async def list_scan_configs( async def update_scan_config( self, - request: web_security_scanner.UpdateScanConfigRequest = None, + request: Union[web_security_scanner.UpdateScanConfigRequest, dict] = None, *, scan_config: gcw_scan_config.ScanConfig = 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]] = (), ) -> gcw_scan_config.ScanConfig: @@ -530,7 +532,7 @@ async def update_scan_config( update of a ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.UpdateScanConfigRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.UpdateScanConfigRequest, dict]): The request object. Request for the `UpdateScanConfigRequest` method. scan_config (:class:`google.cloud.websecurityscanner_v1beta.types.ScanConfig`): @@ -606,17 +608,17 @@ async def update_scan_config( async def start_scan_run( self, - request: web_security_scanner.StartScanRunRequest = None, + request: Union[web_security_scanner.StartScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Start a ScanRun according to the given ScanConfig. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.StartScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.StartScanRunRequest, dict]): The request object. Request for the `StartScanRun` method. name (:class:`str`): @@ -680,17 +682,17 @@ async def start_scan_run( async def get_scan_run( self, - request: web_security_scanner.GetScanRunRequest = None, + request: Union[web_security_scanner.GetScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Gets a ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.GetScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetScanRunRequest, dict]): The request object. Request for the `GetScanRun` method. name (:class:`str`): Required. The resource name of the @@ -763,10 +765,10 @@ async def get_scan_run( async def list_scan_runs( self, - request: web_security_scanner.ListScanRunsRequest = None, + request: Union[web_security_scanner.ListScanRunsRequest, 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.ListScanRunsAsyncPager: @@ -774,7 +776,7 @@ async def list_scan_runs( descending order of ScanRun stop time. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.ListScanRunsRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListScanRunsRequest, dict]): The request object. Request for the `ListScanRuns` method. parent (:class:`str`): @@ -855,17 +857,17 @@ async def list_scan_runs( async def stop_scan_run( self, - request: web_security_scanner.StopScanRunRequest = None, + request: Union[web_security_scanner.StopScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.StopScanRunRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.StopScanRunRequest, dict]): The request object. Request for the `StopScanRun` method. name (:class:`str`): @@ -929,17 +931,17 @@ async def stop_scan_run( async def list_crawled_urls( self, - request: web_security_scanner.ListCrawledUrlsRequest = None, + request: Union[web_security_scanner.ListCrawledUrlsRequest, 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.ListCrawledUrlsAsyncPager: r"""List CrawledUrls under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.ListCrawledUrlsRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListCrawledUrlsRequest, dict]): The request object. Request for the `ListCrawledUrls` method. parent (:class:`str`): @@ -1020,17 +1022,17 @@ async def list_crawled_urls( async def get_finding( self, - request: web_security_scanner.GetFindingRequest = None, + request: Union[web_security_scanner.GetFindingRequest, 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]] = (), ) -> finding.Finding: r"""Gets a Finding. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.GetFindingRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetFindingRequest, dict]): The request object. Request for the `GetFinding` method. name (:class:`str`): Required. The resource name of the @@ -1103,18 +1105,18 @@ async def get_finding( async def list_findings( self, - request: web_security_scanner.ListFindingsRequest = None, + request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsAsyncPager: r"""List Findings under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.ListFindingsRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListFindingsRequest, dict]): The request object. Request for the `ListFindings` method. parent (:class:`str`): @@ -1205,17 +1207,17 @@ async def list_findings( async def list_finding_type_stats( self, - request: web_security_scanner.ListFindingTypeStatsRequest = None, + request: Union[web_security_scanner.ListFindingTypeStatsRequest, 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]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: r"""List all FindingTypeStats under a given ScanRun. Args: - request (:class:`google.cloud.websecurityscanner_v1beta.types.ListFindingTypeStatsRequest`): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListFindingTypeStatsRequest, dict]): The request object. Request for the `ListFindingTypeStats` method. parent (:class:`str`): diff --git a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/client.py b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/client.py index a680680..bcbdf42 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/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.websecurityscanner_v1beta.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1beta.types import crawled_url from google.cloud.websecurityscanner_v1beta.types import finding @@ -406,7 +408,7 @@ def create_scan_config( *, parent: str = None, scan_config: gcw_scan_config.ScanConfig = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> gcw_scan_config.ScanConfig: @@ -488,7 +490,7 @@ def delete_scan_config( request: Union[web_security_scanner.DeleteScanConfigRequest, 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: @@ -555,7 +557,7 @@ def get_scan_config( request: Union[web_security_scanner.GetScanConfigRequest, 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]] = (), ) -> scan_config.ScanConfig: @@ -628,7 +630,7 @@ def list_scan_configs( request: Union[web_security_scanner.ListScanConfigsRequest, 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.ListScanConfigsPager: @@ -709,7 +711,7 @@ def update_scan_config( *, scan_config: gcw_scan_config.ScanConfig = 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]] = (), ) -> gcw_scan_config.ScanConfig: @@ -796,7 +798,7 @@ def start_scan_run( request: Union[web_security_scanner.StartScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -870,7 +872,7 @@ def get_scan_run( request: Union[web_security_scanner.GetScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -943,7 +945,7 @@ def list_scan_runs( request: Union[web_security_scanner.ListScanRunsRequest, 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.ListScanRunsPager: @@ -1025,7 +1027,7 @@ def stop_scan_run( request: Union[web_security_scanner.StopScanRunRequest, 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]] = (), ) -> scan_run.ScanRun: @@ -1099,7 +1101,7 @@ def list_crawled_urls( request: Union[web_security_scanner.ListCrawledUrlsRequest, 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.ListCrawledUrlsPager: @@ -1180,7 +1182,7 @@ def get_finding( request: Union[web_security_scanner.GetFindingRequest, 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]] = (), ) -> finding.Finding: @@ -1254,7 +1256,7 @@ def list_findings( *, parent: str = None, filter: str = None, - retry: retries.Retry = gapic_v1.method.DEFAULT, + retry: OptionalRetry = gapic_v1.method.DEFAULT, timeout: float = None, metadata: Sequence[Tuple[str, str]] = (), ) -> pagers.ListFindingsPager: @@ -1345,7 +1347,7 @@ def list_finding_type_stats( request: Union[web_security_scanner.ListFindingTypeStatsRequest, 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]] = (), ) -> web_security_scanner.ListFindingTypeStatsResponse: diff --git a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/base.py b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/base.py index e965c8f..6e0768e 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/base.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/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 @@ -42,15 +41,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 WebSecurityScannerTransport(abc.ABC): """Abstract transport class for WebSecurityScanner.""" @@ -100,7 +90,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 @@ -133,29 +123,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/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc_asyncio.py b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc_asyncio.py index 690ccc7..64a96aa 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc_asyncio.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/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/websecurityscanner_v1beta/types/scan_config.py b/google/cloud/websecurityscanner_v1beta/types/scan_config.py index c7418da..e014f0f 100644 --- a/google/cloud/websecurityscanner_v1beta/types/scan_config.py +++ b/google/cloud/websecurityscanner_v1beta/types/scan_config.py @@ -103,11 +103,20 @@ class ExportToSecurityCommandCenter(proto.Enum): class Authentication(proto.Message): r"""Scan authentication configuration. + This message has `oneof`_ fields (mutually exclusive fields). + For each oneof, at most one member field can be set at the same time. + Setting any member of the oneof automatically clears all other + members. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: google_account (google.cloud.websecurityscanner_v1beta.types.ScanConfig.Authentication.GoogleAccount): Authentication using a Google account. + This field is a member of `oneof`_ ``authentication``. custom_account (google.cloud.websecurityscanner_v1beta.types.ScanConfig.Authentication.CustomAccount): Authentication using a custom account. + This field is a member of `oneof`_ ``authentication``. """ class GoogleAccount(proto.Message): diff --git a/setup.py b/setup.py index 9881bfa..ecdf2c1 100644 --- a/setup.py +++ b/setup.py @@ -32,9 +32,8 @@ # 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", "proto-plus >= 1.15.0", - "packaging >= 14.3", ] extras = {} diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt index 3f5d8b8..e2a4034 100644 --- a/testing/constraints-3.6.txt +++ b/testing/constraints-3.6.txt @@ -5,7 +5,5 @@ # # 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 proto-plus==1.16.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/websecurityscanner_v1/test_web_security_scanner.py b/tests/unit/gapic/websecurityscanner_v1/test_web_security_scanner.py index 4b4a425..e3fe41d 100644 --- a/tests/unit/gapic/websecurityscanner_v1/test_web_security_scanner.py +++ b/tests/unit/gapic/websecurityscanner_v1/test_web_security_scanner.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.websecurityscanner_v1.services.web_security_scanner import pagers from google.cloud.websecurityscanner_v1.services.web_security_scanner import transports -from google.cloud.websecurityscanner_v1.services.web_security_scanner.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.websecurityscanner_v1.types import crawled_url from google.cloud.websecurityscanner_v1.types import finding from google.cloud.websecurityscanner_v1.types import finding_addon @@ -58,20 +54,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" @@ -229,7 +211,7 @@ def test_web_security_scanner_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, @@ -246,7 +228,7 @@ def test_web_security_scanner_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, @@ -263,7 +245,7 @@ def test_web_security_scanner_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, @@ -292,7 +274,7 @@ def test_web_security_scanner_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, @@ -361,7 +343,7 @@ def test_web_security_scanner_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 @@ -403,7 +385,7 @@ def test_web_security_scanner_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, @@ -425,7 +407,7 @@ def test_web_security_scanner_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, @@ -456,7 +438,7 @@ def test_web_security_scanner_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, @@ -487,7 +469,7 @@ def test_web_security_scanner_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", @@ -3335,7 +3317,6 @@ def test_web_security_scanner_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -3356,26 +3337,6 @@ def test_web_security_scanner_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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.websecurityscanner_v1.services.web_security_scanner.transports.WebSecurityScannerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.WebSecurityScannerTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_web_security_scanner_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( @@ -3387,7 +3348,6 @@ def test_web_security_scanner_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -3400,18 +3360,6 @@ def test_web_security_scanner_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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) - WebSecurityScannerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -3419,7 +3367,6 @@ def test_web_security_scanner_auth_adc_old_google_auth(): transports.WebSecurityScannerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -3433,26 +3380,6 @@ def test_web_security_scanner_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.WebSecurityScannerGrpcTransport, - transports.WebSecurityScannerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/websecurityscanner_v1alpha/test_web_security_scanner.py b/tests/unit/gapic/websecurityscanner_v1alpha/test_web_security_scanner.py index 20441d8..e3b594e 100644 --- a/tests/unit/gapic/websecurityscanner_v1alpha/test_web_security_scanner.py +++ b/tests/unit/gapic/websecurityscanner_v1alpha/test_web_security_scanner.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -42,9 +41,6 @@ from google.cloud.websecurityscanner_v1alpha.services.web_security_scanner import ( transports, ) -from google.cloud.websecurityscanner_v1alpha.services.web_security_scanner.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.websecurityscanner_v1alpha.types import crawled_url from google.cloud.websecurityscanner_v1alpha.types import finding from google.cloud.websecurityscanner_v1alpha.types import finding_addon @@ -59,20 +55,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" @@ -230,7 +212,7 @@ def test_web_security_scanner_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, @@ -247,7 +229,7 @@ def test_web_security_scanner_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, @@ -264,7 +246,7 @@ def test_web_security_scanner_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, @@ -293,7 +275,7 @@ def test_web_security_scanner_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, @@ -362,7 +344,7 @@ def test_web_security_scanner_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 @@ -404,7 +386,7 @@ def test_web_security_scanner_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, @@ -426,7 +408,7 @@ def test_web_security_scanner_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, @@ -457,7 +439,7 @@ def test_web_security_scanner_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, @@ -488,7 +470,7 @@ def test_web_security_scanner_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", @@ -4274,7 +4256,6 @@ def test_web_security_scanner_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -4295,26 +4276,6 @@ def test_web_security_scanner_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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.websecurityscanner_v1alpha.services.web_security_scanner.transports.WebSecurityScannerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.WebSecurityScannerTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_web_security_scanner_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( @@ -4326,7 +4287,6 @@ def test_web_security_scanner_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -4339,18 +4299,6 @@ def test_web_security_scanner_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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) - WebSecurityScannerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -4358,7 +4306,6 @@ def test_web_security_scanner_auth_adc_old_google_auth(): transports.WebSecurityScannerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -4372,26 +4319,6 @@ def test_web_security_scanner_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.WebSecurityScannerGrpcTransport, - transports.WebSecurityScannerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [ diff --git a/tests/unit/gapic/websecurityscanner_v1beta/test_web_security_scanner.py b/tests/unit/gapic/websecurityscanner_v1beta/test_web_security_scanner.py index e8da1b1..348fafd 100644 --- a/tests/unit/gapic/websecurityscanner_v1beta/test_web_security_scanner.py +++ b/tests/unit/gapic/websecurityscanner_v1beta/test_web_security_scanner.py @@ -15,7 +15,6 @@ # import os import mock -import packaging.version import grpc from grpc.experimental import aio @@ -42,9 +41,6 @@ from google.cloud.websecurityscanner_v1beta.services.web_security_scanner import ( transports, ) -from google.cloud.websecurityscanner_v1beta.services.web_security_scanner.transports.base import ( - _GOOGLE_AUTH_VERSION, -) from google.cloud.websecurityscanner_v1beta.types import crawled_url from google.cloud.websecurityscanner_v1beta.types import finding from google.cloud.websecurityscanner_v1beta.types import finding_addon @@ -62,20 +58,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" @@ -233,7 +215,7 @@ def test_web_security_scanner_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, @@ -250,7 +232,7 @@ def test_web_security_scanner_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, @@ -267,7 +249,7 @@ def test_web_security_scanner_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, @@ -296,7 +278,7 @@ def test_web_security_scanner_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, @@ -365,7 +347,7 @@ def test_web_security_scanner_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 @@ -407,7 +389,7 @@ def test_web_security_scanner_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, @@ -429,7 +411,7 @@ def test_web_security_scanner_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, @@ -460,7 +442,7 @@ def test_web_security_scanner_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, @@ -491,7 +473,7 @@ def test_web_security_scanner_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", @@ -4319,7 +4301,6 @@ def test_web_security_scanner_base_transport(): transport.close() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_base_transport_with_credentials_file(): # Instantiate the base transport with a credentials file with mock.patch.object( @@ -4340,26 +4321,6 @@ def test_web_security_scanner_base_transport_with_credentials_file(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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.websecurityscanner_v1beta.services.web_security_scanner.transports.WebSecurityScannerTransport._prep_wrapped_messages" - ) as Transport: - Transport.return_value = None - load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) - transport = transports.WebSecurityScannerTransport( - credentials_file="credentials.json", quota_project_id="octopus", - ) - load_creds.assert_called_once_with( - "credentials.json", - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id="octopus", - ) - - def test_web_security_scanner_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( @@ -4371,7 +4332,6 @@ def test_web_security_scanner_base_transport_with_adc(): adc.assert_called_once() -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_auth_adc(): # If no credentials are provided, we should use ADC credentials. with mock.patch.object(google.auth, "default", autospec=True) as adc: @@ -4384,18 +4344,6 @@ def test_web_security_scanner_auth_adc(): ) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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) - WebSecurityScannerClient() - adc.assert_called_once_with( - scopes=("https://www.googleapis.com/auth/cloud-platform",), - quota_project_id=None, - ) - - @pytest.mark.parametrize( "transport_class", [ @@ -4403,7 +4351,6 @@ def test_web_security_scanner_auth_adc_old_google_auth(): transports.WebSecurityScannerGrpcAsyncIOTransport, ], ) -@requires_google_auth_gte_1_25_0 def test_web_security_scanner_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use # ADC credentials. @@ -4417,26 +4364,6 @@ def test_web_security_scanner_transport_auth_adc(transport_class): ) -@pytest.mark.parametrize( - "transport_class", - [ - transports.WebSecurityScannerGrpcTransport, - transports.WebSecurityScannerGrpcAsyncIOTransport, - ], -) -@requires_google_auth_lt_1_25_0 -def test_web_security_scanner_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",), - quota_project_id="octopus", - ) - - @pytest.mark.parametrize( "transport_class,grpc_helpers", [