Update site S3 bucket name to reduce chance of collision

Author: vivid-cpreston

.github/workflows/client-build.yml

@@ -106,11 +106,11 @@ jobs:
       env:
           TARGET_ENV: ${{ env.TARGET_ENV }}
       run: |
-        aws s3 sync client/wfprev-war/src/main/angular/dist/wfprev s3://wfprev-${{ steps.mapEnvironments.outputs.SHORTENED_ENV }}-site \
+        aws s3 sync client/wfprev-war/src/main/angular/dist/wfprev s3://wfprev-${{vars.TFC_PROJECT}}-${{ steps.mapEnvironments.outputs.SHORTENED_ENV }}-site \
           --delete \
           --cache-control max-age=31536000,public \
           --exclude index.html
-        aws s3 cp client/wfprev-war/src/main/angular/dist/wfprev/index.html s3://wfprev-${{ steps.mapEnvironments.outputs.SHORTENED_ENV }}-site/index.html \
+        aws s3 cp client/wfprev-war/src/main/angular/dist/wfprev/index.html s3://wfprev-${{vars.TFC_PROJECT}}-${{ steps.mapEnvironments.outputs.SHORTENED_ENV }}-site/index.html \
           --cache-control max-age=0,no-cache,no-store,must-revalidate
 
     - name: Invalidate CloudFront Cache

terraform/s3.tf

@@ -2,7 +2,7 @@
 module "s3_secure_bucket" {
   source = "git::https://github.com/bcgov/quickstart-aws-helpers.git//terraform/modules/s3-secure-bucket?ref=v0.0.5"
 
-  bucket_name = "wfprev-${var.SHORTENED_ENV}-site"
+  bucket_name = "wfprev-${var.TFC_PROJECT}-${var.SHORTENED_ENV}-site"
   force_destroy = true
 
   # S3 Bucket Policy for public access
@@ -15,7 +15,7 @@ module "s3_secure_bucket" {
           "AWS" : "${aws_cloudfront_origin_access_identity.oai.iam_arn}"
         },
         Action   = "s3:GetObject",
-        Resource = "arn:aws:s3:::wfprev-${var.SHORTENED_ENV}-site/*"
+        Resource = "arn:aws:s3:::wfprev-${var.TFC_PROJECT}-${var.SHORTENED_ENV}-site/*"
       },
       {
         Effect = "Allow",
@@ -29,8 +29,8 @@ module "s3_secure_bucket" {
           "s3:DeleteObject"
         ],
         Resource = [
-          "arn:aws:s3:::wfprev-${var.SHORTENED_ENV}-site",
-          "arn:aws:s3:::wfprev-${var.SHORTENED_ENV}-site/*"
+          "arn:aws:s3:::wfprev-${var.TFC_PROJECT}-${var.SHORTENED_ENV}-site",
+          "arn:aws:s3:::wfprev-${var.TFC_PROJECT}-${var.SHORTENED_ENV}-site/*"
         ]
       }
     ]

terraform/terragrunt.hcl

@@ -27,6 +27,7 @@ generate "tfvars" {
 TARGET_ENV = "${get_env("TARGET_ENV")}"
 NAMESPACE_ENV = "${get_env("NAMESPACE_ENV")}"
 SHORTENED_ENV = "${get_env("SHORTENED_ENV")}"
+TFC_PROJECT = "${get_env("TFC_PROJECT")}"
 APP_COUNT = "${get_env("APP_COUNT")}"
 LOGGING_LEVEL = "${get_env("LOGGING_LEVEL")}"
 RESTORE_DOWNSCALED_CLUSTER = "${get_env("RESTORE_DOWNSCALED_CLUSTER")}"

terraform/variables.tf

@@ -20,6 +20,11 @@ variable "SHORTENED_ENV" {
   type = string
 }
 
+variable "TFC_PROJECT" {
+  description = "License Plate number of project"
+  type = string
+}
+
 variable "WFPREV_API_CPU_UNITS" {
   description = "server CPU units to provision (1 vCPU = 1024 CPU units)"
   type        = number