mysql use ssl tmp

airbytehq · Dec 24, 2024 · 76d0b1d · 76d0b1d
1 parent 062ff87
commit 76d0b1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/...cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/jdbc/SSLCertificateUtils.kt b/...cdk/bulk/toolkits/extract-jdbc/src/main/kotlin/io/airbyte/cdk/jdbc/SSLCertificateUtils.kt
@@ -46,7 +46,8 @@ private val log = KotlinLogging.logger {}
  */
 object SSLCertificateUtils {
 
-    const val DEFAULT_ROOT_FOLDER = "/tmp"
+    private const val DEFAULT_ROOT_DIR = "/tmp"
+
     private const val PKCS_12 = "PKCS12"
     private const val X509 = "X.509"
     private val RANDOM: Random = SecureRandom()
@@ -109,7 +110,7 @@ object SSLCertificateUtils {
             fromPEMString(certString),
             keyStorePassword,
             FileSystems.getDefault(),
-            DEFAULT_ROOT_FOLDER
+            ""
         )
     }
 
@@ -259,21 +260,7 @@ object SSLCertificateUtils {
         certString: String,
         keyString: String,
         keyStorePassword: String,
-    ): URI {
-        return keyStoreFromClientCertificate(
-            certString,
-            keyString,
-            keyStorePassword,
-            FileSystems.getDefault(),
-            DEFAULT_ROOT_FOLDER,
-        )
-    }
-
-    fun keyStoreFromClientCertificate(
-        certString: String,
-        keyString: String,
-        keyStorePassword: String,
-        directory: String
+        directory: String = DEFAULT_ROOT_DIR,
     ): URI {
         return keyStoreFromClientCertificate(
             certString,

diff --git a/airbyte-integrations/connectors/source-mysql/build.gradle b/airbyte-integrations/connectors/source-mysql/build.gradle
@@ -9,7 +9,7 @@ application {
 airbyteBulkConnector {
     core = 'extract'
     toolkits = ['extract-jdbc', 'extract-cdc']
-    cdk = '0.234'
+    cdk = 'local'
 }
 
 dependencies {

diff --git a/...ce-mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/MySqlSourceConfiguration.kt b/...ce-mysql/src/main/kotlin/io/airbyte/integrations/source/mysql/MySqlSourceConfiguration.kt
@@ -9,7 +9,6 @@ import io.airbyte.cdk.command.JdbcSourceConfiguration
 import io.airbyte.cdk.command.SourceConfiguration
 import io.airbyte.cdk.command.SourceConfigurationFactory
 import io.airbyte.cdk.jdbc.SSLCertificateUtils
-import io.airbyte.cdk.jdbc.SSLCertificateUtils.DEFAULT_ROOT_FOLDER
 import io.airbyte.cdk.ssh.SshConnectionOptions
 import io.airbyte.cdk.ssh.SshNoTunnelMethod
 import io.airbyte.cdk.ssh.SshTunnelMethodConfiguration
@@ -234,9 +233,9 @@ class MySqlSourceConfigurationFactory @Inject constructor(val featureFlags: Set<
         val clientCertKeyStoreUrl: URL =
             buildKeyStore("client") {
                 SSLCertificateUtils.keyStoreFromClientCertificate(
-                    sslData.clientCertificate,
-                    sslData.clientKey,
-                    password
+                    certString=sslData.clientCertificate,
+                    keyString=sslData.clientKey,
+                    keyStorePassword=password
                 )
             }
         extraJdbcProperties[CLIENT_KEY_STORE_URL] = clientCertKeyStoreUrl.toString()