From 5fb6aa80b7de02c80e3070e81774554a0f9d31a6 Mon Sep 17 00:00:00 2001 From: Jesse Whitehouse Date: Tue, 31 Oct 2023 21:05:37 -0400 Subject: [PATCH 1/3] Duplicate of applicable change from #93 Signed-off-by: Jesse Whitehouse --- src/databricks/sql/auth/oauth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/databricks/sql/auth/oauth.py b/src/databricks/sql/auth/oauth.py index 78f516fee..806df08fe 100644 --- a/src/databricks/sql/auth/oauth.py +++ b/src/databricks/sql/auth/oauth.py @@ -125,7 +125,7 @@ def __get_authorization_code(self, client, auth_url, scope, state, challenge): logger.info(f"Port {port} is in use") last_error = e except Exception as e: - logger.error("unexpected error", e) + logger.error("unexpected error: %s", e) if self.redirect_port is None: logger.error( f"Tried all the ports {self.port_range} for oauth redirect, but can't find free port" From eadfd5cfa3061bc7ab82706402a9429cdc87068a Mon Sep 17 00:00:00 2001 From: Jesse Whitehouse Date: Tue, 31 Oct 2023 21:07:42 -0400 Subject: [PATCH 2/3] Update changelog Signed-off-by: Jesse Whitehouse --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 164cf8079..23ab6d62e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add integration tests for Databricks UC Volumes ingestion queries - Add `_retry_max_redirects` config - Enable cloud fetch by default. To disable, set `use_cloud_fetch=False` when building `databricks.sql.client`. +- Fix: our logger would raise an uncaught exception under certain oauth error conditions ## 2.9.3 (2023-08-24) From 72fd790989d1563786ac4c051a514f29eeba5067 Mon Sep 17 00:00:00 2001 From: Levko Kravets Date: Wed, 29 May 2024 12:13:17 +0300 Subject: [PATCH 3/3] Fix after merge Signed-off-by: Levko Kravets --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92ded61af..1e0b34bcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,8 +59,10 @@ - Caching metadata calls - Enable cloud fetch by default. To disable, set `use_cloud_fetch=False` when building `databricks.sql.client`. - Add integration tests for Databricks UC Volumes ingestion queries -- Add `_retry_max_redirects` config -- Enable cloud fetch by default. To disable, set `use_cloud_fetch=False` when building `databricks.sql.client`. +- Retries: + - Add `_retry_max_redirects` config + - Set `_enable_v3_retries=True` and warn if users override it +- Security: bump minimum pyarrow version to 14.0.1 (CVE-2023-47248) ## 2.9.3 (2023-08-24)