delete password auth

Author: edgao

airbyte-integrations/connectors/destination-databricks/metadata.yaml

@@ -62,4 +62,9 @@ data:
           secretStore:
             type: GSM
             alias: airbyte-connector-testing-secret-store
+        - name: SECRET_DESTINATION_DATABRICKS_PERSONAL_ACCESS_TOKEN_CONFIG
+          fileName: pat_config.json
+          secretStore:
+            type: GSM
+            alias: airbyte-connector-testing-secret-store
 metadataSpecVersion: "1.0"

airbyte-integrations/connectors/destination-databricks/src/main/kotlin/io/airbyte/integrations/destination/databricks/DatabricksConnectorClientsFactory.kt

@@ -48,9 +48,9 @@ object DatabricksConnectorClientsFactory {
             "jdbc:databricks://${config.hostname}:${config.port}/${config.database};transportMode=http;httpPath=${config.httpPath};EnableArrow=0"
         when (config.authentication) {
             is BasicAuthentication -> {
-                datasource.userID = config.authentication.username
-                datasource.password = config.authentication.password
-                datasource.setURL("$jdbcUrl;AuthMech=3")
+                datasource.setURL(
+                    "$jdbcUrl;AuthMech=3;UID=token;PWD=${config.authentication.personalAccessToken}"
+                )
             }
             is OAuth2Authentication -> {
                 datasource.setURL(

airbyte-integrations/connectors/destination-databricks/src/main/kotlin/io/airbyte/integrations/destination/databricks/model/DatabricksConnectorConfig.kt

@@ -37,8 +37,6 @@ data class DatabricksConnectorConfig(
 @JsonTypeName("BASIC")
 data class BasicAuthentication(
     @JsonProperty("personal_access_token") val personalAccessToken: String,
-    val username: String,
-    val password: String
 ) : Authentication
 
 @JsonTypeName("OAUTH")

airbyte-integrations/connectors/destination-databricks/src/main/resources/spec.json

@@ -74,52 +74,38 @@
         "order": 8,
         "oneOf": [
           {
-            "title": "Basic Authentication",
-            "required": [
-              "auth_type",
-              "personal_access_token",
-              "username",
-              "password"
-            ],
+            "title": "OAuth2 (Recommended)",
+            "required": ["auth_type", "client_id", "secret"],
             "properties": {
               "auth_type": {
                 "type": "string",
-                "const": "BASIC",
+                "const": "OAUTH",
                 "order": 0
               },
-              "personal_access_token": {
+              "client_id": {
                 "type": "string",
-                "airbyte_secret": true,
                 "order": 1
               },
-              "username": {
-                "type": "string",
-                "order": 2
-              },
-              "password": {
+              "secret": {
                 "type": "string",
                 "airbyte_secret": true,
-                "order": 3
+                "order": 2
               }
             }
           },
           {
-            "title": "OAuth2 (Recommended)",
-            "required": ["auth_type", "client_id", "secret"],
+            "title": "Personal Access Token",
+            "required": ["auth_type", "personal_access_token"],
             "properties": {
               "auth_type": {
                 "type": "string",
-                "const": "OAUTH",
+                "const": "BASIC",
                 "order": 0
               },
-              "client_id": {
-                "type": "string",
-                "order": 1
-              },
-              "secret": {
+              "personal_access_token": {
                 "type": "string",
                 "airbyte_secret": true,
-                "order": 2
+                "order": 1
               }
             }
           }

airbyte-integrations/connectors/destination-databricks/src/test-integration/kotlin/io/airbyte/integrations/destination/databricks/typededupe/DatabricksTypingDedupingTest.kt renamed to airbyte-integrations/connectors/destination-databricks/src/test-integration/kotlin/io/airbyte/integrations/destination/databricks/typededupe/AbstractDatabricksTypingDedupingTest.kt

@@ -21,30 +21,28 @@ import io.airbyte.integrations.destination.databricks.model.DatabricksConnectorC
 import java.nio.file.Path
 import java.sql.Connection
 import java.sql.ResultSet
-import java.util.concurrent.TimeUnit
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Timeout
-import org.mockito.Mockito
 
-class DatabricksTypingDedupingTest : BaseTypingDedupingTest() {
+abstract class AbstractDatabricksTypingDedupingTest(
+    private val jdbcDatabase: JdbcDatabase,
+    private val connectorConfig: DatabricksConnectorConfig,
+) : BaseTypingDedupingTest() {
     override val imageName: String
         get() = "airbyte/destination-databricks:dev"
 
     companion object {
-        private var jdbcDatabase: JdbcDatabase = Mockito.mock()
-        private var connectorConfig: DatabricksConnectorConfig = Mockito.mock()
-        @JvmStatic
-        @BeforeAll
-        @Timeout(value = 10, unit = TimeUnit.MINUTES)
-        fun setupDatabase() {
-            val config = Jsons.deserialize(IOs.readFile(Path.of("secrets/oauth_config.json")))
-            connectorConfig = DatabricksConnectorConfig.deserialize(config)
-            jdbcDatabase =
+        fun setupDatabase(
+            connectorConfigPath: String
+        ): Pair<JdbcDatabase, DatabricksConnectorConfig> {
+            val config = Jsons.deserialize(IOs.readFile(Path.of(connectorConfigPath)))
+            val connectorConfig = DatabricksConnectorConfig.deserialize(config)
+            val jdbcDatabase =
                 DefaultJdbcDatabase(
                     DatabricksConnectorClientsFactory.createDataSource(connectorConfig)
                 )
             // This will trigger warehouse start
             jdbcDatabase.execute("SELECT 1")
+
+            return Pair(jdbcDatabase, connectorConfig)
         }
     }
 

airbyte-integrations/connectors/destination-databricks/src/test-integration/kotlin/io/airbyte/integrations/destination/databricks/typededupe/DatabricksOauthTypingDedupingTest.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.destination.databricks.typededupe
+
+import io.airbyte.cdk.db.jdbc.JdbcDatabase
+import io.airbyte.integrations.destination.databricks.model.DatabricksConnectorConfig
+import java.util.concurrent.TimeUnit
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Timeout
+
+class DatabricksOauthTypingDedupingTest :
+    AbstractDatabricksTypingDedupingTest(jdbcDatabase, connectorConfig) {
+    companion object {
+        private lateinit var jdbcDatabase: JdbcDatabase
+        private lateinit var connectorConfig: DatabricksConnectorConfig
+
+        @JvmStatic
+        @BeforeAll
+        @Timeout(value = 10, unit = TimeUnit.MINUTES)
+        fun setupDatabase() {
+            val (jdbcDatabase, connectorConfig) = setupDatabase("secrets/oauth_config.json")
+            this.jdbcDatabase = jdbcDatabase
+            this.connectorConfig = connectorConfig
+        }
+    }
+}

airbyte-integrations/connectors/destination-databricks/src/test-integration/kotlin/io/airbyte/integrations/destination/databricks/typededupe/DatabricksPersonalAccessTokenTypingDedupingTest.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Airbyte, Inc., all rights reserved.
+ */
+
+package io.airbyte.integrations.destination.databricks.typededupe
+
+import io.airbyte.cdk.db.jdbc.JdbcDatabase
+import io.airbyte.integrations.destination.databricks.model.DatabricksConnectorConfig
+import java.util.concurrent.TimeUnit
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Timeout
+
+class DatabricksPersonalAccessTokenTypingDedupingTest :
+    AbstractDatabricksTypingDedupingTest(jdbcDatabase, connectorConfig) {
+    companion object {
+        private lateinit var jdbcDatabase: JdbcDatabase
+        private lateinit var connectorConfig: DatabricksConnectorConfig
+
+        @JvmStatic
+        @BeforeAll
+        @Timeout(value = 10, unit = TimeUnit.MINUTES)
+        fun setupDatabase() {
+            val (jdbcDatabase, connectorConfig) = setupDatabase("secrets/pat_config.json")
+            this.jdbcDatabase = jdbcDatabase
+            this.connectorConfig = connectorConfig
+        }
+    }
+}