Skip to content

Commit 713dc26

Browse files
ajmu1JackPlowmanCorbiscmabe13mik3ola
authored
Release/30.0 (#1137)
# Release Branch Pull Request ## Description of Changes This release will contain upgrade of terraform core version(from v1.2.1 to v1.13.0), terraform AWS provider version(v5.68.0 to v6.14.1) and python version upgrade(v3.12 to v3.14) for lambda and tester docker images of DI application as well. --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Matthew Begley <60427904+mabe13@users.noreply.github.com> Co-authored-by: Jack Plowman <62281988+JackPlowman@users.noreply.github.com> Co-authored-by: Corbisc <95412908+Corbisc@users.noreply.github.com> Co-authored-by: Matthew Begley <60427904+mabe13@users.noreply.github.com> Co-authored-by: mabe13 <matthewbegley@nhs.net> Co-authored-by: Michael Olaw <michael.olaw1@nhs.net> Co-authored-by: Jack Plowman <jack.plowman1@nhs.net> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vamsi Jonnagadda <vamsijonnagadda@ICTs-MacBook-Pro.local> Co-authored-by: vkjonnagadda <32249251+vkjonnagadda@users.noreply.github.com> Co-authored-by: Thomas Judd-Cooper <me@tomjuddcooper.co.uk> Co-authored-by: Sindhu Natarajan <nsindhupriya@hotmail.co.uk> Co-authored-by: Sindhu <nsindhu26@gmail.com> Co-authored-by: ThomasC-Kainos <106971950+ThomasC-Kainos@users.noreply.github.com> Co-authored-by: ManithaSrinivasa <manitha.srinivasa@accenture.com> Co-authored-by: ajmu1 <ajmu1@hscic.gov.uk> Co-authored-by: ManithaSrinivasa <142212846+ManithaSrinivasa@users.noreply.github.com>
1 parent 9851abb commit 713dc26

20 files changed

Lines changed: 184 additions & 168 deletions

File tree

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
-Dsonar.projectKey=nhsdigital_dos-integration
3939
-Dsonar.coverage.exclusions=tests/**,**/tests/**,infrastructure,application/dos_db_handler/**,test/**,scripts/**,application/conftest.py
4040
-Dsonar.python.coverage.reportPaths=coverage.xml
41-
-Dsonar.python.version=3.12
41+
-Dsonar.python.version=3.14
4242
-Dsonar.exclusions=application/**/tests/**
4343
4444
check-markdown-code-quality:

.github/workflows/configs/vale/styles/config/vocabularies/words/accept.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CodePipeline
2121
Xcode
2222
Tunnelblick
2323
// Environments
24-
dev
24+
[Dd]ev
2525
perf
2626
perf2
2727
nonprod
@@ -32,14 +32,20 @@ mgmt
3232
MGMT
3333
// Development/Deployment Terms
3434
adhoc
35+
rebase
36+
pytest
3537
healthcheck
36-
runbook
37-
Runbook
38+
[Rr]unbooks?
39+
Allowlist
40+
slack_and_infrastructure
41+
opening_times
42+
hotfixes
43+
automations
3844
undeploy
3945
Undeploy
46+
undeployed
4047
Onboarding
4148
onboarding
4249
// Miscellaneous
4350
bbbbbb
4451
gggggg
45-
[A-Z]+s

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The main components you will need for _basic_ development work, are your OS vers
100100

101101
- A VPN Client (OpenVPN or Tunnelblick are 2 NHS Digital suggested options)
102102
- Git
103-
- Python (The project currently runs on 3.12)
103+
- Python (The project currently runs on Python 3.14)
104104
- AWS CLI
105105
- Docker/Podman
106106

@@ -192,7 +192,7 @@ To run ruff on you branch:
192192

193193
List all the type of test suites included and provide instructions how to execute them
194194

195-
- Unit Testing
195+
- Unit
196196
- Integration
197197
- Performance
198198

@@ -482,7 +482,7 @@ To quick update the lambdas run the following command. Note this only updates th
482482

483483
### Remove deployment with commit tag
484484

485-
You can remove a dev deployment using a single command to create a tag which then runs an AWS CodeBuild project that will remove that environment
485+
You can remove a dev deployment using a single command to create a tag which then starts an AWS CodeBuild project that will remove that environment
486486

487487
make tag-commit-to-destroy-environment ENVIRONMENT=[environment to destroy] COMMIT=[short commit hash]
488488
e.g. make tag-commit-to-destroy-environment ENVIRONMENT=ds-363 COMMIT=2bc43dd // This destroys the ds-363 dev environment

build/automation/lib/terraform.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TERRAFORM_STATE_STORE = $(or $(TEXAS_TERRAFORM_STATE_STORE), state-store-$(AWS_A
44
TERRAFORM_STATE_LOCK = $(or $(TEXAS_TERRAFORM_STATE_LOCK), state-lock-$(AWS_ACCOUNT_NAME))
55
TERRAFORM_STATE_KEY = $(PROJECT_GROUP_SHORT)-$(PROJECT_NAME_SHORT)/$(ENVIRONMENT)
66
TERRAFORM_STATE_KEY_SHARED = texas
7-
TERRAFORM_VERSION = $(or $(TEXAS_TERRAFORM_VERSION), 1.2.1)
7+
TERRAFORM_VERSION = $(or $(TEXAS_TERRAFORM_VERSION), 1.13.0)
88

99
# ==============================================================================
1010

build/docker/lambda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/lambda/python:3.12-arm64
1+
FROM public.ecr.aws/lambda/python:3.14-arm64
22
# Update Pip
33
RUN python -m pip install --upgrade pip
44
# Copy Python requirements

build/docker/tester/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12
1+
FROM python:3.14
22
# Update Pip
33
RUN python -m pip install --upgrade pip
44
# Copy Python requirements

infrastructure/modules/s3/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#tfsec:ignore:aws-s3-specify-public-access-block
99
module "s3_bucket" {
1010
source = "terraform-aws-modules/s3-bucket/aws"
11-
version = "3.15.1"
11+
version = "5.7.0"
1212
bucket = var.name
1313
acl = var.acl
1414

infrastructure/stacks/api-key/.terraform.lock.hcl

Lines changed: 19 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

infrastructure/stacks/api-key/terraform.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ terraform {
55
required_providers {
66
aws = {
77
source = "hashicorp/aws"
8-
version = "~> 5.68.0"
8+
version = "~> 6.14.1"
99
}
10-
template = {
10+
random = {
1111
source = "hashicorp/random"
1212
version = "~> 3.3.0"
1313
}

infrastructure/stacks/application/.terraform.lock.hcl

Lines changed: 60 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)