Merge branch 'main' of github.com:Pocket/pocket-monorepo into github-…

…actions
Pocket · Aug 20, 2024 · a74687c · a74687c
2 parents be9fa9e + 1fa1816
commit a74687c
Show file tree

Hide file tree

Showing 84 changed files with 1,121 additions and 1,623 deletions.
diff --git a/.github/actions/cdktf/action.yml b/.github/actions/cdktf/action.yml
@@ -86,6 +86,7 @@ runs:
       env:
         TERRAFORM_TOKEN: ${{ inputs.pagerduty-token }}
         GITHUB_TOKEN: ${{ inputs.github-token }}
+        PAGERDUTY_TOKEN: ${{ inputs.pagerduty-token }}
       run: |
         cd ${{ inputs.stack-output-path }}
         if [ "${{ inputs.behavior }}" = "apply" ]; then

diff --git a/.github/actions/raw-terraform/action.yml b/.github/actions/raw-terraform/action.yml
@@ -84,6 +84,7 @@ runs:
       env:
         TERRAFORM_TOKEN: ${{ inputs.pagerduty-token }}
         GITHUB_TOKEN: ${{ inputs.github-token }}
+        PAGERDUTY_TOKEN: ${{ inputs.pagerduty-token }}
       run: |
         cd ${{ inputs.stack-output-path }}
         if [ "${{ inputs.behavior }}" = "apply" ]; then

diff --git a/infrastructure/account-data-deleter/package.json b/infrastructure/account-data-deleter/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/account-delete-monitor/package.json b/infrastructure/account-delete-monitor/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/annotations-api/package.json b/infrastructure/annotations-api/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/braze/package.json b/infrastructure/braze/package.json
@@ -25,6 +25,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/client-api/package.json b/infrastructure/client-api/package.json
@@ -27,6 +27,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/feature-flags/package.json b/infrastructure/feature-flags/package.json
@@ -26,6 +26,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/fxa-webhook-proxy/package.json b/infrastructure/fxa-webhook-proxy/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/image-api/package.json b/infrastructure/image-api/package.json
@@ -27,6 +27,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/instant-sync-events/package.json b/infrastructure/instant-sync-events/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/list-api/package.json b/infrastructure/list-api/package.json
@@ -27,6 +27,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/parser-graphql-wrapper/package.json b/infrastructure/parser-graphql-wrapper/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/pocket-event-bridge/package.json b/infrastructure/pocket-event-bridge/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/push-server/package.json b/infrastructure/push-server/package.json
@@ -27,6 +27,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/sendgrid-data/package.json b/infrastructure/sendgrid-data/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/shareable-lists-api/package.json b/infrastructure/shareable-lists-api/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/shared-snowplow-consumer/package.json b/infrastructure/shared-snowplow-consumer/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/shares-api/package.json b/infrastructure/shares-api/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/transactional-emails/package.json b/infrastructure/transactional-emails/package.json
@@ -29,6 +29,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/user-api/package.json b/infrastructure/user-api/package.json
@@ -26,6 +26,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/v3-proxy-api/package.json b/infrastructure/v3-proxy-api/package.json
@@ -28,6 +28,6 @@
     "@types/node": "^20.16",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/infrastructure/v3-proxy-api/src/main.ts b/infrastructure/v3-proxy-api/src/main.ts
@@ -8,10 +8,6 @@ import {
 } from '@cdktf/provider-aws';
 import { provider as localProvider } from '@cdktf/provider-local';
 import { provider as nullProvider } from '@cdktf/provider-null';
-import {
-  provider as pagerdutyProvider,
-  dataPagerdutyEscalationPolicy,
-} from '@cdktf/provider-pagerduty';
 import {
   PocketALBApplication,
   PocketPagerDuty,
@@ -29,9 +25,6 @@ class Stack extends TerraformStack {
       region: 'us-east-1',
       defaultTags: [{ tags: config.tags }],
     });
