Merge pull request #1206 from atlanhq/FT-905

Fixes case-sensitivity of connector type on import packages
atlanhq · Jan 10, 2025 · 104d898 · 104d898
2 parents f3f1a66 + a3acca3
commit 104d898
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/util/AssetResolver.kt b/package-toolkit/runtime/src/main/kotlin/com/atlan/pkg/util/AssetResolver.kt
@@ -19,7 +19,7 @@ interface AssetResolver {
     fun getConnectionIdentityFromQN(agnosticQualifiedName: String): ConnectionIdentity? {
         val tokens = agnosticQualifiedName.split("/")
         return if (tokens.size > 1) {
-            ConnectionIdentity(tokens[0], tokens[1])
+            ConnectionIdentity(tokens[0], tokens[1].lowercase())
         } else {
             null
         }

diff --git a/samples/packages/cube-assets-builder/src/main/kotlin/com/atlan/pkg/cab/AssetImporter.kt b/samples/packages/cube-assets-builder/src/main/kotlin/com/atlan/pkg/cab/AssetImporter.kt
@@ -90,7 +90,7 @@ abstract class AssetImporter(
             when (typeName) {
                 Connection.TYPE_NAME -> {
                     val connection = CSVXformer.trimWhitespace(row[header.indexOf(Asset.CONNECTION_NAME.atlanFieldName)])
-                    val connector = CSVXformer.trimWhitespace(row[header.indexOf(ConnectionImporter.CONNECTOR_TYPE)])
+                    val connector = CSVXformer.trimWhitespace(row[header.indexOf(ConnectionImporter.CONNECTOR_TYPE)]).lowercase()
                     parent = null
                     unique = ConnectionIdentity(connection, connector).toString()
                     partial = ""

diff --git a/samples/packages/cube-assets-builder/src/main/kotlin/com/atlan/pkg/cab/Importer.kt b/samples/packages/cube-assets-builder/src/main/kotlin/com/atlan/pkg/cab/Importer.kt
@@ -171,7 +171,7 @@ object Importer {
             }
             if (connectionIdentity == null) {
                 val name = row.getOrNull(header.indexOf("connectionName"))
-                val type = row.getOrNull(header.indexOf("connectorType"))
+                val type = row.getOrNull(header.indexOf("connectorType"))?.lowercase()
                 if (name != null && type != null) {
                     connectionIdentity = AssetResolver.ConnectionIdentity(name, type)
                 }

diff --git a/samples/packages/lineage-builder/src/main/kotlin/com/atlan/pkg/lb/AssetTransformer.kt b/samples/packages/lineage-builder/src/main/kotlin/com/atlan/pkg/lb/AssetTransformer.kt
@@ -56,7 +56,7 @@ class AssetTransformer(
             inputRow: Map<String, String>,
             prefix: String,
         ): String {
-            val connectorType = inputRow["$prefix $CONNECTOR"] ?: ""
+            val connectorType = inputRow["$prefix $CONNECTOR"]?.lowercase() ?: ""
             val connectionName = inputRow["$prefix $CONNECTION"] ?: ""
             val connectionId = AssetResolver.ConnectionIdentity(connectionName, connectorType)
             return ctx.connectionCache.getIdentityMap().getOrDefault(connectionId, "")
@@ -117,7 +117,7 @@ class AssetTransformer(
                 assetQN,
                 inputRow["$prefix $TYPE"] ?: "",
                 inputRow["$prefix $NAME"] ?: "",
-                inputRow["$prefix $CONNECTOR"] ?: "",
+                inputRow["$prefix $CONNECTOR"]?.lowercase() ?: "",
                 connectionQN,
             )
         } else {

diff --git a/samples/packages/lineage-builder/src/main/kotlin/com/atlan/pkg/lb/LineageTransformer.kt b/samples/packages/lineage-builder/src/main/kotlin/com/atlan/pkg/lb/LineageTransformer.kt
@@ -65,7 +65,7 @@ class LineageTransformer(
             if (source !is ICatalog || target !is ICatalog) {
                 logger.warn { "Source and/or target asset are not subtypes of Catalog, and therefore cannot exist in lineage: $inputRow" }
             } else {
-                val xformConnector = inputRow[XFORM_CONNECTOR] ?: ""
+                val xformConnector = inputRow[XFORM_CONNECTOR]?.lowercase() ?: ""
                 val xformConnection = inputRow[XFORM_CONNECTION] ?: ""
                 val connectionId = AssetResolver.ConnectionIdentity(xformConnection, xformConnector)
                 val connectionQN = ctx.connectionCache.getIdentityMap().getOrDefault(connectionId, "")

diff --git a/...les/packages/relational-assets-builder/src/main/kotlin/com/atlan/pkg/rab/AssetImporter.kt b/...les/packages/relational-assets-builder/src/main/kotlin/com/atlan/pkg/rab/AssetImporter.kt
@@ -93,7 +93,7 @@ abstract class AssetImporter(
             when (typeName) {
                 Connection.TYPE_NAME -> {
                     val connection = CSVXformer.trimWhitespace(row[header.indexOf(Asset.CONNECTION_NAME.atlanFieldName)])
-                    val connector = CSVXformer.trimWhitespace(row[header.indexOf(ConnectionImporter.CONNECTOR_TYPE)])
+                    val connector = CSVXformer.trimWhitespace(row[header.indexOf(ConnectionImporter.CONNECTOR_TYPE)]).lowercase()
                     current = ConnectionIdentity(connection, connector).toString()
                     parent = null
                 }