Fix consecutive hyphens in export id (#6194)

Signed-off-by: Hai Yan <oeyh@amazon.com>

Author: oeyh

data-prepper-plugins/rds-source/src/main/java/org/opensearch/dataprepper/plugins/source/rds/export/ExportTaskManager.java

@@ -76,7 +76,10 @@ public String checkExportStatus(String exportTaskId) {
 
     private String generateExportTaskId(String snapshotArn) {
         String snapshotId = Arn.fromString(snapshotArn).resource().resource();
-        return truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16) + "-export-" + UUID.randomUUID().toString().substring(0, 8);
+        String truncatedSnapshotId = truncateString(snapshotId, EXPORT_TASK_ID_MAX_LENGTH - 16);
+        // Remove trailing hyphens to prevent consecutive hyphens in the export task identifier
+        truncatedSnapshotId = truncatedSnapshotId.replaceAll("-+$", "");
+        return truncatedSnapshotId + "-export-" + UUID.randomUUID().toString().substring(0, 8);
     }
 
     private String truncateString(String originalString, int maxLength) {

data-prepper-plugins/rds-source/src/test/java/org/opensearch/dataprepper/plugins/source/rds/export/ExportTaskManagerTest.java

@@ -30,6 +30,8 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.startsWith;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.lenient;
@@ -159,6 +161,46 @@ private static Stream<Arguments> provideStartExportTaskTestParameters() {
         );
     }
 
+    @ParameterizedTest
+    @MethodSource("provideSnapshotIdsWithTrailingHyphens")
+    void test_generateExportTaskId_handles_various_trailing_hyphen_scenarios(String snapshotIdWithTrailingHyphens, String expectedPrefix) {
+        final String snapshotArn = "arn:aws:rds:us-east-1:123456789012:snapshot:" + snapshotIdWithTrailingHyphens;
+        final String iamRoleArn = "arn:aws:iam:us-east-1:123456789012:role:" + UUID.randomUUID();
+        final String bucket = UUID.randomUUID().toString();
+        final String prefix = UUID.randomUUID().toString();
+        final String kmsKey = UUID.randomUUID().toString();
+        final StartExportTaskResponse response = mock(StartExportTaskResponse.class);
+        when(rdsClient.startExportTask(any(StartExportTaskRequest.class))).thenReturn(response);
+        when(response.status()).thenReturn("STARTING");
+
+        final String exportTaskId = exportTaskManager.startExportTask(snapshotArn, iamRoleArn, bucket, prefix, kmsKey, List.of());
+
+        final ArgumentCaptor<StartExportTaskRequest> exportTaskRequestArgumentCaptor =
+                ArgumentCaptor.forClass(StartExportTaskRequest.class);
+        verify(rdsClient).startExportTask(exportTaskRequestArgumentCaptor.capture());
+
+        final StartExportTaskRequest actualRequest = exportTaskRequestArgumentCaptor.getValue();
+        final String actualExportTaskId = actualRequest.exportTaskIdentifier();
+
+        // Verify that there are no consecutive hyphens in the export task identifier
+        assertThat(actualExportTaskId, not(containsString("--")));
+        // Verify that it still contains the expected components
+        assertThat(actualExportTaskId, containsString("-export-"));
+        // Verify that it starts with the expected prefix (after removing trailing hyphens)
+        assertThat(actualExportTaskId, startsWith(expectedPrefix));
+    }
+
+    private static Stream<Arguments> provideSnapshotIdsWithTrailingHyphens() {
+        return Stream.of(
+                Arguments.of("snapshot-name-", "snapshot-name"),
+                Arguments.of("snapshot-name--", "snapshot-name"),
+                Arguments.of("snapshot-name---", "snapshot-name"),
+                Arguments.of("my-cluster-snapshot-", "my-cluster-snapshot"),
+                Arguments.of("complex-db-cluster-backup-snapshot-", "complex-db-cluster-backup-snapshot"),
+                Arguments.of("normal-snapshot", "normal-snapshot") // No trailing hyphen case
+        );
+    }
+
     private ExportTaskManager createObjectUnderTest() {
         return new ExportTaskManager(rdsClient, rdsSourceAggregateMetrics);
     }