5983 Add dependency in BulkExportTaskResources

Author: patchwork01

java/cdk/src/main/java/sleeper/cdk/stack/SleeperCoreStacks.java

@@ -19,6 +19,7 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import software.amazon.awscdk.CustomResource;
 import software.amazon.awscdk.services.cloudwatch.IMetric;
 import software.amazon.awscdk.services.ecs.ICluster;
 import software.amazon.awscdk.services.iam.IGrantable;
@@ -218,6 +219,13 @@ public void addAutoStopEcsClusterTasks(Construct scope, ICluster cluster) {
         autoStopEcsStack.addAutoStopEcsClusterTasks(scope, cluster);
     }
 
+    public void addAutoStopEcsClusterTasksAfterTaskCreatorIsDeleted(Construct scope, ICluster cluster, IFunction taskCreator) {
+        CustomResource autoStop = autoStopEcsStack.addAutoStopEcsClusterTasks(scope, cluster);
+        // This dependency means that during teardown the task creator lambda will be deleted before ECS tasks are stopped.
+        // This is important otherwise more tasks may be created as they are being stopped.
+        taskCreator.getNode().addDependency(autoStop);
+    }
+
     public AutoStopEcsClusterTasksStack getAutoStopEcsStack() {
         return autoStopEcsStack;
     }

java/cdk/src/main/java/sleeper/cdk/stack/bulkexport/BulkExportTaskResources.java

@@ -82,11 +82,12 @@ public BulkExportTaskResources(
         this.props = props;
         this.instanceProperties = props.getInstanceProperties();
         this.jobsQueue = jobsQueue;
-        ecsClusterForBulkExportTasks(coreStacks, jarsBucket, resultsBucket);
-        lambdaToCreateTasks(coreStacks, lambdaCode);
+        Cluster cluster = ecsClusterForBulkExportTasks(coreStacks, jarsBucket, resultsBucket);
+        IFunction taskCreator = lambdaToCreateTasks(coreStacks, lambdaCode);
+        coreStacks.addAutoStopEcsClusterTasksAfterTaskCreatorIsDeleted(stack, cluster, taskCreator);
     }
 
-    private void lambdaToCreateTasks(SleeperCoreStacks coreStacks, SleeperLambdaCode lambdaCode) {
+    private IFunction lambdaToCreateTasks(SleeperCoreStacks coreStacks, SleeperLambdaCode lambdaCode) {
         String instanceId = Utils.cleanInstanceId(instanceProperties);
         String functionName = String.join("-", "sleeper",
                 instanceId, "bulk-export-tasks-creator");
@@ -128,9 +129,11 @@ private void lambdaToCreateTasks(SleeperCoreStacks coreStacks, SleeperLambdaCode
                 .build();
         instanceProperties.set(BULK_EXPORT_TASK_CREATION_LAMBDA_FUNCTION, handler.getFunctionName());
         instanceProperties.set(BULK_EXPORT_TASK_CREATION_CLOUDWATCH_RULE, rule.getRuleName());
+
+        return handler;
     }
 
-    private void ecsClusterForBulkExportTasks(
+    private Cluster ecsClusterForBulkExportTasks(
             SleeperCoreStacks coreStacks, IBucket jarsBucket, IBucket resultsBucket) {
         VpcLookupOptions vpcLookupOptions = VpcLookupOptions.builder()
                 .vpcId(instanceProperties.get(VPC_ID))
@@ -167,8 +170,7 @@ private void ecsClusterForBulkExportTasks(
                 .build();
         new CfnOutput(stack, BULK_EXPORT_CLUSTER_NAME, bulkExportClusterProps);
 
-        coreStacks.addAutoStopEcsClusterTasks(stack, cluster);
-
+        return cluster;
     }
 
     private static PolicyStatement runTasksPolicyStatement() {

java/cdk/src/main/java/sleeper/cdk/stack/core/AutoStopEcsClusterTasksStack.java

@@ -97,10 +97,11 @@ private void createLambda(InstanceProperties instanceProperties, SleeperJarsInBu
     /**
      * Adds a custom resource to stop tasks in an ECS cluster.
      *
-     * @param scope   the stack to add the custom resource to
-     * @param cluster the ECS cluster
+     * @param  scope   the stack to add the custom resource to
+     * @param  cluster the ECS cluster
+     * @return         the custom resource that will stop tasks when it is deleted
      */
-    public void addAutoStopEcsClusterTasks(Construct scope, ICluster cluster) {
+    public CustomResource addAutoStopEcsClusterTasks(Construct scope, ICluster cluster) {
 
         String id = cluster.getNode().getId() + "-AutoStop";
 
@@ -112,6 +113,7 @@ public void addAutoStopEcsClusterTasks(Construct scope, ICluster cluster) {
 
         customResource.getNode().addDependency(cluster);
 
+        return customResource;
     }
 
 }