Merge branch 'main' into dependabot/npm_and_yarn/ip-1.1.9

openstax · Sep 17, 2024 · 439cb2a · 439cb2a
2 parents b38f244 + 5c7de86
commit 439cb2a
Show file tree

Hide file tree

Showing 5 changed files with 1,934 additions and 1,740 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -104,12 +104,6 @@ jobs:
         path: node_modules
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
     - run: yarn install
-    - run: yarn ci:test:${{ matrix.suite }}
-    - uses: actions/upload-artifact@v2
-      if: ${{ failure() }}
-      with:
-        name: diff output
-        path: "**/__diff_output__/*"
 
   lint:
     name: Lint

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -21,11 +21,4 @@ jobs:
     - run: npx playwright install-deps
     - run: npx playwright install
     - run: npm run test
-
-    - name: Upload test results
-      if: always()
-      uses: actions/upload-artifact@v2
-      with:
-        name: playwright-report
-        path: playwright/test-results
 
diff --git a/package.json b/package.json
@@ -103,10 +103,10 @@
     "not op_mini all"
   ],
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.373.0",
-    "@aws-sdk/client-s3": "^3.374.0",
-    "@aws-sdk/client-sqs": "^3.370.0",
-    "@aws-sdk/credential-providers": "^3.370.0",
+    "@aws-sdk/client-cloudformation": "<3.567.0",
+    "@aws-sdk/client-s3": "<3.567.0",
+    "@aws-sdk/client-sqs": "<3.567.0",
+    "@aws-sdk/credential-providers": "<3.567.0",
     "@babel/core": "^7.22.5",
     "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",

diff --git a/script/prerender/fleet.ts b/script/prerender/fleet.ts
@@ -395,10 +395,22 @@ async function waitUntilWorkDone(
       getQueueAttributesResult.Attributes,
       '[SQS] [GetQueueAttributes] Unexpected response: missing Attributes key'
     );
+    const numberOfMessages = assertDefined(
+      attributes.ApproximateNumberOfMessages,
+      '[SQS] [GetQueueAttributes] Unexpected response: missing attributes value'
+    );
+    const messagesDelayed = assertDefined(
+      attributes.ApproximateNumberOfMessagesDelayed,
+      '[SQS] [GetQueueAttributes] Unexpected response: missing attributes value'
+    );
+    const messagesNotVisible = assertDefined(
+      attributes.ApproximateNumberOfMessagesNotVisible,
+      '[SQS] [GetQueueAttributes] Unexpected response: missing attributes value'
+    );
 
-    const numMessages = parseInt(attributes.ApproximateNumberOfMessages, 10) +
-      parseInt(attributes.ApproximateNumberOfMessagesDelayed, 10) +
-      parseInt(attributes.ApproximateNumberOfMessagesNotVisible, 10);
+    const numMessages = parseInt(numberOfMessages, 10) +
+      parseInt(messagesDelayed, 10) +
+      parseInt(messagesNotVisible, 10);
 
     if (numMessages === 0) { break; }