CCM-6996: merge main

Author: Fawad Ali

.gitignore

@@ -16,6 +16,7 @@
 
 # dependencies
 node_modules
+.node-version
 */node_modules
 /.pnp
 .pnp.js
@@ -47,6 +48,7 @@ npm-debug.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+.swc
 
 # reports
 reports

amplify/backend.ts

@@ -20,9 +20,3 @@ const attachPolicy = new PolicyStatement({
 });
 
 sendEmailLambda.addToRolePolicy(attachPolicy);
-
-backend.data.resources.cfnResources.amplifyDynamoDbTables.SessionStorage.timeToLiveAttribute =
-  {
-    attributeName: 'ttl',
-    enabled: true,
-  };

amplify/data/resource.ts

@@ -1,30 +1,38 @@
 import { type ClientSchema, a, defineData } from '@aws-amplify/backend';
 import { sendEmail } from '../functions/send-email/resource';
 
-const templateTypes = ['NHS_APP', 'SMS', 'EMAIL', 'LETTER'] as const;
+enum TemplateType {
+  NHS_APP = 'NHS_APP',
+  SMS = 'SMS',
+  EMAIL = 'EMAIL',
+  LETTER = 'LETTER',
+}
 
-const SessionStorageModel = {
-  id: a.string().required(),
-  templateType: a.enum([...templateTypes, 'UNKNOWN']),
-  nhsAppTemplateName: a.string().required(),
-  nhsAppTemplateMessage: a.string().required(),
-  emailTemplateName: a.string(),
-  emailTemplateSubjectLine: a.string(),
-  emailTemplateMessage: a.string(),
-  smsTemplateName: a.string(),
-  smsTemplateMessage: a.string(),
-  ttl: a.integer().required(),
-};
+enum TemplateStatus {
+  NOT_YET_SUBMITTED = 'NOT_YET_SUBMITTED',
+  SUBMITTED = 'SUBMITTED',
+}
+
+const templateTypes = [
+  TemplateType.NHS_APP,
+  TemplateType.SMS,
+  TemplateType.EMAIL,
+  TemplateType.LETTER,
+] as const;
+
+const templateStatuses = [
+  TemplateStatus.NOT_YET_SUBMITTED,
+  TemplateStatus.SUBMITTED,
+] as const;
 
 const TemplateStorageModel = {
   id: a.string().required(),
-  name: a.string().required(),
-  type: a.enum(templateTypes),
+  templateType: a.ref('TemplateType').required(),
+  templateStatus: a.ref('TemplateStatus').required(),
   version: a.integer().required(),
-  fields: a.customType({
-    subjectLine: a.string(),
-    content: a.string().required(),
-  }),
+  name: a.string().required(),
+  subject: a.string(),
+  message: a.string().required(),
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -34,7 +42,8 @@ const authPermission = (allow: any) =>
     : [allow.guest()];
 
 const schema = a.schema({
-  SessionStorage: a.model(SessionStorageModel).authorization(authPermission),
+  TemplateType: a.enum(templateTypes),
+  TemplateStatus: a.enum(templateStatuses),
   TemplateStorage: a.model(TemplateStorageModel).authorization(authPermission),
   sendEmail: a
     .query()

infrastructure/terraform/components/app/amplify_app.tf

@@ -27,10 +27,10 @@ resource "aws_amplify_app" "main" {
   ]
 
   environment_variables = {
-    NOTIFY_GROUP                            = var.group
-    NOTIFY_ENVIRONMENT                      = var.environment
-    NOTIFY_DOMAIN_NAME                      = local.root_domain_name
-    ACCOUNT_ID                              = var.aws_account_id
-    NEXT_PUBLIC_DISABLE_CONTENT             = var.disable_content
+    NOTIFY_GROUP                = var.group
+    NOTIFY_ENVIRONMENT          = var.environment
+    NOTIFY_DOMAIN_NAME          = local.root_domain_name
+    ACCOUNT_ID                  = var.aws_account_id
+    NEXT_PUBLIC_DISABLE_CONTENT = var.disable_content
   }
 }

infrastructure/terraform/components/app/module_templates_api.tf

@@ -0,0 +1,11 @@
+module "templates_api" {
+  source = "../../modules/templates-api"
+
+  project               = var.project
+  environment           = var.environment
+  aws_account_id        = var.aws_account_id
+  region                = var.region
+  group                 = var.group
+  csi                   = local.csi
+  log_retention_in_days = var.log_retention_in_days
+}

infrastructure/terraform/components/app/outputs.tf

@@ -4,3 +4,7 @@ output "amplify" {
     domain_name = local.root_domain_name
   }
 }
+
+output "api_invoke_url" {
+  value = module.templates_api.api_invoke_url
+}

infrastructure/terraform/components/branch/module_amplify_branch.tf

@@ -20,6 +20,5 @@ module "amplify_branch" {
   environment_variables = {
     NOTIFY_SUBDOMAIN              = var.environment
     NEXT_PUBLIC_BASE_PATH         = "/templates~${local.normalised_branch_name}"
-    MAX_SESSION_LENGTH_IN_SECONDS = 432000 # 5 days in seconds
   }
 }

infrastructure/terraform/modules/lambda-function/cloudwatch_log_group_lambda.tf

@@ -0,0 +1,4 @@
+resource "aws_cloudwatch_log_group" "lambda" {
+  name              = "/aws/lambda/${var.function_name}"
+  retention_in_days = var.log_retention_in_days
+}

infrastructure/terraform/modules/lambda-function/iam_role_lambda_execution_role.tf

@@ -0,0 +1,50 @@
+resource "aws_iam_role" "lambda_execution_role" {
+  name               = "${var.function_name}-execution-role"
+  description        = "IAM Role for Lambda function ${var.function_name}"
+  assume_role_policy = data.aws_iam_policy_document.lambda_service_trust_policy.json
+}
+
+resource "aws_iam_role_policy" "lambda_execution_policy" {
+  role   = aws_iam_role.lambda_execution_role.name
+  name   = "${var.function_name}-execution-policy"
+  policy = data.aws_iam_policy_document.lambda_execution_policy.json
+}
+
+data "aws_iam_policy_document" "lambda_service_trust_policy" {
+  statement {
+    sid    = "LambdaAssumeRole"
+    effect = "Allow"
+
+    actions = [
+      "sts:AssumeRole",
+    ]
+
+    principals {
+      type = "Service"
+
+      identifiers = [
+        "lambda.amazonaws.com"
+      ]
+    }
+  }
+}
+
+data "aws_iam_policy_document" "lambda_execution_policy" {
+  source_policy_documents = [
+    var.execution_role_policy_document
+  ]
+
+  statement {
+    sid    = "AllowLogs"
+    effect = "Allow"
+
+    actions = [
+      "logs:CreateLogStream",
+      "logs:PutLogEvents"
+    ]
+
+    resources = [
+      "${aws_cloudwatch_log_group.lambda.arn}:log-stream:*",
+    ]
+  }
+}

infrastructure/terraform/modules/lambda-function/lambda_function_main.tf

@@ -0,0 +1,9 @@
+resource "aws_lambda_function" "main" {
+  description      = var.description
+  function_name    = var.function_name
+  role             = aws_iam_role.lambda_execution_role.arn
+  filename         = var.filename
+  source_code_hash = var.source_code_hash
+  handler          = var.handler
+  runtime          = var.runtime
+}