Change parsing of pingdom ips

ministryofjustice · Oct 21, 2024 · b0bee89 · b0bee89
1 parent 4b32c1e
commit b0bee89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -54,7 +54,7 @@ jobs:
           # Pull ranges from shared LAA IP ranges and then remove spaces,
           # replace linebreaks with commas, remove last comma, and escape commas for helm input
           SHARED_IP_RANGES_LAA=$(curl -s https://raw.githubusercontent.com/ministryofjustice/laa-ip-allowlist/main/cidrs.txt | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
-          PINGDOM_IP_RANGES=$(curl -s  https://my.pingdom.com/probes/ipv4 | tr '\n' ',' | sed 's/,$//')
+          PINGDOM_IP_RANGES=$(curl -s  https://my.pingdom.com/probes/ipv4 | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
           echo "PINGDOM_IP_RANGES=$PINGDOM_IP_RANGES" >> $GITHUB_ENV
           echo "SHARED_IP_RANGES_LAA=$SHARED_IP_RANGES_LAA" >> $GITHUB_ENV
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -54,7 +54,7 @@ jobs:
           # Pull ranges from shared LAA IP ranges and then remove spaces,
           # replace linebreaks with commas, remove last comma, and escape commas for helm input
           SHARED_IP_RANGES_LAA=$(curl -s https://raw.githubusercontent.com/ministryofjustice/laa-ip-allowlist/main/cidrs.txt | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
-          PINGDOM_IP_RANGES=$(curl -s https://my.pingdom.com/probes/ipv4 | tr '\n' ',' | sed 's/,$//')
+          PINGDOM_IP_RANGES=$(curl -s https://my.pingdom.com/probes/ipv4 | tr -d ' ' | tr '\n' ',' | sed 's/,/\\,/g' | sed 's/\\,$//')
           echo "PINGDOM_IP_RANGES=$PINGDOM_IP_RANGES" >> $GITHUB_ENV
           echo "SHARED_IP_RANGES_LAA=$SHARED_IP_RANGES_LAA" >> $GITHUB_ENV