Merged dspace-cris-2025_02_x into task/dspace-cris-2025_02_x/DSC-2699

Author: vins01-4science

bitbucket-pipelines.yml

@@ -266,38 +266,59 @@ definitions:
           - git commit -am "Enable test environment for ${BRANCH_NAME}" || echo "No changes to commit"
           - git push
 
-    - step: &find-and-invalidate-cloudfront-dev
-        name: Invalidate CloudFront Dev Cache
+    - step: &find-cloudfront-dev
+        name: Find CloudFront Dev Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='dev--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+            - cloudfront_distribution
 
-    - step: &find-and-invalidate-cloudfront-staging
-        name: Invalidate CloudFront Staging Cache
+    - step: &find-cloudfront-staging
+        name: Find CloudFront Staging Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='staging--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+          - cloudfront_distribution
 
-    - step: &find-and-invalidate-cloudfront-test
-        name: Invalidate CloudFront Test Cache
+    - step: &invalidate-cloudfront
+        name: Invalidate CloudFront Cache
+        image: amazon/aws-cli
+        condition:
+          state: cloudfront_distribution != ""
+        script:
+          - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
+          - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
+          - export AWS_DEFAULT_REGION=$AWS_REGION
+          - |
+            if ! aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*"; then
+              echo "CloudFront invalidation failed for distribution ID: $CLOUDFRONT_DISTRIBUTION_ID"
+              exit 1
+            fi
+
+    - step: &find-cloudfront-test
+        name: Find CloudFront Test Cache
         image: amazon/aws-cli
         script:
           - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_CF_KEY_ID
           - export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_CF_KEY
           - export AWS_DEFAULT_REGION=$AWS_REGION
           - export CLOUDFRONT_NAME=$(echo "$BITBUCKET_BRANCH" | awk -F'/' '{if(NF==1)val=$1;else if(NF==2)val=$2;else if(NF==3)val=$2;else val=$3;gsub(/_/, "-", val);print tolower(val)}')
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='test--${CLOUDFRONT_NAME}'].Id" --output text)
-          - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
+          - echo "cloudfront_distribution=$CLOUDFRONT_DISTRIBUTION_ID" >> $BITBUCKET_PIPELINES_VARIABLES_PATH
+        output-variables:
+          - cloudfront_distribution
 
     - step: &check-branch-name-allowed
         name: Check allowed branch name
@@ -323,13 +344,15 @@ pipelines:
       - step: *angular-build
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
     deploy-on-staging:
       - step: *check-branch-name-allowed
       - step: *angular-build
       - step: *build-and-push
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
     turn-on-dev:
       - step: *turn-on-dev
     turn-on-staging:
@@ -349,27 +372,32 @@ pipelines:
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
-    'prod/**':
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
+    "prod/**":
       - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
+      - step: *find-cloudfront-dev
+      - step: *invalidate-cloudfront
       - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
-    'test/**':
+      - step: *find-cloudfront-staging
+      - step: *invalidate-cloudfront
+    "test/**":
       - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
       - step: *build-and-push
       - step: *deploy-on-test
-      - step: *find-and-invalidate-cloudfront-test
+      - step: *find-cloudfront-test
+      - step: *invalidate-cloudfront
 
   pull-requests:
     '**':