prune test hierarchy

airbytehq · Jun 12, 2024 · ff5f8a5 · ff5f8a5
1 parent 2997049
commit ff5f8a5
Show file tree

Hide file tree

Showing 13 changed files with 472 additions and 491 deletions.
diff --git a/airbyte-integrations/connectors/destination-redshift/build.gradle b/airbyte-integrations/connectors/destination-redshift/build.gradle
@@ -24,7 +24,7 @@ compileKotlin {
 airbyteJavaConnector.addCdkDependencies()
 
 application {
-    mainClass = 'io.airbyte.integrations.destination.redshift.RedshiftStagingS3Destination'
+    mainClass = 'io.airbyte.integrations.destination.redshift.RedshiftDestination'
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0',
                                  '-XX:NativeMemoryTracking=detail', '-XX:+UnlockDiagnosticVMOptions',
                                  '-XX:GCLockerRetryAllocationCount=100',]

diff --git a/airbyte-integrations/connectors/destination-redshift/metadata.yaml b/airbyte-integrations/connectors/destination-redshift/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: database
   connectorType: destination
   definitionId: f7a7d195-377f-cf5b-70a5-be6b819019dc
-  dockerImageTag: 2.6.4
+  dockerImageTag: 3.0.0
   dockerRepository: airbyte/destination-redshift
   documentationUrl: https://docs.airbyte.com/integrations/destinations/redshift
   githubIssueLabel: destination-redshift
@@ -24,6 +24,10 @@ data:
           This version introduces [Destinations V2](https://docs.airbyte.com/release_notes/upgrading_to_destinations_v2/#what-is-destinations-v2), which provides better error handling, incremental delivery of data for large syncs, and improved final table structures. To review the breaking changes, and how to upgrade, see [here](https://docs.airbyte.com/release_notes/upgrading_to_destinations_v2/#quick-start-to-upgrading). These changes will likely require updates to downstream dbt / SQL models, which we walk through [here](https://docs.airbyte.com/release_notes/upgrading_to_destinations_v2/#updating-downstream-transformations).
           Selecting `Upgrade` will upgrade **all** connections using this destination at their next sync. You can manually sync existing connections prior to the next scheduled sync to start the upgrade early.
         upgradeDeadline: "2024-03-15"
+      3.0.0:
+        message: >
+          Version 3.0.0 of destination-redshift removes support for the "standard inserts" mode. S3 staging was always preferred for being faster and less expensive, and as part of Airbyte 1.0, we are officially removing the inferior "standard inserts" mode. Upgrading to this version of the destination will require a configuration with an S3 staging area.
+        upgradeDeadline: "2024-07-31"
   resourceRequirements:
     jobSpecific:
       - jobType: sync

diff --git a/.../redshift/RedshiftStagingS3Destination.kt → ...stination/redshift/RedshiftDestination.kt b/.../redshift/RedshiftStagingS3Destination.kt → ...stination/redshift/RedshiftDestination.kt
@@ -73,7 +73,7 @@ import org.apache.commons.lang3.StringUtils
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-class RedshiftStagingS3Destination :
+class RedshiftDestination :
     AbstractJdbcDestination<RedshiftState>(
         DRIVER_CLASS,
         RedshiftSQLNameTransformer(),
@@ -355,8 +355,7 @@ class RedshiftStagingS3Destination :
     }
 
     companion object {
-        private val LOGGER: Logger =
-            LoggerFactory.getLogger(RedshiftStagingS3Destination::class.java)
+        private val LOGGER: Logger = LoggerFactory.getLogger(RedshiftDestination::class.java)
 
         val DRIVER_CLASS: String = DatabaseDriver.REDSHIFT.driverClassName
         val SSL_JDBC_PARAMETERS: Map<String, String> =
@@ -369,7 +368,7 @@ class RedshiftStagingS3Destination :
 
         private fun sshWrappedDestination(): Destination {
             return SshWrappedDestination(
-                RedshiftStagingS3Destination(),
+                RedshiftDestination(),
                 JdbcUtils.HOST_LIST_KEY,
                 JdbcUtils.PORT_LIST_KEY
             )
@@ -409,9 +408,9 @@ class RedshiftStagingS3Destination :
         @JvmStatic
         fun main(args: Array<String>) {
             val destination: Destination = sshWrappedDestination()
-            LOGGER.info("starting destination: {}", RedshiftStagingS3Destination::class.java)
+            LOGGER.info("starting destination: {}", RedshiftDestination::class.java)
             IntegrationRunner(destination).run(args)
-            LOGGER.info("completed destination: {}", RedshiftStagingS3Destination::class.java)
+            LOGGER.info("completed destination: {}", RedshiftDestination::class.java)
         }
     }
 }
diff --git a/...integration/java/io/airbyte/integrations/destination/redshift/RedshiftConnectionTest.java b/...integration/java/io/airbyte/integrations/destination/redshift/RedshiftConnectionTest.java
@@ -18,7 +18,7 @@
 public class RedshiftConnectionTest {
 
   private final JsonNode config = Jsons.deserialize(IOs.readFile(Path.of("secrets/config_staging.json")));
-  private final RedshiftStagingS3Destination destination = new RedshiftStagingS3Destination();
+  private final RedshiftDestination destination = new RedshiftDestination();
   private AirbyteConnectionStatus status;
 
   @Test

diff --git a/.../java/io/airbyte/integrations/destination/redshift/RedshiftDestinationAcceptanceTest.java b/.../java/io/airbyte/integrations/destination/redshift/RedshiftDestinationAcceptanceTest.java