changes for deployment to work fine (#187)

Author: Aadeesh11

.env.example

@@ -3,3 +3,5 @@ JWT_SECRET = somesupersecretstring
 REDIS_AUTH = Redis password you get while provisioning a Redis DB
 REDIS_URL = Redis DB connection string
 REDIS_PORT = Any port you want.
+REDIS_USERNAME = Username of the user that has access to the Redis DB
+INSTANCE = ec2 instance id

pubsub.js

@@ -5,6 +5,7 @@ const options = {
     host: process.env.REDIS_URL,
     port: process.env.REDIS_PORT,
     password: process.env.REDIS_AUTH,
+    username: process.env.REDIS_USERNAME,
     retryStrategy: times => {
         // reconnect after
         return Math.min(times * 50, 2000);

serverless.yml

@@ -5,6 +5,11 @@ useDotenv: true
 provider:
     name: aws
     runtime: nodejs14.x
+    #allows lambda function to access ec2
+    iamRoleStatements:
+        - Effect: "Allow"
+          Action: "*"
+          Resource: "*"
 functions:
     graphql:
         # this is formatted as <FILENAME>.<HANDLER>

serverless/functions/manager.js

@@ -18,7 +18,18 @@ const options = {
 
 const manageInstance = async () => {
     const status = await ec2Client.send(new DescribeInstancesCommand(params));
-    const state = status["Reservations"][0]["Instances"]["State"]["Status"];
+    const instances = status["Reservations"][0]["Instances"];
+    let state;
+    for (let i = 0; i < instances.length; i++) {
+        if (instances[i]["InstanceId"] === process.env.INSTANCE) {
+            state = instances[i]["State"]["Name"];
+            break;
+        }
+    }
+    if (state == undefined) {
+        console.log("Error", "Wrong instance ID");
+        return;
+    }
     const currentTime = new Date();
     const beacons = await Beacon.find({
         $or: [{ startsAt: { $gte: currentTime } }, { expiresAt: { $gte: currentTime } }],
@@ -35,7 +46,7 @@ const manageInstance = async () => {
             return o.startsAt;
         })
     );
-    const earliestEnd = Math.min.apply(
+    const latestEnd = Math.max.apply(
         Math,
         beacons.map(function (o) {
             return o.expiresAt;
@@ -50,7 +61,7 @@ const manageInstance = async () => {
             return data;
         }
     }
-    if (earliestEnd < currentTime) {
+    if (latestEnd < currentTime) {
         const data = await ec2Client.send(new StopInstancesCommand(params));
         console.log("ended instance", data.StoppingInstances);
         return data;