Merge pull request #13 from LorenzoDrudi/feature/refactor

v1.1.1

README.md

@@ -13,8 +13,8 @@
 JavaScript Github Action to clean up AWS running instances (in a specified AWS region) without a Github Runner linked to them. \
 To identify the instances are used two [tags](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html):
 
-1. Key: `Name`, Value: `<REPO_NAME> Github Runner'` (insert the name of your repo).
-2. Key: `Runner`, Value: `<Name of the runner linked to the instance` (it's the value used to understand if its linked runner is online, it must be unique!). 
+1. Key: `Name`, Value: `<REPO_NAME> Github Runner` (insert the name of your repo).
+2. Key: `Runner`, Value: `<Name of the runner linked to the instance>` (it's the value used to understand if its linked runner is online, it must be unique!). 
 
 It works perfectly with the runners deployed using [ephemeral-github-runner](https://github.com/pavlovic-ivan/ephemeral-github-runner) (see also the related [github action](https://github.com/LorenzoDrudi/ephemeral-github-runner-action)).
 

src/index.js

@@ -7,27 +7,26 @@ async function run() {
   try {
     const REPO_NAME = core.getInput('repo-name');
     const REPO_OWNER = core.getInput('repo-owner');
+    const NAME_TAG = `${REPO_NAME} Github Runner`;
     const ROGUE_INSTANCE = 2;
-    const PARAMS = { InstanceIds: []};
+    const PARAMS = { InstanceIds: [] };
     // Get all the infos about the instances in the specified aws region.
     const DATA = await ec2Client.send(new DescribeInstancesCommand({}));
     // Get all the runners linked to the repo
     const RUNNERS_NAME = await getRepoRunningRunnersName(REPO_NAME, REPO_OWNER);
 
     // Iterate over the instances.
-    for (const reservation of DATA.Reservations) {
-      for (const instance of reservation.Instances) {
-        if (instance.State.Name === 'running') {
-          const NAME_TAG = `${REPO_NAME} Github Runner`;
-          const CHECK = instance.Tags
-            .filter(tag => (tag.Key === 'Name' && tag.Value === NAME_TAG)
-              || (tag.Key === 'Runner' && !RUNNERS_NAME.includes(tag.Value)))
-            .length;
-          if (CHECK === ROGUE_INSTANCE) {
-            const ID = instance.InstanceId;
-            PARAMS.InstanceIds.push(ID);
-          }
-        }
+    const RUNNING_INSTANCES = DATA.Reservations
+      .flatMap(reservation => reservation.Instances)
+      .filter(instance => instance.State.Name === 'running');
+    for (const instance of RUNNING_INSTANCES) {
+      const CHECK = instance.Tags
+        .filter(tag => (tag.Key === 'Name' && tag.Value === NAME_TAG)
+          || (tag.Key === 'Runner' && !RUNNERS_NAME.includes(tag.Value)))
+        .length;
+      if (CHECK === ROGUE_INSTANCE) {
+        const ID = instance.InstanceId;
+        PARAMS.InstanceIds.push(ID);
       }
     }
 
@@ -43,3 +42,4 @@ async function run() {
 }
 
 run();
+