From 71b732fa1dc45ced5ab87018b6e38366474f255a 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 15:30:25 +0000 Subject: [PATCH 1/7] chore(python): disable dependency dashboard (#23) --- .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 c43ef6d7041e53f3620816cb311b25c85fae47ad 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 15:46:32 +0000 Subject: [PATCH 2/7] chore(python): group renovate prs (#24) --- .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 d6886906adf2dbe32953123b022741e3afadc61f 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 16:59:09 -0600 Subject: [PATCH 3/7] chore(python): rename default branch to main (#25) Source-Link: https://github.com/googleapis/synthtool/commit/5c0fa62eea9c33ebe61e582424b659eb264e1ba4 Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:0ffe3bdd6c7159692df5f7744da74e5ef19966288a6bf76023e8e04e0c424d7d Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- CONTRIBUTING.rst | 6 +++--- docs/conf.py | 2 +- 3 files changed, 5 insertions(+), 5 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 3853c46..1fba8f7 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-data-fusion``. 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-data-fusion``. 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 6c730df..ad4cf63 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,7 +76,7 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The main toctree document. +# The root toctree document. root_doc = "index" # General information about the project. From 651b0f77ba79377625d05483c1e0da4407db4c1d Mon Sep 17 00:00:00 2001 From: Dan Lee <71398022+dandhlee@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:08:57 -0400 Subject: [PATCH 4/7] chore: revert owlbot main branch templates (#26) --- owlbot.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/owlbot.py b/owlbot.py index e01d08e..8e3e769 100644 --- a/owlbot.py +++ b/owlbot.py @@ -40,37 +40,3 @@ s.shell.run(["nox", "-s", "blacken"], hide_output=False) -# ---------------------------------------------------------------------------- -# Main Branch migration -# ---------------------------------------------------------------------------- - -s.replace( - "*.rst", - "master", - "main" -) - -s.replace( - "CONTRIBUTING.rst", - "kubernetes/community/blob/main", - "kubernetes/community/blob/master" -) - -s.replace( - "docs/conf.py", - "master", - "main" -) - -s.replace( - "docs/conf.py", - "main_doc", - "root_doc" -) - -s.replace( - ".kokoro/*", - "master", - "main" -) - From 32e25e5658dd1e7804a90556940dd1ad039474b1 Mon Sep 17 00:00:00 2001 From: Jeffrey Rennie Date: Tue, 21 Sep 2021 13:42:23 -0700 Subject: [PATCH 5/7] chore: relocate owl bot post processor (#28) 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 080d595..120189d 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 73e18c4504ee8f1f86d9122b4fb8db223ee24cff 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:10:40 +0000 Subject: [PATCH 6/7] chore: use gapic-generator-python 0.51.2 (#29) - [ ] 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/data_fusion/client.py | 30 +++++++++---------- .../services/data_fusion/transports/base.py | 2 +- .../services/data_fusion/transports/grpc.py | 6 ++-- .../data_fusion/transports/grpc_asyncio.py | 6 ++-- scripts/fixup_data_fusion_v1_keywords.py | 16 +++++----- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/google/cloud/data_fusion_v1/services/data_fusion/client.py b/google/cloud/data_fusion_v1/services/data_fusion/client.py index 27224a8..46d30b7 100644 --- a/google/cloud/data_fusion_v1/services/data_fusion/client.py +++ b/google/cloud/data_fusion_v1/services/data_fusion/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 @@ -358,7 +358,7 @@ def __init__( def list_available_versions( self, - request: datafusion.ListAvailableVersionsRequest = None, + request: Union[datafusion.ListAvailableVersionsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -369,7 +369,7 @@ def list_available_versions( the specified project and location. Args: - request (google.cloud.data_fusion_v1.types.ListAvailableVersionsRequest): + request (Union[google.cloud.data_fusion_v1.types.ListAvailableVersionsRequest, dict]): The request object. Request message for the list available versions request. parent (str): @@ -441,7 +441,7 @@ def list_available_versions( def list_instances( self, - request: datafusion.ListInstancesRequest = None, + request: Union[datafusion.ListInstancesRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -451,7 +451,7 @@ def list_instances( and location. Args: - request (google.cloud.data_fusion_v1.types.ListInstancesRequest): + request (Union[google.cloud.data_fusion_v1.types.ListInstancesRequest, dict]): The request object. Request message for listing Data Fusion instances. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -501,7 +501,7 @@ def list_instances( def get_instance( self, - request: datafusion.GetInstanceRequest = None, + request: Union[datafusion.GetInstanceRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -510,7 +510,7 @@ def get_instance( r"""Gets details of a single Data Fusion instance. Args: - request (google.cloud.data_fusion_v1.types.GetInstanceRequest): + request (Union[google.cloud.data_fusion_v1.types.GetInstanceRequest, dict]): The request object. Request message for getting details about a Data Fusion instance. retry (google.api_core.retry.Retry): Designation of what errors, if any, @@ -549,7 +549,7 @@ def get_instance( def create_instance( self, - request: datafusion.CreateInstanceRequest = None, + request: Union[datafusion.CreateInstanceRequest, dict] = None, *, parent: str = None, instance: datafusion.Instance = None, @@ -562,7 +562,7 @@ def create_instance( project and location. Args: - request (google.cloud.data_fusion_v1.types.CreateInstanceRequest): + request (Union[google.cloud.data_fusion_v1.types.CreateInstanceRequest, dict]): The request object. Request message for creating a Data Fusion instance. parent (str): @@ -649,7 +649,7 @@ def create_instance( def delete_instance( self, - request: datafusion.DeleteInstanceRequest = None, + request: Union[datafusion.DeleteInstanceRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -659,7 +659,7 @@ def delete_instance( r"""Deletes a single Date Fusion instance. Args: - request (google.cloud.data_fusion_v1.types.DeleteInstanceRequest): + request (Union[google.cloud.data_fusion_v1.types.DeleteInstanceRequest, dict]): The request object. Request message for deleting a Data Fusion instance. name (str): @@ -742,7 +742,7 @@ def delete_instance( def update_instance( self, - request: datafusion.UpdateInstanceRequest = None, + request: Union[datafusion.UpdateInstanceRequest, dict] = None, *, instance: datafusion.Instance = None, update_mask: field_mask_pb2.FieldMask = None, @@ -753,7 +753,7 @@ def update_instance( r"""Updates a single Data Fusion instance. Args: - request (google.cloud.data_fusion_v1.types.UpdateInstanceRequest): + request (Union[google.cloud.data_fusion_v1.types.UpdateInstanceRequest, dict]): The request object. instance (google.cloud.data_fusion_v1.types.Instance): The instance resource that replaces @@ -844,7 +844,7 @@ def update_instance( def restart_instance( self, - request: datafusion.RestartInstanceRequest = None, + request: Union[datafusion.RestartInstanceRequest, dict] = None, *, retry: retries.Retry = gapic_v1.method.DEFAULT, timeout: float = None, @@ -854,7 +854,7 @@ def restart_instance( At the end of an operation instance is fully restarted. Args: - request (google.cloud.data_fusion_v1.types.RestartInstanceRequest): + request (Union[google.cloud.data_fusion_v1.types.RestartInstanceRequest, dict]): The request object. Request message for restarting a Data Fusion instance. retry (google.api_core.retry.Retry): Designation of what errors, if any, diff --git a/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py b/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py index fa1c763..ad0d124 100644 --- a/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py +++ b/google/cloud/data_fusion_v1/services/data_fusion/transports/base.py @@ -119,7 +119,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/data_fusion_v1/services/data_fusion/transports/grpc.py b/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py index 7add8df..8f47cc7 100644 --- a/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py +++ b/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc.py @@ -84,16 +84,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/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py b/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py index b2b44aa..09c8c3f 100644 --- a/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py +++ b/google/cloud/data_fusion_v1/services/data_fusion/transports/grpc_asyncio.py @@ -131,16 +131,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_data_fusion_v1_keywords.py b/scripts/fixup_data_fusion_v1_keywords.py index b5b7ccf..b8af153 100644 --- a/scripts/fixup_data_fusion_v1_keywords.py +++ b/scripts/fixup_data_fusion_v1_keywords.py @@ -39,13 +39,13 @@ def partition( class data_fusionCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'create_instance': ('parent', 'instance_id', 'instance', ), - 'delete_instance': ('name', ), - 'get_instance': ('name', ), - 'list_available_versions': ('parent', 'page_size', 'page_token', 'latest_patch_only', ), - 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), - 'restart_instance': ('name', ), - 'update_instance': ('instance', 'update_mask', ), + 'create_instance': ('parent', 'instance_id', 'instance', ), + 'delete_instance': ('name', ), + 'get_instance': ('name', ), + 'list_available_versions': ('parent', 'page_size', 'page_token', 'latest_patch_only', ), + 'list_instances': ('parent', 'page_size', 'page_token', 'filter', 'order_by', ), + 'restart_instance': ('name', ), + 'update_instance': ('instance', 'update_mask', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -64,7 +64,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 d39fd0d3e85c3febefb8fa88ea1f4e7fa47dc6bd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Sep 2021 15:48:20 +0000 Subject: [PATCH 7/7] chore: release 1.0.1 (#30) :robot: I have created a release \*beep\* \*boop\* --- ### [1.0.1](https://www.github.com/googleapis/python-data-fusion/compare/v1.0.0...v1.0.1) (2021-09-24) ### Bug Fixes * add 'dict' annotation type to 'request' ([73e18c4](https://www.github.com/googleapis/python-data-fusion/commit/73e18c4504ee8f1f86d9122b4fb8db223ee24cff)) --- 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 dcf4ae8..ebc020e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.1](https://www.github.com/googleapis/python-data-fusion/compare/v1.0.0...v1.0.1) (2021-09-24) + + +### Bug Fixes + +* add 'dict' annotation type to 'request' ([73e18c4](https://www.github.com/googleapis/python-data-fusion/commit/73e18c4504ee8f1f86d9122b4fb8db223ee24cff)) + ## [1.0.0](https://www.github.com/googleapis/python-data-fusion/compare/v0.1.2...v1.0.0) (2021-08-24) diff --git a/setup.py b/setup.py index ed1cbfc..7488f17 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-data-fusion" description = "Cloud Data Fusion API client library" -version = "1.0.0" +version = "1.0.1" release_status = "Development Status :: 5 - Production/Stable" url = "https://github.com/googleapis/python-data-fusion" dependencies = [