destinations-s3-cdk-upgrade

airbytehq · Apr 5, 2024 · 22bf871 · 22bf871
1 parent 7a07bb3
commit 22bf871
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/airbyte-integrations/connectors/destination-s3/build.gradle b/airbyte-integrations/connectors/destination-s3/build.gradle
@@ -6,7 +6,7 @@ plugins {
 airbyteJavaConnector {
     cdkVersionRequired = '0.10.2'
     features = ['db-destinations', 's3-destinations']
-    useLocalCdk = false
+    useLocalCdk = true
 }
 
 airbyteJavaConnector.addCdkDependencies()

diff --git a/...n-s3/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncrypt.java b/...n-s3/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncrypt.java
@@ -25,7 +25,7 @@ protected S3DestinationStrictEncrypt(final S3DestinationConfigFactory configFact
 
   @Override
   public AirbyteConnectionStatus check(final JsonNode config) {
-    final S3DestinationConfig destinationConfig = this.configFactory.getS3DestinationConfig(config, super.storageProvider());
+    final S3DestinationConfig destinationConfig = this.getConfigFactory().getS3DestinationConfig(config, super.storageProvider());
 
     // Fails early to avoid extraneous validations checks if custom endpoint is not secure
     if (!S3BaseChecks.testCustomEndpointSecured(destinationConfig.getEndpoint())) {

diff --git a/.../src/test/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncryptTest.java b/.../src/test/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncryptTest.java
@@ -18,6 +18,7 @@
 import io.airbyte.cdk.integrations.destination.s3.S3DestinationConfig;
 import io.airbyte.cdk.integrations.destination.s3.S3DestinationConfigFactory;
 import io.airbyte.cdk.integrations.destination.s3.StorageProvider;
+import io.airbyte.commons.json.Jsons;
 import io.airbyte.protocol.models.v0.AirbyteConnectionStatus;
 import io.airbyte.protocol.models.v0.AirbyteConnectionStatus.Status;
 import org.junit.jupiter.api.BeforeEach;
@@ -55,7 +56,7 @@ public S3DestinationConfig getS3DestinationConfig(final JsonNode config, final S
   @Test
   public void checksCustomEndpointIsHttpsOnly() {
     final S3Destination destinationWithHttpsOnlyEndpoint = new S3DestinationStrictEncrypt(factoryConfig);
-    final AirbyteConnectionStatus status = destinationWithHttpsOnlyEndpoint.check(null);
+    final AirbyteConnectionStatus status = destinationWithHttpsOnlyEndpoint.check(Jsons.emptyObject());
     assertEquals(Status.SUCCEEDED, status.getStatus(), "custom endpoint did not contain `s3-accesspoint`");
   }
 
@@ -79,7 +80,7 @@ public S3DestinationConfig getS3DestinationConfig(final JsonNode config, final S
       }
 
     });
-    final AirbyteConnectionStatus status = destinationWithStandardUnsecuredEndpoint.check(null);
+    final AirbyteConnectionStatus status = destinationWithStandardUnsecuredEndpoint.check(Jsons.emptyObject());
     assertEquals(Status.FAILED, status.getStatus());
   }
 

diff --git a/...estination-s3/src/test/java/io/airbyte/integrations/destination/s3/S3DestinationTest.java b/...estination-s3/src/test/java/io/airbyte/integrations/destination/s3/S3DestinationTest.java
@@ -27,6 +27,7 @@
 import io.airbyte.cdk.integrations.destination.s3.S3DestinationConfigFactory;
 import io.airbyte.cdk.integrations.destination.s3.S3StorageOperations;
 import io.airbyte.cdk.integrations.destination.s3.StorageProvider;
+import io.airbyte.commons.json.Jsons;
 import io.airbyte.protocol.models.v0.AirbyteConnectionStatus;
 import io.airbyte.protocol.models.v0.AirbyteConnectionStatus.Status;
 import org.junit.jupiter.api.BeforeEach;
@@ -75,7 +76,7 @@ public S3DestinationConfig getS3DestinationConfig(final JsonNode config, final S
   public void checksS3WithoutListObjectPermission() {
     final S3Destination destinationFail = new S3Destination(factoryConfig);
     doThrow(new AmazonS3Exception("Access Denied")).when(s3).listObjects(any(ListObjectsRequest.class));
-    final AirbyteConnectionStatus status = destinationFail.check(null);
+    final AirbyteConnectionStatus status = destinationFail.check(Jsons.emptyObject());
     assertEquals(Status.FAILED, status.getStatus(), "Connection check should have failed");
     assertTrue(status.getMessage().indexOf("Access Denied") > 0, "Connection check returned wrong failure message");
   }
@@ -86,7 +87,7 @@ public void checksS3WithoutListObjectPermission() {
    */
   public void checksS3WithListObjectPermission() {
     final S3Destination destinationSuccess = new S3Destination(factoryConfig);
-    final AirbyteConnectionStatus status = destinationSuccess.check(null);
+    final AirbyteConnectionStatus status = destinationSuccess.check(Jsons.emptyObject());
     assertEquals(Status.SUCCEEDED, status.getStatus(), "Connection check should have succeeded");
   }