Fix serverless deployment and run lint

cisagov · May 10, 2024 · ed886c3 · ed886c3
1 parent ca80984
commit ed886c3
Show file tree

Hide file tree

Showing 8 changed files with 7,044 additions and 7,002 deletions.
diff --git a/backend/env.yml b/backend/env.yml
@@ -9,7 +9,7 @@ dev:
   ENDPOINT_TYPE: REGIONAL
   VPC_ENDPOINT: dummy
   REGION: us-east-1
-  
+
 staging:
   REGION: us-east-1
   ENDPOINT_TYPE: REGIONAL

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -79,9 +79,9 @@
     "prettier": "^3.0.0",
     "sentencer": "^0.2.1",
     "serverless": "^3.30",
-    "serverless-better-credentials": "^1.2.0",
     "serverless-domain-manager": "^7.0",
     "serverless-dotenv-plugin": "^6.0.0",
+    "serverless-plugin-ifelse": "^1.0.7",
     "serverless-webpack": "^5.11.0",
     "supertest": "^6.3",
     "ts-jest": "^27",

diff --git a/backend/serverless.yml b/backend/serverless.yml
@@ -14,6 +14,10 @@ custom:
     certificateName: ${file(env.yml):${self:provider.stage}.DOMAIN, ''}
     stage: ${self:provider.stage}
     createRoute53Record: false
+  serverlessIfElse:
+    - If: '"${file(env.yml):${self:provider.stage}.ENDPOINT_TYPE}" == "REGIONAL"'
+      Exclude:
+        - provider.vpcEndpointIds
 
 provider:
   name: aws
@@ -164,7 +168,7 @@ functions:
 
 
 plugins:
-  - serverless-better-credentials
   - serverless-domain-manager
   - serverless-webpack
   - serverless-dotenv-plugin
+  - serverless-plugin-ifelse
diff --git a/frontend/env.yml b/frontend/env.yml
@@ -1,6 +1,14 @@
 ---
 dev:
   FRONTEND_DOMAIN: ''
+  RESOURCE_POLICY:
+    - Effect: Allow
+      Principal: '*'
+      Action: execute-api:Invoke
+      Resource: execute-api:/${self:provider.stage}/*/*
+  ENDPOINT_TYPE: REGIONAL
+  VPC_ENDPOINT: dummy
+  REGION: us-east-1
 
 staging:
   REGION: us-east-1
@@ -87,3 +95,15 @@ prod-vpc:
     - ${ssm:/crossfeed/prod/SG_ID}
   subnetIds:
     - ${ssm:/crossfeed/prod/SUBNET_ID}
+
+staging-lz-vpc:
+  securityGroupIds:
+    - ${ssm:/crossfeed/staging/SG_ID}
+  subnetIds:
+    - ${ssm:/crossfeed/staging/SUBNET_ID}
+
+prod-lz-vpc:
+  securityGroupIds:
+    - ${ssm:/crossfeed/prod/SG_ID}
+  subnetIds:
+    - ${ssm:/crossfeed/prod/SUBNET_ID}
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -97,9 +97,9 @@
     "prettier": "^3.0.3",
     "sass": "^1.55.0",
     "serverless": "^3.30",
-    "serverless-better-credentials": "^1.2.0",
     "serverless-domain-manager": "^7.0",
     "serverless-http": "^3.2.0",
+    "serverless-plugin-ifelse": "^1.0.7",
     "serverless-webpack": "^5.11.0",
     "ts-jest": "^29.1.1",
     "typescript": "^4.8.4",

diff --git a/frontend/serverless.yml b/frontend/serverless.yml
@@ -14,6 +14,10 @@ custom:
     certificateName: ${file(env.yml):${self:provider.stage}.DOMAIN, ''}
     stage: ${self:provider.stage}
     createRoute53Record: false
+  serverlessIfElse:
+    - If: '"${file(env.yml):${self:provider.stage}.ENDPOINT_TYPE}" == "REGIONAL"'
+      Exclude:
+        - provider.vpcEndpointIds
 
 provider:
   name: aws
@@ -57,5 +61,5 @@ functions:
 
 plugins:
   - serverless-domain-manager
-  - serverless-better-credentials
   - serverless-webpack
+  - serverless-plugin-ifelse