Skip to content

Commit 99a3b55

Browse files
committed
[CONSUL-496] Replace docker_wget & docker_curl (#69)
1 parent b39f73f commit 99a3b55

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/integration/connect/envoy/helpers.windows.bash

+5-5
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,10 @@ function snapshot_envoy_admin {
358358
local OUTDIR="${LOG_DIR}/envoy-snapshots/${DC}/${ENVOY_NAME}"
359359

360360
mkdir -p "${OUTDIR}"
361-
docker_wget "$DC" -s "http://${HOSTPORT}/config_dump" > "${OUTDIR}/config_dump.json"
362-
docker_wget "$DC" -s "http://${HOSTPORT}/clusters?format=json" > "${OUTDIR}/clusters.json"
363-
docker_wget "$DC" -s "http://${HOSTPORT}/stats" > "${OUTDIR}/stats.txt"
364-
docker_wget "$DC" -s "http://${HOSTPORT}/stats/prometheus" > "${OUTDIR}/stats_prometheus.txt"
361+
docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/config_dump" > "${OUTDIR}/config_dump.json"
362+
docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/clusters?format=json" > "${OUTDIR}/clusters.json"
363+
docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/stats" > "${OUTDIR}/stats.txt"
364+
docker_consul_exec "$DC" bash -c "curl -s http://${HOSTPORT}/stats/prometheus" > "${OUTDIR}/stats_prometheus.txt"
365365
}
366366

367367
function reset_envoy_metrics {
@@ -830,7 +830,7 @@ function wait_for_namespace {
830830
local NS="${1}"
831831
local DC=${2:-primary}
832832
get_consul_hostname $DC
833-
retry_default docker_curl "$DC" -sLf "http://${CONSUL_HOSTNAME}:8500/v1/namespace/${NS}" >/dev/null
833+
retry_default docker_consul_exec "$DC" bash -c "curl -sLf http://${CONSUL_HOSTNAME}:8500/v1/namespace/${NS} >/dev/null"
834834
}
835835

836836
function wait_for_config_entry {

0 commit comments

Comments
 (0)