Configure export to use AWS Batch jobid as export id when available

aws · Jul 11, 2024 · 5b9421f · 5b9421f
1 parent c9dac01
commit 5b9421f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/amazonaws/services/neptune/cluster/CloneCluster.java b/src/main/java/com/amazonaws/services/neptune/cluster/CloneCluster.java
@@ -13,6 +13,7 @@
 package com.amazonaws.services.neptune.cluster;
 
 import com.amazonaws.services.neptune.AmazonNeptune;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -51,7 +52,11 @@ public Cluster cloneCluster(ConnectionConfig connectionConfig, ConcurrencyConfig
         }
 
         String clusterId = originalClusterMetadata.clusterId();
-        String targetClusterId = String.format("neptune-export-cluster-%s", UUID.randomUUID().toString().substring(0, 5));
+        String targetClusterIdSuffix = System.getenv("AWS_BATCH_JOB_ID"); // Use AWS Batch job id if running in Neptune Export Service
+        if (StringUtils.isEmpty(targetClusterIdSuffix)) {
+            targetClusterIdSuffix = UUID.randomUUID().toString().substring(0, 5);
+        }
+        String targetClusterId = String.format("neptune-export-cluster-%s", targetClusterIdSuffix);
 
         AddCloneTask addCloneTask = new AddCloneTask(
                 clusterId,