From 03d498e9806e6602abc337c214dfe8342463b7e9 Mon Sep 17 00:00:00 2001
From: Jay Patel <jay.patel@snowflake.com>
Date: Thu, 9 Nov 2023 21:25:27 -0800
Subject: [PATCH 1/2] Fix failing test due to JDBC NPE in 3.14.3

---
 .../com/snowflake/kafka/connector/internal/InternalUtils.java  | 3 +++
 .../snowflake/kafka/connector/internal/InternalStageIT.java    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java b/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
index d8318460b..b8e29c909 100644
--- a/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
+++ b/src/main/java/com/snowflake/kafka/connector/internal/InternalUtils.java
@@ -299,6 +299,9 @@ protected static Properties generateProxyParametersIfRequired(Map<String, String
         proxyProperties.put(SFSessionProperty.PROXY_USER.getPropertyKey(), username);
         proxyProperties.put(SFSessionProperty.PROXY_PASSWORD.getPropertyKey(), password);
       }
+      // There is a change in JDBC version 3.13.31 which causes NPE if this is not added.
+      // https://github.com/snowflakedb/snowflake-jdbc/blob/master/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java#L614
+      proxyProperties.put(SFSessionProperty.GZIP_DISABLED.getPropertyKey(), "false");
     }
     return proxyProperties;
   }
diff --git a/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java b/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
index e03fee897..037c63033 100644
--- a/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
+++ b/src/test/java/com/snowflake/kafka/connector/internal/InternalStageIT.java
@@ -140,6 +140,8 @@ public void testInternalStageWithProxy() throws SnowflakeSQLException {
     proxyProperties.put(SFSessionProperty.PROXY_PORT.getPropertyKey(), "3128");
     proxyProperties.put(SFSessionProperty.PROXY_USER.getPropertyKey(), "admin");
     proxyProperties.put(SFSessionProperty.PROXY_PASSWORD.getPropertyKey(), "test");
+    // required otherwise JDBC version 3.13.31 throws NPE
+    proxyProperties.put(SFSessionProperty.GZIP_DISABLED.getPropertyKey(), "false");
 
     // Create new snowflake connection service
     Map<String, String> config = TestUtils.getConf();

From 25a3205df5307a716f7da96721e7cdda44feda75 Mon Sep 17 00:00:00 2001
From: Jay Patel <jay.patel@snowflake.com>
Date: Tue, 7 Nov 2023 15:07:35 -0800
Subject: [PATCH 2/2] SNOW-913746 Upgrade JDBC to 3.14.3 for using
 useS3regionalURL

---
 pom.xml           | 2 +-
 pom_confluent.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9578da439..82cb4cd53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -327,7 +327,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.13.30</version>
+            <version>3.14.3</version>
         </dependency>
 
         <!-- Ingest SDK for copy staged file into snowflake table -->
diff --git a/pom_confluent.xml b/pom_confluent.xml
index 11a73b654..b39aec57e 100644
--- a/pom_confluent.xml
+++ b/pom_confluent.xml
@@ -379,7 +379,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.13.30</version>
+            <version>3.14.3</version>
         </dependency>
 
         <!-- Ingest SDK for copy staged file into snowflake table -->