From d66fbb0309d8075d081660ead57f9cf3d624a2a8 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 11:53:11 +0530
Subject: [PATCH 1/7] validate cache issue

---
 master_deploy.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/master_deploy.sh b/master_deploy.sh
index aa63a44..6060455 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -70,6 +70,7 @@ ebstemplate=""
 #AWS_S3_BUCKET=""
 #AWS_S3_SOURCE_SYNC_PATH=""
 CFCACHE="false"
+AWS_CLOUD_FRONT_ID=""
 
 # Variables for Lambda 
 #AWS_LAMBDA_DEPLOY_TYPE=""
@@ -696,6 +697,18 @@ deploy_s3bucket() {
     done;
 }
 
+invalidate_cf_cache()
+{
+    if [ "$CFCACHE" = "true" ]; then
+         if [ -z $AWS_CLOUD_FRONT_ID ]; then
+            echo "Based on header applicaiton has invalidated"
+            echo "Skipped which is based on AWS cloudfront ID.Kindly raise request to configure cloud front ID in deployment configuration"
+         else
+            aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*'
+         fi
+    fi
+}
+
 download_envfile()
 {
     Buffer_seclist=$(echo $SEC_LIST | sed 's/,/ /g' )
@@ -1127,6 +1140,7 @@ main()
     if [ "$DEPLOYMENT_TYPE" == "CFRONT" ]
     then
         deploy_s3bucket
+        invalidate_cf_cache
     fi
 
     if [ "$DEPLOYMENT_TYPE" == "LAMBDA" ]

From 59e9c202ea458bb1ef526f38b1ca8ac180fb8699 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 12:47:35 +0530
Subject: [PATCH 2/7] validate cache issue

---
 master_deploy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 6060455..c6b1461 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -70,7 +70,7 @@ ebstemplate=""
 #AWS_S3_BUCKET=""
 #AWS_S3_SOURCE_SYNC_PATH=""
 CFCACHE="false"
-AWS_CLOUD_FRONT_ID=""
+# AWS_CLOUD_FRONT_ID=""
 
 # Variables for Lambda 
 #AWS_LAMBDA_DEPLOY_TYPE=""

From b07c8da47fd9d2e12013d03a32934af99cf5e5bd Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 13:57:54 +0530
Subject: [PATCH 3/7] validate cache issue

---
 master_deploy.sh | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index c6b1461..0f8fba1 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -697,6 +697,27 @@ deploy_s3bucket() {
     done;
 }
 
+check_invalidation_status() {
+    INVALIDATE_ID=$1
+    counter=0
+    echo "invalidating cache"
+    sleep 60
+    invalidstatus =`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+    
+    while [[ $invalidstatus != *"Completed"* ]]
+    do
+        echo "Waiting for 15 sec and try to check the invalidation status..."
+        sleep 15
+        invalidstatus =`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+        counter=`expr $counter + 1`
+        if [[ $counter -gt $COUNTER_LIMIT ]] ; then
+            echo "Invalidation does not complete with in 180 seconds. Please check the GUI mode."
+            exit 1
+        fi
+    done
+    echo "Invalidation completed"
+}
+
 invalidate_cf_cache()
 {
     if [ "$CFCACHE" = "true" ]; then
@@ -704,7 +725,9 @@ invalidate_cf_cache()
             echo "Based on header applicaiton has invalidated"
             echo "Skipped which is based on AWS cloudfront ID.Kindly raise request to configure cloud front ID in deployment configuration"
          else
-            aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*'
+            #aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*'
+            INVALIDATE_ID=`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*' | $JQ 'Invalidation.Id'`
+            check_invalidation_status "$INVALIDATE_ID"
          fi
     fi
 }

From 0fdf835fad170aa7def811be7be90ae08f2097af Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 14:06:11 +0530
Subject: [PATCH 4/7] validate cache issue

---
 master_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 0f8fba1..d642604 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -700,7 +700,7 @@ deploy_s3bucket() {
 check_invalidation_status() {
     INVALIDATE_ID=$1
     counter=0
-    echo "invalidating cache"
+    echo "invalidating cache with ID $INVALIDATE_ID"
     sleep 60
     invalidstatus =`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
     
@@ -726,7 +726,7 @@ invalidate_cf_cache()
             echo "Skipped which is based on AWS cloudfront ID.Kindly raise request to configure cloud front ID in deployment configuration"
          else
             #aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*'
-            INVALIDATE_ID=`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*' | $JQ 'Invalidation.Id'`
+            INVALIDATE_ID=`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --paths '/*' | $JQ '.Invalidation.Id'`
             check_invalidation_status "$INVALIDATE_ID"
          fi
     fi

From 1406399708f241fa7af476c0c7d12b6ab650fed1 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 14:23:32 +0530
Subject: [PATCH 5/7] validate cache issue

---
 master_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index d642604..100c51f 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -702,13 +702,13 @@ check_invalidation_status() {
     counter=0
     echo "invalidating cache with ID $INVALIDATE_ID"
     sleep 60
-    invalidstatus =`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+    invalidstatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
     
     while [[ $invalidstatus != *"Completed"* ]]
     do
         echo "Waiting for 15 sec and try to check the invalidation status..."
         sleep 15
-        invalidstatus =`aws cloudfront create-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+        invalidstatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
         counter=`expr $counter + 1`
         if [[ $counter -gt $COUNTER_LIMIT ]] ; then
             echo "Invalidation does not complete with in 180 seconds. Please check the GUI mode."

From a7ee62e0f9602f97d7948808df4b7d901e22e404 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 14:52:58 +0530
Subject: [PATCH 6/7] validate cache issue

---
 master_deploy.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 100c51f..16fc69e 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -702,13 +702,14 @@ check_invalidation_status() {
     counter=0
     echo "invalidating cache with ID $INVALIDATE_ID"
     sleep 60
-    invalidstatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+    invalidatestatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
     
-    while [[ $invalidstatus != *"Completed"* ]]
+    while [[ $invalidatestatus != *"Completed"* ]]
     do
+        echo $invalidatestatus
         echo "Waiting for 15 sec and try to check the invalidation status..."
         sleep 15
-        invalidstatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+        invalidatestatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
         counter=`expr $counter + 1`
         if [[ $counter -gt $COUNTER_LIMIT ]] ; then
             echo "Invalidation does not complete with in 180 seconds. Please check the GUI mode."

From 4a8716c475edd2176bc86ee119d708e27f6bbde6 Mon Sep 17 00:00:00 2001
From: Gunasekar-K <gunasekar.kesavalu@wipro.com>
Date: Wed, 16 Nov 2022 15:14:21 +0530
Subject: [PATCH 7/7] validate cache issue

---
 master_deploy.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/master_deploy.sh b/master_deploy.sh
index 16fc69e..7f2f405 100755
--- a/master_deploy.sh
+++ b/master_deploy.sh
@@ -702,14 +702,14 @@ check_invalidation_status() {
     counter=0
     echo "invalidating cache with ID $INVALIDATE_ID"
     sleep 60
-    invalidatestatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+    invalidatestatus=`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
     
     while [[ $invalidatestatus != *"Completed"* ]]
     do
         echo $invalidatestatus
         echo "Waiting for 15 sec and try to check the invalidation status..."
         sleep 15
-        invalidatestatus =`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
+        invalidatestatus=`aws cloudfront get-invalidation --distribution-id $AWS_CLOUD_FRONT_ID --id $INVALIDATE_ID | $JQ '.Invalidation.Status'`
         counter=`expr $counter + 1`
         if [[ $counter -gt $COUNTER_LIMIT ]] ; then
             echo "Invalidation does not complete with in 180 seconds. Please check the GUI mode."