csi scope cf policies

Author: alexnuttall

infrastructure/terraform/components/app/amplify_domain_association.tf

@@ -29,8 +29,8 @@ resource "null_resource" "amplify_domain_association" {
     command = "aws amplify create-domain-association --app-id ${self.triggers.amplify_app_id} --domain-name ${self.triggers.amplify_domain_name} --sub-domain-settings prefix=\"\",branchName=\"${self.triggers.amplify_branch_name}\" prefix=\"${self.triggers.amplify_url_prefix}\",branchName=\"${self.triggers.amplify_branch_name}\" --enable-auto-sub-domain --auto-sub-domain-creation-patterns \"*,*/*,pr*\""
   }
 
-  # provisioner "local-exec" {
-  #   when    = destroy
-  #   command = "aws amplify delete-domain-association --app-id ${self.triggers.amplify_app_id} --domain-name ${self.triggers.amplify_domain_name}"
-  # }
+  provisioner "local-exec" {
+    when    = destroy
+    command = "aws amplify delete-domain-association --app-id ${self.triggers.amplify_app_id} --domain-name ${self.triggers.amplify_domain_name}"
+  }
 }

infrastructure/terraform/components/app/cloudfront_distribution_main.tf

@@ -68,7 +68,7 @@ resource "aws_cloudfront_distribution" "main" {
 }
 
 resource "aws_cloudfront_cache_policy" "no_cache" {
-  name = "no-cache-policy"
+  name = "${local.csi}-no-cache-policy"
 
   default_ttl = 0
   max_ttl     = 0
@@ -82,7 +82,7 @@ resource "aws_cloudfront_cache_policy" "no_cache" {
 }
 
 resource "aws_cloudfront_origin_request_policy" "forward_cookies" {
-  name = "forward-cookies"
+  name = "${local.csi}-forward-cookies"
   cookies_config { cookie_behavior = "all" }
   headers_config { header_behavior = "none" }
   query_strings_config { query_string_behavior = "none" }