-    new pagerdutyProvider.PagerdutyProvider(this, 'pagerduty_provider', {
-      token: undefined,
-    });
     new localProvider.LocalProvider(this, 'local_provider');
     new nullProvider.NullProvider(this, 'null_provider');
 
@@ -87,23 +80,7 @@ class Stack extends TerraformStack {
       return undefined;
     }
 
-    const nonCriticalEscalationPolicyId =
-      new dataPagerdutyEscalationPolicy.DataPagerdutyEscalationPolicy(
-        this,
-        'non_critical_escalation_policy',
-        {
-          name: 'Pocket On-Call: Default Non-Critical - Tier 2+ (Former Backend Temporary Holder)',
-        },
-      ).id;
-
-    return new PocketPagerDuty(this, 'pagerduty', {
-      prefix: config.prefix,
-      service: {
-        // This is a Tier 2 service and as such only raises non-critical alarms.
-        criticalEscalationPolicyId: nonCriticalEscalationPolicyId,
-        nonCriticalEscalationPolicyId: nonCriticalEscalationPolicyId,
-      },
-    });
+    return undefined;
   }
 
   /**

diff --git a/lambdas/account-data-deleter-batch-delete/package.json b/lambdas/account-data-deleter-batch-delete/package.json
@@ -26,15 +26,15 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/lodash": "4.17.7",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.spec.ts b/lambdas/account-data-deleter-batch-delete/src/externalCaller/deleteMutation.spec.ts
@@ -1,6 +1,6 @@
 import { config } from '../config';
 import { deleteUserMutationCaller, userApiCalls } from './deleteMutation';
-import nock = require('nock');
+import nock from 'nock';
 
 describe('deleteUser mutation test', () => {
   const testUserId = '1001';

diff --git a/lambdas/account-data-deleter-batch-delete/src/index.ts b/lambdas/account-data-deleter-batch-delete/src/index.ts
@@ -36,7 +36,7 @@ export async function deleteUsers(dynamoUtils: BatchDeleteDyanmoClient) {
     try {
       const deletedId = await deleteUserMutationCaller(userId.toString());
       deletedUserIds.push(parseInt(deletedId));
-    } catch (e) {
+    } catch {
       Sentry.captureException({ message: `unable to delete userId ${userId}` });
       console.log(`unable to delete userId ${userId}`);
     }

diff --git a/lambdas/account-data-deleter-events/package.json b/lambdas/account-data-deleter-events/package.json
@@ -25,14 +25,14 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/account-delete-monitor/package.json b/lambdas/account-delete-monitor/package.json
@@ -25,14 +25,14 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/annotations-api-events/package.json b/lambdas/annotations-api-events/package.json
@@ -22,14 +22,14 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/fxa-webook-proxy-gateway/package.json b/lambdas/fxa-webook-proxy-gateway/package.json
@@ -27,17 +27,17 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/jwk-to-pem": "^2.0.1",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
     "nodemon": "3.1.4",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/fxa-webook-proxy-sqs/package.json b/lambdas/fxa-webook-proxy-sqs/package.json
@@ -26,16 +26,16 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/node": "^20.16",
     "jest": "29.7.0",
     "nock": "14.0.0-beta.11",
     "nodemon": "3.1.4",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/instant-sync-events/package.json b/lambdas/instant-sync-events/package.json
@@ -25,13 +25,13 @@
   "devDependencies": {
     "@aws-sdk/client-sqs": "3.629.0",
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/node": "^20.16",
     "jest": "29.7.0",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }
diff --git a/lambdas/sendgrid-data/package.json b/lambdas/sendgrid-data/package.json
@@ -22,13 +22,13 @@
   },
   "devDependencies": {
     "@pocket-tools/eslint-config": "workspace:*",
-    "@types/aws-lambda": "8.10.141",
+    "@types/aws-lambda": "8.10.143",
     "@types/jest": "29.5.12",
     "@types/node": "^20.16",
     "jest": "29.7.0",
-    "ts-jest": "29.2.3",
+    "ts-jest": "29.2.4",
     "ts-node": "10.9.2",
     "tsconfig": "workspace:*",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   }
 }