Merge pull request #192 from NHSDigital/release/2024-05-02

[Release 2024-05-02]

Author: jameslinnell

.github/actions/components/caching/action.yml

@@ -40,7 +40,7 @@ runs:
         path: ${{ inputs.paths-to-cache }}
         key: "dummy"
         restore-keys: |
-          ${{ env.GITHUB_SHA_SHORT }}-${{ inputs.cache-suffix == '' && 'head' || inputs.cache-suffix }}
+          ${{ env.GITHUB_SHA_SHORT }}-${{ inputs.cache-suffix == '' && 'head' || inputs.cache-suffix }}-
 
     # # For debugging, uncomment the following:
     # - id: tree

.github/workflows/_deploy.yml

@@ -155,8 +155,7 @@ jobs:
           ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }}
       - uses: ./.github/actions/make/
         with:
-          command: test--smoke
-          workspace: ${{ env.WORKSPACE }}
+          command: test--smoke WORKSPACE="${{ env.WORKSPACE }}" ACCOUNT="${{ env.ACCOUNT }}"
           requires-aws: true
           restore-from-cache: "true"
           cache-suffix: ${{ env.CACHE_NAME }}
@@ -180,7 +179,7 @@ jobs:
     steps:
       - name: Send job result to slack
         id: slack
-        uses: slackapi/slack-github-action@v1.25.0
+        uses: slackapi/slack-github-action@v1.26.0
         with:
           payload: |
             {

.github/workflows/merge.yml

@@ -43,7 +43,7 @@ jobs:
     steps:
       - name: Send merge result to slack
         id: slack
-        uses: slackapi/slack-github-action@v1.25.0
+        uses: slackapi/slack-github-action@v1.26.0
         with:
           payload: |
             {

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2024-05-02
+- [PI-341] Prod permissions
+- [PI-268] Search for a device
+- [PI-321] Inactive devices not returned during search
+
 ## 2024-04-26
 - [PI-315] Update trigger
 - [PI-343] Remove people branch

VERSION

@@ -1 +1 @@
-2024.04.26
+2024.05.02

changelog/2024-05-02.md

@@ -0,0 +1,3 @@
+- [PI-341] Prod permissions
+- [PI-268] Search for a device
+- [PI-321] Inactive devices not returned during search

infrastructure/terraform/per_account/dev/parameters/main.tf

@@ -38,6 +38,7 @@ resource "aws_secretsmanager_secret" "apigee-cpm-apikey" {
 resource "aws_secretsmanager_secret" "apigee-app-key" {
   name = "${terraform.workspace}-apigee-app-key"
 }
+
 resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
   name = "${terraform.workspace}-sds-hscn-endpoint"
 }

infrastructure/terraform/per_account/int/main.tf

@@ -32,6 +32,38 @@ module "iam__api-gateway-to-cloudwatch" {
   project = local.project
 }
 
+module "bucket" {
+  source        = "terraform-aws-modules/s3-bucket/aws"
+  version       = "3.15.2"
+  bucket        = "${local.project}--${replace(terraform.workspace, "_", "-")}--test-data"
+  force_destroy = true
+  versioning = {
+    enabled = true
+  }
+  tags = {
+    Name = "${local.project}--${replace(terraform.workspace, "_", "-")}--test-data"
+  }
+}
+
+module "truststore_bucket" {
+  source        = "terraform-aws-modules/s3-bucket/aws"
+  version       = "3.15.2"
+  bucket        = "${local.project}--${replace(terraform.workspace, "_", "-")}--truststore"
+  force_destroy = true
+  versioning = {
+    enabled = true
+  }
+  tags = {
+    Name = "${local.project}--${replace(terraform.workspace, "_", "-")}--truststore"
+  }
+}
+
+module "vpc" {
+  source      = "../modules/vpc"
+  environment = terraform.workspace
+  prefix      = local.project
+}
+
 # -------- ROUTE 53 ---------
 
 resource "aws_route53_zone" "int-ns" {

infrastructure/terraform/per_account/mgmt/modules/route53/main.tf

@@ -37,18 +37,18 @@ module "zones" {
 
 }
 
-# resource "aws_route53_record" "prod_zone" {
-#   zone_id = module.zones.route53_zone_zone_id["cpm.national.nhs.uk"]
-#   name    = "api.cpm.national.nhs.uk"
-#   records = [
-#     "ns-453.awsdns-56.com.",
-#     "ns-980.awsdns-58.net.",
-#     "ns-1983.awsdns-55.co.uk.",
-#     "ns-1103.awsdns-09.org."
-#   ]
-#   ttl  = 300
-#   type = "NS"
-# }
+resource "aws_route53_record" "prod_zone" {
+  zone_id = module.zones.route53_zone_zone_id["cpm.national.nhs.uk"]
+  name    = "api.cpm.national.nhs.uk"
+  records = [
+    "ns-815.awsdns-37.net.",
+    "ns-1169.awsdns-18.org.",
+    "ns-330.awsdns-41.com.",
+    "ns-1759.awsdns-27.co.uk."
+  ]
+  ttl  = 300
+  type = "NS"
+}
 
 resource "aws_route53_record" "dev_zone" {
   zone_id = module.zones.route53_zone_zone_id["cpm.dev.national.nhs.uk"]

infrastructure/terraform/per_account/prod/main.tf

@@ -32,6 +32,38 @@ module "iam__api-gateway-to-cloudwatch" {
   project = local.project
 }
 
+module "bucket" {
+  source        = "terraform-aws-modules/s3-bucket/aws"
+  version       = "3.15.2"
+  bucket        = "${local.project}--${replace(terraform.workspace, "_", "-")}--test-data"
+  force_destroy = true
+  versioning = {
+    enabled = true
+  }
+  tags = {
+    Name = "${local.project}--${replace(terraform.workspace, "_", "-")}--test-data"
+  }
+}
+
+module "truststore_bucket" {
+  source        = "terraform-aws-modules/s3-bucket/aws"
+  version       = "3.15.2"
+  bucket        = "${local.project}--${replace(terraform.workspace, "_", "-")}--truststore"
+  force_destroy = true
+  versioning = {
+    enabled = true
+  }
+  tags = {
+    Name = "${local.project}--${replace(terraform.workspace, "_", "-")}--truststore"
+  }
+}
+
+module "vpc" {
+  source      = "../modules/vpc"
+  environment = terraform.workspace
+  prefix      = local.project
+}
+
 # -------- ROUTE 53 ---------
 
 resource "aws_route53_zone" "prod-ns" {