Merge pull request #835 from sillsdev/develop

Deploy

Author: phillip-hopper

.github/workflows/webonary-cloud-api-pr.yml

@@ -20,7 +20,7 @@ env:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Git checkout
         uses: actions/checkout@v2
@@ -75,19 +75,19 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: "18.X"
+          node-version: "22.X"
           registry-url: "https://registry.npmjs.org"
 
-      - name: NPM 9.x latest
-        run: npm install -g npm@~9
+      - name: NPM 10.x latest
+        run: npm install -g npm@~10
 
       - name: NPM clean install main package
         run: cd webonary-cloud-api; npm ci
 
       - name: NPM clean install lambda package
         run: cd webonary-cloud-api/lambda; npm ci
 
-      - name: Lint, build, and test
+      - name: Build, and test
         run: cd webonary-cloud-api; npm run test
 
       - name: Run cdk diff
@@ -99,9 +99,9 @@ jobs:
         run: set -o pipefail; cd webonary-cloud-api; npx cdk deploy --require-approval never --no-color 2>&1
 
       - name: Mongo migrations status check
-        if: steps.filter.outputs.migrations == 'true'
+        if: steps.filter.outputs.migrations == 'true-skip'
         run: cd webonary-cloud-api/mongo_utils; npx mongo-migrate status
 
       - name: Mongo migrations installation
-        if: github.event_name == 'push' && steps.filter.outputs.migrations == 'true'
+        if: github.event_name == 'push' && steps.filter.outputs.migrations == 'true-skip'
         run: cd webonary-cloud-api/mongo_utils; npx migrations/*.ts && npx mongo-migrate up

webonary-cloud-api/lambda/package-lock.json

@@ -3,14 +3,14 @@
   "version": "0.1.0",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.114",
-    "@types/node": "^18.15.11",
+    "@types/node": "^22.9.3",
     "mongodb-memory-server": "^8.10.2"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.309.0",
     "@aws-sdk/s3-request-presigner": "^3.309.0",
     "axios": "^1.6",
-    "cheerio": "^1.0.0-rc.12",
+    "cheerio": "^1.1.2",
     "mongodb": "^4.17.1",
     "mongodb-client-encryption": "^2.9.1"
   }

webonary-cloud-api/lambda/package.json

@@ -3,7 +3,7 @@ import { App, CfnOutput, Duration, Stack, StackProps } from 'aws-cdk-lib';
 import { CfnPermission, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { NodejsFunction, NodejsFunctionProps } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { Effect, PolicyStatement } from 'aws-cdk-lib/aws-iam';
-import { Bucket, BucketEncryption } from 'aws-cdk-lib/aws-s3';
+import { BlockPublicAccess, Bucket, BucketEncryption } from 'aws-cdk-lib/aws-s3';
 import { Certificate } from 'aws-cdk-lib/aws-certificatemanager';
 import {
   DomainName,
@@ -73,6 +73,7 @@ export class WebonaryCloudApiStack extends Stack {
     // S3
     const dictionaryBucket = new Bucket(this, envSpecific('dictionaryBucket'), {
       encryption: BucketEncryption.S3_MANAGED,
+      blockPublicAccess: BlockPublicAccess.BLOCK_ACLS_ONLY,
       publicReadAccess: true,
       bucketName: S3_DOMAIN_NAME,
     });