Skip to content

CCM-17830: Double PROD rate limits #1068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lapenna-bjss wants to merge 12 commits into
base: release
Choose a base branch
from
Open

CCM-17830: Double PROD rate limits #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97ebf77
CCM-17830: Double PROD rate limits
lapenna-bjss May 20, 2026
9fbd3d0
CCM-17830: Ran `npm audit fix`
gareth-allan Jun 24, 2026
9d5e2d3
CCM-17830: Updated default ratelimit/quota config
gareth-allan Jun 24, 2026
d58edd5
Merge branch 'release' into feature/CCM-17830_Double_prod_rate_limits
gareth-allan Jun 24, 2026
08cf7dc
CCM-17830: Undo package-lock.json changes
gareth-allan Jun 26, 2026
5d9a1e5
CCM-17830: exclude sandbox/coverage/** from sonar scanning
Ian-Hodges Jun 26, 2026
325a641
CCM-17830: revert exclude sandbox/coverage/** from sonar scanning
Ian-Hodges Jun 26, 2026
cbe7478
CCM-17830: delete sandbox/coverage/tmp prior to sonar scanning
Ian-Hodges Jun 26, 2026
8d87d02
CCM-17830: Try using older lcov-result-merger version
gareth-allan Jun 26, 2026
6cc8ccb
CCM-17830: Restore deletion of tmp dir
gareth-allan Jun 26, 2026
d8a05d6
CCM-17830: Delete the right directory
gareth-allan Jun 26, 2026
f018fd1
CCM-17830: Make coverage report merging a makefile command
gareth-allan Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ jobs:
cd sandbox
npm run test
cd -
mkdir coverage coverage-temp
TMPDIR="./coverage-temp" npx lcov-result-merger sandbox/coverage/lcov.info coverage/lcov.info --prepend-source-files
rm -r coverage-temp
make merge-coverage-reports

- name: Check licenses
run: make check-licenses
Expand Down
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ install-hooks: .git/hooks/pre-commit
lint: .check-licenses .ensure-test-documentation-validity .lint-js .lint-python
npm run lint

merge-coverage-reports:
mkdir -p coverage coverage-temp
TMPDIR="./coverage-temp" npm run merge-coverage-reports
rm -r coverage-temp
rm -rf sandbox/coverage/tmp

static-analysis:
npm run static-analysis

Expand Down
14 changes: 12 additions & 2 deletions manifest_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ APIGEE_ENVIRONMENTS:
has_mock_auth: true
variants:
- name: internal-qa
global_ratelimit: '18000pm'
global_quota: '6000'
display_name: Internal QA
- name: ref
has_mock_auth: true
Expand All @@ -29,18 +31,26 @@ APIGEE_ENVIRONMENTS:
variants:
- name: internal-dev-sandbox
display_name: Internal Development Sandbox
global_ratelimit: '18000pm'
global_quota: '6000'
- name: internal-qa-sandbox
variants:
- name: internal-qa-sandbox
display_name: Internal QA Sandbox
global_ratelimit: '18000pm'
global_quota: '6000'
- name: sandbox
variants:
- name: sandbox
display_name: Sandbox
global_ratelimit: '18000pm'
global_quota: '6000'
- name: int
variants:
- name: int
display_name: Integration Testing
global_ratelimit: '18000pm'
global_quota: '6000'
- name: prod
variants:
- name: prod
Expand Down Expand Up @@ -73,11 +83,11 @@ apigee:
quota:
enabled: true
interval: 1
limit: {{ VARIANT.global_quota | default(6000)}}
limit: {{ VARIANT.global_quota | default(12000)}}
timeunit: minute
spikeArrest:
enabled: true
ratelimit: {{ VARIANT.global_ratelimit | default('18000pm') }}
ratelimit: {{ VARIANT.global_ratelimit | default('36000pm') }}
app:
quota:
enabled: true
Expand Down
159 changes: 159 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"sandbox-postman-collection": "newman run postman/NhsNotify.Sandbox.postman_collection.json",
"integration-postman-collection": "poetry run python scripts/build_postman_environment.py && newman run postman/NhsNotify.Integration.postman_collection.json -e postman/Integration.test.postman_environment.json",
"static-analysis": "./scripts/perform-static-analysis.sh",
"zap-security-scan": "./scripts/run_zap.sh"
"zap-security-scan": "./scripts/run_zap.sh",
"merge-coverage-reports": "lcov-result-merger sandbox/coverage/lcov.info coverage/lcov.info --prepend-source-files"
},
"author": "NHS Digital",
"license": "MIT",
Expand Down Expand Up @@ -41,6 +42,7 @@
"eslint-plugin-workspaces": "^0.11.0",
"eslint-plugin-yml": "^1.2.0",
"handlebars": "^4.7.9",
"lcov-result-merger": "^6.0.0",
"license-checker": "^25.0.1",
"minimist": "^1.2.2",
"newman": "^6.2.2",
Expand Down
Loading