Merge branch 'main' into feature/CCM-15551_Remove_Trivy

Author: jamesthompson26-nhs

.tool-versions

@@ -7,7 +7,7 @@ nodejs 18.18.2
 pre-commit 3.6.0
 terraform 1.10.1
 terraform-docs 0.19.0
-# trivy 0.61.0
+# trivy 0.69.3
 # python 3.13.2
 
 # ==============================================================================

infrastructure/terraform/components/reporting/data_iam_policy_document_sso_read_only_table_access.tf

@@ -34,6 +34,7 @@ data "aws_iam_policy_document" "sso_read_only_table_access" {
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_summary_all_email_filter",
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_smsnudge_staging",
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_plan_status_smsnudge",
+        "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_plan_read_status_smsnudge",
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/request_item_status_smsnudge",
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/dates",
         "arn:aws:glue:${var.region}:${var.aws_account_id}:table/${var.project}-*-reporting-database/letters_invoice_units_monthly",

infrastructure/terraform/components/reporting/iam_instance_profile_powerbi_gateway.tf

@@ -186,6 +186,7 @@ data "aws_iam_policy_document" "powerbi_gateway_permissions_policy" {
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_summary_all_email_filter",
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_smsnudge_staging",
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_plan_status_smsnudge",
+        "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_plan_read_status_smsnudge",
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/request_item_status_smsnudge",
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/dates",
         "arn:aws:glue:${var.region}:${local.this_account}:table/${aws_glue_catalog_database.reporting.name}/letters_invoice_units_monthly",

infrastructure/terraform/components/reporting/null_resource_request_item_plan_read_status_smsnudge.tf

@@ -0,0 +1,20 @@
+resource "null_resource" "request_item_plan_read_status_smsnudge" {
+  triggers = {
+    sql = filesha256("${path.module}/scripts/sql/views/request_item_plan_read_status_smsnudge.sql")
+  }
+
+  provisioner "local-exec" {
+    command = <<EOT
+      ${path.module}/scripts/create_replace_view.sh \
+        ${aws_athena_workgroup.setup.name} \
+        ${aws_glue_catalog_database.reporting.name} \
+        request_item_plan_read_status_smsnudge \
+        sms_nudge_client_id "${local.sms_nudge_client_id}"
+    EOT
+  }
+
+  depends_on = [
+    null_resource.request_item_plan_status_table,
+    null_resource.request_item_status_smsnudge_staging_view
+  ]
+}

infrastructure/terraform/components/reporting/scripts/sql/views/request_item_plan_read_status_smsnudge.sql

@@ -0,0 +1,24 @@
+CREATE OR REPLACE VIEW ${view_name} AS
+SELECT
+  DATE(nudge.createdtime) createddate,
+  nudge.clientid,
+  nudge.requestitemplanid,
+  originatingclientid,
+  originatingcampaignid,
+  originatingbillingref,
+  originatingsendinggroupid,
+  originatingrequestitemplanid,
+  app.status AS originalStatus,
+  CASE
+    WHEN nudge.status = 'DELIVERED'
+    AND app.status = 'DELIVERED' THEN DATE_DIFF('second', nudge.createdtime, app.completedtime) / 3600.0 ELSE NULL
+  END hrsToRead
+FROM
+  request_item_plan_status_smsnudge nudge
+LEFT JOIN
+  request_item_plan_status app
+ON (
+  nudge.originatingrequestitemplanid = app.requestitemplanid
+  AND nudge.originatingclientid = app.clientid
+  AND app.communicationtype = 'NHSAPP'
+)