Skip to content

[NDR-343] Allow workspaces to access SSM parameters belonging to the persistent workspace for that environment. #551

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

Merged
jameslinnell merged 5 commits into from
Dec 31, 2025
Merged

[NDR-343] Allow workspaces to access SSM parameters belonging to the persistent workspace for that environment. #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24b385a
[NDR-343] Mtls Common Name SSM
jameslinnell Dec 24, 2025
6a3306b
[NDR-343] Use shared resources
jameslinnell Dec 30, 2025
ff475b8
[NDR-344] Remove unwanted files
jameslinnell Dec 30, 2025
ed86854
[NDR-343] Correct key for shared terraform
jameslinnell Dec 30, 2025
0aeaf6b
[NDR-343] Reverse how key arn is set when sandbox
jameslinnell Dec 31, 2025
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
9 changes: 9 additions & 0 deletions infrastructure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,12 @@ data "aws_ssm_parameter" "apim_url" {
name = "/repo/${var.environment}/user-input/apim-api-url"
}

data "terraform_remote_state" "shared" {
backend = "s3"

config = {
bucket = local.shared_terraform_state_bucket
key = "env:/${var.shared_infra_workspace}/ndr/terraform.tfstate"
region = "eu-west-2"
}
}
2 changes: 1 addition & 1 deletion infrastructure/policies.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ resource "aws_iam_policy" "mtls_access_ssm_policy" {
"kms:Decrypt",
],
Resource = [
module.pdm_encryption_key.kms_arn
local.common_name_kms_key_arn
]
}
]
Expand Down
1 change: 1 addition & 0 deletions infrastructure/preprod.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
environment = "pre-prod"
shared_infra_workspace = "pre-prod"
owner = "nhse/ndr-team"
domain = "national-document-repository.nhs.uk"
certificate_domain = "pre-prod.national-document-repository.nhs.uk"
Expand Down
1 change: 1 addition & 0 deletions infrastructure/prod.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
environment = "prod"
shared_infra_workspace = "prod"
owner = "nhse/ndr-team"
domain = "national-document-repository.nhs.uk"
certificate_domain = "national-document-repository.nhs.uk"
Expand Down
1 change: 1 addition & 0 deletions infrastructure/test.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
environment = "test"
shared_infra_workspace = "ndr-test"
owner = "nhse/ndr-team"
domain = "access-request-fulfilment.patient-deductions.nhs.uk"
certificate_domain = "ndr-test.access-request-fulfilment.patient-deductions.nhs.uk"
Expand Down
12 changes: 10 additions & 2 deletions infrastructure/variable.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,10 @@ locals {

apim_api_url = "https://${var.apim_environment}api.service.nhs.uk/national-document-repository/FHIR/R4"

truststore_bucket_id = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id
truststore_uri = "s3://${local.truststore_bucket_id}/${var.ca_pem_filename}"
truststore_bucket_id = local.is_sandbox ? "ndr-dev-${var.truststore_bucket_name}" : module.ndr-truststore[0].bucket_id
truststore_uri = "s3://${local.truststore_bucket_id}/${var.ca_pem_filename}"
shared_terraform_state_bucket = "ndr-${var.environment}-terraform-state-${data.aws_caller_identity.current.account_id}"
common_name_kms_key_arn = local.is_sandbox ? data.terraform_remote_state.shared.outputs.pdm_kms_key_arn : module.pdm_encryption_key.kms_arn
}

variable "nrl_api_endpoint_suffix" {
Expand Down Expand Up @@ -321,3 +323,9 @@ variable "ssh_key_management_dry_run" {
type = bool
default = false
}

variable "shared_infra_workspace" {
description = "Workspace that owns shared infra like SSM and KMS"
type = string
default = "ndr-dev"
}