From b3e130cf1b6e75f31b9c713e71a39bfe0196db64 Mon Sep 17 00:00:00 2001 From: Jack Carpenter Date: Wed, 11 Sep 2024 17:29:46 +0100 Subject: [PATCH 1/3] added ability to specify quota project in profile --- dbt/adapters/bigquery/connections.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dbt/adapters/bigquery/connections.py b/dbt/adapters/bigquery/connections.py index cdd9d17dc..252e219c3 100644 --- a/dbt/adapters/bigquery/connections.py +++ b/dbt/adapters/bigquery/connections.py @@ -17,7 +17,7 @@ import google.auth.exceptions import google.cloud.bigquery import google.cloud.exceptions -from google.api_core import retry, client_info +from google.api_core import retry, client_info, client_options from google.auth import impersonated_credentials from google.oauth2 import ( credentials as GoogleCredentials, @@ -125,6 +125,7 @@ class BigQueryCredentials(Credentials): database: Optional[str] = None schema: Optional[str] = None execution_project: Optional[str] = None + quota_project: Optional[str] = None location: Optional[str] = None priority: Optional[Priority] = None maximum_bytes_billed: Optional[int] = None @@ -404,14 +405,17 @@ def get_credentials(cls, profile_credentials): def get_bigquery_client(cls, profile_credentials): creds = cls.get_credentials(profile_credentials) execution_project = profile_credentials.execution_project + quota_project = profile_credentials.quota_project location = getattr(profile_credentials, "location", None) info = client_info.ClientInfo(user_agent=f"dbt-bigquery-{dbt_version.version}") + options = client_options.ClientOptions(quota_project_id=quota_project) return google.cloud.bigquery.Client( execution_project, creds, location=location, client_info=info, + client_options=options, ) @classmethod From 3dc053abb82332b13c7134a3297bc0c3aba59bec Mon Sep 17 00:00:00 2001 From: Jack Carpenter Date: Wed, 11 Sep 2024 21:30:08 +0100 Subject: [PATCH 2/3] updated to fix failing unit test after addition of client_options --- tests/unit/test_bigquery_adapter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_bigquery_adapter.py b/tests/unit/test_bigquery_adapter.py index a922525fd..da499d266 100644 --- a/tests/unit/test_bigquery_adapter.py +++ b/tests/unit/test_bigquery_adapter.py @@ -386,15 +386,17 @@ def test_cancel_open_connections_single(self): adapter.connections.thread_connections.update({key: master, 1: model}) self.assertEqual(len(list(adapter.cancel_open_connections())), 1) + @patch("dbt.adapters.bigquery.impl.google.api_core.client_options.ClientOptions") @patch("dbt.adapters.bigquery.impl.google.auth.default") @patch("dbt.adapters.bigquery.impl.google.cloud.bigquery") - def test_location_user_agent(self, mock_bq, mock_auth_default): + def test_location_user_agent(self, mock_bq, mock_auth_default, MockClientOptions): creds = MagicMock() mock_auth_default.return_value = (creds, MagicMock()) adapter = self.get_adapter("loc") connection = adapter.acquire_connection("dummy") mock_client = mock_bq.Client + mock_client_options = MockClientOptions.return_value mock_client.assert_not_called() connection.handle @@ -403,6 +405,7 @@ def test_location_user_agent(self, mock_bq, mock_auth_default): creds, location="Luna Station", client_info=HasUserAgent(), + client_options=mock_client_options, ) From f9646a7b2196abcf539d61225a8d329fa7b4155f Mon Sep 17 00:00:00 2001 From: Jack Carpenter Date: Wed, 11 Sep 2024 23:50:16 +0100 Subject: [PATCH 3/3] Added changie release --- .changes/unreleased/Features-20240911-234859.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changes/unreleased/Features-20240911-234859.yaml diff --git a/.changes/unreleased/Features-20240911-234859.yaml b/.changes/unreleased/Features-20240911-234859.yaml new file mode 100644 index 000000000..5351c3315 --- /dev/null +++ b/.changes/unreleased/Features-20240911-234859.yaml @@ -0,0 +1,6 @@ +kind: Features +body: Adds the ability to set optional `quota_project` in profile +time: 2024-09-11T23:48:59.767649+01:00 +custom: + Author: jcarpenter12 + Issue: 1343 1344