From 374e31647bdb111feef1b09e5d0635b31b7a18aa Mon Sep 17 00:00:00 2001
From: Jonathon Herbert <jonathon.herbert@guardian.co.uk>
Date: Wed, 10 Apr 2024 09:02:36 +0100
Subject: [PATCH] Remove caching from cloudfront distribution

---
 cdk/lib/__snapshots__/index.test.ts.snap | 37 +-----------------------
 cdk/lib/index.ts                         | 23 ++-------------
 2 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/cdk/lib/__snapshots__/index.test.ts.snap b/cdk/lib/__snapshots__/index.test.ts.snap
index 542f8e815..3c2f87c8b 100644
--- a/cdk/lib/__snapshots__/index.test.ts.snap
+++ b/cdk/lib/__snapshots__/index.test.ts.snap
@@ -1767,39 +1767,6 @@ exports[`The typerighter stack matches the snapshot 1`] = `
       },
       "Type": "AWS::EC2::SecurityGroupEgress",
     },
-    "checkercloudfrontcachepolicyC5791389": {
-      "Properties": {
-        "CachePolicyConfig": {
-          "DefaultTTL": 86400,
-          "MaxTTL": 31536000,
-          "MinTTL": 0,
-          "Name": "checker-cloudfront-cache-policy-TEST",
-          "ParametersInCacheKeyAndForwardedToOrigin": {
-            "CookiesConfig": {
-              "CookieBehavior": "all",
-            },
-            "EnableAcceptEncodingBrotli": false,
-            "EnableAcceptEncodingGzip": false,
-            "HeadersConfig": {
-              "HeaderBehavior": "whitelist",
-              "Headers": [
-                "Host",
-                "Origin",
-                "Access-Control-Request-Headers",
-                "Access-Control-Request-Method",
-                "X-Gu-Tools-HMAC-Token",
-                "X-Gu-Tools-HMAC-Date",
-                "X-Gu-Tools-Service-Name",
-              ],
-            },
-            "QueryStringsConfig": {
-              "QueryStringBehavior": "all",
-            },
-          },
-        },
-      },
-      "Type": "AWS::CloudFront::CachePolicy",
-    },
     "checkerdnsrecords": {
       "Properties": {
         "Name": "checker.test.dev-gutools.co.uk",
@@ -2325,9 +2292,7 @@ EOF
               "POST",
               "DELETE",
             ],
-            "CachePolicyId": {
-              "Ref": "checkercloudfrontcachepolicyC5791389",
-            },
+            "CachePolicyId": "4135ea2d-6df8-44a3-9df3-4b5a84be39ad",
             "Compress": true,
             "TargetOriginId": "typerightertyperightercloudfrontOrigin1DFFB56FA",
             "ViewerProtocolPolicy": "allow-all",
diff --git a/cdk/lib/index.ts b/cdk/lib/index.ts
index c5b2db31f..dae706f4e 100644
--- a/cdk/lib/index.ts
+++ b/cdk/lib/index.ts
@@ -225,33 +225,14 @@ EOF
         defaultBehavior: {
           origin: checkerOrigin,
           allowedMethods: AllowedMethods.ALLOW_ALL,
-          cachePolicy: new CachePolicy(
-            this,
-            "checker-cloudfront-cache-policy",
-            {
-              cachePolicyName: `checker-cloudfront-cache-policy-${this.stage}`,
-              cookieBehavior: CacheCookieBehavior.all(),
-              headerBehavior: CacheHeaderBehavior.allowList(
-                "Host",
-                "Origin",
-                "Access-Control-Request-Headers",
-                "Access-Control-Request-Method",
-                "X-Gu-Tools-HMAC-Token",
-                "X-Gu-Tools-HMAC-Date",
-                "X-Gu-Tools-Service-Name"
-              ),
-              queryStringBehavior: CacheQueryStringBehavior.all(),
-            }
-          ),
+          cachePolicy: CachePolicy.CACHING_DISABLED
         },
         domainNames: [checkerDomain],
         logBucket: cloudfrontBucket,
         certificate: checkerCertificate,
       }
     );
-
-    checkerCloudFrontDistro.addBehavior("/healthcheck", checkerOrigin, { cachePolicy: CachePolicy.CACHING_DISABLED });
-
+    
     const checkerDnsRecord = new GuDnsRecordSet(this, "checker-dns-records", {
       name: checkerDomain,
       recordType: RecordType.CNAME,