From 546875afffa9ea4b34fc6d5ca181cf5b770d0829 Mon Sep 17 00:00:00 2001 From: David Sibley Date: Thu, 16 Jan 2025 10:52:23 +0000 Subject: [PATCH] update ADR list and add ADR for workspace use --- .../0032-ncsc-pdns-not-at-platform-level.md | 2 +- .../0034-use-cloud-map.md | 2 +- .../0035-terraform-workspaces.md | 20 +++++++++++++++++++ architecture-decision-record/README.md | 6 ++++-- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 architecture-decision-record/0035-terraform-workspaces.md diff --git a/architecture-decision-record/0032-ncsc-pdns-not-at-platform-level.md b/architecture-decision-record/0032-ncsc-pdns-not-at-platform-level.md index 9d63841fa..f94123801 100644 --- a/architecture-decision-record/0032-ncsc-pdns-not-at-platform-level.md +++ b/architecture-decision-record/0032-ncsc-pdns-not-at-platform-level.md @@ -4,7 +4,7 @@ Date: 2024-07-10 ## Status -🤔 Proposed +✅ Accepted ## Context diff --git a/architecture-decision-record/0034-use-cloud-map.md b/architecture-decision-record/0034-use-cloud-map.md index 282bade36..174a70481 100644 --- a/architecture-decision-record/0034-use-cloud-map.md +++ b/architecture-decision-record/0034-use-cloud-map.md @@ -1,4 +1,4 @@ -# 33. Use of AWS Cloud Map +# 34. Use of AWS Cloud Map Date: 2024-12-01 diff --git a/architecture-decision-record/0035-terraform-workspaces.md b/architecture-decision-record/0035-terraform-workspaces.md new file mode 100644 index 000000000..28b1214b9 --- /dev/null +++ b/architecture-decision-record/0035-terraform-workspaces.md @@ -0,0 +1,20 @@ +# 35. Use of Terraform Workspaces + +Date: 2024-12-01 + +## Status + +✅ Accepted + +## Context + +Terraform [workspaces](https://developer.hashicorp.com/terraform/language/state/workspaces) allow us to use code consistently across environments while maintain separation of state files. + +## Decision + +We will continue the use of workspaces for separation. Code which uses the `default` workspace will be documented here as an exception. + +## Exceptions + +* `terraform/modernisation-platform-account` +* `terraform/github` diff --git a/architecture-decision-record/README.md b/architecture-decision-record/README.md index 2c6a6fbeb..dd48b184e 100644 --- a/architecture-decision-record/README.md +++ b/architecture-decision-record/README.md @@ -35,8 +35,10 @@ This is our architecture decision log, made during the design and build of the M 1. ♻ [How we deploy shared Active Directory controllers](0029-how-we-deploy-shared-active-directory-controllers.md) 1. ✅ [Cross environment network access](0030-cross-environment-network-access.md) 1. ✅ [LLMs will be hosted on the Analytical Platform](0031-llms-will-be-hosted-on-the-analytical-platform.md) -1. 🤔 [NCSC PDNS will not be applied at platform level](0032-ncsc-pdns-not-at-platform-level.md) - +1. ✅ [NCSC PDNS will not be applied at platform level](0032-ncsc-pdns-not-at-platform-level.md) +1. ❌ [Increase security of sensitive S3 objects (state bucket)](0033-s3-state-bucket-condition-security.md) +1. ❌ [Use of AWS Cloud Map](0034-use-cloud-map.md) +1. ✅ [Use of Terraform Workspaces](0035-terraform-workspaces.md) ## Statuses