From c91193ed2287f3dfbaafbe97e4ad4e89418addff Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Tue, 17 Mar 2026 09:42:16 +0000
Subject: [PATCH] use managed cloudfront caching and forwarding policies
 instead of defining our own

---
 .../terraform/modules/cloudfront/main.tf      | 46 +++----------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/infrastructure/terraform/modules/cloudfront/main.tf b/infrastructure/terraform/modules/cloudfront/main.tf
index 3b5fe549..261352a8 100644
--- a/infrastructure/terraform/modules/cloudfront/main.tf
+++ b/infrastructure/terraform/modules/cloudfront/main.tf
@@ -1,39 +1,9 @@
-resource "aws_cloudfront_cache_policy" "api" {
-  name = "api-no-cache"
-
-  default_ttl = 0
-  max_ttl     = 0
-  min_ttl     = 0
-
-  parameters_in_cache_key_and_forwarded_to_origin {
-    cookies_config {
-      cookie_behavior = "none"
-    }
-
-    headers_config {
-      header_behavior = "none"
-    }
-
-    query_strings_config {
-      query_string_behavior = "none"
-    }
-  }
+data "aws_cloudfront_cache_policy" "caching_disabled" {
+  name = "Managed-CachingDisabled"
 }
 
-resource "aws_cloudfront_origin_request_policy" "api" {
-  name = "api-forward-all"
-
-  headers_config {
-    header_behavior = "allViewer"
-  }
-
-  query_strings_config {
-    query_string_behavior = "all"
-  }
-
-  cookies_config {
-    cookie_behavior = "all"
-  }
+data "aws_cloudfront_origin_request_policy" "all_viewer_except_host_header" {
+  name = "Managed-AllViewerExceptHostHeader"
 }
 
 ############################################
@@ -122,12 +92,8 @@ resource "aws_cloudfront_distribution" "this" {
     allowed_methods = ["GET","HEAD","OPTIONS","PUT","POST","PATCH","DELETE"]
     cached_methods  = ["GET","HEAD"]
 
-    cache_policy_id          = aws_cloudfront_cache_policy.api.id
-    origin_request_policy_id = aws_cloudfront_origin_request_policy.api.id
-
-    min_ttl     = 0
-    default_ttl = 0
-    max_ttl     = 0
+    cache_policy_id          = data.aws_cloudfront_cache_policy.caching_disabled.id
+    origin_request_policy_id = data.aws_cloudfront_origin_request_policy.all_viewer_except_host_header.id
   }
 
   price_class = "PriceClass_All"