Merge branch 'master' into bump-version-s3-gcs-9th-April

airbyte-integrations/connectors/destination-gcs/src/main/java/io/airbyte/integrations/destination/gcs/GcsDestination.java

@@ -46,10 +46,10 @@ public AirbyteConnectionStatus check(final JsonNode config) {
       final AmazonS3 s3Client = destinationConfig.getS3Client();
 
       // Test single upload (for small files) permissions
-      S3Destination.testSingleUpload(s3Client, destinationConfig.getBucketName());
+      S3Destination.testSingleUpload(s3Client, destinationConfig.getBucketName(), destinationConfig.getBucketPath());
 
       // Test multipart upload with stream transfer manager
-      S3Destination.testMultipartUpload(s3Client, destinationConfig.getBucketName());
+      S3Destination.testMultipartUpload(s3Client, destinationConfig.getBucketName(), destinationConfig.getBucketPath());
 
       return new AirbyteConnectionStatus().withStatus(Status.SUCCEEDED);
     } catch (final Exception e) {

airbyte-integrations/connectors/destination-s3/src/main/java/io/airbyte/integrations/destination/s3/S3Destination.java

@@ -62,10 +62,10 @@ public AirbyteConnectionStatus check(final JsonNode config) {
       S3Destination.attemptS3WriteAndDelete(storageOperations, destinationConfig, destinationConfig.getBucketName());
 
       // Test single upload (for small files) permissions
-      testSingleUpload(s3Client, destinationConfig.getBucketName());
+      testSingleUpload(s3Client, destinationConfig.getBucketName(), destinationConfig.getBucketPath());
 
       // Test multipart upload with stream transfer manager
-      testMultipartUpload(s3Client, destinationConfig.getBucketName());
+      testMultipartUpload(s3Client, destinationConfig.getBucketName(), destinationConfig.getBucketPath());
 
       return new AirbyteConnectionStatus().withStatus(Status.SUCCEEDED);
     } catch (final Exception e) {
@@ -77,9 +77,12 @@ public AirbyteConnectionStatus check(final JsonNode config) {
     }
   }
 
-  public static void testSingleUpload(final AmazonS3 s3Client, final String bucketName) {
+  public static void testSingleUpload(final AmazonS3 s3Client, final String bucketName, String bucketPath) {
     LOGGER.info("Started testing if all required credentials assigned to user for single file uploading");
-    final String testFile = "test_" + System.currentTimeMillis();
+    if (bucketPath.endsWith("/")) {
+      throw new RuntimeException("Bucket Path should not end with /");
+    }
+    final String testFile = bucketPath + "/" + "test_" + System.currentTimeMillis();
     try {
       s3Client.putObject(bucketName, testFile, "this is a test file");
     } finally {
@@ -88,10 +91,12 @@ public static void testSingleUpload(final AmazonS3 s3Client, final String bucket
     LOGGER.info("Finished checking for normal upload mode");
   }
 
-  public static void testMultipartUpload(final AmazonS3 s3Client, final String bucketName) throws IOException {
+  public static void testMultipartUpload(final AmazonS3 s3Client, final String bucketName, String bucketPath) throws IOException {
     LOGGER.info("Started testing if all required credentials assigned to user for multipart upload");
-
-    final String testFile = "test_" + System.currentTimeMillis();
+    if (bucketPath.endsWith("/")) {
+      throw new RuntimeException("Bucket Path should not end with /");
+    }
+    final String testFile = bucketPath + "/" + "test_" + System.currentTimeMillis();
     final StreamTransferManager manager = StreamTransferManagerHelper.getDefault(
         bucketName,
         testFile,