diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ee60f7..2567653 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 a86a8bc..c3e7751 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/.kokoro/build.sh b/.kokoro/build.sh index bfbb290..5459772 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 311a8d5..8a324c9 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 dbacb88..7f309ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.1.4](https://www.github.com/googleapis/python-network-security/compare/v0.1.3...v0.1.4) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([dcefd7e](https://www.github.com/googleapis/python-network-security/commit/dcefd7e92f08e12c868fee114c73075e8ba356a5)) + ### [0.1.3](https://www.github.com/googleapis/python-network-security/compare/v0.1.2...v0.1.3) (2021-07-29) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 59ff9c3..8017294 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-network-security # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-network-security.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-network-security``. 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-network-security``. 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-network-security/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-network-security/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-network-security @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-network-security/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-network-security/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 906583d..b4c51b9 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Python Client for Network Security API - `Product Documentation`_ .. |beta| image:: https://img.shields.io/badge/support-beta-orange.svg - :target: https://github.com/googleapis/google-cloud-python/blob/master/README.rst#beta-support + :target: https://github.com/googleapis/google-cloud-python/blob/main/README.rst#beta-support .. |pypi| image:: https://img.shields.io/pypi/v/google-cloud-network-security.svg :target: https://pypi.org/project/google-cloud-network-security/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-network-security.svg @@ -77,4 +77,4 @@ Next Steps APIs that we cover. .. _Network Security API Product documentation: https://cloud.google.com/traffic-director/docs/reference/network-security/rest -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst diff --git a/docs/conf.py b/docs/conf.py index 0ee6941..f8c7aaa 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-network-security" @@ -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-network-security.tex", "google-cloud-network-security Documentation", author, @@ -314,7 +315,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ( - master_doc, + root_doc, "google-cloud-network-security", "google-cloud-network-security Documentation", [author], @@ -333,7 +334,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-network-security", "google-cloud-network-security Documentation", author, diff --git a/google/cloud/network_security_v1beta1/services/network_security/client.py b/google/cloud/network_security_v1beta1/services/network_security/client.py index 4ee534a..3e40f96 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/client.py +++ b/google/cloud/network_security_v1beta1/services/network_security/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 @@ -410,7 +410,9 @@ def __init__( def list_authorization_policies( self, - request: authorization_policy.ListAuthorizationPoliciesRequest = None, + request: Union[ + authorization_policy.ListAuthorizationPoliciesRequest, dict + ] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -421,7 +423,7 @@ def list_authorization_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListAuthorizationPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListAuthorizationPoliciesRequest, dict]): The request object. Request used with the ListAuthorizationPolicies method. parent (str): @@ -496,7 +498,7 @@ def list_authorization_policies( def get_authorization_policy( self, - request: authorization_policy.GetAuthorizationPolicyRequest = None, + request: Union[authorization_policy.GetAuthorizationPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -506,7 +508,7 @@ def get_authorization_policy( r"""Gets details of a single AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetAuthorizationPolicyRequest, dict]): The request object. Request used by the GetAuthorizationPolicy method. name (str): @@ -573,7 +575,9 @@ def get_authorization_policy( def create_authorization_policy( self, - request: gcn_authorization_policy.CreateAuthorizationPolicyRequest = None, + request: Union[ + gcn_authorization_policy.CreateAuthorizationPolicyRequest, dict + ] = None, *, parent: str = None, authorization_policy: gcn_authorization_policy.AuthorizationPolicy = None, @@ -586,7 +590,7 @@ def create_authorization_policy( and location. Args: - request (google.cloud.network_security_v1beta1.types.CreateAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateAuthorizationPolicyRequest, dict]): The request object. Request used by the CreateAuthorizationPolicy method. parent (str): @@ -688,7 +692,9 @@ def create_authorization_policy( def update_authorization_policy( self, - request: gcn_authorization_policy.UpdateAuthorizationPolicyRequest = None, + request: Union[ + gcn_authorization_policy.UpdateAuthorizationPolicyRequest, dict + ] = None, *, authorization_policy: gcn_authorization_policy.AuthorizationPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -700,7 +706,7 @@ def update_authorization_policy( AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateAuthorizationPolicyRequest, dict]): The request object. Request used by the UpdateAuthorizationPolicy method. authorization_policy (google.cloud.network_security_v1beta1.types.AuthorizationPolicy): @@ -794,7 +800,9 @@ def update_authorization_policy( def delete_authorization_policy( self, - request: authorization_policy.DeleteAuthorizationPolicyRequest = None, + request: Union[ + authorization_policy.DeleteAuthorizationPolicyRequest, dict + ] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -804,7 +812,7 @@ def delete_authorization_policy( r"""Deletes a single AuthorizationPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteAuthorizationPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteAuthorizationPolicyRequest, dict]): The request object. Request used by the DeleteAuthorizationPolicy method. name (str): @@ -891,7 +899,7 @@ def delete_authorization_policy( def list_server_tls_policies( self, - request: server_tls_policy.ListServerTlsPoliciesRequest = None, + request: Union[server_tls_policy.ListServerTlsPoliciesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -902,7 +910,7 @@ def list_server_tls_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListServerTlsPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListServerTlsPoliciesRequest, dict]): The request object. Request used by the ListServerTlsPolicies method. parent (str): @@ -973,7 +981,7 @@ def list_server_tls_policies( def get_server_tls_policy( self, - request: server_tls_policy.GetServerTlsPolicyRequest = None, + request: Union[server_tls_policy.GetServerTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -983,7 +991,7 @@ def get_server_tls_policy( r"""Gets details of a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetServerTlsPolicyRequest, dict]): The request object. Request used by the GetServerTlsPolicy method. name (str): @@ -1050,7 +1058,7 @@ def get_server_tls_policy( def create_server_tls_policy( self, - request: gcn_server_tls_policy.CreateServerTlsPolicyRequest = None, + request: Union[gcn_server_tls_policy.CreateServerTlsPolicyRequest, dict] = None, *, parent: str = None, server_tls_policy: gcn_server_tls_policy.ServerTlsPolicy = None, @@ -1063,7 +1071,7 @@ def create_server_tls_policy( location. Args: - request (google.cloud.network_security_v1beta1.types.CreateServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateServerTlsPolicyRequest, dict]): The request object. Request used by the CreateServerTlsPolicy method. parent (str): @@ -1159,7 +1167,7 @@ def create_server_tls_policy( def update_server_tls_policy( self, - request: gcn_server_tls_policy.UpdateServerTlsPolicyRequest = None, + request: Union[gcn_server_tls_policy.UpdateServerTlsPolicyRequest, dict] = None, *, server_tls_policy: gcn_server_tls_policy.ServerTlsPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1170,7 +1178,7 @@ def update_server_tls_policy( r"""Updates the parameters of a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateServerTlsPolicyRequest, dict]): The request object. Request used by UpdateServerTlsPolicy method. server_tls_policy (google.cloud.network_security_v1beta1.types.ServerTlsPolicy): @@ -1260,7 +1268,7 @@ def update_server_tls_policy( def delete_server_tls_policy( self, - request: server_tls_policy.DeleteServerTlsPolicyRequest = None, + request: Union[server_tls_policy.DeleteServerTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1270,7 +1278,7 @@ def delete_server_tls_policy( r"""Deletes a single ServerTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteServerTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteServerTlsPolicyRequest, dict]): The request object. Request used by the DeleteServerTlsPolicy method. name (str): @@ -1353,7 +1361,7 @@ def delete_server_tls_policy( def list_client_tls_policies( self, - request: client_tls_policy.ListClientTlsPoliciesRequest = None, + request: Union[client_tls_policy.ListClientTlsPoliciesRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1364,7 +1372,7 @@ def list_client_tls_policies( location. Args: - request (google.cloud.network_security_v1beta1.types.ListClientTlsPoliciesRequest): + request (Union[google.cloud.network_security_v1beta1.types.ListClientTlsPoliciesRequest, dict]): The request object. Request used by the ListClientTlsPolicies method. parent (str): @@ -1435,7 +1443,7 @@ def list_client_tls_policies( def get_client_tls_policy( self, - request: client_tls_policy.GetClientTlsPolicyRequest = None, + request: Union[client_tls_policy.GetClientTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1445,7 +1453,7 @@ def get_client_tls_policy( r"""Gets details of a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.GetClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.GetClientTlsPolicyRequest, dict]): The request object. Request used by the GetClientTlsPolicy method. name (str): @@ -1511,7 +1519,7 @@ def get_client_tls_policy( def create_client_tls_policy( self, - request: gcn_client_tls_policy.CreateClientTlsPolicyRequest = None, + request: Union[gcn_client_tls_policy.CreateClientTlsPolicyRequest, dict] = None, *, parent: str = None, client_tls_policy: gcn_client_tls_policy.ClientTlsPolicy = None, @@ -1524,7 +1532,7 @@ def create_client_tls_policy( location. Args: - request (google.cloud.network_security_v1beta1.types.CreateClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.CreateClientTlsPolicyRequest, dict]): The request object. Request used by the CreateClientTlsPolicy method. parent (str): @@ -1619,7 +1627,7 @@ def create_client_tls_policy( def update_client_tls_policy( self, - request: gcn_client_tls_policy.UpdateClientTlsPolicyRequest = None, + request: Union[gcn_client_tls_policy.UpdateClientTlsPolicyRequest, dict] = None, *, client_tls_policy: gcn_client_tls_policy.ClientTlsPolicy = None, update_mask: field_mask_pb2.FieldMask = None, @@ -1630,7 +1638,7 @@ def update_client_tls_policy( r"""Updates the parameters of a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.UpdateClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.UpdateClientTlsPolicyRequest, dict]): The request object. Request used by UpdateClientTlsPolicy method. client_tls_policy (google.cloud.network_security_v1beta1.types.ClientTlsPolicy): @@ -1719,7 +1727,7 @@ def update_client_tls_policy( def delete_client_tls_policy( self, - request: client_tls_policy.DeleteClientTlsPolicyRequest = None, + request: Union[client_tls_policy.DeleteClientTlsPolicyRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -1729,7 +1737,7 @@ def delete_client_tls_policy( r"""Deletes a single ClientTlsPolicy. Args: - request (google.cloud.network_security_v1beta1.types.DeleteClientTlsPolicyRequest): + request (Union[google.cloud.network_security_v1beta1.types.DeleteClientTlsPolicyRequest, dict]): The request object. Request used by the DeleteClientTlsPolicy method. name (str): diff --git a/google/cloud/network_security_v1beta1/services/network_security/transports/base.py b/google/cloud/network_security_v1beta1/services/network_security/transports/base.py index c1d0300..6e4bd27 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/base.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/base.py @@ -130,7 +130,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/network_security_v1beta1/services/network_security/transports/grpc.py b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py index f8fd775..70f2231 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc.py @@ -91,16 +91,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/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py index 7632628..c6fe5bb 100644 --- a/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py +++ b/google/cloud/network_security_v1beta1/services/network_security/transports/grpc_asyncio.py @@ -138,16 +138,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 94ee6a8..93ea9b1 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/owlbot.py b/owlbot.py index 3c023cc..e4c86b9 100644 --- a/owlbot.py +++ b/owlbot.py @@ -31,8 +31,51 @@ # ---------------------------------------------------------------------------- templated_files = gcp.CommonTemplates().py_library(microgenerator=True, cov_level=99) +python.py_samples(skip_readmes=True) s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file +# Remove the replacements below once https://github.com/googleapis/synthtool/pull/1188 is merged + +# Update googleapis/repo-automation-bots repo to main in .kokoro/*.sh files +s.replace(".kokoro/*.sh", "repo-automation-bots/tree/master", "repo-automation-bots/tree/main") + +# Customize CONTRIBUTING.rst to replace master with main +s.replace( + "CONTRIBUTING.rst", + "fetch and merge changes from upstream into master", + "fetch and merge changes from upstream into main", +) + +s.replace( + "CONTRIBUTING.rst", + "git merge upstream/master", + "git merge upstream/main", +) + +s.replace( + "CONTRIBUTING.rst", + """export GOOGLE_CLOUD_TESTING_BRANCH=\"master\"""", + """export GOOGLE_CLOUD_TESTING_BRANCH=\"main\"""", +) + +s.replace( + "CONTRIBUTING.rst", + "remote \(``master``\)", + "remote (``main``)", +) + +s.replace( + "CONTRIBUTING.rst", + "blob/master/CONTRIBUTING.rst", + "blob/main/CONTRIBUTING.rst", +) + +s.replace( + "CONTRIBUTING.rst", + "blob/master/noxfile.py", + "blob/main/noxfile.py", +) + # ---------------------------------------------------------------------------- # Run blacken session # ---------------------------------------------------------------------------- diff --git a/renovate.json b/renovate.json index c048955..c21036d 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/scripts/fixup_network_security_v1beta1_keywords.py b/scripts/fixup_network_security_v1beta1_keywords.py index e680120..219b0cc 100644 --- a/scripts/fixup_network_security_v1beta1_keywords.py +++ b/scripts/fixup_network_security_v1beta1_keywords.py @@ -39,21 +39,21 @@ def partition( class network_securityCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_authorization_policy': ('parent', 'authorization_policy_id', 'authorization_policy', ), - 'create_client_tls_policy': ('parent', 'client_tls_policy_id', 'client_tls_policy', ), - 'create_server_tls_policy': ('parent', 'server_tls_policy_id', 'server_tls_policy', ), - 'delete_authorization_policy': ('name', ), - 'delete_client_tls_policy': ('name', ), - 'delete_server_tls_policy': ('name', ), - 'get_authorization_policy': ('name', ), - 'get_client_tls_policy': ('name', ), - 'get_server_tls_policy': ('name', ), - 'list_authorization_policies': ('parent', 'page_size', 'page_token', ), - 'list_client_tls_policies': ('parent', 'page_size', 'page_token', ), - 'list_server_tls_policies': ('parent', 'page_size', 'page_token', ), - 'update_authorization_policy': ('authorization_policy', 'update_mask', ), - 'update_client_tls_policy': ('client_tls_policy', 'update_mask', ), - 'update_server_tls_policy': ('server_tls_policy', 'update_mask', ), + 'create_authorization_policy': ('parent', 'authorization_policy_id', 'authorization_policy', ), + 'create_client_tls_policy': ('parent', 'client_tls_policy_id', 'client_tls_policy', ), + 'create_server_tls_policy': ('parent', 'server_tls_policy_id', 'server_tls_policy', ), + 'delete_authorization_policy': ('name', ), + 'delete_client_tls_policy': ('name', ), + 'delete_server_tls_policy': ('name', ), + 'get_authorization_policy': ('name', ), + 'get_client_tls_policy': ('name', ), + 'get_server_tls_policy': ('name', ), + 'list_authorization_policies': ('parent', 'page_size', 'page_token', ), + 'list_client_tls_policies': ('parent', 'page_size', 'page_token', ), + 'list_server_tls_policies': ('parent', 'page_size', 'page_token', ), + 'update_authorization_policy': ('authorization_policy', 'update_mask', ), + 'update_client_tls_policy': ('client_tls_policy', 'update_mask', ), + 'update_server_tls_policy': ('server_tls_policy', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -72,7 +72,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 a0406db..275d649 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 e374b42..81ef03e 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-network-security" description = "Network Security API client library" -version = "0.1.3" +version = "0.1.4" release_status = "Development Status :: 4 - Beta" dependencies = [ # NOTE: Maintainers, please do not require google-api-core>=2.x.x