Fix conflicts

openaddresses · Feb 7, 2025 · 1d537a0 · 1d537a0
2 parents 0d7eb03 + b11e386
commit 1d537a0
Show file tree

Hide file tree

Showing 28 changed files with 877 additions and 369 deletions.
diff --git a/.github/workflows/ecr_task.yml b/.github/workflows/ecr_task.yml
@@ -17,7 +17,7 @@ jobs:
         if: github.event.pull_request.draft == false
         steps:
             - name: Configure AWS Credentials
-              uses: aws-actions/configure-aws-credentials@v1
+              uses: aws-actions/configure-aws-credentials@v4
               with:
                   aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
                   aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/README.md b/README.md
@@ -27,9 +27,9 @@ On every commit, GitHub actions will build the latest Docker image and push it t
 This parameter will be populated automatically by the `deploy` cli and simply points the stack
 to use the correspondingly Docker image from ECR.
 
-#### MapboxToken
+#### ProtomapsKey
 
-A read-only Mapbox API token for displaying base maps underneath our address data. (Token should start with `pk.`)
+A Protomaps API key ([from here](https://protomaps.com/dashboard)) for displaying base maps underneath our address data.
 
 #### Bucket
 

diff --git a/api/lib/batch.js b/api/lib/batch.js
@@ -104,7 +104,7 @@ export async function trigger(event) {
             jobQueue: event.type === 'job' ? t3_queue : t3_priority_queue,
             jobName: `OA_Job_${event.job}`,
             containerOverrides: {
-                command: ['./task.js'],
+                command: ['node', 'task.js'],
                 environment: [
                     { name: 'OA_JOB_ID', value: String(event.job) }
                 ]
@@ -121,7 +121,7 @@ export async function trigger(event) {
             jobQueue: t3_priority_queue,
             jobName: `OA_Export_${event.id}`,
             containerOverrides: {
-                command: ['./export.js'],
+                command: ['node', 'export.js'],
                 environment: [
                     { name: 'OA_EXPORT_ID', value: String(event.id) }
                 ]
@@ -136,7 +136,7 @@ export async function trigger(event) {
             jobQueue: mega_queue,
             jobName: 'OA_Collect',
             containerOverrides: {
-                command: ['./collect.js'],
+                command: ['node', 'collect.js'],
                 environment: []
             }
         };
@@ -146,7 +146,7 @@ export async function trigger(event) {
             jobQueue: mega_queue,
             jobName: 'OA_Fabric',
             containerOverrides: {
-                command: ['./fabric.js'],
+                command: ['node', 'fabric.js'],
                 environment: []
             }
         };
@@ -156,7 +156,7 @@ export async function trigger(event) {
             jobQueue: t3_queue,
             jobName: 'OA_Sources',
             containerOverrides: {
-                command: ['./sources.js'],
+                command: ['node', 'sources.js'],
                 environment: []
             }
         };

diff --git a/api/lib/config.js b/api/lib/config.js
@@ -83,8 +83,8 @@ export default class Config {
                 this.R2Bucket = process.env.R2Bucket;
             }
 
-            if (!process.env.MAPBOX_TOKEN) {
-                throw new Error('not ok - MAPBOX_TOKEN env var required');
+            if (!process.env.PROTOMAPS_KEY) {
+                throw new Error('not ok - PROTOMAPS_KEY env var required');
             }
 
             if (!process.env.CLOUDFLARE_ACCOUNT_ID) {

diff --git a/api/lib/types/map.js b/api/lib/types/map.js
@@ -31,7 +31,7 @@ export default class Map extends Generic {
 
     static map() {
         return {
-            token: process.env.MAPBOX_TOKEN
+            protomaps_key: process.env.PROTOMAPS_KEY
         };
     }
 

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -28,7 +28,7 @@
         "@mapbox/sphericalmercator": "^1.1.0",
         "@octokit/auth-app": "^4.0.6",
         "@octokit/rest": "^19.0.4",
-        "@octokit/webhooks": "11.0.0",
+        "@octokit/webhooks": "11.1.2",
         "@openaddresses/batch-error": "^2.1.0",
         "@openaddresses/batch-generic": "^14.0.0",
         "@openaddresses/batch-schema": "^9.0.0",
@@ -40,7 +40,7 @@
         "cors": "^2.8.5",
         "csv-stringify": "^6.0.0",
         "d3-queue": "^3.0.7",
-        "express": "^4.17.1",
+        "express": "^4.21.2",
         "express-minify": "^1.0.0",
         "json-schema-ref-parser": "^9.0.9",
         "jsonwebtoken": "^9.0.0",
@@ -58,7 +58,7 @@
         "swagger-ui-express": "^5.0.0",
         "tape": "^5.6.1",
         "tilebase": "^4.0.0",
-        "undici": "^6.0.0"
+        "undici": "^6.21.1"
     },
     "devDependencies": {
         "@mapbox/mock-aws-sdk-js": "^1.0.0",

diff --git a/api/routes/github.js b/api/routes/github.js
@@ -9,7 +9,7 @@ export default async function router(schema, config) {
         group: 'Github',
         auth: 'admin',
         description: 'Callback endpoint for GitHub Webhooks. Should not be called by user functions'
-    }, bodyparser.raw({ type: '*/*' }), async (req, res) => {
+    }, bodyparser.raw({ type: '*/*', limit: '500kb' }), async (req, res) => {
         if (!process.env.GithubSecret) return res.status(400).send('Invalid X-Hub-Signature');
 
         const ci = new CI(config);