Update serverless

backend/package.json

@@ -11,6 +11,7 @@
     "@aws-sdk/client-ssm": "^3.414.0",
     "@elastic/elasticsearch": "~7.10.0",
     "@thefaultvault/tfv-cpe-parser": "^1.3.0",
+    "@types/dockerode": "^3.3.19",
     "amqplib": "^0.10.3",
     "aws-sdk": "^2.1551.0",
     "axios": "^1.6",
@@ -22,7 +23,6 @@
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "date-fns": "^3.3.1",
-    "@types/dockerode": "^3.3.19",
     "express": "^4.18.1",
     "global-agent": "^2.2.0",
     "got": "^11.8.5",
@@ -78,6 +78,7 @@
     "sentencer": "^0.2.1",
     "serverless": "^3.30",
     "serverless-domain-manager": "^7.0",
+    "serverless-dotenv-plugin": "^6.0.0",
     "serverless-webpack": "^5.11.0",
     "supertest": "^6.3",
     "ts-jest": "^27",

backend/serverless.yml

@@ -47,7 +47,7 @@ provider:
             - cognito-idp:AdminDisableUser
             - cognito-idp:ListUsers
             - cognito-idp:AdminSetUserPassword
-          Resource: "arn:aws:cognito-idp:${self:provider.region}:${aws:accountId}:userpool/${file(env.yml):${self:provider.stage}.REACT_APP_USER_POOL_ID}"
+          Resource: "arn:aws:cognito-idp:${self:provider.region}:${aws:accountId}:userpool/${env:REACT_APP_USER_POOL_ID}"
         - Effect: Allow
           Action:
             - ecs:RunTask
@@ -136,3 +136,4 @@ functions:
 plugins:
   - serverless-domain-manager
   - serverless-webpack
+  - serverless-dotenv-plugin

backend/src/tasks/functions.yml

@@ -40,7 +40,7 @@ checkUserExpiration:
         - "cognito-idp:AdminDisableUser"
         - "cognito-idp:ListUsers"
         - "cognito-idp:AdminSetUserPassword"
-      Resource: "arn:aws:cognito-idp:${self:provider.region}:${aws:accountId}:userpool/${file(env.yml):${self:provider.stage}.REACT_APP_USER_POOL_ID}"
+      Resource: "arn:aws:cognito-idp:${self:provider.region}:${aws:accountId}:userpool/${env:REACT_APP_USER_POOL_ID}"
 
 
 scanExecution: