Merge branch 'main' into dependabot/npm_and_yarn/integration/js/multi…

…-5727489b49
aws · Jan 6, 2025 · cf7cbf8 · cf7cbf8
2 parents 762a716 + a3093f2
commit cf7cbf8
Show file tree

Hide file tree

Showing 25 changed files with 2,384 additions and 2,599 deletions.
diff --git a/.github/actions/setup-integration-test/action.yml b/.github/actions/setup-integration-test/action.yml
@@ -67,10 +67,8 @@ runs:
     - name: Clean Install
       run: npm ci
       shell: bash
-    - name: Add localhost 8080 host to /etc/hosts for Linux only
+    - name: Add testsite host to /etc/hosts for Linux only (fixes 500 internal error when loading the test page)
       shell: bash
       if: runner.os == 'Linux'
       run: |
-          sudo echo "127.0.0.1 testsite" | sudo tee -a /etc/hosts
-
-      
+          sudo echo "127.0.0.1 testsite" | sudo tee -a /etc/hosts
diff --git a/.github/workflows/browser-compatibility-test-previous-major-version.yml b/.github/workflows/browser-compatibility-test-previous-major-version.yml
@@ -15,6 +15,9 @@ env:
   MESSAGING_USER_ARN: ${{secrets.MESSAGING_USER_ARN}}
   PRE_RUN_SCRIPT_URL: ${{secrets.PRE_RUN_SCRIPT_URL}}
 
+permissions:
+  id-token: write   # This is required for requesting the JWT
+
 jobs:
   get-previous-version:
     name: Get Previous Major Version
@@ -50,8 +53,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Audio Compatibility Test
         run: npm run test:browser-compatibility-audio
   browser-compatibility-video-previous-major-version:
@@ -72,8 +75,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Video Compatibility Test
         run: npm run test:browser-compatibility-video
   browser-compatibility-content-share-previous-major-version:
@@ -95,8 +98,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Content Share Compatibility Test
         run: npm run test:browser-compatibility-content-share
   browser-compatibility-data-message-previous-major-version:
@@ -118,8 +121,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Data Message Compatibility Test
         run: npm run test:browser-compatibility-data-message
   browser-compatibility-meeting-readiness-checker-previous-major-version:
@@ -141,8 +144,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Meeting Readiness Checker Compatibility Test
         run: npm run test:browser-compatibility-meeting-readiness-checker
   browser-compatibility-background-blur-previous-major-version:
@@ -164,8 +167,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Background Blur Compatibility Test
         run: npm run test:browser-compatibility-background-blur
   browser-compatibility-linux-audio-previous-major-version:
@@ -188,8 +191,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Audio Compatibility Test
           run: npm run test:linux-browser-compatibility-audio
   browser-compatibility-linux-video-previous-major-version:
@@ -212,8 +215,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Video Compatibility Test
           run: npm run test:linux-browser-compatibility-video
   browser-compatibility-linux-content-share-previous-major-version:
@@ -236,8 +239,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Content Share Compatibility Test
           run: npm run test:linux-browser-compatibility-content-share
   browser-compatibility-linux-other-previous-major-version:
@@ -260,8 +263,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Other Compatibility Test
           run: npm run test:linux-browser-compatibility-other
   browser-compatibility-results-report-previous-major-version:
@@ -305,4 +308,4 @@ jobs:
       - name: Install Axios
         run: npm install axios
       - name: Send Slack Message
-        run: node .github/script/send-test-report.js ${{ secrets.SLACK_JS_SDK_DEV_CORE_PREV_VER_WEBHOOK }} ${{ env.WORKFLOW_URL}} ${{ env.WORKFLOW_JOBS_STATUS }}
+        run: node .github/script/send-test-report.js ${{ secrets.SLACK_JS_SDK_DEV_CORE_PREV_VER_WEBHOOK }} ${{ env.WORKFLOW_URL}} ${{ env.WORKFLOW_JOBS_STATUS }}
diff --git a/.github/workflows/browser-compatibility-test.yml b/.github/workflows/browser-compatibility-test.yml
@@ -16,6 +16,9 @@ env:
   SLACK_JS_SDK_DEV_CORE_WEBHOOK: ${{secrets.SLACK_JS_SDK_DEV_CORE_WEBHOOK}}
   PRE_RUN_SCRIPT_URL: ${{secrets.PRE_RUN_SCRIPT_URL}}
 
+permissions:
+  id-token: write   # This is required for requesting the JWT
+
 jobs:
   browser-compatibility-audio:
     name: Audio Compatibility Test
@@ -33,8 +36,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Audio Compatibility Test
         run: npm run test:browser-compatibility-audio
   browser-compatibility-video:
@@ -53,8 +56,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Video Compatibility Test
         run: npm run test:browser-compatibility-video
   browser-compatibility-content-share:
@@ -75,8 +78,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Content Share Compatibility Test
         run: npm run test:browser-compatibility-content-share
   browser-compatibility-data-message:
@@ -97,8 +100,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Data Message Compatibility Test
         run: npm run test:browser-compatibility-data-message
   browser-compatibility-meeting-readiness-checker:
@@ -119,8 +122,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Meeting Readiness Checker Compatibility Test
         run: npm run test:browser-compatibility-meeting-readiness-checker
   browser-compatibility-background-blur:
@@ -141,8 +144,8 @@ jobs:
         with:
           sauce-username: ${{ secrets.SAUCE_USERNAME }}
           sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+          aws-role-session-name: ${{ env.TEST_TYPE }}
       - name: Run Background Blur Compatibility Test
         run: npm run test:browser-compatibility-background-blur
   browser-compatibility-linux-audio:
@@ -164,8 +167,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Audio Compatibility Test
           run: npm run test:linux-browser-compatibility-audio
   browser-compatibility-linux-video:
@@ -187,8 +190,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Video Compatibility Test
           run: npm run test:linux-browser-compatibility-video
   browser-compatibility-linux-content-share:
@@ -210,8 +213,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Content Share Compatibility Test
           run: npm run test:linux-browser-compatibility-content-share
   browser-compatibility-linux-other:
@@ -233,8 +236,8 @@ jobs:
             sauce-username: ${{ secrets.SAUCE_USERNAME }}
             sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
             sauce-rest-url: https://us-east-1.saucelabs.com/rest/v1
-            aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
-            aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+            aws-role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME_SDK_DEV }}
+            aws-role-session-name: ${{ env.TEST_TYPE }}
         - name: Run Linux Other Compatibility Test
           run: npm run test:linux-browser-compatibility-other
   browser-compatibility-results-report:
@@ -278,4 +281,4 @@ jobs:
       - name: Install Axios
         run: npm install axios
       - name: Send Slack Message
-        run: node .github/script/send-test-report.js ${{ secrets.SLACK_JS_SDK_DEV_CORE_WEBHOOK }} ${{ env.WORKFLOW_URL}} ${{ env.WORKFLOW_JOBS_STATUS }}
+        run: node .github/script/send-test-report.js ${{ secrets.SLACK_JS_SDK_DEV_CORE_WEBHOOK }} ${{ env.WORKFLOW_URL}} ${{ env.WORKFLOW_JOBS_STATUS }}