Skip to content

Commit

Permalink
Merge branch 'main' into adjust-tunnel-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
rsdmike authored Dec 16, 2024
2 parents ae971c5 + dfd0f27 commit a8294f9
Show file tree
Hide file tree
Showing 228 changed files with 27,269 additions and 25,362 deletions.
42 changes: 0 additions & 42 deletions .chglog/CHANGELOG.tpl.md

This file was deleted.

28 changes: 0 additions & 28 deletions .chglog/config.yml

This file was deleted.

46 changes: 0 additions & 46 deletions .eslintrc.json

This file was deleted.

19 changes: 11 additions & 8 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ Hello there! 😄
To expedite issue processing please search open and closed issues before submitting a new one.
Existing issues often contain information about workarounds, resolution, or progress updates.
🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->

**Describe the bug** 🪲
A clear and concise description of what the bug is.


**To Reproduce** 🪜
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -21,15 +22,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**AMT Device (please complete the following information):** 🖥️
- OS: [e.g. Linux Kernel & Version]
- AMT Version: [e.g. 11.8.5, 12.0.45]
- AMT Configuration Mode: [e.g. Admin Control Mode or Client Control Mode]
- Network Configuration [e.g. Dynamic IP or Static IP]

- OS: [e.g. Linux Kernel & Version]
- AMT Version: [e.g. 11.8.5, 12.0.45]
- AMT Configuration Mode: [e.g. Admin Control Mode or Client Control Mode]
- Network Configuration [e.g. Dynamic IP or Static IP]

**Service Deployment (please complete the following information):** ⛈️
- Deployment Type: [e.g. Azure, Docker, K8s]
- Node Version: [e.g. LTS 14]
- Component & Version: [e.g. RPS 2.0.0]

- Deployment Type: [e.g. Azure, Docker, K8s]
- Node Version: [e.g. LTS 14]
- Component & Version: [e.g. RPS 2.0.0]

**Additional context**
Add any other context about the problem here.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
## PR Checklist

<!-- Please check if your PR fulfills the following requirements: -->

- [ ] Unit Tests have been added for new changes
- [ ] API tests have been updated if applicable
- [ ] All commented code has been removed
- [ ] If you've added a dependency, you've ensured license is compatible with Apache 2.0 and clearly outlined the added dependency.


## What are you changing?
<!-- Please provide a short description of the updates that are in the PR -->

<!-- Please provide a short description of the updates that are in the PR -->

## Anything the reviewer should know when reviewing this PR?

Expand Down
55 changes: 40 additions & 15 deletions .github/commitlint.config.cjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,41 @@
module.exports = {
extends: ['@commitlint/config-conventional'],
rules: {
'body-max-line-length': [2, 'always', 200],
'subject-case': [
1,
'never',
['sentence-case', 'start-case', 'pascal-case', 'upper-case'],
],
'scope-enum': [
2,
'always',
['db', 'api', 'secrets', 'activation', 'deactivation', 'maintenance', 'state-machine', 'health', 'utils', 'events', 'docker', 'deps', 'deps-dev', 'gh-actions', 'config']
]
}
}
extends: ['@commitlint/config-conventional'],
rules: {
'body-max-line-length': [
2,
'always',
200
],
'subject-case': [
1,
'never',
[
'sentence-case',
'start-case',
'pascal-case',
'upper-case'
]
],
'scope-enum': [
2,
'always',
[
'db',
'api',
'secrets',
'activation',
'deactivation',
'maintenance',
'state-machine',
'health',
'utils',
'events',
'docker',
'deps',
'deps-dev',
'gh-actions',
'config'
]
]
}
}
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version: 2
updates:
# Maintain dependencies for npm modules
- package-ecosystem: "npm"
directory: "/"
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: "daily"
interval: 'daily'

- package-ecosystem: github-actions
directory: /
Expand Down
52 changes: 27 additions & 25 deletions .github/workflows/api-test.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
name: RPS API Tests


on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]
workflow_dispatch:
permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
with:
egress-policy: audit
- name: Harden Runner
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- run: docker build -f Dockerfile -t rps:${GITHUB_SHA} .
- run: docker compose up -d

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- run: docker build -f Dockerfile -t rps:${GITHUB_SHA} .
- run: docker-compose up -d

- name: Let Docker Spin up
run: sleep 5
- name: Run RPS API Tests
run: docker run --network=host -v /home/runner/work/rps/rps/src/test/collections/:/collections -v /home/runner/work/mps/mps/src/test/results/:/results postman/newman:5.3-alpine run /collections/rps.postman_collection.json -e /collections/rps.postman_environment.json --insecure --reporters cli,json,junit --reporter-json-export /results/rps_api_results.json --reporter-junit-export /results/rps_api_results_junit.xml
- name: Run RPS Security Tests
run: docker run --network=host -v /home/runner/work/rps/rps/src/test/collections/:/collections -v /home/runner/work/mps/mps/src/test/results/:/results postman/newman run /collections/rps_security_api_test.postman_collection.json -e /collections/rps.postman_environment.json -d /collections/data/rps_security_api_test.data.json --insecure --reporters cli,json,junit --reporter-json-export /results/rps_api_security_results.json --reporter-junit-export /results/rps_api_security_results_junit.xml
# - name: Dump docker logs on failure
# if: failure()
# uses: jwalton/gh-docker-logs@v2
- name: Upload Postman Results
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: rps-api
path: /home/runner/work/mps/mps/src/test/results
- name: Let Docker Spin up
run: sleep 5
- name: Run RPS API Tests
run: docker run --network=host -v /home/runner/work/rps/rps/src/test/collections/:/collections -v /home/runner/work/mps/mps/src/test/results/:/results postman/newman:5.3-alpine run /collections/rps.postman_collection.json -e /collections/rps.postman_environment.json --insecure --reporters cli,json,junit --reporter-json-export /results/rps_api_results.json --reporter-junit-export /results/rps_api_results_junit.xml
- name: Run RPS Security Tests
run: docker run --network=host -v /home/runner/work/rps/rps/src/test/collections/:/collections -v /home/runner/work/mps/mps/src/test/results/:/results postman/newman run /collections/rps_security_api_test.postman_collection.json -e /collections/rps.postman_environment.json -d /collections/data/rps_security_api_test.data.json --insecure --reporters cli,json,junit --reporter-json-export /results/rps_api_security_results.json --reporter-junit-export /results/rps_api_security_results_junit.xml
# - name: Dump docker logs on failure
# if: failure()
# uses: jwalton/gh-docker-logs@v2
- name: Upload Postman Results
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: rps-api
path: /home/runner/work/mps/mps/src/test/results
28 changes: 0 additions & 28 deletions .github/workflows/azureBoardsSync.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/changelog.yml

This file was deleted.

Loading

0 comments on commit a8294f9

Please sign in to comment.