From 0c3c15abb9830f1cad8c9accc91bb7944334722b Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 9 Nov 2021 18:28:00 -0500
Subject: [PATCH 01/13] chore: use gapic-generator-python 0.56.2 (#56)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: update Java and Python dependencies

PiperOrigin-RevId: 408420890

Source-Link: https://github.com/googleapis/googleapis/commit/2921f9fb3bfbd16f6b2da0104373e2b47a80a65e

Source-Link: https://github.com/googleapis/googleapis-gen/commit/6598ca8cbbf5226733a099c4506518a5af6ff74c
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjU5OGNhOGNiYmY1MjI2NzMzYTA5OWM0NTA2NTE4YTVhZjZmZjc0YyJ9

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../services/eventarc/async_client.py         | 13 +--
 .../eventarc_v1/services/eventarc/client.py   | 25 ++++--
 .../services/eventarc/transports/base.py      | 10 +--
 .../services/eventarc/transports/grpc.py      |  6 +-
 .../eventarc/transports/grpc_asyncio.py       |  6 +-
 google/cloud/eventarc_v1/types/trigger.py     |  2 +
 tests/unit/gapic/eventarc_v1/test_eventarc.py | 80 ++++++++++++++-----
 7 files changed, 98 insertions(+), 44 deletions(-)

diff --git a/google/cloud/eventarc_v1/services/eventarc/async_client.py b/google/cloud/eventarc_v1/services/eventarc/async_client.py
index 3545caf..5f698cd 100644
--- a/google/cloud/eventarc_v1/services/eventarc/async_client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/async_client.py
@@ -19,14 +19,17 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core.client_options import ClientOptions  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core.client_options import ClientOptions
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
diff --git a/google/cloud/eventarc_v1/services/eventarc/client.py b/google/cloud/eventarc_v1/services/eventarc/client.py
index 502528e..61f03ae 100644
--- a/google/cloud/eventarc_v1/services/eventarc/client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/client.py
@@ -14,23 +14,25 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-from distutils import util
 import os
 import re
 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
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core import client_options as client_options_lib
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
@@ -311,8 +313,15 @@ def __init__(
             client_options = client_options_lib.ClientOptions()
 
         # Create SSL credentials for mutual TLS if needed.
-        use_client_cert = bool(
-            util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
+        if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
+            "true",
+            "false",
+        ):
+            raise ValueError(
+                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
+            )
+        use_client_cert = (
+            os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
         )
 
         client_cert_source_func = None
diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/base.py b/google/cloud/eventarc_v1/services/eventarc/transports/base.py
index 17c76ee..dc416eb 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/base.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/base.py
@@ -18,11 +18,11 @@
 import pkg_resources
 
 import google.auth  # type: ignore
-import google.api_core  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
-from google.api_core import operations_v1  # type: ignore
+import google.api_core
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
+from google.api_core import operations_v1
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py b/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
index 2dcdfc5..3f21eb0 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
@@ -16,9 +16,9 @@
 import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import grpc_helpers  # type: ignore
-from google.api_core import operations_v1  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
+from google.api_core import grpc_helpers
+from google.api_core import operations_v1
+from google.api_core import gapic_v1
 import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py b/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
index a6f1c15..c83cc2d 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
@@ -16,9 +16,9 @@
 import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import grpc_helpers_async  # type: ignore
-from google.api_core import operations_v1  # type: ignore
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers_async
+from google.api_core import operations_v1
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 
diff --git a/google/cloud/eventarc_v1/types/trigger.py b/google/cloud/eventarc_v1/types/trigger.py
index 8a85b39..9e1bee4 100644
--- a/google/cloud/eventarc_v1/types/trigger.py
+++ b/google/cloud/eventarc_v1/types/trigger.py
@@ -133,6 +133,7 @@ class Destination(proto.Message):
             Cloud Run fully-managed service that receives
             the events. The service should be running in the
             same project of the trigger.
+
             This field is a member of `oneof`_ ``descriptor``.
     """
 
@@ -152,6 +153,7 @@ class Transport(proto.Message):
         pubsub (google.cloud.eventarc_v1.types.Pubsub):
             The Pub/Sub topic and subscription used by
             Eventarc as delivery intermediary.
+
             This field is a member of `oneof`_ ``intermediary``.
     """
 
diff --git a/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/unit/gapic/eventarc_v1/test_eventarc.py
index 860e659..10410f8 100644
--- a/tests/unit/gapic/eventarc_v1/test_eventarc.py
+++ b/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -615,7 +615,9 @@ def test_get_trigger_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].name == "name_value"
+        arg = args[0].name
+        mock_val = "name_value"
+        assert arg == mock_val
 
 
 def test_get_trigger_flattened_error():
@@ -647,7 +649,9 @@ async def test_get_trigger_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].name == "name_value"
+        arg = args[0].name
+        mock_val = "name_value"
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -816,7 +820,9 @@ def test_list_triggers_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].parent == "parent_value"
+        arg = args[0].parent
+        mock_val = "parent_value"
+        assert arg == mock_val
 
 
 def test_list_triggers_flattened_error():
@@ -850,7 +856,9 @@ async def test_list_triggers_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].parent == "parent_value"
+        arg = args[0].parent
+        mock_val = "parent_value"
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -1136,9 +1144,15 @@ def test_create_trigger_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].parent == "parent_value"
-        assert args[0].trigger == gce_trigger.Trigger(name="name_value")
-        assert args[0].trigger_id == "trigger_id_value"
+        arg = args[0].parent
+        mock_val = "parent_value"
+        assert arg == mock_val
+        arg = args[0].trigger
+        mock_val = gce_trigger.Trigger(name="name_value")
+        assert arg == mock_val
+        arg = args[0].trigger_id
+        mock_val = "trigger_id_value"
+        assert arg == mock_val
 
 
 def test_create_trigger_flattened_error():
@@ -1179,9 +1193,15 @@ async def test_create_trigger_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].parent == "parent_value"
-        assert args[0].trigger == gce_trigger.Trigger(name="name_value")
-        assert args[0].trigger_id == "trigger_id_value"
+        arg = args[0].parent
+        mock_val = "parent_value"
+        assert arg == mock_val
+        arg = args[0].trigger
+        mock_val = gce_trigger.Trigger(name="name_value")
+        assert arg == mock_val
+        arg = args[0].trigger_id
+        mock_val = "trigger_id_value"
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -1352,9 +1372,15 @@ def test_update_trigger_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].trigger == gce_trigger.Trigger(name="name_value")
-        assert args[0].update_mask == field_mask_pb2.FieldMask(paths=["paths_value"])
-        assert args[0].allow_missing == True
+        arg = args[0].trigger
+        mock_val = gce_trigger.Trigger(name="name_value")
+        assert arg == mock_val
+        arg = args[0].update_mask
+        mock_val = field_mask_pb2.FieldMask(paths=["paths_value"])
+        assert arg == mock_val
+        arg = args[0].allow_missing
+        mock_val = True
+        assert arg == mock_val
 
 
 def test_update_trigger_flattened_error():
