CCM-17830: Double PROD rate limits

.github/workflows/build.yml

@@ -28,15 +28,16 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y ca-certificates curl gnupg
           sudo mkdir -p /etc/apt/keyrings
-          curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+          curl --proto '=https' --tlsv1.2 -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
           NODE_MAJOR=20
           echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 
       - name: Upgrade python packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
+        run: python -m pip install pip==26.1.2 setuptools==83.0.0 wheel==0.47.0
 
       - name: Install poetry
-        run: pip install poetry
+        run: |
+          pip install --only-binary :all: poetry==2.2.1
 
       - name: Cache poetry packages
         uses: actions/cache@v4
@@ -58,9 +59,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

Makefile

@@ -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
 

manifest_template.yml

@@ -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
@@ -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
@@ -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

package.json

@@ -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",
@@ -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",

scripts/perform-static-analysis.sh

@@ -30,8 +30,6 @@ function main() {
 
 function create-report() {
 
-  rm -rf sandbox/coverage/tmp
-
   docker run --rm --platform linux/amd64 \
     --volume $PWD:/usr/src \
     sonarsource/sonar-scanner-cli:$image_version \