Merge branch 'feature/CCM-9037_internal-bucket' into feature/CCM-8585-upload-pdf-backend-squash

Author: alexnuttall

.github/actions/normalize-branch-name/action.yaml

@@ -2,7 +2,7 @@ name: "Normalize branch name"
 description: "Normalize branch name"
 outputs:
   normalized_branch_name:
-    description: 14 character branch identifier (0000-thebranch)
+    description: 10 character branch identifier (0000-branch)
     value: ${{ steps.normalize_branch_name.outputs.normalized_branch_name }}
 runs:
   using: "composite"
@@ -14,5 +14,5 @@ runs:
         stripped=$(echo $branch | sed -e 's/[^a-zA-Z0-9-]//g' | tr '[:upper:]' '[:lower:]')
         starting_from_jira_ref=$(echo $stripped | sed -n 's/.*\([0-9]\{4,\}.*\)/\1/p')
         with_fallback=${starting_from_jira_ref:-$stripped}
-        chopped=$(echo $with_fallback | head -c 14)
+        chopped=$(echo $with_fallback | head -c 10)
         echo "normalized_branch_name=$chopped" >> $GITHUB_OUTPUT

infrastructure/terraform/components/sandbox/data_acct_kms_key.tf

@@ -1,3 +1,3 @@
 data "aws_kms_key" "sandbox" {
-  key_id = "${var.project}-main-acct-sandbox"
+  key_id = "alias/${var.project}-main-acct-sandbox"
 }