@@ -1395,9 +1421,15 @@ async def test_update_trigger_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].trigger == gce_trigger.Trigger(name="name_value")
-        assert args[0].update_mask == field_mask_pb2.FieldMask(paths=["paths_value"])
-        assert args[0].allow_missing == True
+        arg = args[0].trigger
+        mock_val = gce_trigger.Trigger(name="name_value")
+        assert arg == mock_val
+        arg = args[0].update_mask
+        mock_val = field_mask_pb2.FieldMask(paths=["paths_value"])
+        assert arg == mock_val
+        arg = args[0].allow_missing
+        mock_val = True
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -1562,8 +1594,12 @@ def test_delete_trigger_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].name == "name_value"
-        assert args[0].allow_missing == True
+        arg = args[0].name
+        mock_val = "name_value"
+        assert arg == mock_val
+        arg = args[0].allow_missing
+        mock_val = True
+        assert arg == mock_val
 
 
 def test_delete_trigger_flattened_error():
@@ -1597,8 +1633,12 @@ async def test_delete_trigger_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].name == "name_value"
-        assert args[0].allow_missing == True
+        arg = args[0].name
+        mock_val = "name_value"
+        assert arg == mock_val
+        arg = args[0].allow_missing
+        mock_val = True
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio

From f2e9dbd6f1e9c19f4e63fc9715f32dc3e47d35e3 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 11 Nov 2021 13:05:00 -0500
Subject: [PATCH 02/13] chore(python): add .github/CODEOWNERS as a templated
 file (#57)

Source-Link: https://github.com/googleapis/synthtool/commit/c5026b3217973a8db55db8ee85feee0e9a65e295
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:0e18b9475fbeb12d9ad4302283171edebb6baf2dfca1bd215ee3b34ed79d95d7

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml | 2 +-
 .github/CODEOWNERS        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index cb89b2e..7519fa3 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:ec49167c606648a063d1222220b48119c912562849a0528f35bfb592a9f72737
+  digest: sha256:0e18b9475fbeb12d9ad4302283171edebb6baf2dfca1bd215ee3b34ed79d95d7
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index be888a9..44cc868 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,9 +3,10 @@
 #
 # For syntax help see:
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+# Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# The @googleapis/yoshi-python is the default owner for changes in this repo
-*               @googleapis/yoshi-python
-
+# @googleapis/yoshi-python is the default owner for changes in this repo
+*     @googleapis/yoshi-python
 
+# @googleapis/python-samples-owners is the default owner for samples changes
 /samples/   @googleapis/python-samples-owners

From f5c9c9e897458ae282f52236a8d00619c835d3fa Mon Sep 17 00:00:00 2001
From: Dan Lee <71398022+dandhlee@users.noreply.github.com>
Date: Thu, 18 Nov 2021 12:59:50 -0500
Subject: [PATCH 03/13] chore: update doc links from googleapis.dev to
 cloud.google.com (#58)

---
 .repo-metadata.json | 2 +-
 README.rst          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index a355ed4..c0e4cfd 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -2,7 +2,7 @@
     "name": "eventarc",
     "name_pretty": "Eventarc",
     "product_documentation": "https://cloud.google.com/eventarc/",
-    "client_documentation": "https://googleapis.dev/python/eventarc/latest",
+    "client_documentation": "https://cloud.google.com/python/docs/reference/eventarc/latest",
     "issue_tracker": "",
     "release_level": "ga",
     "language": "python",
diff --git a/README.rst b/README.rst
index 9b2ccda..804a408 100644
--- a/README.rst
+++ b/README.rst
@@ -16,7 +16,7 @@ management — you can optimize productivity and costs while building a modern,
 .. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud-eventarc.svg
    :target: https://pypi.org/project/google-cloud-eventarc/
 .. _Eventarc: https://cloud.google.com/eventarc
-.. _Client Library Documentation: https://googleapis.dev/python/eventarc/latest
+.. _Client Library Documentation: https://cloud.google.com/python/docs/reference/eventarc/latest
 .. _Product Documentation:  https://cloud.google.com/eventarc/docs
 
 Quick Start

From bbaef50909130a1a0e3566bf6769a1f89b86a372 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Tue, 28 Dec 2021 13:18:14 -0500
Subject: [PATCH 04/13] chore: update .repo-metadata.json (#61)

---
 .repo-metadata.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.repo-metadata.json b/.repo-metadata.json
index c0e4cfd..3f4fc60 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -4,12 +4,13 @@
     "product_documentation": "https://cloud.google.com/eventarc/",
     "client_documentation": "https://cloud.google.com/python/docs/reference/eventarc/latest",
     "issue_tracker": "",
-    "release_level": "ga",
+    "release_level": "stable",
     "language": "python",
     "library_type": "GAPIC_AUTO",
     "repo": "googleapis/python-eventarc",
     "distribution_name": "google-cloud-eventarc",
     "api_id": "eventarc.googleapis.com",
     "default_version": "v1",
-    "codeowner_team": ""
+    "codeowner_team": "",
+    "api_shortname": "eventarc"
 }

From 0eb6460fbc587cf56a1e4d7015553d87ffa22258 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 17:16:44 +0000
Subject: [PATCH 05/13] chore: use python-samples-reviewers (#63)

---
 .github/.OwlBot.lock.yaml | 2 +-
 .github/CODEOWNERS        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 7519fa3..f33299d 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:0e18b9475fbeb12d9ad4302283171edebb6baf2dfca1bd215ee3b34ed79d95d7
+  digest: sha256:899d5d7cc340fa8ef9d8ae1a8cfba362c6898584f779e156f25ee828ba824610
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 44cc868..e446644 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,5 +8,5 @@
 # @googleapis/yoshi-python is the default owner for changes in this repo
 *     @googleapis/yoshi-python
 
-# @googleapis/python-samples-owners is the default owner for samples changes
-/samples/   @googleapis/python-samples-owners
+# @googleapis/python-samples-reviewers is the default owner for samples changes
+/samples/   @googleapis/python-samples-reviewers

From dd9a4f571ba5be128cc0fb9183eab5082fcd5189 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 19:51:17 -0500
Subject: [PATCH 06/13] chore: use gapic-generator-python 0.58.4 (#62)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: use gapic-generator-python 0.58.4

fix: provide appropriate mock values for message body fields

committer: dovs
PiperOrigin-RevId: 419025932

Source-Link: https://github.com/googleapis/googleapis/commit/73da6697f598f1ba30618924936a59f8e457ec89

Source-Link: https://github.com/googleapis/googleapis-gen/commit/46df624a54b9ed47c1a7eefb7a49413cf7b82f98
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDZkZjYyNGE1NGI5ZWQ0N2MxYTdlZWZiN2E0OTQxM2NmN2I4MmY5OCJ9

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
---
 .../services/eventarc/transports/base.py      |  1 -
 tests/unit/gapic/eventarc_v1/test_eventarc.py | 69 +++++++------------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/base.py b/google/cloud/eventarc_v1/services/eventarc/transports/base.py
index dc416eb..f43e8e0 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/base.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/base.py
@@ -102,7 +102,6 @@ def __init__(
             credentials, _ = google.auth.load_credentials_from_file(
                 credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
             )
-
         elif credentials is None:
             credentials, _ = google.auth.default(
                 **scopes_kwargs, quota_project_id=quota_project_id
diff --git a/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/unit/gapic/eventarc_v1/test_eventarc.py
index 10410f8..9989fc1 100644
--- a/tests/unit/gapic/eventarc_v1/test_eventarc.py
+++ b/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -237,20 +237,20 @@ def test_eventarc_client_client_options(client_class, transport_class, transport
     # unsupported value.
     with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "Unsupported"}):
         with pytest.raises(MutualTLSChannelError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case GOOGLE_API_USE_CLIENT_CERTIFICATE has unsupported value.
     with mock.patch.dict(
         os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "Unsupported"}
     ):
         with pytest.raises(ValueError):
-            client = client_class()
+            client = client_class(transport=transport_name)
 
     # Check the case quota_project_id is provided
     options = client_options.ClientOptions(quota_project_id="octopus")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -307,7 +307,7 @@ def test_eventarc_client_mtls_env_auto(
         )
         with mock.patch.object(transport_class, "__init__") as patched:
             patched.return_value = None
-            client = client_class(transport=transport_name, client_options=options)
+            client = client_class(client_options=options, transport=transport_name)
 
             if use_client_cert_env == "false":
                 expected_client_cert_source = None
@@ -398,7 +398,7 @@ def test_eventarc_client_client_options_scopes(
     options = client_options.ClientOptions(scopes=["1", "2"],)
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file=None,
@@ -425,7 +425,7 @@ def test_eventarc_client_client_options_credentials_file(
     options = client_options.ClientOptions(credentials_file="credentials.json")
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
-        client = client_class(transport=transport_name, client_options=options)
+        client = client_class(client_options=options, transport=transport_name)
         patched.assert_called_once_with(
             credentials=None,
             credentials_file="credentials.json",
@@ -456,7 +456,8 @@ def test_eventarc_client_client_options_from_dict():
         )
 
 
-def test_get_trigger(transport: str = "grpc", request_type=eventarc.GetTriggerRequest):
+@pytest.mark.parametrize("request_type", [eventarc.GetTriggerRequest, dict,])
+def test_get_trigger(request_type, transport: str = "grpc"):
     client = EventarcClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -489,10 +490,6 @@ def test_get_trigger(transport: str = "grpc", request_type=eventarc.GetTriggerRe
     assert response.etag == "etag_value"
 
 
-def test_get_trigger_from_dict():
-    test_get_trigger(request_type=dict)
-
-
 def test_get_trigger_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -666,9 +663,8 @@ async def test_get_trigger_flattened_error_async():
         )
 
 
-def test_list_triggers(
-    transport: str = "grpc", request_type=eventarc.ListTriggersRequest
-):
+@pytest.mark.parametrize("request_type", [eventarc.ListTriggersRequest, dict,])
+def test_list_triggers(request_type, transport: str = "grpc"):
     client = EventarcClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -696,10 +692,6 @@ def test_list_triggers(
     assert response.unreachable == ["unreachable_value"]
 
 
-def test_list_triggers_from_dict():
-    test_list_triggers(request_type=dict)
-
-
 def test_list_triggers_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -873,8 +865,10 @@ async def test_list_triggers_flattened_error_async():
         )
 
 
-def test_list_triggers_pager():
-    client = EventarcClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_triggers_pager(transport_name: str = "grpc"):
+    client = EventarcClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(type(client.transport.list_triggers), "__call__") as call:
@@ -907,8 +901,10 @@ def test_list_triggers_pager():
         assert all(isinstance(i, trigger.Trigger) for i in results)
 
 
-def test_list_triggers_pages():
-    client = EventarcClient(credentials=ga_credentials.AnonymousCredentials,)
+def test_list_triggers_pages(transport_name: str = "grpc"):
+    client = EventarcClient(
+        credentials=ga_credentials.AnonymousCredentials, transport=transport_name,
+    )
 
     # Mock the actual call within the gRPC stub, and fake the request.
     with mock.patch.object(type(client.transport.list_triggers), "__call__") as call:
@@ -995,9 +991,8 @@ async def test_list_triggers_async_pages():
             assert page_.raw_page.next_page_token == token
 
 
-def test_create_trigger(
-    transport: str = "grpc", request_type=eventarc.CreateTriggerRequest
-):
+@pytest.mark.parametrize("request_type", [eventarc.CreateTriggerRequest, dict,])
+def test_create_trigger(request_type, transport: str = "grpc"):
     client = EventarcClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1021,10 +1016,6 @@ def test_create_trigger(
     assert isinstance(response, future.Future)
 
 
-def test_create_trigger_from_dict():
-    test_create_trigger(request_type=dict)
-
-
 def test_create_trigger_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1219,9 +1210,8 @@ async def test_create_trigger_flattened_error_async():
         )
 
 
-def test_update_trigger(
-    transport: str = "grpc", request_type=eventarc.UpdateTriggerRequest
-):
+@pytest.mark.parametrize("request_type", [eventarc.UpdateTriggerRequest, dict,])
+def test_update_trigger(request_type, transport: str = "grpc"):
     client = EventarcClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1245,10 +1235,6 @@ def test_update_trigger(
     assert isinstance(response, future.Future)
 
 
-def test_update_trigger_from_dict():
-    test_update_trigger(request_type=dict)
-
-
 def test_update_trigger_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -1447,9 +1433,8 @@ async def test_update_trigger_flattened_error_async():
         )
 
 
-def test_delete_trigger(
-    transport: str = "grpc", request_type=eventarc.DeleteTriggerRequest
-):
+@pytest.mark.parametrize("request_type", [eventarc.DeleteTriggerRequest, dict,])
+def test_delete_trigger(request_type, transport: str = "grpc"):
     client = EventarcClient(
         credentials=ga_credentials.AnonymousCredentials(), transport=transport,
     )
@@ -1473,10 +1458,6 @@ def test_delete_trigger(
     assert isinstance(response, future.Future)
 
 
-def test_delete_trigger_from_dict():
-    test_delete_trigger(request_type=dict)
-
-
 def test_delete_trigger_empty_call():
     # This test is a coverage failsafe to make sure that totally empty calls,
     # i.e. request == None and no flattened fields passed, work.
@@ -2213,7 +2194,7 @@ def test_parse_common_location_path():
     assert expected == actual
 
 
-def test_client_withDEFAULT_CLIENT_INFO():
+def test_client_with_default_client_info():
     client_info = gapic_v1.client_info.ClientInfo()
 
     with mock.patch.object(

From 69404f75a99b6db4bce1b4da05c403f8984dc328 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:17:08 -0500
Subject: [PATCH 07/13] build: switch to release-please for tagging (#64)

Source-Link: https://github.com/googleapis/synthtool/commit/f8077d237e0df2cb0066dfc6e09fc41e1c59646a
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:dfa9b663b32de8b5b327e32c1da665a80de48876558dd58091d8160c60ad7355

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.lock.yaml   | 2 +-
 .github/release-please.yml  | 1 +
 .github/release-trigger.yml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .github/release-trigger.yml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f33299d..ff5126c 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:899d5d7cc340fa8ef9d8ae1a8cfba362c6898584f779e156f25ee828ba824610
+  digest: sha256:dfa9b663b32de8b5b327e32c1da665a80de48876558dd58091d8160c60ad7355
diff --git a/.github/release-please.yml b/.github/release-please.yml
index 4507ad0..466597e 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -1 +1,2 @@
 releaseType: python
+handleGHRelease: true
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
new file mode 100644
index 0000000..d4ca941
--- /dev/null
+++ b/.github/release-trigger.yml
@@ -0,0 +1 @@
+enabled: true

From 78063bba5c527251707f53038eb3208069f5d242 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:47:14 -0500
Subject: [PATCH 08/13] chore(python): update release.sh to use keystore (#65)

Source-Link: https://github.com/googleapis/synthtool/commit/69fda12e2994f0b595a397e8bb6e3e9f380524eb
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:ae600f36b6bc972b368367b6f83a1d91ec2c82a4a116b383d67d547c56fe6de3

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
---
 .github/.OwlBot.lock.yaml  |  2 +-
 .kokoro/release.sh         |  2 +-
 .kokoro/release/common.cfg | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index ff5126c..eecb84c 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:dfa9b663b32de8b5b327e32c1da665a80de48876558dd58091d8160c60ad7355
+  digest: sha256:ae600f36b6bc972b368367b6f83a1d91ec2c82a4a116b383d67d547c56fe6de3
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index e37244f..2ae17b3 100755
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -26,7 +26,7 @@ python3 -m pip install --upgrade twine wheel setuptools
 export PYTHONUNBUFFERED=1
 
 # Move into the package, build the distribution and upload.
-TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token")
+TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
 cd github/python-eventarc
 python3 setup.py sdist bdist_wheel
 twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*
diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
index 8bf37f0..a664fac 100644
--- a/.kokoro/release/common.cfg
+++ b/.kokoro/release/common.cfg
@@ -23,8 +23,18 @@ env_vars: {
     value: "github/python-eventarc/.kokoro/release.sh"
 }
 
+# Fetch PyPI password
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "google-cloud-pypi-token-keystore-1"
+    }
+  }
+}
+
 # Tokens needed to report release status back to GitHub
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,google-cloud-pypi-token"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
 }

From bd6be6858b0f984b083b805a7a2007b2b1a2ac6a Mon Sep 17 00:00:00 2001
From: Dina Graves Portman <dinagraves@google.com>
Date: Thu, 20 Jan 2022 10:56:29 -0500
Subject: [PATCH 09/13] chore: add codeowners (#66)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: add codeowners

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .github/CODEOWNERS  | 8 ++++----
 .repo-metadata.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e446644..63a84c3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,8 +5,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 # Note: This file is autogenerated. To make changes to the codeowner team, please update .repo-metadata.json.
 
-# @googleapis/yoshi-python is the default owner for changes in this repo
-*     @googleapis/yoshi-python
+# @googleapis/yoshi-python @googleapis/aap-dpes are the default owners for changes in this repo
+*     @googleapis/yoshi-python @googleapis/aap-dpes
 
-# @googleapis/python-samples-reviewers is the default owner for samples changes
-/samples/   @googleapis/python-samples-reviewers
+# @googleapis/python-samples-reviewers @googleapis/aap-dpes are the default owners for samples changes
+/samples/   @googleapis/python-samples-reviewers @googleapis/aap-dpes
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 3f4fc60..73552c2 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -11,6 +11,6 @@
     "distribution_name": "google-cloud-eventarc",
     "api_id": "eventarc.googleapis.com",
     "default_version": "v1",
-    "codeowner_team": "",
+    "codeowner_team": "@googleapis/aap-dpes",
     "api_shortname": "eventarc"
 }

From 86eb6b0bc8ceea19aa8dcbb964e9043038a7c6a2 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 20 Jan 2022 14:42:57 -0500
Subject: [PATCH 10/13] ci(python): run lint / unit tests / docs as GH actions
 (#67)

Source-Link: https://github.com/googleapis/synthtool/commit/57be0cdb0b94e1669cee0ca38d790de1dfdbcd44
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:ed1f9983d5a935a89fe8085e8bb97d94e41015252c5b6c9771257cf8624367e6

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Dina Graves Portman <dinagraves@google.com>
---
 .github/.OwlBot.lock.yaml      | 15 ++++++++-
 .github/workflows/docs.yml     | 38 +++++++++++++++++++++++
 .github/workflows/lint.yml     | 25 +++++++++++++++
 .github/workflows/unittest.yml | 57 ++++++++++++++++++++++++++++++++++
 4 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/docs.yml
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/unittest.yml

diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index eecb84c..8cb4380 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,16 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:ae600f36b6bc972b368367b6f83a1d91ec2c82a4a116b383d67d547c56fe6de3
+  digest: sha256:ed1f9983d5a935a89fe8085e8bb97d94e41015252c5b6c9771257cf8624367e6
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 0000000..f7b8344
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,38 @@
+on:
+  pull_request:
+    branches:
+      - main
+name: docs
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run docs
+      run: |
+        nox -s docs
+  docfx:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run docfx
+      run: |
+        nox -s docfx
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..1e8b05c
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,25 @@
+on:
+  pull_request:
+    branches:
+      - main
+name: lint
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run lint
+      run: |
+        nox -s lint
+    - name: Run lint_setup_py
+      run: |
+        nox -s lint_setup_py
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
new file mode 100644
index 0000000..074ee25
--- /dev/null
+++ b/.github/workflows/unittest.yml
@@ -0,0 +1,57 @@
+on:
+  pull_request:
+    branches:
+      - main
+name: unittest
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10']
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run unit tests
+      env:
+        COVERAGE_FILE: .coverage-${{ matrix.python }}
+      run: |
+        nox -s unit-${{ matrix.python }}
+    - name: Upload coverage results
+      uses: actions/upload-artifact@v2
+      with:
+        name: coverage-artifacts
+        path: .coverage-${{ matrix.python }}
+
+  cover:
+    runs-on: ubuntu-latest
+    needs:
+        - unit
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install coverage
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install coverage
+    - name: Download coverage results
+      uses: actions/download-artifact@v2
+      with:
+        name: coverage-artifacts
+        path: .coverage-results/
+    - name: Report coverage results
+      run: |
+        coverage combine .coverage-results/.coverage*
+        coverage report --show-missing --fail-under=100

From 96e07bbbfbb75aa16d33ee9e0984144949e5adc3 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 10:38:19 -0500
Subject: [PATCH 11/13] feat: add api key support (#68)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: upgrade gapic-generator-java, gax-java and gapic-generator-python

PiperOrigin-RevId: 423842556

Source-Link: https://github.com/googleapis/googleapis/commit/a616ca08f4b1416abbac7bc5dd6d61c791756a81

Source-Link: https://github.com/googleapis/googleapis-gen/commit/29b938c58c1e51d019f2ee539d55dc0a3c86a905
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjliOTM4YzU4YzFlNTFkMDE5ZjJlZTUzOWQ1NWRjMGEzYzg2YTkwNSJ9

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../services/eventarc/async_client.py         |  38 +++++-
 .../eventarc_v1/services/eventarc/client.py   | 127 ++++++++++++------
 tests/unit/gapic/eventarc_v1/test_eventarc.py | 124 +++++++++++++++++
 3 files changed, 245 insertions(+), 44 deletions(-)

diff --git a/google/cloud/eventarc_v1/services/eventarc/async_client.py b/google/cloud/eventarc_v1/services/eventarc/async_client.py
index 5f698cd..db77494 100644
--- a/google/cloud/eventarc_v1/services/eventarc/async_client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/async_client.py
@@ -16,7 +16,7 @@
 from collections import OrderedDict
 import functools
 import re
-from typing import Dict, Sequence, Tuple, Type, Union
+from typing import Dict, Optional, Sequence, Tuple, Type, Union
 import pkg_resources
 
 from google.api_core.client_options import ClientOptions
@@ -111,6 +111,42 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
 
     from_service_account_json = from_service_account_file
 
+    @classmethod
+    def get_mtls_endpoint_and_cert_source(
+        cls, client_options: Optional[ClientOptions] = None
+    ):
+        """Return the API endpoint and client cert source for mutual TLS.
+
+        The client cert source is determined in the following order:
+        (1) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is not "true", the
+        client cert source is None.
+        (2) if `client_options.client_cert_source` is provided, use the provided one; if the
+        default client cert source exists, use the default one; otherwise the client cert
+        source is None.
+
+        The API endpoint is determined in the following order:
+        (1) if `client_options.api_endpoint` if provided, use the provided one.
+        (2) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is "always", use the
+        default mTLS endpoint; if the environment variabel is "never", use the default API
+        endpoint; otherwise if client cert source exists, use the default mTLS endpoint, otherwise
+        use the default API endpoint.
+
+        More details can be found at https://google.aip.dev/auth/4114.
+
+        Args:
+            client_options (google.api_core.client_options.ClientOptions): Custom options for the
+                client. Only the `api_endpoint` and `client_cert_source` properties may be used
+                in this method.
+
+        Returns:
+            Tuple[str, Callable[[], Tuple[bytes, bytes]]]: returns the API endpoint and the
+                client cert source to use.
+
+        Raises:
+            google.auth.exceptions.MutualTLSChannelError: If any errors happen.
+        """
+        return EventarcClient.get_mtls_endpoint_and_cert_source(client_options)  # type: ignore
+
     @property
     def transport(self) -> EventarcTransport:
         """Returns the transport used by the client instance.
diff --git a/google/cloud/eventarc_v1/services/eventarc/client.py b/google/cloud/eventarc_v1/services/eventarc/client.py
index 61f03ae..ecddc61 100644
--- a/google/cloud/eventarc_v1/services/eventarc/client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/client.py
@@ -262,6 +262,73 @@ def parse_common_location_path(path: str) -> Dict[str, str]:
         m = re.match(r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)$", path)
         return m.groupdict() if m else {}
 
+    @classmethod
+    def get_mtls_endpoint_and_cert_source(
+        cls, client_options: Optional[client_options_lib.ClientOptions] = None
+    ):
+        """Return the API endpoint and client cert source for mutual TLS.
+
+        The client cert source is determined in the following order:
+        (1) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is not "true", the
+        client cert source is None.
+        (2) if `client_options.client_cert_source` is provided, use the provided one; if the
+        default client cert source exists, use the default one; otherwise the client cert
+        source is None.
+
+        The API endpoint is determined in the following order:
+        (1) if `client_options.api_endpoint` if provided, use the provided one.
+        (2) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is "always", use the
+        default mTLS endpoint; if the environment variabel is "never", use the default API
+        endpoint; otherwise if client cert source exists, use the default mTLS endpoint, otherwise
+        use the default API endpoint.
+
+        More details can be found at https://google.aip.dev/auth/4114.
+
+        Args:
+            client_options (google.api_core.client_options.ClientOptions): Custom options for the
+                client. Only the `api_endpoint` and `client_cert_source` properties may be used
+                in this method.
+
+        Returns:
+            Tuple[str, Callable[[], Tuple[bytes, bytes]]]: returns the API endpoint and the
+                client cert source to use.
+
+        Raises:
+            google.auth.exceptions.MutualTLSChannelError: If any errors happen.
+        """
+        if client_options is None:
+            client_options = client_options_lib.ClientOptions()
+        use_client_cert = os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false")
+        use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto")
+        if use_client_cert not in ("true", "false"):
+            raise ValueError(
+                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
+            )
+        if use_mtls_endpoint not in ("auto", "never", "always"):
+            raise MutualTLSChannelError(
+                "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` must be `never`, `auto` or `always`"
+            )
+
+        # Figure out the client cert source to use.
+        client_cert_source = None
+        if use_client_cert == "true":
+            if client_options.client_cert_source:
+                client_cert_source = client_options.client_cert_source
+            elif mtls.has_default_client_cert_source():
+                client_cert_source = mtls.default_client_cert_source()
+
+        # Figure out which api endpoint to use.
+        if client_options.api_endpoint is not None:
+            api_endpoint = client_options.api_endpoint
+        elif use_mtls_endpoint == "always" or (
+            use_mtls_endpoint == "auto" and client_cert_source
+        ):
+            api_endpoint = cls.DEFAULT_MTLS_ENDPOINT
+        else:
+            api_endpoint = cls.DEFAULT_ENDPOINT
+
+        return api_endpoint, client_cert_source
+
     def __init__(
         self,
         *,
@@ -312,57 +379,22 @@ def __init__(
         if client_options is None:
             client_options = client_options_lib.ClientOptions()
 
-        # Create SSL credentials for mutual TLS if needed.
-        if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
-            "true",
-            "false",
-        ):
-            raise ValueError(
-                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
-            )
-        use_client_cert = (
-            os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
+        api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
+            client_options
         )
 
-        client_cert_source_func = None
-        is_mtls = False
-        if use_client_cert:
-            if client_options.client_cert_source:
-                is_mtls = True
-                client_cert_source_func = client_options.client_cert_source
-            else:
-                is_mtls = mtls.has_default_client_cert_source()
-                if is_mtls:
-                    client_cert_source_func = mtls.default_client_cert_source()
-                else:
-                    client_cert_source_func = None
-
-        # Figure out which api endpoint to use.
-        if client_options.api_endpoint is not None:
-            api_endpoint = client_options.api_endpoint
-        else:
-            use_mtls_env = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto")
-            if use_mtls_env == "never":
-                api_endpoint = self.DEFAULT_ENDPOINT
-            elif use_mtls_env == "always":
-                api_endpoint = self.DEFAULT_MTLS_ENDPOINT
-            elif use_mtls_env == "auto":
-                if is_mtls:
-                    api_endpoint = self.DEFAULT_MTLS_ENDPOINT
-                else:
-                    api_endpoint = self.DEFAULT_ENDPOINT
-            else:
-                raise MutualTLSChannelError(
-                    "Unsupported GOOGLE_API_USE_MTLS_ENDPOINT value. Accepted "
-                    "values: never, auto, always"
-                )
+        api_key_value = getattr(client_options, "api_key", None)
+        if api_key_value and credentials:
+            raise ValueError(
+                "client_options.api_key and credentials are mutually exclusive"
+            )
 
         # Save or instantiate the transport.
         # Ordinarily, we provide the transport, but allowing a custom transport
         # instance provides an extensibility point for unusual situations.
         if isinstance(transport, EventarcTransport):
             # transport is a EventarcTransport instance.
-            if credentials or client_options.credentials_file:
+            if credentials or client_options.credentials_file or api_key_value:
                 raise ValueError(
                     "When providing a transport instance, "
                     "provide its credentials directly."
@@ -374,6 +406,15 @@ def __init__(
                 )
             self._transport = transport
         else:
+            import google.auth._default  # type: ignore
+
+            if api_key_value and hasattr(
+                google.auth._default, "get_api_key_credentials"
+            ):
+                credentials = google.auth._default.get_api_key_credentials(
+                    api_key_value
+                )
+
             Transport = type(self).get_transport_class(transport)
             self._transport = Transport(
                 credentials=credentials,
diff --git a/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/unit/gapic/eventarc_v1/test_eventarc.py
index 9989fc1..9c4aae7 100644
--- a/tests/unit/gapic/eventarc_v1/test_eventarc.py
+++ b/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -384,6 +384,83 @@ def test_eventarc_client_mtls_env_auto(
                 )
 
 
+@pytest.mark.parametrize("client_class", [EventarcClient, EventarcAsyncClient])
+@mock.patch.object(
+    EventarcClient, "DEFAULT_ENDPOINT", modify_default_endpoint(EventarcClient)
+)
+@mock.patch.object(
+    EventarcAsyncClient,
+    "DEFAULT_ENDPOINT",
+    modify_default_endpoint(EventarcAsyncClient),
+)
+def test_eventarc_client_get_mtls_endpoint_and_cert_source(client_class):
+    mock_client_cert_source = mock.Mock()
+
+    # Test the case GOOGLE_API_USE_CLIENT_CERTIFICATE is "true".
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "true"}):
+        mock_api_endpoint = "foo"
+        options = client_options.ClientOptions(
+            client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint
+        )
+        api_endpoint, cert_source = client_class.get_mtls_endpoint_and_cert_source(
+            options
+        )
+        assert api_endpoint == mock_api_endpoint
+        assert cert_source == mock_client_cert_source
+
+    # Test the case GOOGLE_API_USE_CLIENT_CERTIFICATE is "false".
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "false"}):
+        mock_client_cert_source = mock.Mock()
+        mock_api_endpoint = "foo"
+        options = client_options.ClientOptions(
+            client_cert_source=mock_client_cert_source, api_endpoint=mock_api_endpoint
+        )
+        api_endpoint, cert_source = client_class.get_mtls_endpoint_and_cert_source(
+            options
+        )
+        assert api_endpoint == mock_api_endpoint
+        assert cert_source is None
+
+    # Test the case GOOGLE_API_USE_MTLS_ENDPOINT is "never".
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "never"}):
+        api_endpoint, cert_source = client_class.get_mtls_endpoint_and_cert_source()
+        assert api_endpoint == client_class.DEFAULT_ENDPOINT
+        assert cert_source is None
+
+    # Test the case GOOGLE_API_USE_MTLS_ENDPOINT is "always".
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_MTLS_ENDPOINT": "always"}):
+        api_endpoint, cert_source = client_class.get_mtls_endpoint_and_cert_source()
+        assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT
+        assert cert_source is None
+
+    # Test the case GOOGLE_API_USE_MTLS_ENDPOINT is "auto" and default cert doesn't exist.
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "true"}):
+        with mock.patch(
+            "google.auth.transport.mtls.has_default_client_cert_source",
+            return_value=False,
+        ):
+            api_endpoint, cert_source = client_class.get_mtls_endpoint_and_cert_source()
+            assert api_endpoint == client_class.DEFAULT_ENDPOINT
+            assert cert_source is None
+
+    # Test the case GOOGLE_API_USE_MTLS_ENDPOINT is "auto" and default cert exists.
+    with mock.patch.dict(os.environ, {"GOOGLE_API_USE_CLIENT_CERTIFICATE": "true"}):
+        with mock.patch(
+            "google.auth.transport.mtls.has_default_client_cert_source",
+            return_value=True,
+        ):
+            with mock.patch(
+                "google.auth.transport.mtls.default_client_cert_source",
+                return_value=mock_client_cert_source,
+            ):
+                (
+                    api_endpoint,
+                    cert_source,
+                ) = client_class.get_mtls_endpoint_and_cert_source()
+                assert api_endpoint == client_class.DEFAULT_MTLS_ENDPOINT
+                assert cert_source == mock_client_cert_source
+
+
 @pytest.mark.parametrize(
     "client_class,transport_class,transport_name",
     [
@@ -1654,6 +1731,23 @@ def test_credentials_transport_error():
             transport=transport,
         )
 
+    # It is an error to provide an api_key and a transport instance.
+    transport = transports.EventarcGrpcTransport(
+        credentials=ga_credentials.AnonymousCredentials(),
+    )
+    options = client_options.ClientOptions()
+    options.api_key = "api_key"
+    with pytest.raises(ValueError):
+        client = EventarcClient(client_options=options, transport=transport,)
+
+    # It is an error to provide an api_key and a credential.
+    options = mock.Mock()
+    options.api_key = "api_key"
+    with pytest.raises(ValueError):
+        client = EventarcClient(
+            client_options=options, credentials=ga_credentials.AnonymousCredentials()
+        )
+
     # It is an error to provide scopes and a transport instance.
     transport = transports.EventarcGrpcTransport(
         credentials=ga_credentials.AnonymousCredentials(),
@@ -2259,3 +2353,33 @@ def test_client_ctx():
             with client:
                 pass
             close.assert_called()
+
+
+@pytest.mark.parametrize(
+    "client_class,transport_class",
+    [
+        (EventarcClient, transports.EventarcGrpcTransport),
+        (EventarcAsyncClient, transports.EventarcGrpcAsyncIOTransport),
+    ],
+)
+def test_api_key_credentials(client_class, transport_class):
+    with mock.patch.object(
+        google.auth._default, "get_api_key_credentials", create=True
+    ) as get_api_key_credentials:
+        mock_cred = mock.Mock()
+        get_api_key_credentials.return_value = mock_cred
+        options = client_options.ClientOptions()
+        options.api_key = "api_key"
+        with mock.patch.object(transport_class, "__init__") as patched:
+            patched.return_value = None
+            client = client_class(client_options=options)
+            patched.assert_called_once_with(
+                credentials=mock_cred,
+                credentials_file=None,
+                host=client.DEFAULT_ENDPOINT,
+                scopes=None,
+                client_cert_source_for_mtls=None,
+                quota_project_id=None,
+                client_info=transports.base.DEFAULT_CLIENT_INFO,
+                always_use_jwt_access=True,
+            )

From 6bffd757478617fe6ffff905f42fc702a0cb1262 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:26:37 +0000
Subject: [PATCH 12/13] chore: use gapic-generator-python 0.62.1 (#71)

- [ ] Regenerate this pull request now.

fix: resolve DuplicateCredentialArgs error when using credentials_file

committer: parthea
PiperOrigin-RevId: 425964861

Source-Link: https://github.com/googleapis/googleapis/commit/84b1a5a4f6fb2d04905be58e586b8a7a4310a8cf

Source-Link: https://github.com/googleapis/googleapis-gen/commit/4fb761bbd8506ac156f49bac5f18306aa8eb3aa8
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9
---
 .../services/eventarc/async_client.py         | 10 +--
 .../eventarc_v1/services/eventarc/client.py   | 10 +--
 .../services/eventarc/transports/grpc.py      |  7 +-
 .../eventarc/transports/grpc_asyncio.py       |  7 +-
 tests/unit/gapic/eventarc_v1/test_eventarc.py | 76 ++++++++++++++++++-
 5 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/google/cloud/eventarc_v1/services/eventarc/async_client.py b/google/cloud/eventarc_v1/services/eventarc/async_client.py
index db77494..9afd283 100644
--- a/google/cloud/eventarc_v1/services/eventarc/async_client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/async_client.py
@@ -242,7 +242,7 @@ async def get_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([name])
         if request is not None and has_flattened_params:
@@ -316,7 +316,7 @@ async def list_triggers(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([parent])
         if request is not None and has_flattened_params:
@@ -411,7 +411,7 @@ async def create_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([parent, trigger, trigger_id])
         if request is not None and has_flattened_params:
@@ -514,7 +514,7 @@ async def update_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([trigger, update_mask, allow_missing])
         if request is not None and has_flattened_params:
@@ -611,7 +611,7 @@ async def delete_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([name, allow_missing])
         if request is not None and has_flattened_params:
diff --git a/google/cloud/eventarc_v1/services/eventarc/client.py b/google/cloud/eventarc_v1/services/eventarc/client.py
index ecddc61..75c5da5 100644
--- a/google/cloud/eventarc_v1/services/eventarc/client.py
+++ b/google/cloud/eventarc_v1/services/eventarc/client.py
@@ -462,7 +462,7 @@ def get_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([name])
         if request is not None and has_flattened_params:
@@ -536,7 +536,7 @@ def list_triggers(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([parent])
         if request is not None and has_flattened_params:
@@ -631,7 +631,7 @@ def create_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([parent, trigger, trigger_id])
         if request is not None and has_flattened_params:
@@ -734,7 +734,7 @@ def update_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([trigger, update_mask, allow_missing])
         if request is not None and has_flattened_params:
@@ -831,7 +831,7 @@ def delete_trigger(
 
         """
         # Create or coerce a protobuf request object.
-        # Sanity check: If we got a request object, we should *not* have
+        # Quick check: If we got a request object, we should *not* have
         # gotten any keyword arguments that map to the request.
         has_flattened_params = any([name, allow_missing])
         if request is not None and has_flattened_params:
diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py b/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
index 3f21eb0..40638ce 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py
@@ -164,8 +164,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,
@@ -238,7 +241,7 @@ def operations_client(self) -> operations_v1.OperationsClient:
         This property caches on the instance; repeated calls return the same
         client.
         """
-        # Sanity check: Only create a new client if we do not already have one.
+        # Quick check: Only create a new client if we do not already have one.
         if self._operations_client is None:
             self._operations_client = operations_v1.OperationsClient(self.grpc_channel)
 
diff --git a/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py b/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
index c83cc2d..0d18d97 100644
--- a/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
+++ b/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py
@@ -209,8 +209,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,
@@ -240,7 +243,7 @@ def operations_client(self) -> operations_v1.OperationsAsyncClient:
         This property caches on the instance; repeated calls return the same
         client.
         """
-        # Sanity check: Only create a new client if we do not already have one.
+        # Quick check: Only create a new client if we do not already have one.
         if self._operations_client is None:
             self._operations_client = operations_v1.OperationsAsyncClient(
                 self.grpc_channel
diff --git a/tests/unit/gapic/eventarc_v1/test_eventarc.py b/tests/unit/gapic/eventarc_v1/test_eventarc.py
index 9c4aae7..d44d061 100644
--- a/tests/unit/gapic/eventarc_v1/test_eventarc.py
+++ b/tests/unit/gapic/eventarc_v1/test_eventarc.py
@@ -29,6 +29,7 @@
 from google.api_core import gapic_v1
 from google.api_core import grpc_helpers
 from google.api_core import grpc_helpers_async
+from google.api_core import operation
 from google.api_core import operation_async  # type: ignore
 from google.api_core import operations_v1
 from google.api_core import path_template
@@ -489,17 +490,23 @@ def test_eventarc_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
-    "client_class,transport_class,transport_name",
+    "client_class,transport_class,transport_name,grpc_helpers",
     [
-        (EventarcClient, transports.EventarcGrpcTransport, "grpc"),
-        (EventarcAsyncClient, transports.EventarcGrpcAsyncIOTransport, "grpc_asyncio"),
+        (EventarcClient, transports.EventarcGrpcTransport, "grpc", grpc_helpers),
+        (
+            EventarcAsyncClient,
+            transports.EventarcGrpcAsyncIOTransport,
+            "grpc_asyncio",
+            grpc_helpers_async,
+        ),
     ],
 )
 def test_eventarc_client_client_options_credentials_file(
-    client_class, transport_class, transport_name
+    client_class, transport_class, transport_name, grpc_helpers
 ):
     # Check the case credentials file is provided.
     options = client_options.ClientOptions(credentials_file="credentials.json")
+
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
         client = client_class(client_options=options, transport=transport_name)
@@ -533,6 +540,67 @@ def test_eventarc_client_client_options_from_dict():
         )
 
 
+@pytest.mark.parametrize(
+    "client_class,transport_class,transport_name,grpc_helpers",
+    [
+        (EventarcClient, transports.EventarcGrpcTransport, "grpc", grpc_helpers),
+        (
+            EventarcAsyncClient,
+            transports.EventarcGrpcAsyncIOTransport,
+            "grpc_asyncio",
+            grpc_helpers_async,
+        ),
+    ],
+)
+def test_eventarc_client_create_channel_credentials_file(
+    client_class, transport_class, transport_name, grpc_helpers
+):
+    # Check the case credentials file is provided.
+    options = client_options.ClientOptions(credentials_file="credentials.json")
+
+    with mock.patch.object(transport_class, "__init__") as patched:
+        patched.return_value = None
+        client = client_class(client_options=options, transport=transport_name)
+        patched.assert_called_once_with(
+            credentials=None,
+            credentials_file="credentials.json",
+            host=client.DEFAULT_ENDPOINT,
+            scopes=None,
+            client_cert_source_for_mtls=None,
+            quota_project_id=None,
+            client_info=transports.base.DEFAULT_CLIENT_INFO,
+            always_use_jwt_access=True,
+        )
+
+    # test that the credentials from file are saved and used as the credentials.
+    with mock.patch.object(
+        google.auth, "load_credentials_from_file", autospec=True
+    ) as load_creds, mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as adc, mock.patch.object(
+        grpc_helpers, "create_channel"
+    ) as create_channel:
+        creds = ga_credentials.AnonymousCredentials()
+        file_creds = ga_credentials.AnonymousCredentials()
+        load_creds.return_value = (file_creds, None)
+        adc.return_value = (creds, None)
+        client = client_class(client_options=options, transport=transport_name)
+        create_channel.assert_called_with(
+            "eventarc.googleapis.com:443",
+            credentials=file_creds,
+            credentials_file=None,
+            quota_project_id=None,
+            default_scopes=("https://www.googleapis.com/auth/cloud-platform",),
+            scopes=None,
+            default_host="eventarc.googleapis.com",
+            ssl_credentials=None,
+            options=[
+                ("grpc.max_send_message_length", -1),
+                ("grpc.max_receive_message_length", -1),
+            ],
+        )
+
+
 @pytest.mark.parametrize("request_type", [eventarc.GetTriggerRequest, dict,])
 def test_get_trigger(request_type, transport: str = "grpc"):
     client = EventarcClient(

From 2ebb10086d3d95a290c6528f00cb23d73675a6d7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 3 Feb 2022 11:21:50 -0800
Subject: [PATCH 13/13] chore(main): release 1.3.0 (#69)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 12 ++++++++++++
 setup.py     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61789db..bf7e25a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.3.0](https://github.com/googleapis/python-eventarc/compare/v1.2.1...v1.3.0) (2022-02-03)
+
+
+### Features
+
+* add api key support ([#68](https://github.com/googleapis/python-eventarc/issues/68)) ([96e07bb](https://github.com/googleapis/python-eventarc/commit/96e07bbbfbb75aa16d33ee9e0984144949e5adc3))
+
+
+### Bug Fixes
+
+* resolve DuplicateCredentialArgs error when using credentials_file ([6bffd75](https://github.com/googleapis/python-eventarc/commit/6bffd757478617fe6ffff905f42fc702a0cb1262))
+
 ### [1.2.1](https://www.github.com/googleapis/python-eventarc/compare/v1.2.0...v1.2.1) (2021-11-01)
 
 
diff --git a/setup.py b/setup.py
index 6b4aa5c..4b1eb9c 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
 
 name = "google-cloud-eventarc"
 description = "Eventarc API client library"
-version = "1.2.1"
+version = "1.3.0"
 release_status = "Development Status :: 5 - Production/Stable"
 url = "https://github.com/googleapis/python-eventarc"
 dependencies = [