Merged in task/dspace-cris-2024_02_x/DWS-182 (pull request DSpace#3618)

Task/dspace cris 2024 02 x/DWS-182

Approved-by: Vincenzo Mecca

Author: atarix83

bitbucket-pipelines.yml

@@ -215,25 +215,25 @@ definitions:
           - git push
 
     - step: &find-and-invalidate-cloudfront-dev
-        name: Find and Invalidate CloudFront Cache
+        name: Invalidate CloudFront Dev Cache
         image: amazon/aws-cli
         script:
-          - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
-          - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
-          - aws configure set default.region $AWS_REGION
+          - 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)
+          - 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 "/*"
 
     - step: &find-and-invalidate-cloudfront-staging
-        name: Find and Invalidate CloudFront Cache
+        name: Invalidate CloudFront Staging Cache
         image: amazon/aws-cli
         script:
-          - aws configure set aws_access_key_id $AWS_ACCESS_CF_KEY_ID
-          - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_CF_KEY
-          - aws configure set default.region $AWS_REGION
+          - 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)
+          - 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 "/*"
 
 pipelines: