bigquery cleaner is singleton (#59149)

Author: edgao

airbyte-integrations/connectors/destination-bigquery/src/test-integration/kotlin/io/airbyte/integrations/destination/bigquery/BigQueryDestinationTestUtils.kt

@@ -16,19 +16,30 @@ import io.airbyte.integrations.destination.bigquery.spec.BigqueryConfiguration
 import io.airbyte.integrations.destination.bigquery.spec.BigqueryConfigurationFactory
 import io.airbyte.integrations.destination.bigquery.spec.BigquerySpecification
 import io.airbyte.integrations.destination.bigquery.util.BigqueryClientFactory
-import io.github.oshai.kotlinlogging.KotlinLogging
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-private val logger = KotlinLogging.logger {}
-
 object BigQueryDestinationTestUtils {
     private val LOGGER: Logger = LoggerFactory.getLogger(BigQueryDestinationTestUtils::class.java)
 
+    val standardInsertRawOverrideConfig =
+        createConfig(
+            configFile = Path.of("secrets/credentials-1s1t-standard-raw-override.json"),
+            datasetId = DEFAULT_NAMESPACE_PLACEHOLDER,
+            stagingPath = "test_path/$DEFAULT_NAMESPACE_PLACEHOLDER",
+            rawDatasetId = "${DEFAULT_NAMESPACE_PLACEHOLDER}_raw_dataset",
+        )
+    val standardInsertConfig =
+        createConfig(
+            configFile = Path.of("secrets/credentials-1s1t-standard.json"),
+            datasetId = DEFAULT_NAMESPACE_PLACEHOLDER,
+            stagingPath = "test_path/$DEFAULT_NAMESPACE_PLACEHOLDER",
+        )
+
     /**
      * Parse the config file and replace dataset with rawNamespace and stagingPath randomly
      * generated by the test.

airbyte-integrations/connectors/destination-bigquery/src/test-integration/kotlin/io/airbyte/integrations/destination/bigquery/BigqueryDestinationCleaner.kt

@@ -18,7 +18,23 @@ import kotlinx.coroutines.runBlocking
 
 private val logger = KotlinLogging.logger {}
 
-class BigqueryDestinationCleaner(private val configJson: JsonNode) : DestinationCleaner {
+object BigqueryDestinationCleaner : DestinationCleaner {
+    private val actualCleaner =
+        BigqueryDestinationCleanerInstance(
+                BigQueryDestinationTestUtils.standardInsertRawOverrideConfig
+            )
+            .compose(
+                BigqueryDestinationCleanerInstance(
+                    BigQueryDestinationTestUtils.standardInsertConfig
+                )
+            )
+
+    override fun cleanup() {
+        actualCleaner.cleanup()
+    }
+}
+
+class BigqueryDestinationCleanerInstance(private val configJson: JsonNode) : DestinationCleaner {
     override fun cleanup() {
         val config = BigQueryDestinationTestUtils.parseConfig(configJson)
         val bigquery = BigqueryClientFactory(config).make()

airbyte-integrations/connectors/destination-bigquery/src/test-integration/kotlin/io/airbyte/integrations/destination/bigquery/BigqueryWriteTest.kt

@@ -8,7 +8,6 @@ import io.airbyte.cdk.load.test.util.DestinationDataDumper
 import io.airbyte.cdk.load.test.util.ExpectedRecordMapper
 import io.airbyte.cdk.load.test.util.UncoercedExpectedRecordMapper
 import io.airbyte.cdk.load.toolkits.load.db.orchestration.ColumnNameModifyingMapper
-import io.airbyte.cdk.load.util.deserializeToNode
 import io.airbyte.cdk.load.util.serializeToString
 import io.airbyte.cdk.load.write.AllTypesBehavior
 import io.airbyte.cdk.load.write.BasicFunctionalityIntegrationTest
@@ -35,7 +34,7 @@ abstract class BigqueryWriteTest(
         configContents = configContents,
         BigquerySpecification::class.java,
         dataDumper,
-        BigqueryDestinationCleaner(configContents.deserializeToNode()),
+        BigqueryDestinationCleaner,
         recordMangler = expectedRecordMapper,
         isStreamSchemaRetroactive = isStreamSchemaRetroactive,
         supportsDedup = supportsDedup,
@@ -110,13 +109,7 @@ class StandardInsertRawOverrideDisableTd :
 
 class StandardInsertRawOverride :
     BigqueryTDWriteTest(
-        BigQueryDestinationTestUtils.createConfig(
-                configFile = Path.of("secrets/credentials-1s1t-standard-raw-override.json"),
-                datasetId = DEFAULT_NAMESPACE_PLACEHOLDER,
-                stagingPath = "test_path/$DEFAULT_NAMESPACE_PLACEHOLDER",
-                rawDatasetId = "${DEFAULT_NAMESPACE_PLACEHOLDER}_raw_dataset",
-            )
-            .serializeToString(),
+        BigQueryDestinationTestUtils.standardInsertRawOverrideConfig.serializeToString()
     ) {
     @Test
     override fun testBasicWrite() {
@@ -129,14 +122,7 @@ class StandardInsertRawOverride :
 }
 
 class StandardInsert :
-    BigqueryTDWriteTest(
-        BigQueryDestinationTestUtils.createConfig(
-                configFile = Path.of("secrets/credentials-1s1t-standard.json"),
-                datasetId = DEFAULT_NAMESPACE_PLACEHOLDER,
-                stagingPath = "test_path/$DEFAULT_NAMESPACE_PLACEHOLDER",
-            )
-            .serializeToString(),
-    ) {
+    BigqueryTDWriteTest(BigQueryDestinationTestUtils.standardInsertConfig.serializeToString()) {
     @Test
     override fun testBasicWrite() {
         super.testBasicWrite()