From 38915a2078e3e467d0d30a805970227f54597873 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 12 Aug 2021 16:42:17 +0000 Subject: [PATCH 01/11] chore(python): avoid `.nox` directories when building docs (#45) Source-Link: https://github.com/googleapis/synthtool/commit/7e1f6da50524b5d98eb67adbf6dd0805df54233d Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d --- .github/.OwlBot.lock.yaml | 2 +- docs/conf.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9ee60f7..b771c37 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 + digest: sha256:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d diff --git a/docs/conf.py b/docs/conf.py index 95788ea..78d5700 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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", From dc2a6962f8fae92617c1b6e3daf55c679855aa11 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 13 Aug 2021 11:49:34 -0400 Subject: [PATCH 02/11] chore: drop mention of Python 2.7 from templates (#46) Source-Link: https://github.com/googleapis/synthtool/commit/facee4cc1ea096cd8bcc008bb85929daa7c414c0 Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- noxfile.py | 12 +++++++++--- scripts/readme-gen/templates/install_deps.tmpl.rst | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b771c37..a9fcd07 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:a1a891041baa4ffbe1a809ac1b8b9b4a71887293c9101c88e8e255943c5aec2d + digest: sha256:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 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/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 From e195dc727d479027ff77746cbf292c5a7da8a58c Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:42:08 -0600 Subject: [PATCH 03/11] chore: generate python samples templates in owlbot.py (#47) Generate python samples templates in owlbot.py --- owlbot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/owlbot.py b/owlbot.py index a273821..a4169ac 100644 --- a/owlbot.py +++ b/owlbot.py @@ -43,6 +43,7 @@ # ---------------------------------------------------------------------------- templated_files = common.py_library(cov_level=99, microgenerator=True) +python.py_samples(skip_readmes=True) # the microgenerator has a good coveragerc file excludes = [".coveragerc"] From 574ecaa97c33435ef930d951338a5a159ce1c0af Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 30 Aug 2021 16:14:24 +0000 Subject: [PATCH 04/11] chore(python): disable dependency dashboard (#49) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a9fcd07..b75186c 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:9743664022bd63a8084be67f144898314c7ca12f0a03e422ac17c733c129d803 + digest: sha256:d6761eec279244e57fe9d21f8343381a01d3632c034811a72f68b83119e58c69 diff --git a/renovate.json b/renovate.json index c048955..9fa8816 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,8 @@ { "extends": [ - "config:base", ":preserveSemverRanges" + "config:base", + ":preserveSemverRanges", + ":disableDependencyDashboard" ], "ignorePaths": [".pre-commit-config.yaml"], "pip_requirements": { From 215389a1386bd67a19e8a8602b1b0f65471ebf95 Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Mon, 30 Aug 2021 16:39:28 -0400 Subject: [PATCH 05/11] chore: migrate to main branch (#51) --- .kokoro/build.sh | 2 +- .kokoro/test-samples-impl.sh | 2 +- CONTRIBUTING.rst | 12 ++++++------ owlbot.py | 29 +++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fab5711..6c96299 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/CONTRIBUTING.rst b/CONTRIBUTING.rst index a740b05..0b5760b 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-service-management # repository into your local repository. $ git remote add upstream git@github.com:googleapis/python-service-management.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-service-management``. 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``). + the branch should be the main 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-service-management/blob/master/CONTRIBUTING.rst``) +``https://github.com/googleapis/python-service-management/blob/main/CONTRIBUTING.rst``) may cause problems creating links or rendering the description. .. _description on PyPI: https://pypi.org/project/google-cloud-service-management @@ -234,7 +234,7 @@ We support: Supported versions can be found in our ``noxfile.py`` `config`_. -.. _config: https://github.com/googleapis/python-service-management/blob/master/noxfile.py +.. _config: https://github.com/googleapis/python-service-management/blob/main/noxfile.py We also explicitly decided to support Python 3 beginning with version 3.6. diff --git a/owlbot.py b/owlbot.py index a4169ac..9c959c1 100644 --- a/owlbot.py +++ b/owlbot.py @@ -52,3 +52,32 @@ ) s.shell.run(["nox", "-s", "blacken"], hide_output=False) + +# ---------------------------------------------------------------------------- +# Main Branch migration +# ---------------------------------------------------------------------------- + +s.replace( + "*.rst", + "master", + "main" +) + +s.replace( + "*.rst", + "google-cloud-python/blob/main", + "google-cloud-python/blob/master" +) + +s.replace( + "CONTRIBUTING.rst", + "kubernetes/community/blob/main", + "kubernetes/community/blob/master" +) + +s.replace( + ".kokoro/*", + "master", + "main" +) + From 7c545b70e1c574b06b4b6da3afd1959f461f4380 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 17:02:17 +0000 Subject: [PATCH 06/11] chore(python): group renovate prs (#52) --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b75186c..ef3cb34 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:d6761eec279244e57fe9d21f8343381a01d3632c034811a72f68b83119e58c69 + digest: sha256:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7 diff --git a/renovate.json b/renovate.json index 9fa8816..c21036d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,7 @@ { "extends": [ "config:base", + "group:all", ":preserveSemverRanges", ":disableDependencyDashboard" ], From 36d665006337ade168306ddde7a8271e66a58a02 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 15:16:10 +0000 Subject: [PATCH 07/11] chore(python): rename default branch to main (#53) --- .github/.OwlBot.lock.yaml | 2 +- CONTRIBUTING.rst | 6 +++--- docs/conf.py | 10 +++++----- owlbot.py | 29 ----------------------------- 4 files changed, 9 insertions(+), 38 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ef3cb34..c07f148 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:1456ea2b3b523ccff5e13030acef56d1de28f21249c62aa0f196265880338fa7 + digest: sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0b5760b..80b5bd4 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -113,9 +113,9 @@ Coding Style export GOOGLE_CLOUD_TESTING_BRANCH="main" By doing this, you are specifying the location of the most up-to-date - version of ``python-service-management``. 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 (``main``). + version of ``python-service-management``. 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 diff --git a/docs/conf.py b/docs/conf.py index 78d5700..05c5168 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-service-management" @@ -280,7 +280,7 @@ # author, documentclass [howto, manual, or own class]). latex_documents = [ ( - master_doc, + root_doc, "google-cloud-service-management.tex", "google-cloud-service-management Documentation", author, @@ -315,7 +315,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ( - master_doc, + root_doc, "google-cloud-service-management", "google-cloud-service-management Documentation", [author], @@ -334,7 +334,7 @@ # dir menu entry, description, category) texinfo_documents = [ ( - master_doc, + root_doc, "google-cloud-service-management", "google-cloud-service-management Documentation", author, diff --git a/owlbot.py b/owlbot.py index 9c959c1..a4169ac 100644 --- a/owlbot.py +++ b/owlbot.py @@ -52,32 +52,3 @@ ) s.shell.run(["nox", "-s", "blacken"], hide_output=False) - -# ---------------------------------------------------------------------------- -# Main Branch migration -# ---------------------------------------------------------------------------- - -s.replace( - "*.rst", - "master", - "main" -) - -s.replace( - "*.rst", - "google-cloud-python/blob/main", - "google-cloud-python/blob/master" -) - -s.replace( - "CONTRIBUTING.rst", - "kubernetes/community/blob/main", - "kubernetes/community/blob/master" -) - -s.replace( - ".kokoro/*", - "master", - "main" -) - From befe8b7bdb4ecca1066d96a368cca68a7ba1d188 Mon Sep 17 00:00:00 2001 From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:32:36 -0600 Subject: [PATCH 08/11] chore: reference main branch of google-cloud-python (#54) --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index f7709e8..d147c18 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ monitoring. - `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-service-management.svg :target: https://pypi.org/project/google-cloud-service-management/ .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-service-management.svg @@ -85,4 +85,4 @@ Next Steps APIs that we cover. .. _Service Management API Product documentation: https://cloud.google.com/service-infrastructure/docs/overview/ -.. _README: https://github.com/googleapis/google-cloud-python/blob/master/README.rst +.. _README: https://github.com/googleapis/google-cloud-python/blob/main/README.rst From 9651061fdb8229e4f6b8e52586b21676896d3fe5 Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Tue, 21 Sep 2021 12:40:41 -0700 Subject: [PATCH 09/11] chore: relocate owl bot post processor (#56) chore: relocate owl bot post processor --- .github/.OwlBot.lock.yaml | 4 ++-- .github/.OwlBot.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index c07f148..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:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d + image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest + digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 07cf1b4..6f2669f 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 From 7547e3a53a6a437e56cbc832d62aecc627cb4cd6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:12:39 +0000 Subject: [PATCH 10/11] chore: use gapic-generator-python 0.51.2 (#57) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/service_manager/client.py | 62 +++++++++---------- .../service_manager/transports/base.py | 2 +- .../service_manager/transports/grpc.py | 6 +- .../transports/grpc_asyncio.py | 6 +- .../fixup_servicemanagement_v1_keywords.py | 32 +++++----- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/google/cloud/servicemanagement_v1/services/service_manager/client.py b/google/cloud/servicemanagement_v1/services/service_manager/client.py index cf1e90d..cee7894 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/client.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/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 import warnings @@ -366,7 +366,7 @@ def __init__( def list_services( self, - request: servicemanager.ListServicesRequest = None, + request: Union[servicemanager.ListServicesRequest, dict] = None, *, producer_project_id: str = None, consumer_id: str = None, @@ -385,7 +385,7 @@ def list_services( ``consumer_id`` must have the format of "project:{PROJECT-ID}". Args: - request (google.cloud.servicemanagement_v1.types.ListServicesRequest): + request (Union[google.cloud.servicemanagement_v1.types.ListServicesRequest, dict]): The request object. Request message for `ListServices` method. producer_project_id (str): @@ -461,7 +461,7 @@ def list_services( def get_service( self, - request: servicemanager.GetServiceRequest = None, + request: Union[servicemanager.GetServiceRequest, dict] = None, *, service_name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -472,7 +472,7 @@ def get_service( unless the service is public. Args: - request (google.cloud.servicemanagement_v1.types.GetServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.GetServiceRequest, dict]): The request object. Request message for `GetService` method. service_name (str): @@ -529,7 +529,7 @@ def get_service( def create_service( self, - request: servicemanager.CreateServiceRequest = None, + request: Union[servicemanager.CreateServiceRequest, dict] = None, *, service: resources.ManagedService = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -542,7 +542,7 @@ def create_service( Operation Args: - request (google.cloud.servicemanagement_v1.types.CreateServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.CreateServiceRequest, dict]): The request object. Request message for CreateService method. service (google.cloud.servicemanagement_v1.types.ManagedService): @@ -607,7 +607,7 @@ def create_service( def delete_service( self, - request: servicemanager.DeleteServiceRequest = None, + request: Union[servicemanager.DeleteServiceRequest, dict] = None, *, service_name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -624,7 +624,7 @@ def delete_service( Operation Args: - request (google.cloud.servicemanagement_v1.types.DeleteServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.DeleteServiceRequest, dict]): The request object. Request message for DeleteService method. service_name (str): @@ -702,7 +702,7 @@ def delete_service( def undelete_service( self, - request: servicemanager.UndeleteServiceRequest = None, + request: Union[servicemanager.UndeleteServiceRequest, dict] = None, *, service_name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -718,7 +718,7 @@ def undelete_service( Operation Args: - request (google.cloud.servicemanagement_v1.types.UndeleteServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.UndeleteServiceRequest, dict]): The request object. Request message for UndeleteService method. service_name (str): @@ -786,7 +786,7 @@ def undelete_service( def list_service_configs( self, - request: servicemanager.ListServiceConfigsRequest = None, + request: Union[servicemanager.ListServiceConfigsRequest, dict] = None, *, service_name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -797,7 +797,7 @@ def list_service_configs( managed service, from the newest to the oldest. Args: - request (google.cloud.servicemanagement_v1.types.ListServiceConfigsRequest): + request (Union[google.cloud.servicemanagement_v1.types.ListServiceConfigsRequest, dict]): The request object. Request message for ListServiceConfigs method. service_name (str): @@ -863,7 +863,7 @@ def list_service_configs( def get_service_config( self, - request: servicemanager.GetServiceConfigRequest = None, + request: Union[servicemanager.GetServiceConfigRequest, dict] = None, *, service_name: str = None, config_id: str = None, @@ -876,7 +876,7 @@ def get_service_config( service. Args: - request (google.cloud.servicemanagement_v1.types.GetServiceConfigRequest): + request (Union[google.cloud.servicemanagement_v1.types.GetServiceConfigRequest, dict]): The request object. Request message for GetServiceConfig method. service_name (str): @@ -971,7 +971,7 @@ def get_service_config( def create_service_config( self, - request: servicemanager.CreateServiceConfigRequest = None, + request: Union[servicemanager.CreateServiceConfigRequest, dict] = None, *, service_name: str = None, service_config: service_pb2.Service = None, @@ -990,7 +990,7 @@ def create_service_config( rest will be deleted eventually. Args: - request (google.cloud.servicemanagement_v1.types.CreateServiceConfigRequest): + request (Union[google.cloud.servicemanagement_v1.types.CreateServiceConfigRequest, dict]): The request object. Request message for CreateServiceConfig method. service_name (str): @@ -1073,7 +1073,7 @@ def create_service_config( def submit_config_source( self, - request: servicemanager.SubmitConfigSourceRequest = None, + request: Union[servicemanager.SubmitConfigSourceRequest, dict] = None, *, service_name: str = None, config_source: resources.ConfigSource = None, @@ -1097,7 +1097,7 @@ def submit_config_source( Operation Args: - request (google.cloud.servicemanagement_v1.types.SubmitConfigSourceRequest): + request (Union[google.cloud.servicemanagement_v1.types.SubmitConfigSourceRequest, dict]): The request object. Request message for SubmitConfigSource method. service_name (str): @@ -1185,7 +1185,7 @@ def submit_config_source( def list_service_rollouts( self, - request: servicemanager.ListServiceRolloutsRequest = None, + request: Union[servicemanager.ListServiceRolloutsRequest, dict] = None, *, service_name: str = None, filter: str = None, @@ -1198,7 +1198,7 @@ def list_service_rollouts( oldest. Args: - request (google.cloud.servicemanagement_v1.types.ListServiceRolloutsRequest): + request (Union[google.cloud.servicemanagement_v1.types.ListServiceRolloutsRequest, dict]): The request object. Request message for 'ListServiceRollouts' service_name (str): @@ -1280,7 +1280,7 @@ def list_service_rollouts( def get_service_rollout( self, - request: servicemanager.GetServiceRolloutRequest = None, + request: Union[servicemanager.GetServiceRolloutRequest, dict] = None, *, service_name: str = None, rollout_id: str = None, @@ -1292,7 +1292,7 @@ def get_service_rollout( [rollout][google.api.servicemanagement.v1.Rollout]. Args: - request (google.cloud.servicemanagement_v1.types.GetServiceRolloutRequest): + request (Union[google.cloud.servicemanagement_v1.types.GetServiceRolloutRequest, dict]): The request object. Request message for GetServiceRollout method. service_name (str): @@ -1362,7 +1362,7 @@ def get_service_rollout( def create_service_rollout( self, - request: servicemanager.CreateServiceRolloutRequest = None, + request: Union[servicemanager.CreateServiceRolloutRequest, dict] = None, *, service_name: str = None, rollout: resources.Rollout = None, @@ -1389,7 +1389,7 @@ def create_service_rollout( Operation Args: - request (google.cloud.servicemanagement_v1.types.CreateServiceRolloutRequest): + request (Union[google.cloud.servicemanagement_v1.types.CreateServiceRolloutRequest, dict]): The request object. Request message for 'CreateServiceRollout' service_name (str): @@ -1467,7 +1467,7 @@ def create_service_rollout( def generate_config_report( self, - request: servicemanager.GenerateConfigReportRequest = None, + request: Union[servicemanager.GenerateConfigReportRequest, dict] = None, *, new_config: any_pb2.Any = None, old_config: any_pb2.Any = None, @@ -1489,7 +1489,7 @@ def generate_config_report( the last pushed service configuration. Args: - request (google.cloud.servicemanagement_v1.types.GenerateConfigReportRequest): + request (Union[google.cloud.servicemanagement_v1.types.GenerateConfigReportRequest, dict]): The request object. Request message for GenerateConfigReport method. new_config (google.protobuf.any_pb2.Any): @@ -1561,7 +1561,7 @@ def generate_config_report( def enable_service( self, - request: servicemanager.EnableServiceRequest = None, + request: Union[servicemanager.EnableServiceRequest, dict] = None, *, service_name: str = None, consumer_id: str = None, @@ -1578,7 +1578,7 @@ def enable_service( Operation Args: - request (google.cloud.servicemanagement_v1.types.EnableServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.EnableServiceRequest, dict]): The request object. Request message for EnableService method. service_name (str): @@ -1666,7 +1666,7 @@ def enable_service( def disable_service( self, - request: servicemanager.DisableServiceRequest = None, + request: Union[servicemanager.DisableServiceRequest, dict] = None, *, service_name: str = None, consumer_id: str = None, @@ -1683,7 +1683,7 @@ def disable_service( Operation Args: - request (google.cloud.servicemanagement_v1.types.DisableServiceRequest): + request (Union[google.cloud.servicemanagement_v1.types.DisableServiceRequest, dict]): The request object. Request message for DisableService method. service_name (str): diff --git a/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py b/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py index e2b007e..e8f458c 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/transports/base.py @@ -126,7 +126,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/servicemanagement_v1/services/service_manager/transports/grpc.py b/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc.py index 66f10bd..117e6d6 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc.py @@ -85,16 +85,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/servicemanagement_v1/services/service_manager/transports/grpc_asyncio.py b/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc_asyncio.py index 29b2258..4d2c5d9 100644 --- a/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc_asyncio.py +++ b/google/cloud/servicemanagement_v1/services/service_manager/transports/grpc_asyncio.py @@ -132,16 +132,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_servicemanagement_v1_keywords.py b/scripts/fixup_servicemanagement_v1_keywords.py index 1ac6d2a..7269923 100644 --- a/scripts/fixup_servicemanagement_v1_keywords.py +++ b/scripts/fixup_servicemanagement_v1_keywords.py @@ -39,21 +39,21 @@ def partition( class servicemanagementCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_service': ('service', ), - 'create_service_config': ('service_name', 'service_config', ), - 'create_service_rollout': ('service_name', 'rollout', ), - 'delete_service': ('service_name', ), - 'disable_service': ('service_name', 'consumer_id', ), - 'enable_service': ('service_name', 'consumer_id', ), - 'generate_config_report': ('new_config', 'old_config', ), - 'get_service': ('service_name', ), - 'get_service_config': ('service_name', 'config_id', 'view', ), - 'get_service_rollout': ('service_name', 'rollout_id', ), - 'list_service_configs': ('service_name', 'page_token', 'page_size', ), - 'list_service_rollouts': ('service_name', 'filter', 'page_token', 'page_size', ), - 'list_services': ('producer_project_id', 'page_size', 'page_token', 'consumer_id', ), - 'submit_config_source': ('service_name', 'config_source', 'validate_only', ), - 'undelete_service': ('service_name', ), + 'create_service': ('service', ), + 'create_service_config': ('service_name', 'service_config', ), + 'create_service_rollout': ('service_name', 'rollout', ), + 'delete_service': ('service_name', ), + 'disable_service': ('service_name', 'consumer_id', ), + 'enable_service': ('service_name', 'consumer_id', ), + 'generate_config_report': ('new_config', 'old_config', ), + 'get_service': ('service_name', ), + 'get_service_config': ('service_name', 'config_id', 'view', ), + 'get_service_rollout': ('service_name', 'rollout_id', ), + 'list_service_configs': ('service_name', 'page_token', 'page_size', ), + 'list_service_rollouts': ('service_name', 'filter', 'page_token', 'page_size', ), + 'list_services': ('producer_project_id', 'page_size', 'page_token', 'consumer_id', ), + 'submit_config_source': ('service_name', 'config_source', 'validate_only', ), + 'undelete_service': ('service_name', ), } 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 ) From 417e987c92c4559f41c6b7faa1af607b9af4b1eb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:52:28 +0000 Subject: [PATCH 11/11] chore: release 1.0.3 (#58) :robot: I have created a release \*beep\* \*boop\* --- ### [1.0.3](https://www.github.com/googleapis/python-service-management/compare/v1.0.2...v1.0.3) (2021-09-24) ### Bug Fixes * add 'dict' annotation type to 'request' ([7547e3a](https://www.github.com/googleapis/python-service-management/commit/7547e3a53a6a437e56cbc832d62aecc627cb4cd6)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed4686c..ae3892a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.3](https://www.github.com/googleapis/python-service-management/compare/v1.0.2...v1.0.3) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([7547e3a](https://www.github.com/googleapis/python-service-management/commit/7547e3a53a6a437e56cbc832d62aecc627cb4cd6)) + ### [1.0.2](https://www.github.com/googleapis/python-service-management/compare/v1.0.1...v1.0.2) (2021-07-28) diff --git a/setup.py b/setup.py index ddb1317..df986a3 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ import setuptools # type: ignore name = "google-cloud-service-management" -version = "1.0.2" +version = "1.0.3" description = "Service Management API" release_status = "Development Status :: 5 - Production/Stable" url = "https://github.com/googleapis/python-service-management"