Update migrate-s3.yaml

ministryofjustice · Nov 18, 2024 · ba15979 · ba15979
1 parent 93b68a7
commit ba15979
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/migrate-s3.yaml b/.github/workflows/migrate-s3.yaml
@@ -69,13 +69,14 @@ jobs:
           # remove all spaces and put one comma between prefixes
           cleaned_prefixes=$(echo $prefixes | tr -s '[:space:]' ',' | sed 's/[,/]*$//')
 
-          # remove `contentstore.deleted/` from cleaned_prefixes
-          cleaned_prefixes=$(echo $cleaned_prefixes | sed 's/contentstore.deleted,//')
+          # remove `contentstore.deleted/` from cleaned_prefixes with comma if in list
+          cleaned_prefixes=$(echo $cleaned_prefixes | sed 's/contentstore.deleted,//')\
+          # remove `contentstore.deleted` from cleaned_prefixes if at the end of the list
+          cleaned_prefixes=$(echo $cleaned_prefixes | sed 's/contentstore.deleted//')
 
           DIRS=""
           IFS=','
           for prefix in $cleaned_prefixes; do
-
               DIR=$(kubectl exec $SERVICE_POD_NAME -- aws s3api list-objects-v2 --bucket $SRC_BUCKET --prefix "$prefix" --delimiter '/' --query 'CommonPrefixes[*].Prefix' --output text)
               if [ -n "$DIR" ]; then
                   DIR=$(echo $DIR | tr -s '[:space:]' ',' | sed 's/[,/]*$//')