diff --git a/.gitleaksignore b/.gitleaksignore index fd6b8777..969beb5d 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -17,3 +17,5 @@ e44436c05bb859820c89b241df2e589ab760595b:infrastructure/terraform/components/rep 66380f86140cd9c23e5a3e61044488872e632bf7:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 056d713eefe2305444059e99d707bd902ed6f532:infrastructure/terraform/components/reporting/variables.tf:ipv4:109 +d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_int.tfvars:generic-api-key:29 +d38af4e4f6c36ca9c3d843193b434386a9bad5ee:infrastructure/terraform/etc/env_eu-west-2_prod.tfvars:generic-api-key:43 diff --git a/.tool-versions b/.tool-versions index 0c4297fa..653bf379 100644 --- a/.tool-versions +++ b/.tool-versions @@ -8,7 +8,7 @@ pre-commit 3.6.0 terraform 1.10.1 terraform-docs 0.19.0 # trivy 0.69.3 -# python 3.13.2 +python 3.13.2 # ============================================================================== # The section below is reserved for Docker image versions. diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 32586891..e8a699d9 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -32,7 +32,7 @@ GEM ffi (1.16.3) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (3.25.5-x86_64-linux) + google-protobuf (3.25.5) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) @@ -93,6 +93,8 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.27.0) + nokogiri (1.19.1-arm64-darwin) + racc (~> 1.4) nokogiri (1.19.1-x86_64-linux-gnu) racc (~> 1.4) pathutil (0.16.2) @@ -106,9 +108,10 @@ GEM rexml (3.4.2) rouge (4.2.1) safe_yaml (1.0.5) - sass-embedded (1.69.5) + sass-embedded (1.69.5-arm64-darwin) + google-protobuf (~> 3.23) + sass-embedded (1.69.5-x86_64-linux-gnu) google-protobuf (~> 3.23) - rake (>= 13.0.0) securerandom (0.4.1) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -118,6 +121,7 @@ GEM webrick (1.8.2) PLATFORMS + arm64-darwin-25 x86_64-linux DEPENDENCIES diff --git a/docs/package-lock.json b/docs/package-lock.json index dae51275..bb77f6ee 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1,22 +1,22 @@ { - "lockfileVersion": 3, "name": "nhs-notify", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, "packages": { "": { + "name": "nhs-notify", + "version": "1.0.0", + "license": "ISC", "dependencies": { "nhsuk-frontend": "^8.1.1" }, - "devDependencies": {}, - "license": "ISC", - "name": "nhs-notify", - "version": "1.0.0" + "devDependencies": {} }, "node_modules/nhsuk-frontend": { - "integrity": "sha512-qVMhgQqz0UD9D/sXqvllinge2WeGBwyBxdJAfcNxEvWl4oZ6FWCZbMFE9YCTqDjpfy9k2K251x8QJm1MssSA6Q==", + "version": "8.2.0", "resolved": "https://registry.npmjs.org/nhsuk-frontend/-/nhsuk-frontend-8.2.0.tgz", - "version": "8.2.0" + "integrity": "sha512-qVMhgQqz0UD9D/sXqvllinge2WeGBwyBxdJAfcNxEvWl4oZ6FWCZbMFE9YCTqDjpfy9k2K251x8QJm1MssSA6Q==" } - }, - "requires": true, - "version": "1.0.0" + } } diff --git a/scripts/config/pre-commit.yaml b/scripts/config/pre-commit.yaml index 71fa7f12..dd57dd0f 100644 --- a/scripts/config/pre-commit.yaml +++ b/scripts/config/pre-commit.yaml @@ -16,7 +16,7 @@ repos: exclude: '(^|/)package(-lock)?\.json$' - repo: https://github.com/NHSDigital/nhs-notify-shared-modules - rev: 3.0.9 + rev: 3.1.2 hooks: - id: sort-dictionary - id: scan-secrets diff --git a/scripts/config/vale/styles/config/vocabularies/words/accept.txt b/scripts/config/vale/styles/config/vocabularies/words/accept.txt index eb07ae3e..9cdd3cdd 100644 --- a/scripts/config/vale/styles/config/vocabularies/words/accept.txt +++ b/scripts/config/vale/styles/config/vocabularies/words/accept.txt @@ -1,6 +1,6 @@ -[A-Z]+s add_column athena_named_query +[A-Z]+s Bitwarden bot Cognito