Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CONSUL-204] Support Curl on helpers.windows.bash #9

Merged
merged 2 commits into from
Jul 7, 2022
Merged

[CONSUL-204] Support Curl on helpers.windows.bash #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec1936e
[CONSUL-204] Support Curl on helpers.windows.bash
joselo85 Jul 7, 2022
b5908b3
Apply suggestions from code review
ezfepo Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions test/integration/connect/envoy/helpers.windows.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,10 @@ function snapshot_envoy_admin {
local OUTDIR="${LOG_DIR}/envoy-snapshots/${DC}/${ENVOY_NAME}"

mkdir -p "${OUTDIR}"
docker_wget "$DC" "http://${HOSTPORT}/config_dump" -q -O - > "${OUTDIR}/config_dump.json"
docker_wget "$DC" "http://${HOSTPORT}/clusters?format=json" -q -O - > "${OUTDIR}/clusters.json"
docker_wget "$DC" "http://${HOSTPORT}/stats" -q -O - > "${OUTDIR}/stats.txt"
docker_wget "$DC" "http://${HOSTPORT}/stats/prometheus" -q -O - > "${OUTDIR}/stats_prometheus.txt"
docker_wget "$DC" -s "http://${HOSTPORT}/config_dump" > "${OUTDIR}/config_dump.json"
docker_wget "$DC" -s "http://${HOSTPORT}/clusters?format=json" > "${OUTDIR}/clusters.json"
docker_wget "$DC" -s "http://${HOSTPORT}/stats" > "${OUTDIR}/stats.txt"
docker_wget "$DC" -s "http://${HOSTPORT}/stats/prometheus" > "${OUTDIR}/stats_prometheus.txt"
}

function reset_envoy_metrics {
Expand Down Expand Up @@ -562,30 +562,30 @@ function assert_intention_denied {
function docker_consul {
local DC=$1
shift 1
docker run -i --rm --network container:envoy_consul-${DC}_1 consul-dev "$@"
docker.exe run -i --rm --network container:envoy_consul-${DC}_1 consul-dev "$@"
}

function docker_consul_for_proxy_bootstrap {
local DC=$1
shift 1

docker run -i --rm --network container:envoy_consul-${DC}_1 consul-dev "$@"
docker.exe run -i --rm --network container:envoy_consul-${DC}_1 consul-dev "$@"
}

function docker_wget {
local DC=$1
shift 1
docker run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/alpine:3.9 wget "$@"
docker.exe run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/windows/nanoserver curl "$@"
}

function docker_curl {
local DC=$1
shift 1
docker run --rm --network container:envoy_consul-${DC}_1 --entrypoint curl consul-dev "$@"
docker.exe run --rm --network container:envoy_consul-${DC}_1 --entrypoint curl consul-dev "$@"
}

function docker_exec {
if ! docker exec -i "$@"
if ! docker.exe exec -i "$@"
then
echo "Failed to execute: docker exec -i $@" 1>&2
return 1
Expand Down