Skip to content

Commit

Permalink
Remove tags from integration test - not needed, causes headaches with…
Browse files Browse the repository at this point in the history 
… parallelism

Signed-off-by: Christopher Grote <cmgrote@users.noreply.github.com>
  • Loading branch information
@cmgrote
cmgrote committed May 2, 2024
1 parent f950c93 commit 0d8233f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 32 deletions.
27 changes: 1 addition & 26 deletions samples/packages/asset-import/src/test/kotlin/com/atlan/pkg/aim/ImportDataDomainTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
package com.atlan.pkg.aim

import AssetImportCfg
import com.atlan.Atlan
import com.atlan.model.assets.Asset
import com.atlan.model.assets.DataDomain
import com.atlan.model.assets.DataProduct
import com.atlan.model.assets.IDataMesh
import com.atlan.model.assets.Readme
import com.atlan.model.core.AtlanTag
import com.atlan.model.enums.AtlanAnnouncementType
import com.atlan.model.enums.AtlanIcon
import com.atlan.model.enums.AtlanTagColor
import com.atlan.model.enums.CertificateStatus
import com.atlan.model.fields.AtlanField
import com.atlan.model.typedefs.AtlanTagDef
import com.atlan.net.RequestOptions
import com.atlan.pkg.PackageTest
import org.testng.ITestContext
import org.testng.annotations.AfterClass
Expand All @@ -32,8 +27,6 @@ class ImportDataDomainTest : PackageTest() {
private val dataDomain2 = makeUnique("idd2")
private val dataDomain3 = makeUnique("idd3")
private val dataProduct1 = makeUnique("idp1")
private val tag1 = makeUnique("idt1")
private val tag2 = makeUnique("idt2")
private lateinit var d1: DataDomain
private lateinit var d2: DataDomain
private lateinit var d3: DataDomain
Expand All @@ -45,7 +38,7 @@ class ImportDataDomainTest : PackageTest() {
)

private fun prepFile() {
// Prepare a copy of the file with unique names for glossaries and tags
// Prepare a copy of the file with unique names for domains and products
val input = Paths.get("src", "test", "resources", "data_domain.csv").toFile()
val output = Paths.get(testDirectory, testFile).toFile()
input.useLines { lines ->
Expand All @@ -55,24 +48,11 @@ class ImportDataDomainTest : PackageTest() {
.replace("{{DATADOMAIN2}}", dataDomain2)
.replace("{{DATADOMAIN3}}", dataDomain3)
.replace("{{DATAPRODUCT1}}", dataProduct1)
.replace("{{TAG1}}", tag1)
.replace("{{TAG2}}", tag2)
output.appendText("$revised\n")
}
}
}

private fun createTags() {
val maxNetworkRetries = 3
val client = Atlan.getDefaultClient()
val t1 = AtlanTagDef.creator(tag1, AtlanIcon.AIRPLANE, AtlanTagColor.GREEN).build()
val t2 = AtlanTagDef.creator(tag2, AtlanIcon.ROBOT, AtlanTagColor.RED).build()
client.typeDefs.create(
listOf(t1, t2),
RequestOptions.from(client).maxNetworkRetries(maxNetworkRetries).build(),
)
}

private val dataDomainAttrs: List<AtlanField> = listOf(
DataDomain.NAME,
DataDomain.ASSET_ICON,
Expand Down Expand Up @@ -101,14 +81,12 @@ class ImportDataDomainTest : PackageTest() {
DataProduct.CERTIFICATE_STATUS,
DataProduct.CERTIFICATE_STATUS_MESSAGE,
DataProduct.DATA_DOMAIN,
DataProduct.ATLAN_TAGS,
DataProduct.README,
)

@BeforeClass
fun beforeClass() {
prepFile()
createTags()
setup(
AssetImportCfg(
assetsFile = null,
Expand Down Expand Up @@ -180,7 +158,6 @@ class ImportDataDomainTest : PackageTest() {
assertEquals(d3.qualifiedName, p1.dataDomain.qualifiedName)
assertNotNull(p1.readme)
assertEquals("<h1>This is Product!</h1>", p1.readme.description)
assertEquals(setOf(tag1, tag2), p1.atlanTags.map(AtlanTag::getTypeName).toSet())
}

private fun findDataDomain(domainName: String): DataDomain {
Expand Down Expand Up @@ -211,8 +188,6 @@ class ImportDataDomainTest : PackageTest() {
removeDomain(dataDomain2)
removeDomain(dataDomain3)
removeProduct(dataProduct1)
removeTag(tag1)
removeTag(tag2)
teardown(context.failedTests.size() > 0)
}
}
11 changes: 5 additions & 6 deletions samples/packages/asset-import/src/test/resources/data_domain.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
qualifiedName,typeName,name,assetIcon,assetThemeHex,assetCoverImage,parentDomain,dataDomain,dataProductAssetsDSL,displayName,description,userDescription,ownerUsers,ownerGroups,certificateStatus,certificateStatusMessage,announcementType,announcementTitle,announcementMessage,atlanTags,readme
,DataDomain,{{DATADOMAIN1}},PhFileCloud,#3940E1,/assets/default-domain-cover-HZNqYyE-.png,,,,,,Test domain for asset import,ernest,admins,VERIFIED,,warning,Careful,This is only a test.,,<h1>This is Domain!</h1>
,DataDomain,{{DATADOMAIN2}},PhFileCloud,,,{{DATADOMAIN1}},,,,,Test subdomain,ernest,admins,DRAFT,With a message!,,,,,
,DataDomain,{{DATADOMAIN3}},PhFileCloud,,,{{DATADOMAIN1}}@{{DATADOMAIN2}},,,,,Test sub sub domain,ernest,admins,,,,,,,
,DataProduct,{{DATAPRODUCT1}},,,,,{{DATADOMAIN1}}@{{DATADOMAIN2}}@{{DATADOMAIN3}},"""{\""query\"": {\""attributes\"": [\""__traitNames\"", \""connectorName\"", \""__customAttributes\"", \""certificateStatus\"", \""tenantId\"", \""anchor\"", \""parentQualifiedName\"", \""Query.parentQualifiedName\"", \""AtlasGlossaryTerm.anchor\"", \""databaseName\"", \""schemaName\"", \""parent\"", \""connectionQualifiedName\"", \""collectionQualifiedName\"", \""announcementMessage\"", \""announcementTitle\"", \""announcementType\"", \""announcementUpdatedAt\"", \""announcementUpdatedBy\"", \""allowQuery\"", \""allowQueryPreview\"", \""adminGroups\"", \""adminRoles\"", \""adminUsers\"", \""category\"", \""credentialStrategy\"", \""connectionSSOCredentialGuid\"", \""certificateStatus\"", \""certificateUpdatedAt\"", \""certificateUpdatedBy\"", \""classifications\"", \""connectionId\"", \""connectionQualifiedName\"", \""connectorName\"", \""dataType\"", \""defaultDatabaseQualifiedName\"", \""defaultSchemaQualifiedName\"", \""description\"", \""displayName\"", \""links\"", \""link\"", \""meanings\"", \""name\"", \""ownerGroups\"", \""ownerUsers\"", \""qualifiedName\"", \""typeName\"", \""userDescription\"", \""displayDescription\"", \""subDataType\"", \""rowLimit\"", \""queryTimeout\"", \""previewCredentialStrategy\"", \""policyStrategy\"", \""policyStrategyForSamplePreview\"", \""useObjectStorage\"", \""objectStorageUploadThreshold\"", \""outputPortDataProducts\""], \""dsl\"": {\""from\"": 0, \""query\"": {\""bool\"": {\""filter\"": {\""bool\"": {\""filter\"": [{\""term\"": {\""__state\"": {\""value\"": \""ACTIVE\"", \""case_insensitive\"": false}}}, {\""term\"": {\""__typeName.keyword\"": {\""value\"": \""AtlasGlossaryTerm\"", \""case_insensitive\"": false}}}]}}}}}, \""suppressLogs\"": true}, \""filterScrubbed\"": true}""",,,Test data product,ernest,admins,,,,,,"{{TAG1}}
{{TAG2}}",<h1>This is Product!</h1>
qualifiedName,typeName,name,assetIcon,assetThemeHex,assetCoverImage,parentDomain,dataDomain,dataProductAssetsDSL,displayName,description,userDescription,ownerUsers,ownerGroups,certificateStatus,certificateStatusMessage,announcementType,announcementTitle,announcementMessage,readme
,DataDomain,{{DATADOMAIN1}},PhFileCloud,#3940E1,/assets/default-domain-cover-HZNqYyE-.png,,,,,,Test domain for asset import,ernest,admins,VERIFIED,,warning,Careful,This is only a test.,<h1>This is Domain!</h1>
,DataDomain,{{DATADOMAIN2}},PhFileCloud,,,{{DATADOMAIN1}},,,,,Test subdomain,ernest,admins,DRAFT,With a message!,,,,
,DataDomain,{{DATADOMAIN3}},PhFileCloud,,,{{DATADOMAIN1}}@{{DATADOMAIN2}},,,,,Test sub sub domain,ernest,admins,,,,,,
,DataProduct,{{DATAPRODUCT1}},,,,,{{DATADOMAIN1}}@{{DATADOMAIN2}}@{{DATADOMAIN3}},"""{\""query\"": {\""attributes\"": [\""__traitNames\"", \""connectorName\"", \""__customAttributes\"", \""certificateStatus\"", \""tenantId\"", \""anchor\"", \""parentQualifiedName\"", \""Query.parentQualifiedName\"", \""AtlasGlossaryTerm.anchor\"", \""databaseName\"", \""schemaName\"", \""parent\"", \""connectionQualifiedName\"", \""collectionQualifiedName\"", \""announcementMessage\"", \""announcementTitle\"", \""announcementType\"", \""announcementUpdatedAt\"", \""announcementUpdatedBy\"", \""allowQuery\"", \""allowQueryPreview\"", \""adminGroups\"", \""adminRoles\"", \""adminUsers\"", \""category\"", \""credentialStrategy\"", \""connectionSSOCredentialGuid\"", \""certificateStatus\"", \""certificateUpdatedAt\"", \""certificateUpdatedBy\"", \""classifications\"", \""connectionId\"", \""connectionQualifiedName\"", \""connectorName\"", \""dataType\"", \""defaultDatabaseQualifiedName\"", \""defaultSchemaQualifiedName\"", \""description\"", \""displayName\"", \""links\"", \""link\"", \""meanings\"", \""name\"", \""ownerGroups\"", \""ownerUsers\"", \""qualifiedName\"", \""typeName\"", \""userDescription\"", \""displayDescription\"", \""subDataType\"", \""rowLimit\"", \""queryTimeout\"", \""previewCredentialStrategy\"", \""policyStrategy\"", \""policyStrategyForSamplePreview\"", \""useObjectStorage\"", \""objectStorageUploadThreshold\"", \""outputPortDataProducts\""], \""dsl\"": {\""from\"": 0, \""query\"": {\""bool\"": {\""filter\"": {\""bool\"": {\""filter\"": [{\""term\"": {\""__state\"": {\""value\"": \""ACTIVE\"", \""case_insensitive\"": false}}}, {\""term\"": {\""__typeName.keyword\"": {\""value\"": \""AtlasGlossaryTerm\"", \""case_insensitive\"": false}}}]}}}}}, \""suppressLogs\"": true}, \""filterScrubbed\"": true}""",,,Test data product,ernest,admins,,,,,,<h1>This is Product!</h1>
,,,,,,,,,,,,,,,,,,,

0 comments on commit 0d8233f

Please sign in to comment.