Merge pull request #463 from NHSDigital/release/2025-01-08

Release/2025 01 08

Author: jameslinnell

.github/workflows/destroy-nonprod-workspace.yml

@@ -0,0 +1,65 @@
+name: "Destroy: Workspace - Nonprod"
+
+on:
+  workflow_dispatch:
+    inputs:
+      account:
+        description: Account to destroy
+        required: true
+        default: qa
+        type: choice
+        options:
+          - dev
+          - qa
+      sandbox:
+        description: Do you want to destroy the sandbox version?
+        type: boolean
+        default: false
+
+jobs:
+  parse-secrets:
+    runs-on: [self-hosted, ci]
+    steps:
+      - id: parse-secrets
+        run: |
+          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
+
+  get-branch-from-workflow-file:
+    runs-on: [self-hosted, ci]
+    needs: [parse-secrets]
+    outputs:
+      branch_name: ${{ steps.get_branch.outputs.branch_name }}
+    steps:
+      - id: get_branch
+        run: |
+          workflow_ref=${{ github.workflow_ref }}
+          branch_name=${workflow_ref#*refs/heads/}
+          branch_name=${branch_name#*refs/tags/}
+          echo "branch_name=${branch_name}" >> $GITHUB_OUTPUT
+
+  build-base:
+    runs-on: [self-hosted, ci]
+    needs: [get-branch-from-workflow-file]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
+      - uses: ./.github/actions/make/
+        with:
+          command: build
+          save-to-cache: "true"
+          restore-from-cache: "false"
+
+  destroy_persistent_workspace:
+    runs-on: [self-hosted, ci]
+    needs: [build-base]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
+      - name: Destroy workspace
+        uses: ./.github/actions/make/
+        with:
+          command: terraform--destroy TERRAFORM_WORKSPACE=${{ inputs.account }}${{ inputs.sandbox == true && '-sandbox' || '' }} TF_CLI_ARGS=${{ env.TF_CLI_ARGS }}
+          requires-aws: true

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
+## 2025-01-08
+- [PI-716] Pipeline enhancements
+- [PI-430] Remove Account Wide VPC
+
 ## 2025-01-02
+- [PI-670] Billing Alarms
 - [PI-688] Changelog ETL - delete an AS
 - [PI-690] Changelog ETL - modify / add to an MHS
 - [PI-694] Changelog ETL - modify / remove from an MHS

VERSION

@@ -1 +1 @@
-2025.01.02
+2025.01.08

changelog/2025-01-02.md

@@ -1,3 +1,4 @@
+- [PI-670] Billing Alarms
 - [PI-688] Changelog ETL - delete an AS
 - [PI-690] Changelog ETL - modify / add to an MHS
 - [PI-694] Changelog ETL - modify / remove from an MHS

changelog/2025-01-08.md

@@ -0,0 +1,2 @@
+- [PI-716] Pipeline enhancements
+- [PI-430] Remove Account Wide VPC

infrastructure/terraform/per_account/dev/main.tf

@@ -96,13 +96,6 @@ module "sds_etl_hscn_vpc" {
   prefix      = local.project
 }
 
-module "vpc" {
-  source      = "../modules/vpc"
-  environment = terraform.workspace
-  prefix      = local.project
-}
-
-
 # -------- ROUTE 53 ---------
 
 resource "aws_route53_zone" "dev-ns" {

infrastructure/terraform/per_account/int/main.tf

@@ -96,12 +96,6 @@ module "sds_etl_hscn_vpc" {
   environment = terraform.workspace
   prefix      = local.project
 }
-module "vpc" {
-  source      = "../modules/vpc"
-  environment = terraform.workspace
-  prefix      = local.project
-}
-
 
 # -------- ROUTE 53 ---------
 

infrastructure/terraform/per_account/modules/vpc/lambda-connectivity-vpc.tf

@@ -95,11 +95,6 @@ module "sds_etl_hscn_vpc" {
   environment = terraform.workspace
   prefix      = local.project
 }
-module "vpc" {
-  source      = "../modules/vpc"
-  environment = terraform.workspace
-  prefix      = local.project
-}
 
 # -------- ROUTE 53 ---------