diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ee60f7e..2567653c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-python:latest - digest: sha256:aea14a583128771ae8aefa364e1652f3c56070168ef31beb203534222d842b8b + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest + digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index c0c2d790..cd76ea20 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,7 +13,7 @@ # limitations under the License. docker: - image: gcr.io/repo-automation-bots/owlbot-python:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest deep-remove-regex: - /owl-bot-staging diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index af599353..3e98ae70 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,9 +1,11 @@ -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/sync-repo-settings -# Rules for master branch protection +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings +# Rules for main branch protection branchProtectionRules: # Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master +# Defaults to `main` +- pattern: main + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: true requiredStatusCheckContexts: - 'Kokoro' - 'cla/google' diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 3b55f5c8..a959019e 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -41,7 +41,7 @@ python3 -m pip install --upgrade --quiet nox python3 -m nox --version # If this is a continuous build, send the test log to the FlakyBot. -# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot. +# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot. if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"continuous"* ]]; then cleanup() { chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot diff --git a/.kokoro/test-samples-impl.sh b/.kokoro/test-samples-impl.sh index 311a8d54..8a324c9c 100755 --- a/.kokoro/test-samples-impl.sh +++ b/.kokoro/test-samples-impl.sh @@ -80,7 +80,7 @@ for file in samples/**/requirements.txt; do EXIT=$? # If this is a periodic build, send the test log to the FlakyBot. - # See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot. + # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot. if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot $KOKORO_GFILE_DIR/linux_amd64/flakybot diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eea838c..4eb487b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-securitycenter/#history +### [1.5.1](https://www.github.com/googleapis/python-securitycenter/compare/v1.5.0...v1.5.1) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([00fb3d3](https://www.github.com/googleapis/python-securitycenter/commit/00fb3d397d604977ef0dc32305ba27158d87f4bc)) + ## [1.5.0](https://www.github.com/googleapis/python-securitycenter/compare/v1.4.0...v1.5.0) (2021-07-28) @@ -100,7 +107,7 @@ ### ⚠ BREAKING CHANGES -* generate with microgenerator. See [Migration Guide](https://github.com/googleapis/python-securitycenter/blob/master/UPGRADING.md)(#49) +* generate with microgenerator. See [Migration Guide](https://github.com/googleapis/python-securitycenter/blob/main/UPGRADING.md)(#49) ### Features diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4b80ec30..9dbfc7b5 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -50,9 +50,9 @@ You'll have to create a development environment using a Git checkout: # Configure remotes such that you can pull changes from the googleapis/python-securitycenter # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-securitycenter.git - # fetch and merge changes from upstream into master + # fetch and merge changes from upstream into main $ git fetch upstream - $ git merge upstream/master + $ git merge upstream/main Now your local repo is set up such that you will push changes to your GitHub repo, from which you can submit a pull request. @@ -110,12 +110,12 @@ Coding Style variables:: export GOOGLE_CLOUD_TESTING_REMOTE="upstream" - export GOOGLE_CLOUD_TESTING_BRANCH="master" + export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date - version of ``python-securitycenter``. The the suggested remote name ``upstream`` - should point to the official ``googleapis`` checkout and the - the branch should be the main branch on that remote (``master``). + version of ``python-securitycenter``. The + remote name ``upstream`` should point to the official ``googleapis`` + checkout and the branch should be the default branch on that remote (``main``). - This repository contains configuration for the `pre-commit `__ tool, which automates checking @@ -209,7 +209,7 @@ The `description on PyPI`_ for the project comes directly from the ``README``. Due to the reStructuredText (``rst``) parser used by PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst`` instead of -``https://github.com/googleapis/python-securitycenter/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-securitycenter/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-securitycenter @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-securitycenter/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-securitycenter/blob/main/noxfile.py We also explicitly decided to support Python 3 beginning with version 3.6. diff --git a/README.rst b/README.rst index 93cac0da..063d2f10 100644 --- a/README.rst +++ b/README.rst @@ -8,12 +8,12 @@ Python Client for Cloud Security Command Center API - `Product Documentation`_ .. |GA| image:: https://img.shields.io/badge/support-ga-gold.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#general-availability + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#general-availability .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-securitycenter.svg :target: https://pypi.org/project/google-cloud-securitycenter/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-securitycenter.svg :target: https://pypi.org/project/google-cloud-securitycenter/ -.. _Alpha: https://github.com/googleapis/google-cloud-python/blob/master/README.rst +.. _Alpha: https://github.com/googleapis/google-cloud-python/blob/main/README.rst .. _Cloud Security Command Center API: https://cloud.google.com/security-command-center .. _Client Library Documentation: https://googleapis.dev/python/securitycenter/latest .. _Product Documentation: https://cloud.google.com/security-command-center diff --git a/docs/conf.py b/docs/conf.py index c820e2d6..2c8f8ee6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,8 +76,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = "index" +# The root toctree document. +root_doc = "index" # General information about the project. project = "google-cloud-securitycenter" @@ -110,6 +110,7 @@ # directories to ignore when looking for source files. exclude_patterns = [ "_build", + "**/.nox/**/*", "samples/AUTHORING_GUIDE.md", "samples/CONTRIBUTING.md", "samples/snippets/README.rst", @@ -279,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-securitycenter.tex", "google-cloud-securitycenter Documentation", author, @@ -314,7 +315,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ( - master_doc, + root_doc, "google-cloud-securitycenter", "google-cloud-securitycenter Documentation", [author], @@ -333,7 +334,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-securitycenter", "google-cloud-securitycenter Documentation", author, diff --git a/google/cloud/securitycenter_v1/services/security_center/client.py b/google/cloud/securitycenter_v1/services/security_center/client.py index 2993688f..f7c8b3fa 100644 --- a/google/cloud/securitycenter_v1/services/security_center/client.py +++ b/google/cloud/securitycenter_v1/services/security_center/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 @@ -463,7 +463,7 @@ def __init__( def create_source( self, - request: securitycenter_service.CreateSourceRequest = None, + request: Union[securitycenter_service.CreateSourceRequest, dict] = None, *, parent: str = None, source: gcs_source.Source = None, @@ -474,7 +474,7 @@ def create_source( r"""Creates a source. Args: - request (google.cloud.securitycenter_v1.types.CreateSourceRequest): + request (Union[google.cloud.securitycenter_v1.types.CreateSourceRequest, dict]): The request object. Request message for creating a source. parent (str): @@ -549,7 +549,7 @@ def create_source( def create_finding( self, - request: securitycenter_service.CreateFindingRequest = None, + request: Union[securitycenter_service.CreateFindingRequest, dict] = None, *, parent: str = None, finding_id: str = None, @@ -562,7 +562,7 @@ def create_finding( exist for finding creation to succeed. Args: - request (google.cloud.securitycenter_v1.types.CreateFindingRequest): + request (Union[google.cloud.securitycenter_v1.types.CreateFindingRequest, dict]): The request object. Request message for creating a finding. parent (str): @@ -653,7 +653,9 @@ def create_finding( def create_notification_config( self, - request: securitycenter_service.CreateNotificationConfigRequest = None, + request: Union[ + securitycenter_service.CreateNotificationConfigRequest, dict + ] = None, *, parent: str = None, config_id: str = None, @@ -665,7 +667,7 @@ def create_notification_config( r"""Creates a notification config. Args: - request (google.cloud.securitycenter_v1.types.CreateNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1.types.CreateNotificationConfigRequest, dict]): The request object. Request message for creating a notification config. parent (str): @@ -758,7 +760,9 @@ def create_notification_config( def delete_notification_config( self, - request: securitycenter_service.DeleteNotificationConfigRequest = None, + request: Union[ + securitycenter_service.DeleteNotificationConfigRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -768,7 +772,7 @@ def delete_notification_config( r"""Deletes a notification config. Args: - request (google.cloud.securitycenter_v1.types.DeleteNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1.types.DeleteNotificationConfigRequest, dict]): The request object. Request message for deleting a notification config. name (str): @@ -827,7 +831,7 @@ def delete_notification_config( def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -838,7 +842,7 @@ def get_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.GetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (str): @@ -953,7 +957,9 @@ def get_iam_policy( def get_notification_config( self, - request: securitycenter_service.GetNotificationConfigRequest = None, + request: Union[ + securitycenter_service.GetNotificationConfigRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -963,7 +969,7 @@ def get_notification_config( r"""Gets a notification config. Args: - request (google.cloud.securitycenter_v1.types.GetNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1.types.GetNotificationConfigRequest, dict]): The request object. Request message for getting a notification config. name (str): @@ -1029,7 +1035,9 @@ def get_notification_config( def get_organization_settings( self, - request: securitycenter_service.GetOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.GetOrganizationSettingsRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1039,7 +1047,7 @@ def get_organization_settings( r"""Gets the settings for an organization. Args: - request (google.cloud.securitycenter_v1.types.GetOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1.types.GetOrganizationSettingsRequest, dict]): The request object. Request message for getting organization settings. name (str): @@ -1106,7 +1114,7 @@ def get_organization_settings( def get_source( self, - request: securitycenter_service.GetSourceRequest = None, + request: Union[securitycenter_service.GetSourceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1116,7 +1124,7 @@ def get_source( r"""Gets a source. Args: - request (google.cloud.securitycenter_v1.types.GetSourceRequest): + request (Union[google.cloud.securitycenter_v1.types.GetSourceRequest, dict]): The request object. Request message for getting a source. name (str): @@ -1182,7 +1190,7 @@ def get_source( def group_assets( self, - request: securitycenter_service.GroupAssetsRequest = None, + request: Union[securitycenter_service.GroupAssetsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1192,7 +1200,7 @@ def group_assets( their specified properties. Args: - request (google.cloud.securitycenter_v1.types.GroupAssetsRequest): + request (Union[google.cloud.securitycenter_v1.types.GroupAssetsRequest, dict]): The request object. Request message for grouping by assets. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1242,7 +1250,7 @@ def group_assets( def group_findings( self, - request: securitycenter_service.GroupFindingsRequest = None, + request: Union[securitycenter_service.GroupFindingsRequest, dict] = None, *, parent: str = None, group_by: str = None, @@ -1259,7 +1267,7 @@ def group_findings( /v1/projects/{project_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1.types.GroupFindingsRequest): + request (Union[google.cloud.securitycenter_v1.types.GroupFindingsRequest, dict]): The request object. Request message for grouping by findings. parent (str): @@ -1359,7 +1367,7 @@ def group_findings( def list_assets( self, - request: securitycenter_service.ListAssetsRequest = None, + request: Union[securitycenter_service.ListAssetsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1368,7 +1376,7 @@ def list_assets( r"""Lists an organization's assets. Args: - request (google.cloud.securitycenter_v1.types.ListAssetsRequest): + request (Union[google.cloud.securitycenter_v1.types.ListAssetsRequest, dict]): The request object. Request message for listing assets. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -1416,7 +1424,7 @@ def list_assets( def list_findings( self, - request: securitycenter_service.ListFindingsRequest = None, + request: Union[securitycenter_service.ListFindingsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1428,7 +1436,7 @@ def list_findings( Example: /v1/organizations/{organization_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1.types.ListFindingsRequest): + request (Union[google.cloud.securitycenter_v1.types.ListFindingsRequest, dict]): The request object. Request message for listing findings. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1478,7 +1486,9 @@ def list_findings( def list_notification_configs( self, - request: securitycenter_service.ListNotificationConfigsRequest = None, + request: Union[ + securitycenter_service.ListNotificationConfigsRequest, dict + ] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1488,7 +1498,7 @@ def list_notification_configs( r"""Lists notification configs. Args: - request (google.cloud.securitycenter_v1.types.ListNotificationConfigsRequest): + request (Union[google.cloud.securitycenter_v1.types.ListNotificationConfigsRequest, dict]): The request object. Request message for listing notification configs. parent (str): @@ -1563,7 +1573,7 @@ def list_notification_configs( def list_sources( self, - request: securitycenter_service.ListSourcesRequest = None, + request: Union[securitycenter_service.ListSourcesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1573,7 +1583,7 @@ def list_sources( r"""Lists all sources belonging to an organization. Args: - request (google.cloud.securitycenter_v1.types.ListSourcesRequest): + request (Union[google.cloud.securitycenter_v1.types.ListSourcesRequest, dict]): The request object. Request message for listing sources. parent (str): Required. Resource name of the parent of sources to @@ -1643,7 +1653,7 @@ def list_sources( def run_asset_discovery( self, - request: securitycenter_service.RunAssetDiscoveryRequest = None, + request: Union[securitycenter_service.RunAssetDiscoveryRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1658,7 +1668,7 @@ def run_asset_discovery( receive a TOO_MANY_REQUESTS error. Args: - request (google.cloud.securitycenter_v1.types.RunAssetDiscoveryRequest): + request (Union[google.cloud.securitycenter_v1.types.RunAssetDiscoveryRequest, dict]): The request object. Request message for running asset discovery for an organization. parent (str): @@ -1731,7 +1741,7 @@ def run_asset_discovery( def set_finding_state( self, - request: securitycenter_service.SetFindingStateRequest = None, + request: Union[securitycenter_service.SetFindingStateRequest, dict] = None, *, name: str = None, state: finding.Finding.State = None, @@ -1743,7 +1753,7 @@ def set_finding_state( r"""Updates the state of a finding. Args: - request (google.cloud.securitycenter_v1.types.SetFindingStateRequest): + request (Union[google.cloud.securitycenter_v1.types.SetFindingStateRequest, dict]): The request object. Request message for updating a finding's state. name (str): @@ -1832,7 +1842,7 @@ def set_finding_state( def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1843,7 +1853,7 @@ def set_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.SetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (str): @@ -1958,7 +1968,7 @@ def set_iam_policy( def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, resource: str = None, permissions: Sequence[str] = None, @@ -1970,7 +1980,7 @@ def test_iam_permissions( specified source. Args: - request (google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. resource (str): @@ -2041,7 +2051,7 @@ def test_iam_permissions( def update_finding( self, - request: securitycenter_service.UpdateFindingRequest = None, + request: Union[securitycenter_service.UpdateFindingRequest, dict] = None, *, finding: gcs_finding.Finding = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -2052,7 +2062,7 @@ def update_finding( source must exist for a finding creation to succeed. Args: - request (google.cloud.securitycenter_v1.types.UpdateFindingRequest): + request (Union[google.cloud.securitycenter_v1.types.UpdateFindingRequest, dict]): The request object. Request message for updating or creating a finding. finding (google.cloud.securitycenter_v1.types.Finding): @@ -2127,7 +2137,9 @@ def update_finding( def update_notification_config( self, - request: securitycenter_service.UpdateNotificationConfigRequest = None, + request: Union[ + securitycenter_service.UpdateNotificationConfigRequest, dict + ] = None, *, notification_config: gcs_notification_config.NotificationConfig = None, update_mask: field_mask_pb2.FieldMask = None, @@ -2139,7 +2151,7 @@ def update_notification_config( allowed: description, pubsub_topic, streaming_config.filter Args: - request (google.cloud.securitycenter_v1.types.UpdateNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1.types.UpdateNotificationConfigRequest, dict]): The request object. Request message for updating a notification config. notification_config (google.cloud.securitycenter_v1.types.NotificationConfig): @@ -2221,7 +2233,9 @@ def update_notification_config( def update_organization_settings( self, - request: securitycenter_service.UpdateOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.UpdateOrganizationSettingsRequest, dict + ] = None, *, organization_settings: gcs_organization_settings.OrganizationSettings = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -2231,7 +2245,7 @@ def update_organization_settings( r"""Updates an organization's settings. Args: - request (google.cloud.securitycenter_v1.types.UpdateOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1.types.UpdateOrganizationSettingsRequest, dict]): The request object. Request message for updating an organization's settings. organization_settings (google.cloud.securitycenter_v1.types.OrganizationSettings): @@ -2299,7 +2313,7 @@ def update_organization_settings( def update_source( self, - request: securitycenter_service.UpdateSourceRequest = None, + request: Union[securitycenter_service.UpdateSourceRequest, dict] = None, *, source: gcs_source.Source = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -2309,7 +2323,7 @@ def update_source( r"""Updates a source. Args: - request (google.cloud.securitycenter_v1.types.UpdateSourceRequest): + request (Union[google.cloud.securitycenter_v1.types.UpdateSourceRequest, dict]): The request object. Request message for updating a source. source (google.cloud.securitycenter_v1.types.Source): @@ -2376,7 +2390,7 @@ def update_source( def update_security_marks( self, - request: securitycenter_service.UpdateSecurityMarksRequest = None, + request: Union[securitycenter_service.UpdateSecurityMarksRequest, dict] = None, *, security_marks: gcs_security_marks.SecurityMarks = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -2386,7 +2400,7 @@ def update_security_marks( r"""Updates security marks. Args: - request (google.cloud.securitycenter_v1.types.UpdateSecurityMarksRequest): + request (Union[google.cloud.securitycenter_v1.types.UpdateSecurityMarksRequest, dict]): The request object. Request message for updating a SecurityMarks resource. security_marks (google.cloud.securitycenter_v1.types.SecurityMarks): diff --git a/google/cloud/securitycenter_v1/services/security_center/transports/base.py b/google/cloud/securitycenter_v1/services/security_center/transports/base.py index 8b8719b2..c94fca8f 100644 --- a/google/cloud/securitycenter_v1/services/security_center/transports/base.py +++ b/google/cloud/securitycenter_v1/services/security_center/transports/base.py @@ -135,7 +135,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/securitycenter_v1/services/security_center/transports/grpc.py b/google/cloud/securitycenter_v1/services/security_center/transports/grpc.py index 409d20b7..3da55ecf 100644 --- a/google/cloud/securitycenter_v1/services/security_center/transports/grpc.py +++ b/google/cloud/securitycenter_v1/services/security_center/transports/grpc.py @@ -98,16 +98,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/securitycenter_v1/services/security_center/transports/grpc_asyncio.py b/google/cloud/securitycenter_v1/services/security_center/transports/grpc_asyncio.py index 7c83eee0..e3848fca 100644 --- a/google/cloud/securitycenter_v1/services/security_center/transports/grpc_asyncio.py +++ b/google/cloud/securitycenter_v1/services/security_center/transports/grpc_asyncio.py @@ -145,16 +145,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/securitycenter_v1beta1/services/security_center/client.py b/google/cloud/securitycenter_v1beta1/services/security_center/client.py index 312e0ecf..0cdb40ec 100644 --- a/google/cloud/securitycenter_v1beta1/services/security_center/client.py +++ b/google/cloud/securitycenter_v1beta1/services/security_center/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 @@ -431,7 +431,7 @@ def __init__( def create_source( self, - request: securitycenter_service.CreateSourceRequest = None, + request: Union[securitycenter_service.CreateSourceRequest, dict] = None, *, parent: str = None, source: gcs_source.Source = None, @@ -442,7 +442,7 @@ def create_source( r"""Creates a source. Args: - request (google.cloud.securitycenter_v1beta1.types.CreateSourceRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.CreateSourceRequest, dict]): The request object. Request message for creating a source. parent (str): @@ -517,7 +517,7 @@ def create_source( def create_finding( self, - request: securitycenter_service.CreateFindingRequest = None, + request: Union[securitycenter_service.CreateFindingRequest, dict] = None, *, parent: str = None, finding_id: str = None, @@ -530,7 +530,7 @@ def create_finding( exist for finding creation to succeed. Args: - request (google.cloud.securitycenter_v1beta1.types.CreateFindingRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.CreateFindingRequest, dict]): The request object. Request message for creating a finding. parent (str): @@ -621,7 +621,7 @@ def create_finding( def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -632,7 +632,7 @@ def get_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.GetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (str): @@ -747,7 +747,9 @@ def get_iam_policy( def get_organization_settings( self, - request: securitycenter_service.GetOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.GetOrganizationSettingsRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -757,7 +759,7 @@ def get_organization_settings( r"""Gets the settings for an organization. Args: - request (google.cloud.securitycenter_v1beta1.types.GetOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.GetOrganizationSettingsRequest, dict]): The request object. Request message for getting organization settings. name (str): @@ -824,7 +826,7 @@ def get_organization_settings( def get_source( self, - request: securitycenter_service.GetSourceRequest = None, + request: Union[securitycenter_service.GetSourceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -834,7 +836,7 @@ def get_source( r"""Gets a source. Args: - request (google.cloud.securitycenter_v1beta1.types.GetSourceRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.GetSourceRequest, dict]): The request object. Request message for getting a source. name (str): @@ -900,7 +902,7 @@ def get_source( def group_assets( self, - request: securitycenter_service.GroupAssetsRequest = None, + request: Union[securitycenter_service.GroupAssetsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -910,7 +912,7 @@ def group_assets( their specified properties. Args: - request (google.cloud.securitycenter_v1beta1.types.GroupAssetsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.GroupAssetsRequest, dict]): The request object. Request message for grouping by assets. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -960,7 +962,7 @@ def group_assets( def group_findings( self, - request: securitycenter_service.GroupFindingsRequest = None, + request: Union[securitycenter_service.GroupFindingsRequest, dict] = None, *, parent: str = None, group_by: str = None, @@ -976,7 +978,7 @@ def group_findings( /v1beta1/organizations/{organization_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1beta1.types.GroupFindingsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.GroupFindingsRequest, dict]): The request object. Request message for grouping by findings. parent (str): @@ -1067,7 +1069,7 @@ def group_findings( def list_assets( self, - request: securitycenter_service.ListAssetsRequest = None, + request: Union[securitycenter_service.ListAssetsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1076,7 +1078,7 @@ def list_assets( r"""Lists an organization's assets. Args: - request (google.cloud.securitycenter_v1beta1.types.ListAssetsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.ListAssetsRequest, dict]): The request object. Request message for listing assets. retry (google.api_core.retry.Retry): Designation of what errors, if any, should be retried. @@ -1124,7 +1126,7 @@ def list_assets( def list_findings( self, - request: securitycenter_service.ListFindingsRequest = None, + request: Union[securitycenter_service.ListFindingsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1137,7 +1139,7 @@ def list_findings( /v1beta1/organizations/{organization_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1beta1.types.ListFindingsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.ListFindingsRequest, dict]): The request object. Request message for listing findings. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1187,7 +1189,7 @@ def list_findings( def list_sources( self, - request: securitycenter_service.ListSourcesRequest = None, + request: Union[securitycenter_service.ListSourcesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1197,7 +1199,7 @@ def list_sources( r"""Lists all sources belonging to an organization. Args: - request (google.cloud.securitycenter_v1beta1.types.ListSourcesRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.ListSourcesRequest, dict]): The request object. Request message for listing sources. parent (str): Required. Resource name of the parent of sources to @@ -1266,7 +1268,7 @@ def list_sources( def run_asset_discovery( self, - request: securitycenter_service.RunAssetDiscoveryRequest = None, + request: Union[securitycenter_service.RunAssetDiscoveryRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1281,7 +1283,7 @@ def run_asset_discovery( receive a TOO_MANY_REQUESTS error. Args: - request (google.cloud.securitycenter_v1beta1.types.RunAssetDiscoveryRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.RunAssetDiscoveryRequest, dict]): The request object. Request message for running asset discovery for an organization. parent (str): @@ -1364,7 +1366,7 @@ def run_asset_discovery( def set_finding_state( self, - request: securitycenter_service.SetFindingStateRequest = None, + request: Union[securitycenter_service.SetFindingStateRequest, dict] = None, *, name: str = None, state: finding.Finding.State = None, @@ -1376,7 +1378,7 @@ def set_finding_state( r"""Updates the state of a finding. Args: - request (google.cloud.securitycenter_v1beta1.types.SetFindingStateRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.SetFindingStateRequest, dict]): The request object. Request message for updating a finding's state. name (str): @@ -1465,7 +1467,7 @@ def set_finding_state( def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1476,7 +1478,7 @@ def set_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.SetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (str): @@ -1591,7 +1593,7 @@ def set_iam_policy( def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, resource: str = None, permissions: Sequence[str] = None, @@ -1603,7 +1605,7 @@ def test_iam_permissions( specified source. Args: - request (google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. resource (str): @@ -1674,7 +1676,7 @@ def test_iam_permissions( def update_finding( self, - request: securitycenter_service.UpdateFindingRequest = None, + request: Union[securitycenter_service.UpdateFindingRequest, dict] = None, *, finding: gcs_finding.Finding = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1685,7 +1687,7 @@ def update_finding( source must exist for a finding creation to succeed. Args: - request (google.cloud.securitycenter_v1beta1.types.UpdateFindingRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.UpdateFindingRequest, dict]): The request object. Request message for updating or creating a finding. finding (google.cloud.securitycenter_v1beta1.types.Finding): @@ -1760,7 +1762,9 @@ def update_finding( def update_organization_settings( self, - request: securitycenter_service.UpdateOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.UpdateOrganizationSettingsRequest, dict + ] = None, *, organization_settings: gcs_organization_settings.OrganizationSettings = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1770,7 +1774,7 @@ def update_organization_settings( r"""Updates an organization's settings. Args: - request (google.cloud.securitycenter_v1beta1.types.UpdateOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.UpdateOrganizationSettingsRequest, dict]): The request object. Request message for updating an organization's settings. organization_settings (google.cloud.securitycenter_v1beta1.types.OrganizationSettings): @@ -1838,7 +1842,7 @@ def update_organization_settings( def update_source( self, - request: securitycenter_service.UpdateSourceRequest = None, + request: Union[securitycenter_service.UpdateSourceRequest, dict] = None, *, source: gcs_source.Source = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1848,7 +1852,7 @@ def update_source( r"""Updates a source. Args: - request (google.cloud.securitycenter_v1beta1.types.UpdateSourceRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.UpdateSourceRequest, dict]): The request object. Request message for updating a source. source (google.cloud.securitycenter_v1beta1.types.Source): @@ -1915,7 +1919,7 @@ def update_source( def update_security_marks( self, - request: securitycenter_service.UpdateSecurityMarksRequest = None, + request: Union[securitycenter_service.UpdateSecurityMarksRequest, dict] = None, *, security_marks: gcs_security_marks.SecurityMarks = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1925,7 +1929,7 @@ def update_security_marks( r"""Updates security marks. Args: - request (google.cloud.securitycenter_v1beta1.types.UpdateSecurityMarksRequest): + request (Union[google.cloud.securitycenter_v1beta1.types.UpdateSecurityMarksRequest, dict]): The request object. Request message for updating a SecurityMarks resource. security_marks (google.cloud.securitycenter_v1beta1.types.SecurityMarks): diff --git a/google/cloud/securitycenter_v1beta1/services/security_center/transports/base.py b/google/cloud/securitycenter_v1beta1/services/security_center/transports/base.py index 580a82d6..92be13c1 100644 --- a/google/cloud/securitycenter_v1beta1/services/security_center/transports/base.py +++ b/google/cloud/securitycenter_v1beta1/services/security_center/transports/base.py @@ -132,7 +132,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/securitycenter_v1beta1/services/security_center/transports/grpc.py b/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc.py index 76795564..b13d5dbd 100644 --- a/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc.py +++ b/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc.py @@ -95,16 +95,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/securitycenter_v1beta1/services/security_center/transports/grpc_asyncio.py b/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc_asyncio.py index 345bbc25..b7ef8bf8 100644 --- a/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc_asyncio.py +++ b/google/cloud/securitycenter_v1beta1/services/security_center/transports/grpc_asyncio.py @@ -142,16 +142,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/securitycenter_v1p1beta1/services/security_center/client.py b/google/cloud/securitycenter_v1p1beta1/services/security_center/client.py index 0aa897ac..82f32c35 100644 --- a/google/cloud/securitycenter_v1p1beta1/services/security_center/client.py +++ b/google/cloud/securitycenter_v1p1beta1/services/security_center/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 @@ -464,7 +464,7 @@ def __init__( def create_source( self, - request: securitycenter_service.CreateSourceRequest = None, + request: Union[securitycenter_service.CreateSourceRequest, dict] = None, *, parent: str = None, source: gcs_source.Source = None, @@ -475,7 +475,7 @@ def create_source( r"""Creates a source. Args: - request (google.cloud.securitycenter_v1p1beta1.types.CreateSourceRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.CreateSourceRequest, dict]): The request object. Request message for creating a source. parent (str): @@ -550,7 +550,7 @@ def create_source( def create_finding( self, - request: securitycenter_service.CreateFindingRequest = None, + request: Union[securitycenter_service.CreateFindingRequest, dict] = None, *, parent: str = None, finding_id: str = None, @@ -563,7 +563,7 @@ def create_finding( exist for finding creation to succeed. Args: - request (google.cloud.securitycenter_v1p1beta1.types.CreateFindingRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.CreateFindingRequest, dict]): The request object. Request message for creating a finding. parent (str): @@ -651,7 +651,9 @@ def create_finding( def create_notification_config( self, - request: securitycenter_service.CreateNotificationConfigRequest = None, + request: Union[ + securitycenter_service.CreateNotificationConfigRequest, dict + ] = None, *, parent: str = None, config_id: str = None, @@ -663,7 +665,7 @@ def create_notification_config( r"""Creates a notification config. Args: - request (google.cloud.securitycenter_v1p1beta1.types.CreateNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.CreateNotificationConfigRequest, dict]): The request object. Request message for creating a notification config. parent (str): @@ -756,7 +758,9 @@ def create_notification_config( def delete_notification_config( self, - request: securitycenter_service.DeleteNotificationConfigRequest = None, + request: Union[ + securitycenter_service.DeleteNotificationConfigRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -766,7 +770,7 @@ def delete_notification_config( r"""Deletes a notification config. Args: - request (google.cloud.securitycenter_v1p1beta1.types.DeleteNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.DeleteNotificationConfigRequest, dict]): The request object. Request message for deleting a notification config. name (str): @@ -825,7 +829,7 @@ def delete_notification_config( def get_iam_policy( self, - request: iam_policy_pb2.GetIamPolicyRequest = None, + request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -836,7 +840,7 @@ def get_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.GetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]): The request object. Request message for `GetIamPolicy` method. resource (str): @@ -951,7 +955,9 @@ def get_iam_policy( def get_notification_config( self, - request: securitycenter_service.GetNotificationConfigRequest = None, + request: Union[ + securitycenter_service.GetNotificationConfigRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -961,7 +967,7 @@ def get_notification_config( r"""Gets a notification config. Args: - request (google.cloud.securitycenter_v1p1beta1.types.GetNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.GetNotificationConfigRequest, dict]): The request object. Request message for getting a notification config. name (str): @@ -1028,7 +1034,9 @@ def get_notification_config( def get_organization_settings( self, - request: securitycenter_service.GetOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.GetOrganizationSettingsRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1038,7 +1046,7 @@ def get_organization_settings( r"""Gets the settings for an organization. Args: - request (google.cloud.securitycenter_v1p1beta1.types.GetOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.GetOrganizationSettingsRequest, dict]): The request object. Request message for getting organization settings. name (str): @@ -1105,7 +1113,7 @@ def get_organization_settings( def get_source( self, - request: securitycenter_service.GetSourceRequest = None, + request: Union[securitycenter_service.GetSourceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1115,7 +1123,7 @@ def get_source( r"""Gets a source. Args: - request (google.cloud.securitycenter_v1p1beta1.types.GetSourceRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.GetSourceRequest, dict]): The request object. Request message for getting a source. name (str): @@ -1181,7 +1189,7 @@ def get_source( def group_assets( self, - request: securitycenter_service.GroupAssetsRequest = None, + request: Union[securitycenter_service.GroupAssetsRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -1191,7 +1199,7 @@ def group_assets( their specified properties. Args: - request (google.cloud.securitycenter_v1p1beta1.types.GroupAssetsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.GroupAssetsRequest, dict]): The request object. Request message for grouping by assets. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -1241,7 +1249,7 @@ def group_assets( def group_findings( self, - request: securitycenter_service.GroupFindingsRequest = None, + request: Union[securitycenter_service.GroupFindingsRequest, dict] = None, *, parent: str = None, group_by: str = None, @@ -1258,7 +1266,7 @@ def group_findings( /v1/projects/{project_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1p1beta1.types.GroupFindingsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.GroupFindingsRequest, dict]): The request object. Request message for grouping by findings. parent (str): @@ -1358,7 +1366,7 @@ def group_findings( def list_assets( self, - request: securitycenter_service.ListAssetsRequest = None, + request: Union[securitycenter_service.ListAssetsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1368,7 +1376,7 @@ def list_assets( r"""Lists an organization's assets. Args: - request (google.cloud.securitycenter_v1p1beta1.types.ListAssetsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.ListAssetsRequest, dict]): The request object. Request message for listing assets. parent (str): Required. Name of the organization assets should belong @@ -1437,7 +1445,7 @@ def list_assets( def list_findings( self, - request: securitycenter_service.ListFindingsRequest = None, + request: Union[securitycenter_service.ListFindingsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1451,7 +1459,7 @@ def list_findings( /v1p1beta1/organizations/{organization_id}/sources/-/findings Args: - request (google.cloud.securitycenter_v1p1beta1.types.ListFindingsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.ListFindingsRequest, dict]): The request object. Request message for listing findings. parent (str): @@ -1528,7 +1536,9 @@ def list_findings( def list_notification_configs( self, - request: securitycenter_service.ListNotificationConfigsRequest = None, + request: Union[ + securitycenter_service.ListNotificationConfigsRequest, dict + ] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1538,7 +1548,7 @@ def list_notification_configs( r"""Lists notification configs. Args: - request (google.cloud.securitycenter_v1p1beta1.types.ListNotificationConfigsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.ListNotificationConfigsRequest, dict]): The request object. Request message for listing notification configs. parent (str): @@ -1613,7 +1623,7 @@ def list_notification_configs( def list_sources( self, - request: securitycenter_service.ListSourcesRequest = None, + request: Union[securitycenter_service.ListSourcesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1623,7 +1633,7 @@ def list_sources( r"""Lists all sources belonging to an organization. Args: - request (google.cloud.securitycenter_v1p1beta1.types.ListSourcesRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.ListSourcesRequest, dict]): The request object. Request message for listing sources. parent (str): Required. Resource name of the parent of sources to @@ -1693,7 +1703,7 @@ def list_sources( def run_asset_discovery( self, - request: securitycenter_service.RunAssetDiscoveryRequest = None, + request: Union[securitycenter_service.RunAssetDiscoveryRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1708,7 +1718,7 @@ def run_asset_discovery( receive a TOO_MANY_REQUESTS error. Args: - request (google.cloud.securitycenter_v1p1beta1.types.RunAssetDiscoveryRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.RunAssetDiscoveryRequest, dict]): The request object. Request message for running asset discovery for an organization. parent (str): @@ -1781,7 +1791,7 @@ def run_asset_discovery( def set_finding_state( self, - request: securitycenter_service.SetFindingStateRequest = None, + request: Union[securitycenter_service.SetFindingStateRequest, dict] = None, *, name: str = None, state: finding.Finding.State = None, @@ -1793,7 +1803,7 @@ def set_finding_state( r"""Updates the state of a finding. Args: - request (google.cloud.securitycenter_v1p1beta1.types.SetFindingStateRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.SetFindingStateRequest, dict]): The request object. Request message for updating a finding's state. name (str): @@ -1882,7 +1892,7 @@ def set_finding_state( def set_iam_policy( self, - request: iam_policy_pb2.SetIamPolicyRequest = None, + request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None, *, resource: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1893,7 +1903,7 @@ def set_iam_policy( Source. Args: - request (google.iam.v1.iam_policy_pb2.SetIamPolicyRequest): + request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]): The request object. Request message for `SetIamPolicy` method. resource (str): @@ -2008,7 +2018,7 @@ def set_iam_policy( def test_iam_permissions( self, - request: iam_policy_pb2.TestIamPermissionsRequest = None, + request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None, *, resource: str = None, permissions: Sequence[str] = None, @@ -2020,7 +2030,7 @@ def test_iam_permissions( specified source. Args: - request (google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest): + request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]): The request object. Request message for `TestIamPermissions` method. resource (str): @@ -2091,7 +2101,7 @@ def test_iam_permissions( def update_finding( self, - request: securitycenter_service.UpdateFindingRequest = None, + request: Union[securitycenter_service.UpdateFindingRequest, dict] = None, *, finding: gcs_finding.Finding = None, update_mask: field_mask_pb2.FieldMask = None, @@ -2103,7 +2113,7 @@ def update_finding( source must exist for a finding creation to succeed. Args: - request (google.cloud.securitycenter_v1p1beta1.types.UpdateFindingRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.UpdateFindingRequest, dict]): The request object. Request message for updating or creating a finding. finding (google.cloud.securitycenter_v1p1beta1.types.Finding): @@ -2194,7 +2204,9 @@ def update_finding( def update_notification_config( self, - request: securitycenter_service.UpdateNotificationConfigRequest = None, + request: Union[ + securitycenter_service.UpdateNotificationConfigRequest, dict + ] = None, *, notification_config: gcs_notification_config.NotificationConfig = None, update_mask: field_mask_pb2.FieldMask = None, @@ -2206,7 +2218,7 @@ def update_notification_config( allowed: description, pubsub_topic, streaming_config.filter Args: - request (google.cloud.securitycenter_v1p1beta1.types.UpdateNotificationConfigRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.UpdateNotificationConfigRequest, dict]): The request object. Request message for updating a notification config. notification_config (google.cloud.securitycenter_v1p1beta1.types.NotificationConfig): @@ -2289,7 +2301,9 @@ def update_notification_config( def update_organization_settings( self, - request: securitycenter_service.UpdateOrganizationSettingsRequest = None, + request: Union[ + securitycenter_service.UpdateOrganizationSettingsRequest, dict + ] = None, *, organization_settings: gcs_organization_settings.OrganizationSettings = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -2299,7 +2313,7 @@ def update_organization_settings( r"""Updates an organization's settings. Args: - request (google.cloud.securitycenter_v1p1beta1.types.UpdateOrganizationSettingsRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.UpdateOrganizationSettingsRequest, dict]): The request object. Request message for updating an organization's settings. organization_settings (google.cloud.securitycenter_v1p1beta1.types.OrganizationSettings): @@ -2367,7 +2381,7 @@ def update_organization_settings( def update_source( self, - request: securitycenter_service.UpdateSourceRequest = None, + request: Union[securitycenter_service.UpdateSourceRequest, dict] = None, *, source: gcs_source.Source = None, update_mask: field_mask_pb2.FieldMask = None, @@ -2378,7 +2392,7 @@ def update_source( r"""Updates a source. Args: - request (google.cloud.securitycenter_v1p1beta1.types.UpdateSourceRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.UpdateSourceRequest, dict]): The request object. Request message for updating a source. source (google.cloud.securitycenter_v1p1beta1.types.Source): @@ -2456,7 +2470,7 @@ def update_source( def update_security_marks( self, - request: securitycenter_service.UpdateSecurityMarksRequest = None, + request: Union[securitycenter_service.UpdateSecurityMarksRequest, dict] = None, *, security_marks: gcs_security_marks.SecurityMarks = None, update_mask: field_mask_pb2.FieldMask = None, @@ -2467,7 +2481,7 @@ def update_security_marks( r"""Updates security marks. Args: - request (google.cloud.securitycenter_v1p1beta1.types.UpdateSecurityMarksRequest): + request (Union[google.cloud.securitycenter_v1p1beta1.types.UpdateSecurityMarksRequest, dict]): The request object. Request message for updating a SecurityMarks resource. security_marks (google.cloud.securitycenter_v1p1beta1.types.SecurityMarks): diff --git a/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/base.py b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/base.py index 784492f2..72a996c8 100644 --- a/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/base.py +++ b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/base.py @@ -137,7 +137,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/securitycenter_v1p1beta1/services/security_center/transports/grpc.py b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc.py index a5c0867f..809d4093 100644 --- a/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc.py +++ b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc.py @@ -100,16 +100,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/securitycenter_v1p1beta1/services/security_center/transports/grpc_asyncio.py b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc_asyncio.py index 0fc54f7a..6ca1d810 100644 --- a/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc_asyncio.py +++ b/google/cloud/securitycenter_v1p1beta1/services/security_center/transports/grpc_asyncio.py @@ -147,16 +147,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/noxfile.py b/noxfile.py index 03aa2f58..2bf3ffd7 100644 --- a/noxfile.py +++ b/noxfile.py @@ -84,9 +84,15 @@ def default(session): constraints_path = str( CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" ) - session.install("asyncmock", "pytest-asyncio", "-c", constraints_path) - - session.install("mock", "pytest", "pytest-cov", "-c", constraints_path) + session.install( + "mock", + "asyncmock", + "pytest", + "pytest-cov", + "pytest-asyncio", + "-c", + constraints_path, + ) session.install("-e", ".", "-c", constraints_path) diff --git a/renovate.json b/renovate.json index c0489556..c21036d3 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,9 @@ { "extends": [ - "config:base", ":preserveSemverRanges" + "config:base", + "group:all", + ":preserveSemverRanges", + ":disableDependencyDashboard" ], "ignorePaths": [".pre-commit-config.yaml"], "pip_requirements": { diff --git a/samples/snippets/noxfile.py b/samples/snippets/noxfile.py index 6a8ccdae..b008613f 100644 --- a/samples/snippets/noxfile.py +++ b/samples/snippets/noxfile.py @@ -39,17 +39,15 @@ TEST_CONFIG = { # You can opt out from the test for specific Python versions. - 'ignored_versions': ["2.7"], - + "ignored_versions": [], # Old samples are opted out of enforcing Python type hints # All new samples should feature them - 'enforce_type_hints': False, - + "enforce_type_hints": False, # An envvar key for determining the project id to use. Change it # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a # build specific Cloud project. You can also use your own string # to use your own Cloud project. - 'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT', + "gcloud_project_env": "GOOGLE_CLOUD_PROJECT", # 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT', # If you need to use a specific version of pip, # change pip_version_override to the string representation @@ -57,13 +55,13 @@ "pip_version_override": None, # A dictionary you want to inject into your test. Don't put any # secrets here. These values will override predefined values. - 'envs': {}, + "envs": {}, } try: # Ensure we can import noxfile_config in the project's directory. - sys.path.append('.') + sys.path.append(".") from noxfile_config import TEST_CONFIG_OVERRIDE except ImportError as e: print("No user noxfile_config found: detail: {}".format(e)) @@ -78,25 +76,28 @@ def get_pytest_env_vars() -> Dict[str, str]: ret = {} # Override the GCLOUD_PROJECT and the alias. - env_key = TEST_CONFIG['gcloud_project_env'] + env_key = TEST_CONFIG["gcloud_project_env"] # This should error out if not set. - ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key] + ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key] # Apply user supplied envs. - ret.update(TEST_CONFIG['envs']) + ret.update(TEST_CONFIG["envs"]) return ret # DO NOT EDIT - automatically generated. -# All versions used to tested samples. -ALL_VERSIONS = ["2.7", "3.6", "3.7", "3.8", "3.9"] +# All versions used to test samples. +ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"] # Any default versions that should be ignored. -IGNORED_VERSIONS = TEST_CONFIG['ignored_versions'] +IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"] TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS]) -INSTALL_LIBRARY_FROM_SOURCE = bool(os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False)) +INSTALL_LIBRARY_FROM_SOURCE = os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False) in ( + "True", + "true", +) # # Style Checks # @@ -141,7 +142,7 @@ def _determine_local_import_names(start_dir: str) -> List[str]: @nox.session def lint(session: nox.sessions.Session) -> None: - if not TEST_CONFIG['enforce_type_hints']: + if not TEST_CONFIG["enforce_type_hints"]: session.install("flake8", "flake8-import-order") else: session.install("flake8", "flake8-import-order", "flake8-annotations") @@ -150,9 +151,11 @@ def lint(session: nox.sessions.Session) -> None: args = FLAKE8_COMMON_ARGS + [ "--application-import-names", ",".join(local_names), - "." + ".", ] session.run("flake8", *args) + + # # Black # @@ -165,6 +168,7 @@ def blacken(session: nox.sessions.Session) -> None: session.run("black", *python_files) + # # Sample Tests # @@ -173,7 +177,9 @@ def blacken(session: nox.sessions.Session) -> None: PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"] -def _session_tests(session: nox.sessions.Session, post_install: Callable = None) -> None: +def _session_tests( + session: nox.sessions.Session, post_install: Callable = None +) -> None: if TEST_CONFIG["pip_version_override"]: pip_version = TEST_CONFIG["pip_version_override"] session.install(f"pip=={pip_version}") @@ -203,7 +209,7 @@ def _session_tests(session: nox.sessions.Session, post_install: Callable = None) # on travis where slow and flaky tests are excluded. # See http://doc.pytest.org/en/latest/_modules/_pytest/main.html success_codes=[0, 5], - env=get_pytest_env_vars() + env=get_pytest_env_vars(), ) @@ -213,9 +219,9 @@ def py(session: nox.sessions.Session) -> None: if session.python in TESTED_VERSIONS: _session_tests(session) else: - session.skip("SKIPPED: {} tests are disabled for this sample.".format( - session.python - )) + session.skip( + "SKIPPED: {} tests are disabled for this sample.".format(session.python) + ) # diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index 90f11a28..56269517 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-pubsub==2.6.1 -google-cloud-securitycenter==1.4.0 \ No newline at end of file +google-cloud-pubsub==2.8.0 +google-cloud-securitycenter==1.5.0 \ No newline at end of file diff --git a/samples/snippets/snippets_findings.py b/samples/snippets/snippets_findings.py index a9484653..39aa8f65 100644 --- a/samples/snippets/snippets_findings.py +++ b/samples/snippets/snippets_findings.py @@ -158,7 +158,7 @@ def create_finding(source_name): client = securitycenter.SecurityCenterClient() # Use the current time as the finding "event time". - event_time = datetime.datetime.now() + event_time = datetime.datetime.now(tz=datetime.timezone.utc) # source_name is the resource path for a source that has been # created previously (you can use list_sources to find a specific one). @@ -230,7 +230,7 @@ def create_finding_with_source_properties(source_name): num_value.number_value = 1234 # Use the current time as the finding "event time". - event_time = datetime.datetime.now() + event_time = datetime.datetime.now(tz=datetime.timezone.utc) finding = Finding( state=Finding.State.ACTIVE, @@ -268,7 +268,7 @@ def update_finding(source_name): # Set the update time to Now. This must be some time greater then the # event_time on the original finding. - event_time = datetime.datetime.now() + event_time = datetime.datetime.now(tz=datetime.timezone.utc) # source_name is the resource path for a source that has been # created previously (you can use list_sources to find a specific one). @@ -319,7 +319,7 @@ def update_finding_state(source_name): request={ "name": finding_name, "state": Finding.State.INACTIVE, - "start_time": datetime.datetime.now(), + "start_time": datetime.datetime.now(tz=datetime.timezone.utc), } ) print(f"New state: {new_finding.state}") diff --git a/samples/snippets/snippets_list_assets.py b/samples/snippets/snippets_list_assets.py index e0099e54..64180acc 100644 --- a/samples/snippets/snippets_list_assets.py +++ b/samples/snippets/snippets_list_assets.py @@ -66,7 +66,7 @@ def list_assets_with_filters_and_read_time(organization_id): """Demonstrate listing assets with a filter.""" i = 0 # [START securitycenter_list_assets_at_time] - from datetime import datetime, timedelta + from datetime import datetime, timedelta, timezone from google.cloud import securitycenter @@ -82,7 +82,7 @@ def list_assets_with_filters_and_read_time(organization_id): ) # Lists assets as of yesterday. - read_time = datetime.utcnow() - timedelta(days=1) + read_time = datetime.now(tz=timezone.utc) - timedelta(days=1) # Call the API and print results. asset_iterator = client.list_assets( diff --git a/scripts/fixup_securitycenter_v1_keywords.py b/scripts/fixup_securitycenter_v1_keywords.py index 43acd75e..bb7aec08 100644 --- a/scripts/fixup_securitycenter_v1_keywords.py +++ b/scripts/fixup_securitycenter_v1_keywords.py @@ -39,29 +39,29 @@ def partition( class securitycenterCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_finding': ('parent', 'finding_id', 'finding', ), - 'create_notification_config': ('parent', 'config_id', 'notification_config', ), - 'create_source': ('parent', 'source', ), - 'delete_notification_config': ('name', ), - 'get_iam_policy': ('resource', 'options', ), - 'get_notification_config': ('name', ), - 'get_organization_settings': ('name', ), - 'get_source': ('name', ), - 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), - 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'compare_duration', 'page_token', 'page_size', ), - 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), - 'list_notification_configs': ('parent', 'page_token', 'page_size', ), - 'list_sources': ('parent', 'page_token', 'page_size', ), - 'run_asset_discovery': ('parent', ), - 'set_finding_state': ('name', 'state', 'start_time', ), - 'set_iam_policy': ('resource', 'policy', ), - 'test_iam_permissions': ('resource', 'permissions', ), - 'update_finding': ('finding', 'update_mask', ), - 'update_notification_config': ('notification_config', 'update_mask', ), - 'update_organization_settings': ('organization_settings', 'update_mask', ), - 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), - 'update_source': ('source', 'update_mask', ), + 'create_finding': ('parent', 'finding_id', 'finding', ), + 'create_notification_config': ('parent', 'config_id', 'notification_config', ), + 'create_source': ('parent', 'source', ), + 'delete_notification_config': ('name', ), + 'get_iam_policy': ('resource', 'options', ), + 'get_notification_config': ('name', ), + 'get_organization_settings': ('name', ), + 'get_source': ('name', ), + 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), + 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'compare_duration', 'page_token', 'page_size', ), + 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), + 'list_notification_configs': ('parent', 'page_token', 'page_size', ), + 'list_sources': ('parent', 'page_token', 'page_size', ), + 'run_asset_discovery': ('parent', ), + 'set_finding_state': ('name', 'state', 'start_time', ), + 'set_iam_policy': ('resource', 'policy', ), + 'test_iam_permissions': ('resource', 'permissions', ), + 'update_finding': ('finding', 'update_mask', ), + 'update_notification_config': ('notification_config', 'update_mask', ), + 'update_organization_settings': ('organization_settings', 'update_mask', ), + 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), + 'update_source': ('source', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -80,7 +80,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_securitycenter_v1beta1_keywords.py b/scripts/fixup_securitycenter_v1beta1_keywords.py index c85a7b83..835bfb0c 100644 --- a/scripts/fixup_securitycenter_v1beta1_keywords.py +++ b/scripts/fixup_securitycenter_v1beta1_keywords.py @@ -39,24 +39,24 @@ def partition( class securitycenterCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_finding': ('parent', 'finding_id', 'finding', ), - 'create_source': ('parent', 'source', ), - 'get_iam_policy': ('resource', 'options', ), - 'get_organization_settings': ('name', ), - 'get_source': ('name', ), - 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), - 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'page_token', 'page_size', ), - 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'field_mask', 'page_token', 'page_size', ), - 'list_sources': ('parent', 'page_token', 'page_size', ), - 'run_asset_discovery': ('parent', ), - 'set_finding_state': ('name', 'state', 'start_time', ), - 'set_iam_policy': ('resource', 'policy', ), - 'test_iam_permissions': ('resource', 'permissions', ), - 'update_finding': ('finding', 'update_mask', ), - 'update_organization_settings': ('organization_settings', 'update_mask', ), - 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), - 'update_source': ('source', 'update_mask', ), + 'create_finding': ('parent', 'finding_id', 'finding', ), + 'create_source': ('parent', 'source', ), + 'get_iam_policy': ('resource', 'options', ), + 'get_organization_settings': ('name', ), + 'get_source': ('name', ), + 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), + 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'page_token', 'page_size', ), + 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'field_mask', 'page_token', 'page_size', ), + 'list_sources': ('parent', 'page_token', 'page_size', ), + 'run_asset_discovery': ('parent', ), + 'set_finding_state': ('name', 'state', 'start_time', ), + 'set_iam_policy': ('resource', 'policy', ), + 'test_iam_permissions': ('resource', 'permissions', ), + 'update_finding': ('finding', 'update_mask', ), + 'update_organization_settings': ('organization_settings', 'update_mask', ), + 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), + 'update_source': ('source', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -75,7 +75,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_securitycenter_v1p1beta1_keywords.py b/scripts/fixup_securitycenter_v1p1beta1_keywords.py index 43acd75e..bb7aec08 100644 --- a/scripts/fixup_securitycenter_v1p1beta1_keywords.py +++ b/scripts/fixup_securitycenter_v1p1beta1_keywords.py @@ -39,29 +39,29 @@ def partition( class securitycenterCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_finding': ('parent', 'finding_id', 'finding', ), - 'create_notification_config': ('parent', 'config_id', 'notification_config', ), - 'create_source': ('parent', 'source', ), - 'delete_notification_config': ('name', ), - 'get_iam_policy': ('resource', 'options', ), - 'get_notification_config': ('name', ), - 'get_organization_settings': ('name', ), - 'get_source': ('name', ), - 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), - 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'compare_duration', 'page_token', 'page_size', ), - 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), - 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), - 'list_notification_configs': ('parent', 'page_token', 'page_size', ), - 'list_sources': ('parent', 'page_token', 'page_size', ), - 'run_asset_discovery': ('parent', ), - 'set_finding_state': ('name', 'state', 'start_time', ), - 'set_iam_policy': ('resource', 'policy', ), - 'test_iam_permissions': ('resource', 'permissions', ), - 'update_finding': ('finding', 'update_mask', ), - 'update_notification_config': ('notification_config', 'update_mask', ), - 'update_organization_settings': ('organization_settings', 'update_mask', ), - 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), - 'update_source': ('source', 'update_mask', ), + 'create_finding': ('parent', 'finding_id', 'finding', ), + 'create_notification_config': ('parent', 'config_id', 'notification_config', ), + 'create_source': ('parent', 'source', ), + 'delete_notification_config': ('name', ), + 'get_iam_policy': ('resource', 'options', ), + 'get_notification_config': ('name', ), + 'get_organization_settings': ('name', ), + 'get_source': ('name', ), + 'group_assets': ('parent', 'group_by', 'filter', 'compare_duration', 'read_time', 'page_token', 'page_size', ), + 'group_findings': ('parent', 'group_by', 'filter', 'read_time', 'compare_duration', 'page_token', 'page_size', ), + 'list_assets': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), + 'list_findings': ('parent', 'filter', 'order_by', 'read_time', 'compare_duration', 'field_mask', 'page_token', 'page_size', ), + 'list_notification_configs': ('parent', 'page_token', 'page_size', ), + 'list_sources': ('parent', 'page_token', 'page_size', ), + 'run_asset_discovery': ('parent', ), + 'set_finding_state': ('name', 'state', 'start_time', ), + 'set_iam_policy': ('resource', 'policy', ), + 'test_iam_permissions': ('resource', 'permissions', ), + 'update_finding': ('finding', 'update_mask', ), + 'update_notification_config': ('notification_config', 'update_mask', ), + 'update_organization_settings': ('organization_settings', 'update_mask', ), + 'update_security_marks': ('security_marks', 'update_mask', 'start_time', ), + 'update_source': ('source', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -80,7 +80,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/readme-gen/templates/install_deps.tmpl.rst b/scripts/readme-gen/templates/install_deps.tmpl.rst index a0406dba..275d6498 100644 --- a/scripts/readme-gen/templates/install_deps.tmpl.rst +++ b/scripts/readme-gen/templates/install_deps.tmpl.rst @@ -12,7 +12,7 @@ Install Dependencies .. _Python Development Environment Setup Guide: https://cloud.google.com/python/setup -#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+. +#. Create a virtualenv. Samples are compatible with Python 3.6+. .. code-block:: bash diff --git a/setup.py b/setup.py index 25bb053f..59f31b78 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ name = "google-cloud-securitycenter" description = "Cloud Security Command Center API client library" -version = "1.5.0" +version = "1.5.1" release_status = "Development Status :: 5 - Production/Stable" dependencies = [ # NOTE: Maintainers, please do not require google-api-core>=2.x.x