From 15b7d1fa81188a866e089a7a6a715cbe7d768976 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:12:19 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.51.2 (#108) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/web_security_scanner/client.py | 54 +++++++++---------- .../web_security_scanner/transports/base.py | 2 +- .../web_security_scanner/transports/grpc.py | 6 +-- .../transports/grpc_asyncio.py | 6 +-- .../services/web_security_scanner/client.py | 54 +++++++++---------- .../web_security_scanner/transports/base.py | 2 +- .../web_security_scanner/transports/grpc.py | 6 +-- .../transports/grpc_asyncio.py | 6 +-- .../services/web_security_scanner/client.py | 54 +++++++++---------- .../web_security_scanner/transports/base.py | 2 +- .../web_security_scanner/transports/grpc.py | 6 +-- .../transports/grpc_asyncio.py | 6 +-- .../fixup_websecurityscanner_v1_keywords.py | 28 +++++----- ...xup_websecurityscanner_v1alpha_keywords.py | 28 +++++----- ...ixup_websecurityscanner_v1beta_keywords.py | 28 +++++----- 15 files changed, 144 insertions(+), 144 deletions(-) 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 7881267..4bb4719 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -372,7 +372,7 @@ def __init__( 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, timeout: float = None, @@ -381,7 +381,7 @@ def create_scan_config( r"""Creates a new ScanConfig. Args: - request (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, @@ -422,7 +422,7 @@ def create_scan_config( 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, timeout: float = None, @@ -432,7 +432,7 @@ def delete_scan_config( resources. Args: - request (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, @@ -466,7 +466,7 @@ def delete_scan_config( 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, timeout: float = None, @@ -475,7 +475,7 @@ def get_scan_config( r"""Gets a ScanConfig. Args: - request (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, @@ -516,7 +516,7 @@ def get_scan_config( 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, timeout: float = None, @@ -525,7 +525,7 @@ def list_scan_configs( r"""Lists ScanConfigs under a given project. Args: - request (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, @@ -574,7 +574,7 @@ def list_scan_configs( 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, timeout: float = None, @@ -584,7 +584,7 @@ def update_scan_config( update of a ScanConfig. Args: - request (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, @@ -627,7 +627,7 @@ def update_scan_config( 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, timeout: float = None, @@ -636,7 +636,7 @@ def start_scan_run( r"""Start a ScanRun according to the given ScanConfig. Args: - request (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, @@ -678,7 +678,7 @@ def start_scan_run( 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, timeout: float = None, @@ -687,7 +687,7 @@ def get_scan_run( r"""Gets a ScanRun. Args: - request (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. @@ -728,7 +728,7 @@ def get_scan_run( 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, timeout: float = None, @@ -738,7 +738,7 @@ def list_scan_runs( descending order of ScanRun stop time. Args: - request (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, @@ -787,7 +787,7 @@ def list_scan_runs( 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, timeout: float = None, @@ -796,7 +796,7 @@ def stop_scan_run( r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (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, @@ -838,7 +838,7 @@ def stop_scan_run( 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, timeout: float = None, @@ -847,7 +847,7 @@ def list_crawled_urls( r"""List CrawledUrls under a given ScanRun. Args: - request (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, @@ -896,7 +896,7 @@ def list_crawled_urls( 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, timeout: float = None, @@ -905,7 +905,7 @@ def get_finding( r"""Gets a Finding. Args: - request (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. @@ -946,7 +946,7 @@ def get_finding( 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, timeout: float = None, @@ -955,7 +955,7 @@ def list_findings( r"""List Findings under a given ScanRun. Args: - request (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, @@ -1004,7 +1004,7 @@ def list_findings( 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, timeout: float = None, @@ -1013,7 +1013,7 @@ def list_finding_type_stats( r"""List all FindingTypeStats under a given ScanRun. Args: - request (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/transports/base.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/base.py index 78a037b..13530f8 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 @@ -121,7 +121,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc.py b/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc.py index 04cf05b..b8767c3 100644 --- a/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc.py +++ b/google/cloud/websecurityscanner_v1/services/web_security_scanner/transports/grpc.py @@ -87,16 +87,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. 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 79827a3..6de2096 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 @@ -134,16 +134,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. 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 8e615b0..d8c650f 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -403,7 +403,7 @@ def __init__( 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, @@ -414,7 +414,7 @@ def create_scan_config( r"""Creates a new ScanConfig. Args: - request (google.cloud.websecurityscanner_v1alpha.types.CreateScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.CreateScanConfigRequest, dict]): The request object. Request for the `CreateScanConfig` method. parent (str): @@ -487,7 +487,7 @@ def create_scan_config( 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, @@ -498,7 +498,7 @@ def delete_scan_config( resources. Args: - request (google.cloud.websecurityscanner_v1alpha.types.DeleteScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.DeleteScanConfigRequest, dict]): The request object. Request for the `DeleteScanConfig` method. name (str): @@ -554,7 +554,7 @@ def delete_scan_config( 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, @@ -564,7 +564,7 @@ def get_scan_config( r"""Gets a ScanConfig. Args: - request (google.cloud.websecurityscanner_v1alpha.types.GetScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetScanConfigRequest, dict]): The request object. Request for the `GetScanConfig` method. name (str): @@ -628,7 +628,7 @@ def get_scan_config( 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, @@ -638,7 +638,7 @@ def list_scan_configs( r"""Lists ScanConfigs under a given project. Args: - request (google.cloud.websecurityscanner_v1alpha.types.ListScanConfigsRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListScanConfigsRequest, dict]): The request object. Request for the `ListScanConfigs` method. parent (str): @@ -708,7 +708,7 @@ def list_scan_configs( 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, @@ -720,7 +720,7 @@ def update_scan_config( update of a ScanConfig. Args: - request (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 (google.cloud.websecurityscanner_v1alpha.types.ScanConfig): @@ -797,7 +797,7 @@ def update_scan_config( 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, @@ -807,7 +807,7 @@ def start_scan_run( r"""Start a ScanRun according to the given ScanConfig. Args: - request (google.cloud.websecurityscanner_v1alpha.types.StartScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.StartScanRunRequest, dict]): The request object. Request for the `StartScanRun` method. name (str): @@ -870,7 +870,7 @@ def start_scan_run( 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, @@ -880,7 +880,7 @@ def get_scan_run( r"""Gets a ScanRun. Args: - request (google.cloud.websecurityscanner_v1alpha.types.GetScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetScanRunRequest, dict]): The request object. Request for the `GetScanRun` method. name (str): Required. The resource name of the @@ -942,7 +942,7 @@ def get_scan_run( 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, @@ -953,7 +953,7 @@ def list_scan_runs( descending order of ScanRun stop time. Args: - request (google.cloud.websecurityscanner_v1alpha.types.ListScanRunsRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListScanRunsRequest, dict]): The request object. Request for the `ListScanRuns` method. parent (str): @@ -1024,7 +1024,7 @@ def list_scan_runs( 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, @@ -1034,7 +1034,7 @@ def stop_scan_run( r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (google.cloud.websecurityscanner_v1alpha.types.StopScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.StopScanRunRequest, dict]): The request object. Request for the `StopScanRun` method. name (str): @@ -1097,7 +1097,7 @@ def stop_scan_run( 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, @@ -1107,7 +1107,7 @@ def list_crawled_urls( r"""List CrawledUrls under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1alpha.types.ListCrawledUrlsRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListCrawledUrlsRequest, dict]): The request object. Request for the `ListCrawledUrls` method. parent (str): @@ -1178,7 +1178,7 @@ def list_crawled_urls( 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, @@ -1188,7 +1188,7 @@ def get_finding( r"""Gets a Finding. Args: - request (google.cloud.websecurityscanner_v1alpha.types.GetFindingRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.GetFindingRequest, dict]): The request object. Request for the `GetFinding` method. name (str): Required. The resource name of the @@ -1251,7 +1251,7 @@ def get_finding( def list_findings( self, - request: web_security_scanner.ListFindingsRequest = None, + request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, parent: str = None, filter: str = None, @@ -1262,7 +1262,7 @@ def list_findings( r"""List Findings under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1alpha.types.ListFindingsRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListFindingsRequest, dict]): The request object. Request for the `ListFindings` method. parent (str): @@ -1343,7 +1343,7 @@ def list_findings( 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, @@ -1353,7 +1353,7 @@ def list_finding_type_stats( r"""List all FindingTypeStats under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1alpha.types.ListFindingTypeStatsRequest): + request (Union[google.cloud.websecurityscanner_v1alpha.types.ListFindingTypeStatsRequest, dict]): The request object. Request for the `ListFindingTypeStats` method. parent (str): 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 5057c45..0d32f74 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 @@ -122,7 +122,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc.py b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc.py index 97d0d28..4b25911 100644 --- a/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc.py +++ b/google/cloud/websecurityscanner_v1alpha/services/web_security_scanner/transports/grpc.py @@ -88,16 +88,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. 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 7296a6d..400e2b1 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 @@ -135,16 +135,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. 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 29a0910..736ae09 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/client.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -405,7 +405,7 @@ def __init__( 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, @@ -416,7 +416,7 @@ def create_scan_config( r"""Creates a new ScanConfig. Args: - request (google.cloud.websecurityscanner_v1beta.types.CreateScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.CreateScanConfigRequest, dict]): The request object. Request for the `CreateScanConfig` method. parent (str): @@ -488,7 +488,7 @@ def create_scan_config( 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, @@ -499,7 +499,7 @@ def delete_scan_config( resources. Args: - request (google.cloud.websecurityscanner_v1beta.types.DeleteScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.DeleteScanConfigRequest, dict]): The request object. Request for the `DeleteScanConfig` method. name (str): @@ -555,7 +555,7 @@ def delete_scan_config( 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, @@ -565,7 +565,7 @@ def get_scan_config( r"""Gets a ScanConfig. Args: - request (google.cloud.websecurityscanner_v1beta.types.GetScanConfigRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetScanConfigRequest, dict]): The request object. Request for the `GetScanConfig` method. name (str): @@ -628,7 +628,7 @@ def get_scan_config( 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, @@ -638,7 +638,7 @@ def list_scan_configs( r"""Lists ScanConfigs under a given project. Args: - request (google.cloud.websecurityscanner_v1beta.types.ListScanConfigsRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListScanConfigsRequest, dict]): The request object. Request for the `ListScanConfigs` method. parent (str): @@ -708,7 +708,7 @@ def list_scan_configs( 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, @@ -720,7 +720,7 @@ def update_scan_config( update of a ScanConfig. Args: - request (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 (google.cloud.websecurityscanner_v1beta.types.ScanConfig): @@ -796,7 +796,7 @@ def update_scan_config( 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, @@ -806,7 +806,7 @@ def start_scan_run( r"""Start a ScanRun according to the given ScanConfig. Args: - request (google.cloud.websecurityscanner_v1beta.types.StartScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.StartScanRunRequest, dict]): The request object. Request for the `StartScanRun` method. name (str): @@ -870,7 +870,7 @@ def start_scan_run( 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, @@ -880,7 +880,7 @@ def get_scan_run( r"""Gets a ScanRun. Args: - request (google.cloud.websecurityscanner_v1beta.types.GetScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetScanRunRequest, dict]): The request object. Request for the `GetScanRun` method. name (str): Required. The resource name of the @@ -943,7 +943,7 @@ def get_scan_run( 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, @@ -954,7 +954,7 @@ def list_scan_runs( descending order of ScanRun stop time. Args: - request (google.cloud.websecurityscanner_v1beta.types.ListScanRunsRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListScanRunsRequest, dict]): The request object. Request for the `ListScanRuns` method. parent (str): @@ -1025,7 +1025,7 @@ def list_scan_runs( 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, @@ -1035,7 +1035,7 @@ def stop_scan_run( r"""Stops a ScanRun. The stopped ScanRun is returned. Args: - request (google.cloud.websecurityscanner_v1beta.types.StopScanRunRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.StopScanRunRequest, dict]): The request object. Request for the `StopScanRun` method. name (str): @@ -1099,7 +1099,7 @@ def stop_scan_run( 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, @@ -1109,7 +1109,7 @@ def list_crawled_urls( r"""List CrawledUrls under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1beta.types.ListCrawledUrlsRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListCrawledUrlsRequest, dict]): The request object. Request for the `ListCrawledUrls` method. parent (str): @@ -1180,7 +1180,7 @@ def list_crawled_urls( 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, @@ -1190,7 +1190,7 @@ def get_finding( r"""Gets a Finding. Args: - request (google.cloud.websecurityscanner_v1beta.types.GetFindingRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.GetFindingRequest, dict]): The request object. Request for the `GetFinding` method. name (str): Required. The resource name of the @@ -1253,7 +1253,7 @@ def get_finding( def list_findings( self, - request: web_security_scanner.ListFindingsRequest = None, + request: Union[web_security_scanner.ListFindingsRequest, dict] = None, *, parent: str = None, filter: str = None, @@ -1264,7 +1264,7 @@ def list_findings( r"""List Findings under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1beta.types.ListFindingsRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListFindingsRequest, dict]): The request object. Request for the `ListFindings` method. parent (str): @@ -1345,7 +1345,7 @@ def list_findings( 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, @@ -1355,7 +1355,7 @@ def list_finding_type_stats( r"""List all FindingTypeStats under a given ScanRun. Args: - request (google.cloud.websecurityscanner_v1beta.types.ListFindingTypeStatsRequest): + request (Union[google.cloud.websecurityscanner_v1beta.types.ListFindingTypeStatsRequest, dict]): The request object. Request for the `ListFindingTypeStats` method. parent (str): 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 2ec097f..2dbb73a 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 @@ -122,7 +122,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc.py b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc.py index 5a8f541..1bc7090 100644 --- a/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc.py +++ b/google/cloud/websecurityscanner_v1beta/services/web_security_scanner/transports/grpc.py @@ -88,16 +88,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. 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 15bcfab..b7649be 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 @@ -135,16 +135,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_websecurityscanner_v1_keywords.py b/scripts/fixup_websecurityscanner_v1_keywords.py index cdd5da0..5dd19da 100644 --- a/scripts/fixup_websecurityscanner_v1_keywords.py +++ b/scripts/fixup_websecurityscanner_v1_keywords.py @@ -39,19 +39,19 @@ def partition( class websecurityscannerCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_scan_config': ('parent', 'scan_config', ), - 'delete_scan_config': ('name', ), - 'get_finding': ('name', ), - 'get_scan_config': ('name', ), - 'get_scan_run': ('name', ), - 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), - 'list_finding_type_stats': ('parent', ), - 'list_scan_configs': ('parent', 'page_token', 'page_size', ), - 'list_scan_runs': ('parent', 'page_token', 'page_size', ), - 'start_scan_run': ('name', ), - 'stop_scan_run': ('name', ), - 'update_scan_config': ('scan_config', 'update_mask', ), + 'create_scan_config': ('parent', 'scan_config', ), + 'delete_scan_config': ('name', ), + 'get_finding': ('name', ), + 'get_scan_config': ('name', ), + 'get_scan_run': ('name', ), + 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), + 'list_finding_type_stats': ('parent', ), + 'list_scan_configs': ('parent', 'page_token', 'page_size', ), + 'list_scan_runs': ('parent', 'page_token', 'page_size', ), + 'start_scan_run': ('name', ), + 'stop_scan_run': ('name', ), + 'update_scan_config': ('scan_config', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -70,7 +70,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) diff --git a/scripts/fixup_websecurityscanner_v1alpha_keywords.py b/scripts/fixup_websecurityscanner_v1alpha_keywords.py index cdd5da0..5dd19da 100644 --- a/scripts/fixup_websecurityscanner_v1alpha_keywords.py +++ b/scripts/fixup_websecurityscanner_v1alpha_keywords.py @@ -39,19 +39,19 @@ def partition( class websecurityscannerCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_scan_config': ('parent', 'scan_config', ), - 'delete_scan_config': ('name', ), - 'get_finding': ('name', ), - 'get_scan_config': ('name', ), - 'get_scan_run': ('name', ), - 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), - 'list_finding_type_stats': ('parent', ), - 'list_scan_configs': ('parent', 'page_token', 'page_size', ), - 'list_scan_runs': ('parent', 'page_token', 'page_size', ), - 'start_scan_run': ('name', ), - 'stop_scan_run': ('name', ), - 'update_scan_config': ('scan_config', 'update_mask', ), + 'create_scan_config': ('parent', 'scan_config', ), + 'delete_scan_config': ('name', ), + 'get_finding': ('name', ), + 'get_scan_config': ('name', ), + 'get_scan_run': ('name', ), + 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), + 'list_finding_type_stats': ('parent', ), + 'list_scan_configs': ('parent', 'page_token', 'page_size', ), + 'list_scan_runs': ('parent', 'page_token', 'page_size', ), + 'start_scan_run': ('name', ), + 'stop_scan_run': ('name', ), + 'update_scan_config': ('scan_config', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -70,7 +70,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) diff --git a/scripts/fixup_websecurityscanner_v1beta_keywords.py b/scripts/fixup_websecurityscanner_v1beta_keywords.py index cdd5da0..5dd19da 100644 --- a/scripts/fixup_websecurityscanner_v1beta_keywords.py +++ b/scripts/fixup_websecurityscanner_v1beta_keywords.py @@ -39,19 +39,19 @@ def partition( class websecurityscannerCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_scan_config': ('parent', 'scan_config', ), - 'delete_scan_config': ('name', ), - 'get_finding': ('name', ), - 'get_scan_config': ('name', ), - 'get_scan_run': ('name', ), - 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), - 'list_finding_type_stats': ('parent', ), - 'list_scan_configs': ('parent', 'page_token', 'page_size', ), - 'list_scan_runs': ('parent', 'page_token', 'page_size', ), - 'start_scan_run': ('name', ), - 'stop_scan_run': ('name', ), - 'update_scan_config': ('scan_config', 'update_mask', ), + 'create_scan_config': ('parent', 'scan_config', ), + 'delete_scan_config': ('name', ), + 'get_finding': ('name', ), + 'get_scan_config': ('name', ), + 'get_scan_run': ('name', ), + 'list_crawled_urls': ('parent', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'page_token', 'page_size', ), + 'list_finding_type_stats': ('parent', ), + 'list_scan_configs': ('parent', 'page_token', 'page_size', ), + 'list_scan_runs': ('parent', 'page_token', 'page_size', ), + 'start_scan_run': ('name', ), + 'stop_scan_run': ('name', ), + 'update_scan_config': ('scan_config', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -70,7 +70,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs )