Merge branch 'main' into dsingh14/linkry

Author: devksingh4

.github/workflows/deploy-dev.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -85,7 +85,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"

.github/workflows/deploy-prod.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -80,7 +80,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -109,7 +109,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"
@@ -152,7 +152,7 @@ jobs:
       - name: Set up Node for testing
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
       - uses: actions/checkout@v4
         env:
           HUSKY: "0"

Makefile

@@ -66,13 +66,15 @@ deploy_dev: check_account_dev build
 
 install:
 	yarn -D
+	pip install cfn-lint
 
 test_live_integration: install
 	yarn test:live
 
 test_unit: install
 	yarn typecheck
 	yarn lint
+	cfn-lint cloudformation/**/* --ignore-templates cloudformation/phony-swagger.yml
 	yarn prettier
 	yarn test:unit
 

cloudformation/main.yml

@@ -25,7 +25,6 @@ Parameters:
 
 Conditions:
   IsProd: !Equals [!Ref RunEnvironment, 'prod']
-  IsDev: !Equals [!Ref RunEnvironment, 'dev']
   ShouldAttachVpc:
     !Equals [true, !Ref VpcRequired]
 
@@ -34,7 +33,7 @@ Mappings:
     dev:
       LogRetentionDays: 7
     prod:
-      LogRetentionDays: 30
+      LogRetentionDays: 365
   ApiGwConfig:
     dev:
       ApiCertificateArn: arn:aws:acm:us-east-1:427040638965:certificate/63ccdf0b-d2b5-44f0-b589-eceffb935c23
@@ -121,13 +120,34 @@ Resources:
     Type: AWS::Serverless::Function
     DependsOn:
       - AppLogGroups
+    Metadata:
+      BuildMethod: esbuild
+      BuildProperties:
+        Format: esm
+        Minify: true
+        OutExtension:
+          - .js=.mjs
+        Target: "es2022"
+        Sourcemap: false
+        EntryPoints:
+          - api/lambda.js
+        External:
+          - aws-sdk
+        Banner:
+          - js=import path from 'path';
+            import { fileURLToPath } from 'url';
+            import { createRequire as topLevelCreateRequire } from 'module';
+            const require = topLevelCreateRequire(import.meta.url);
+            const __filename = fileURLToPath(import.meta.url);
+            const __dirname = path.dirname(__filename);
     Properties:
+      Architectures: [arm64]
       CodeUri: ../dist
       AutoPublishAlias: live
-      Runtime: nodejs20.x
+      Runtime: nodejs22.x
       Description: !Sub "${ApplicationFriendlyName} API Lambda"
       FunctionName: !Sub ${ApplicationPrefix}-lambda
-      Handler: api/lambda.handler
+      Handler: lambda.handler
       MemorySize: 512
       Role: !GetAtt AppSecurityRoles.Outputs.MainFunctionRoleArn
       Timeout: 60
@@ -149,6 +169,7 @@ Resources:
   IamGroupRolesTable:
     Type: 'AWS::DynamoDB::Table'
     DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
     Properties:
       BillingMode: 'PAY_PER_REQUEST'
       TableName: infra-core-api-iam-grouproles
@@ -165,6 +186,7 @@ Resources:
   IamUserRolesTable:
     Type: 'AWS::DynamoDB::Table'
     DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
     Properties:
       BillingMode: 'PAY_PER_REQUEST'
       TableName: infra-core-api-iam-userroles
@@ -181,6 +203,7 @@ Resources:
   EventRecordsTable:
     Type: 'AWS::DynamoDB::Table'
     DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
     Properties:
       BillingMode: 'PAY_PER_REQUEST'
       TableName: infra-core-api-events
@@ -234,6 +257,7 @@ Resources:
   CacheRecordsTable:
     Type: 'AWS::DynamoDB::Table'
     DeletionPolicy: "Retain"
+    UpdateReplacePolicy: "Retain"
     Properties:
       BillingMode: 'PAY_PER_REQUEST'
       TableName: infra-core-api-cache
@@ -317,14 +341,33 @@ Resources:
     Condition: IsProd
     Properties:
       AlarmName: !Sub ${ApplicationPrefix}-gateway-latency-high
-      AlarmDescription: !Sub 'Alarm if ${ApplicationPrefix} API gateway latency is > 3s.'
+      AlarmDescription: 'Average API gateway latency is > 1.25s for 2 minutes.'
       Namespace: 'AWS/ApiGateway'
       MetricName: 'Latency'
       Statistic: 'Average'
-      Period: '60'
+      Period: '120'
       EvaluationPeriods: '1'
       ComparisonOperator: 'GreaterThanThreshold'
