From 38e07f193cc09423c5c6f4186cc6b0c0a02327bd Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Fri, 29 Sep 2023 13:40:51 -0400
Subject: [PATCH] GHA: make live - draft upload of nightly-distributions page

---
 .github/scripts/clear-s3-caches-file.sh       | 45 +++++++------------
 .../upload-nightly-downloads-page.yml         |  4 +-
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/.github/scripts/clear-s3-caches-file.sh b/.github/scripts/clear-s3-caches-file.sh
index 03a2ef74a..5ff66130e 100755
--- a/.github/scripts/clear-s3-caches-file.sh
+++ b/.github/scripts/clear-s3-caches-file.sh
@@ -4,35 +4,24 @@ file=$1
 echo "Clearing S3 caches for file: ${file}"
 
 #Flush AWS Cloudfront Cache
-echo "aws cloudfront create-invalidation --distribution-id ECAO9Q8651L8M --output json --paths '${file}'"
-
-#invalidation_json=`aws cloudfront create-invalidation --distribution-id ECAO9Q8651L8M --output json --paths "${path_with_pattern}"`
-#echo "Invalidation response: ${invalidation_json}"
-#invalidation_id=`echo $invalidation_json | jq -r '.Invalidation.Id'`
-#invalidation_status=`echo $invalidation_json | jq -r '.Invalidation.Status'`
-#echo "ID=${invalidation_id} Status=${invalidation_status}"
-#while [ "${invalidation_status}" == "InProgress" ]
-#do
-#   echo "Invalidation status: ${invalidation_status}"
-#   sleep 3
-#   invalidation_status=`aws cloudfront get-invalidation --distribution-id ECAO9Q8651L8M --id $invalidation_id --output json | jq -r '.Invalidation.Status'`
-#done
-#echo "Final invalidation status: ${invalidation_status}"
+invalidation_json=`aws cloudfront create-invalidation --distribution-id ECAO9Q8651L8M --output json --paths "${file}"`
+echo "Invalidation response: ${invalidation_json}"
+invalidation_id=`echo $invalidation_json | jq -r '.Invalidation.Id'`
+invalidation_status=`echo $invalidation_json | jq -r '.Invalidation.Status'`
+echo "ID=${invalidation_id} Status=${invalidation_status}"
+while [ "${invalidation_status}" == "InProgress" ]
+do
+   echo "Invalidation status: ${invalidation_status}"
+   sleep 3
+   invalidation_status=`aws cloudfront get-invalidation --distribution-id ECAO9Q8651L8M --id $invalidation_id --output json | jq -r '.Invalidation.Status'`
+done
+echo "Final invalidation status: ${invalidation_status}"
 
 # Flush CloudFlare Cache
-json="{\"files\": [ \"s3://dist.springsource.com/${file}\" ] }"
-echo $json
-#    curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \
-#      -H "X-Auth-Email: spring-sysadmin@pivotal.io" \
-#      -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \
-#      -H "Content-Type: application/json" \
-#      --data "${json}"
-
-#  curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \
-#    -H "X-Auth-Email: spring-sysadmin@pivotal.io" \
-#    -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \
-#    -H "Content-Type: application/json" \
-#    --data "${json}"
-#fi
+curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONE_ID}/purge_cache" \
+  -H "X-Auth-Email: spring-sysadmin@pivotal.io" \
+  -H "Authorization: Bearer ${CLOUDFLARE_CACHE_TOKEN}" \
+  -H "Content-Type: application/json" \
+  --data "{\"files\": [ \"s3://dist.springsource.com/${file}\" ] }"
 
 
diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml
index d73018313..a2d2d6f6f 100644
--- a/.github/workflows/upload-nightly-downloads-page.yml
+++ b/.github/workflows/upload-nightly-downloads-page.yml
@@ -21,9 +21,9 @@ jobs:
           AWS_DEFAULT_REGION: us-east-1
         run: |
           echo "Removing old nightly-distributions.html from s3..."
-          aws s3 rm s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --dryrun
+          aws s3 rm s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html
           echo "Uploading new nightly-distributions.html to s3..."
-          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --acl public-read --no-progress --dryrun
+          aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://dist.springsource.com/snapshot/STS4/nightly-distributions.html --acl public-read --no-progress
       - name: Invalidate S3 Cloudfront Cache
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}