Merge branch 'main' into fix/CCM-8859-accessibility-text-logo

Author: nicki-nhs

frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap

@@ -7,7 +7,7 @@ exports[`PreviewLetterTemplate component matches snapshot 1`] = `
   >
     <a
       class="nhsuk-back-link__link"
-      href="/templates/manage-templates"
+      href="/templates/message-templates"
       id="back-link"
     >
       <svg
@@ -144,7 +144,7 @@ exports[`PreviewLetterTemplate component matches snapshot 1`] = `
         </a>
         <p>
           <a
-            href="/manage-templates"
+            href="/message-templates"
           >
             Back to all templates
           </a>
@@ -162,7 +162,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
   >
     <a
       class="nhsuk-back-link__link"
-      href="/templates/manage-templates"
+      href="/templates/message-templates"
       id="back-link"
     >
       <svg
@@ -299,7 +299,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
         </a>
         <p>
           <a
-            href="/manage-templates"
+            href="/message-templates"
           >
             Back to all templates
           </a>

frontend/src/components/organisms/PreviewLetterTemplate/PreviewLetterTemplate.tsx

@@ -17,7 +17,7 @@ export function PreviewLetterTemplate({
 
   return (
     <>
-      <BackLink href={`${basePath}/manage-templates`} id='back-link'>
+      <BackLink href={`${basePath}/message-templates`} id='back-link'>
         {backLinkText}
       </BackLink>
       <NHSNotifyMain>
@@ -32,7 +32,7 @@ export function PreviewLetterTemplate({
               {buttonText}
             </NHSNotifyButton>
             <p>
-              <Link href='/manage-templates'>{backLinkText}</Link>
+              <Link href='/message-templates'>{backLinkText}</Link>
             </p>
           </div>
         </div>

infrastructure/terraform/components/acct/iam_policy_github_deploy_overload.tf

@@ -48,6 +48,7 @@ data "aws_iam_policy_document" "github_deploy" {
       "ec2:ModifyVpc*",
       "ec2:ReleaseAddress",
       "ec2:Replace*",
+      "ec2:Revoke*",
     ]
     resources = ["*"]
   }

infrastructure/terraform/components/branch/locals.tf

@@ -1,4 +1,4 @@
 locals {
   root_domain_name       = "${var.environment}.${local.app.amplify["domain_name"]}"
-  normalised_branch_name = lower(substr(join("", regexall("[a-zA-Z0-9-]+", var.branch_name)), 0, 25))
+  normalised_branch_name = trimsuffix(lower(substr(join("", regexall("[a-zA-Z0-9-]+", var.branch_name)), 0, 25)),"-")
 }