#1906 dont kill terminated instances

yegor256 · Feb 28, 2024 · 439c395 · 439c395
1 parent 243750b
commit 439c395
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/com/rultor/agents/aws/PrunesInstances.java b/src/main/java/com/rultor/agents/aws/PrunesInstances.java
@@ -79,21 +79,25 @@ public void execute(final Talks talks) throws IOException {
         final Collection<String> seen = new LinkedList<>();
         for (final Reservation rsrv : res.getReservations()) {
             final Instance instance = rsrv.getInstances().get(0);
+            final String status = this.api.aws().describeInstanceStatus(
+                new DescribeInstanceStatusRequest()
+                    .withIncludeAllInstances(true)
+                    .withInstanceIds(instance.getInstanceId())
+            ).getInstanceStatuses().get(0).getInstanceState().getName();
             final String label = String.format(
                 "%s/%s/%s",
                 instance.getInstanceId(),
                 instance.getInstanceType(),
-                this.api.aws().describeInstanceStatus(
-                    new DescribeInstanceStatusRequest()
-                        .withIncludeAllInstances(true)
-                        .withInstanceIds(instance.getInstanceId())
-                ).getInstanceStatuses().get(0).getInstanceState().getName()
+                status
             );
             seen.add(label);
             final Date time = instance.getLaunchTime();
             if (time.getTime() > threshold) {
                 continue;
             }
+            if ("terminated".equals(status)) {
+                continue;
+            }
             this.api.aws().terminateInstances(
                 new TerminateInstancesRequest()
                     .withInstanceIds(instance.getInstanceId())