Merge branch 'master' into feature/VED-366-internal-qa-env-pre-work

Author: dlzhry2nhs

.github/workflows/quality-checks.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
 
-      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903
+      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f
         with:
           node-version: "23.11.0"
           cache: "npm"

infrastructure/account/.terraform.lock.hcl

@@ -38,7 +38,8 @@ resource "aws_apigatewayv2_domain_name" "service_api_domain_name" {
     security_policy = "TLS_1_2"
   }
   mutual_tls_authentication {
-    truststore_uri = "s3://${aws_s3_bucket.truststore_bucket.bucket}/${local.truststore_file_name}"
+    truststore_uri     = "s3://${aws_s3_bucket.truststore_bucket.bucket}/${local.truststore_file_name}"
+    truststore_version = aws_s3_object_copy.copy_cert_from_storage.version_id
   }
   tags = {
     Name = "${var.prefix}-api-domain-name"

infrastructure/grafana/non-prod/terraform/.terraform.lock.hcl

@@ -12,13 +12,27 @@ data "aws_s3_object" "cert" {
   key    = local.truststore_file_name
 }
 
+resource "terraform_data" "cert_etag" {
+  input = data.aws_s3_object.cert.etag
+}
+
 resource "aws_s3_bucket" "truststore_bucket" {
   bucket        = "${var.prefix}-truststores"
   force_destroy = true
 }
 
+resource "aws_s3_bucket_versioning" "truststore_bucket" {
+  bucket = aws_s3_bucket.truststore_bucket.bucket
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
 resource "aws_s3_object_copy" "copy_cert_from_storage" {
   bucket = aws_s3_bucket.truststore_bucket.bucket
   key    = local.truststore_file_name
   source = "${data.aws_s3_object.cert.bucket}/${local.truststore_file_name}"
+  lifecycle {
+    replace_triggered_by = [terraform_data.cert_etag]
+  }
 }