More concessions to try and get things working in CI

Author: ChrisPenner

transcripts/share-apis/notifications/check-delivery-methods.json

@@ -11,14 +11,14 @@
       {
         "config": {
           "id": "NW-<UUID>",
-          "url": "http://localhost:9999"
+          "url": "http://<HOST>:9999/good-webhook"
         },
         "kind": "webhook"
       },
       {
         "config": {
           "id": "NW-<UUID>",
-          "url": "http://localhost:9999/invalid?x-set-response-status-code=500"
+          "url": "http://<HOST>:9999/invalid?x-set-response-status-code=500"
         },
         "kind": "webhook"
       }

transcripts/share-apis/notifications/run.zsh

@@ -18,11 +18,11 @@ subscription_id=$(fetch_data_jq "$test_user" POST create-subscription-for-projec
 }" )
 
 webhook_id=$(fetch_data_jq "$test_user" POST create-webhook  '/users/test/notifications/delivery-methods/webhooks' '.webhookId' "{
-  \"url\": \"http://http-echo:${echo_server_port}\"
+  \"url\": \"${echo_server}/good-webhook\"
 }" )
 
 failing_webhook_id=$(fetch_data_jq "$test_user" POST create-webhook  '/users/test/notifications/delivery-methods/webhooks' '.webhookId' "{
-  \"url\": \"http://http-echo:${echo_server_port}/invalid?x-set-response-status-code=500\"
+  \"url\": \"${echo_server}/invalid?x-set-response-status-code=500\"
 }" )
 
 fetch "$test_user" POST add-webhook-to-subscription "/users/test/notifications/subscriptions/${subscription_id}/delivery-methods/add" "{

transcripts/transcript_helpers.sh

@@ -10,6 +10,11 @@ ucm_credentials_file="${ucm_xdg_data_dir}/unisonlanguage/credentials.json"
 # Executable to use when running unison transcripts
 export UCM_PATH="${1:-"$(which ucm)"}"
 export echo_server_port=9999
+export echo_server="http://localhost:${echo_server_port}"
+# if CI=true, change the echo server url to a url from the docker network.
+if [ "${CI:-false}" = "true" ]; then
+  export echo_server="http://echo-server:${echo_server_port}"
+fi
 
 # UCM to use within transcripts
 transcript_ucm() {
@@ -111,7 +116,10 @@ clean_for_transcript() {
     # Replace all cursors in stdin with the string "<CURSOR>"
     sed -E 's/"cursor": ?"[^"]+"/"cursor": "<CURSOR>"/g' | \
     # Replace all JWTs in stdin with the string "<JWT>"
-    sed -E 's/eyJ([[:alnum:]_.-]+)/<JWT>/g'
+    sed -E 's/eyJ([[:alnum:]_.-]+)/<JWT>/g' | \
+    # In docker we network things together with host names, but locally we just use localhost; so 
+    # this normalizes everything in transcripts.
+    sed -E 's/(localhost|http-echo):/<HOST>:/g'
 }
 
 fetch() {