Destination S3: Adapt kotlin CDK (#36869)

gisripa · web-flow · commit 5ea2b93c38ee · 2024-04-08T12:15:01.000-07:00
diff --git a/airbyte-integrations/connectors/destination-s3/build.gradle b/airbyte-integrations/connectors/destination-s3/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.10.2'
+    cdkVersionRequired = '0.29.8'
     features = ['db-destinations', 's3-destinations']
     useLocalCdk = false
 }
diff --git a/airbyte-integrations/connectors/destination-s3/metadata.yaml b/airbyte-integrations/connectors/destination-s3/metadata.yaml
@@ -2,7 +2,7 @@ data:
   connectorSubtype: file
   connectorType: destination
   definitionId: 4816b78f-1489-44c1-9060-4b19d5fa9362
-  dockerImageTag: 0.5.9
+  dockerImageTag: 0.6.0
   dockerRepository: airbyte/destination-s3
   githubIssueLabel: destination-s3
   icon: s3.svg
diff --git a/airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncrypt.java b/airbyte-integrations/connectors/destination-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/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/S3DestinationStrictEncryptTest.java b/airbyte-integrations/connectors/destination-s3/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/airbyte-integrations/connectors/destination-s3/src/test/java/io/airbyte/integrations/destination/s3/S3DestinationTest.java b/airbyte-integrations/connectors/destination-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");
   }
 
diff --git a/docs/integrations/destinations/s3.md b/docs/integrations/destinations/s3.md
@@ -401,8 +401,9 @@ In order for everything to work correctly, it is also necessary that the user wh
 ## CHANGELOG
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                              |
-| :------ | :--------- | :--------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 0.5.9 | 2024-02-22 | [35569](https://github.com/airbytehq/airbyte/pull/35569) | Fix logging bug. |
+|:--------|:-----------|:-----------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.6.0   | 2024-04-08 | [36869](https://github.com/airbytehq/airbyte/pull/36869)   | Adapt to CDK 0.29.8; Kotlin converted code.                                                                                                          |
+| 0.5.9   | 2024-02-22 | [35569](https://github.com/airbytehq/airbyte/pull/35569)   | Fix logging bug.                                                                                                                                     |
 | 0.5.8   | 2024-01-03 | [#33924](https://github.com/airbytehq/airbyte/pull/33924)  | Add new ap-southeast-3 AWS region                                                                                                                    |
 | 0.5.7   | 2023-12-28 | [#33788](https://github.com/airbytehq/airbyte/pull/33788)  | Thread-safe fix for file part names                                                                                                                  |
 | 0.5.6   | 2023-12-08 | [#33263](https://github.com/airbytehq/airbyte/pull/33263)  | (incorrect filename format, do not use) Adopt java CDK version 0.7.0.                                                                                |

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`airbyteJavaConnector {`
`7`		`- cdkVersionRequired = '0.10.2'`
	`7`	`+ cdkVersionRequired = '0.29.8'`
`8`	`8`	`features = ['db-destinations', 's3-destinations']`
`9`	`9`	`useLocalCdk = false`
`10`	`10`	`}`