admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into CEC-5672

Browse Source
This commit is contained in:
Paul Adamsen
2024-01-30 17:08:26 -05:00
committed by GitHub
parent 6bd5bd1c39 803d964a7e
commit 0a886904d6
7 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/blackduck.yml vendored
View File

@@ -1,20 +1,20 @@
name: Blackduck name: Blackduck Intelligent Scan
on: on:
push: schedule:
branches: # run scans twice a month
- CEC-4882-off-main - cron: '0 2 1,15 * *'
jobs: jobs:
blackduck: blackduck:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: actions/setup-node@v3 - uses: actions/setup-node@v4
with: with:
node-version: '16' node-version: '20'
cache: npm cache: npm
- run: npm install - run: npm install
@@ -22,7 +22,7 @@ jobs:
- name: Run Synopsys Detect INTELLIGENT - name: Run Synopsys Detect INTELLIGENT
run: | run: |
bash <(curl -s -L https://detect.synopsys.com/detect8.sh) \ bash <(curl -s -L https://detect.synopsys.com/detect9.sh) \
--blackduck.url=${{ secrets.BLACKDUCK_URL }} \ --blackduck.url=${{ secrets.BLACKDUCK_URL }} \
--blackduck.api.token=${{ secrets.BLACKDUCK_API_KEY }} \ --blackduck.api.token=${{ secrets.BLACKDUCK_API_KEY }} \
--blackduck.trust.cert=true \ --blackduck.trust.cert=true \

8
.github/workflows/blackduck_rapid.yml vendored
View File

@@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: actions/setup-node@v3 - uses: actions/setup-node@v4
with: with:
node-version: '16' node-version: '20'
cache: npm cache: npm
- run: npm install - run: npm install
@@ -26,7 +26,7 @@ jobs:
- name: Run Synopsys Detect RAPID - name: Run Synopsys Detect RAPID
run: | run: |
bash <(curl -s -L https://detect.synopsys.com/detect8.sh) \ bash <(curl -s -L https://detect.synopsys.com/detect9.sh) \
--blackduck.url=${{ secrets.BLACKDUCK_URL }} \ --blackduck.url=${{ secrets.BLACKDUCK_URL }} \
--blackduck.api.token=${{ secrets.BLACKDUCK_API_KEY }} \ --blackduck.api.token=${{ secrets.BLACKDUCK_API_KEY }} \
--blackduck.trust.cert=true \ --blackduck.trust.cert=true \

10
.github/workflows/deploy-on-demand-v2.yml vendored
View File

@@ -31,7 +31,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -39,7 +39,7 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
@@ -67,10 +67,10 @@ jobs:
echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push - name: Build and push
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=${{ env.ENVIRONMENT }} build-args: ENVIRONMENT=${{ env.ENVIRONMENT }}
@@ -93,7 +93,7 @@ jobs:
ENVIRONMENT: ${{ needs.build.outputs.build-env }} ENVIRONMENT: ${{ needs.build.outputs.build-env }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:

10
.github/workflows/deploy-on-demand.yml vendored
View File

@@ -32,7 +32,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -40,7 +40,7 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
@@ -65,10 +65,10 @@ jobs:
echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push - name: Build and push
uses: docker/build-push-action@v3 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=${{ env.ENVIRONMENT }} build-args: ENVIRONMENT=${{ env.ENVIRONMENT }}
@@ -84,7 +84,7 @@ jobs:
ENVIRONMENT: ${{ needs.build.outputs.build-env }} ENVIRONMENT: ${{ needs.build.outputs.build-env }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:

50
.github/workflows/deploy.yml vendored
View File

@@ -24,7 +24,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -32,17 +32,17 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
password: ${{ secrets.AZURE_CLIENT_SECRET }} password: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push DEV - name: Build and push DEV
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=dev build-args: ENVIRONMENT=dev
@@ -64,7 +64,7 @@ jobs:
environment: dev environment: dev
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:
@@ -101,7 +101,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -109,17 +109,17 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
password: ${{ secrets.AZURE_CLIENT_SECRET }} password: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push STG - name: Build and push STG
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=stg build-args: ENVIRONMENT=stg
@@ -142,7 +142,7 @@ jobs:
environment: stg environment: stg
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:
@@ -179,7 +179,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -187,17 +187,17 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
password: ${{ secrets.AZURE_CLIENT_SECRET }} password: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push PREPROD - name: Build and push PREPROD
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=prd build-args: ENVIRONMENT=prd
@@ -219,7 +219,7 @@ jobs:
environment: stg environment: stg
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:
@@ -256,7 +256,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -264,17 +264,17 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
password: ${{ secrets.AZURE_CLIENT_SECRET }} password: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push CEC-PRD - name: Build and push CEC-PRD
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=cec-prd build-args: ENVIRONMENT=cec-prd
@@ -296,7 +296,7 @@ jobs:
environment: prd environment: prd
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:
@@ -333,7 +333,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2 uses: rtCamp/action-slack-notify@v2
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Azure Login - name: Azure Login
uses: azure/login@v1 uses: azure/login@v1
@@ -341,17 +341,17 @@ jobs:
creds: ${{ secrets.AZURE_CREDENTIALS }} creds: ${{ secrets.AZURE_CREDENTIALS }}
- name: Login to ACR - name: Login to ACR
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.AZURE_CLIENT_ID }} username: ${{ secrets.AZURE_CLIENT_ID }}
password: ${{ secrets.AZURE_CLIENT_SECRET }} password: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Build and push CEC-EUPRD - name: Build and push CEC-EUPRD
uses: docker/build-push-action@v4 uses: docker/build-push-action@v5
with: with:
context: . context: .
build-args: ENVIRONMENT=cec-euprd build-args: ENVIRONMENT=cec-euprd
@@ -374,7 +374,7 @@ jobs:
environment: prd environment: prd
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- uses: rtCamp/action-slack-notify@v2 - uses: rtCamp/action-slack-notify@v2
env: env:

6
.github/workflows/test.yml vendored
View File

@@ -13,14 +13,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3 uses: actions/setup-node@v4
with: with:
node-version: "16" node-version: "20"
cache: "npm" cache: "npm"
- run: npm install - run: npm install
- run: npm run build --if-present - run: npm run build --if-present

4
src/utils/polling.test.js
View File

@@ -14,7 +14,7 @@ describe("Polling", () => {
const poll = new Polling(callback, 100); const poll = new Polling(callback, 100);
const spy = jest.spyOn(poll, "callback"); const spy = jest.spyOn(poll, "callback");
poll.start(); poll.start();
await sleep(500); await sleep(501); // +1 for safety
poll.end(); poll.end();
await sleep(500); await sleep(500);
expect(spy).toHaveBeenCalledTimes(5); expect(spy).toHaveBeenCalledTimes(5);
@@ -25,7 +25,7 @@ describe("Polling", () => {
const poll = new Polling(callback, 100); const poll = new Polling(callback, 100);
const spy = jest.spyOn(poll, "callback"); const spy = jest.spyOn(poll, "callback");
poll.start(); poll.start();
await sleep(1000); await sleep(1001); // +1 for safety
expect(spy).toHaveBeenCalledTimes(5); expect(spy).toHaveBeenCalledTimes(5);
}); });
}); });