From ead704bb18fe76c9115a27471d86fbc8ae9e9311 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 10 May 2022 18:14:49 +0000
Subject: [PATCH 1/2] fix(deps): update dependency
 com.microsoft.sqlserver:mssql-jdbc to v10

---
 cloud-sql/sqlserver/client-side-encryption/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloud-sql/sqlserver/client-side-encryption/pom.xml b/cloud-sql/sqlserver/client-side-encryption/pom.xml
index 94d69542ee4..ce5c9f05f41 100644
--- a/cloud-sql/sqlserver/client-side-encryption/pom.xml
+++ b/cloud-sql/sqlserver/client-side-encryption/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.microsoft.sqlserver</groupId>
       <artifactId>mssql-jdbc</artifactId>
-      <version>9.4.1.jre8</version>
+      <version>10.2.0.jre8</version>
     </dependency>
     <dependency>
       <groupId>com.google.crypto.tink</groupId>

From 51b9b3b7bb8c368008e1e05648170a3952260ed0 Mon Sep 17 00:00:00 2001
From: Shubha Rajan <shubhadayini@google.com>
Date: Tue, 10 May 2022 12:52:05 -0700
Subject: [PATCH 2/2] add encrypt=false flag to SQL Server Client-side
 Encryption samples

---
 .../src/main/java/cloudsql/tink/CloudSqlConnectionPool.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java b/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java
index 23eaa7c6866..a0a9438f943 100644
--- a/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java
+++ b/cloud-sql/sqlserver/client-side-encryption/src/main/java/cloudsql/tink/CloudSqlConnectionPool.java
@@ -35,6 +35,10 @@ public static DataSource createConnectionPool(String dbUser, String dbPass, Stri
     config.setPassword(dbPass); // e.g. "my-password"
     config.addDataSourceProperty("databaseName", dbName);
 
+    // The Cloud SQL Java Connector provides SSL encryption so 
+    // it should be disabled at the driver level
+    config.addDataSourceProperty("encrypt", "false");
+
     config.addDataSourceProperty("socketFactoryClass",
         "com.google.cloud.sql.sqlserver.SocketFactory");
     config.addDataSourceProperty("socketFactoryConstructorArg", instanceConnectionName);
@@ -60,4 +64,4 @@ public static void createTable(DataSource pool, String tableName) throws SQLExce
     }
   }
 }
-// [END cloud_sql_sqlserver_cse_db]
\ No newline at end of file
+// [END cloud_sql_sqlserver_cse_db]