From 6bf982d8b513c9b3d54f64b5df46f8b50990c477 Mon Sep 17 00:00:00 2001
From: Leonardo Medici <leonardo_medici@me.com>
Date: Thu, 6 Jun 2024 11:40:03 +0200
Subject: [PATCH] Handle CDN invalidations only if CDN explicitly enabled

---
 changelog.md                              | 6 ++++++
 src/sam/02-after/00-get-app-apex/index.js | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 3e676d6b..7b95f997 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Architect Deploy changelog
 
+## [5.0.8] 2024-06-06
+
+### Fixed
+
+- Handle CDN invalidations only if CDN explicitly enabled
+
 ---
 
 ## [5.0.8] 2025-01-23
diff --git a/src/sam/02-after/00-get-app-apex/index.js b/src/sam/02-after/00-get-app-apex/index.js
index a041826e..c29af4bb 100644
--- a/src/sam/02-after/00-get-app-apex/index.js
+++ b/src/sam/02-after/00-get-app-apex/index.js
@@ -88,7 +88,7 @@ module.exports = function getAppApex (params, callback) {
           else callback()
         },
         function invalidateS3 (callback) {
-          if (s3 && !creatingS3 && !enablingS3 && !destroyingS3) {
+          if (cdnEnabled && s3 && !creatingS3 && !enablingS3 && !destroyingS3) {
             update.status('Invalidating static asset (S3) CDN distribution cache')
             aws.cloudfront.CreateInvalidation({
               Id: s3.id,
@@ -132,7 +132,7 @@ module.exports = function getAppApex (params, callback) {
           else callback()
         },
         function invalidateApiGateway (callback) {
-          if (apigateway && !creatingApiGateway && !enablingApiGateway && !destroyingApiGateway) {
+          if (cdnEnabled && apigateway && !creatingApiGateway && !enablingApiGateway && !destroyingApiGateway) {
             update.status('Invalidating API Gateway CDN distribution cache')
             aws.cloudfront.CreateInvalidation({
               Id: apigateway.id,