-      Threshold: '3000'
+      Threshold: '1250'
+      AlarmActions:
+        - !Ref AlertSNSArn
+      Dimensions:
+        - Name: 'ApiName'
+          Value: !Sub ${ApplicationPrefix}-gateway
+
+  AppApiGatewayNoRequestsAlarm:
+    Type: 'AWS::CloudWatch::Alarm'
+    Condition: IsProd
+    Properties:
+      AlarmName: !Sub ${ApplicationPrefix}-gateway-no-requests
+      AlarmDescription: 'No requests have been received in the past 5 minutes.'
+      Namespace: 'AWS/ApiGateway'
+      MetricName: 'Count'
+      Statistic: 'Sum'
+      Period: '300'
+      EvaluationPeriods: '1'
+      ComparisonOperator: 'LessThanThreshold'
+      Threshold: '1'
       AlarmActions:
         - !Ref AlertSNSArn
       Dimensions:
@@ -336,7 +379,7 @@ Resources:
     Condition: IsProd
     Properties:
       AlarmName: !Sub ${ApplicationPrefix}-gateway-5xx
-      AlarmDescription: !Sub 'Alarm if ${ApplicationPrefix} API gateway 5XX errors are detected.'
+      AlarmDescription: 'More than 2 API gateway 5XX errors were detected.'
       Namespace: 'AWS/ApiGateway'
       MetricName: '5XXError'
       Statistic: 'Average'

package.json

@@ -11,48 +11,25 @@
   "scripts": {
     "build": "yarn workspaces run build && yarn lockfile-manage",
     "dev": "concurrently --names 'api,ui' 'yarn workspace infra-core-api run dev' 'yarn workspace infra-core-ui run dev'",
-    "lockfile-manage": "synp --with-workspace --source-file yarn.lock && cp package-lock.json dist/ && cp package.json dist/ && rm package-lock.json",
+    "lockfile-manage": "synp --with-workspace --source-file yarn.lock && cp package-lock.json dist/ && cp src/api/package.json dist/ && rm package-lock.json",
     "prettier": "yarn workspaces run prettier && prettier --check tests/**/*.ts",
     "prettier:write": "yarn workspaces run prettier:write && prettier --write tests/**/*.ts",
     "lint": "yarn workspaces run lint",
     "prepare": "node .husky/install.mjs || true",
     "typecheck": "yarn workspaces run typecheck",
-    "test:unit": "vitest run tests/unit && yarn workspace infra-core-ui run test:unit",
+    "test:unit": "vitest run tests/unit --config tests/unit/vitest.config.ts && yarn workspace infra-core-ui run test:unit",
     "test:unit-ui": "yarn test:unit --ui",
     "test:unit-watch": "vitest tests/unit",
     "test:live": "vitest tests/live",
     "test:live-ui": "yarn test:live --ui",
     "test:e2e": "playwright test",
     "test:e2e-ui": "playwright test --ui"
   },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.624.0",
-    "@aws-sdk/client-secrets-manager": "^3.624.0",
-    "@aws-sdk/util-dynamodb": "^3.624.0",
-    "@azure/msal-node": "^2.16.1",
-    "@fastify/auth": "^5.0.1",
-    "@fastify/aws-lambda": "^5.0.0",
-    "@fastify/caching": "^9.0.1",
-    "@fastify/cors": "^10.0.1",
-    "@touch4it/ical-timezones": "^1.9.0",
-    "discord.js": "^14.15.3",
-    "dotenv": "^16.4.5",
-    "fastify": "^5.1.0",
-    "fastify-plugin": "^4.5.1",
-    "ical-generator": "^7.2.0",
-    "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.1.0",
-    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.45",
-    "pluralize": "^8.0.0",
-    "zod": "^3.23.8",
-    "zod-to-json-schema": "^3.23.2",
-    "zod-validation-error": "^3.3.1"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@eslint/compat": "^1.1.1",
     "@playwright/test": "^1.49.1",
-    "@tsconfig/node20": "^20.1.4",
+    "@tsconfig/node22": "^22.0.0",
     "@types/node": "^22.1.0",
     "@types/pluralize": "^0.0.33",
     "@types/react": "^18.3.3",
@@ -81,7 +58,7 @@
     "husky": "^9.1.4",
     "identity-obj-proxy": "^3.0.0",
     "jsdom": "^24.1.1",
-    "node-ical": "^0.18.0",
+    "node-ical": "^0.20.1",
     "postcss": "^8.4.41",
     "postcss-preset-mantine": "^1.17.0",
     "postcss-simple-vars": "^7.0.1",
@@ -105,4 +82,4 @@
   "resolutions": {
     "pdfjs-dist": "^4.8.69"
   }
-}
+}