From 07014794c6709932af6b44bd61422b2c0861d7aa Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Mon, 1 Jun 2020 14:05:55 -0700 Subject: [PATCH] Fix missing "sample_" function conversions. (#7442) These were lost in a merge. --- .../security/authn_policy/scripts/authn_policy.sh | 15 +++++++-------- .../authz_ingress/scripts/authz_ingress.sh | 5 ++--- .../ingress/scripts/ingress_sni_passthrough.sh | 5 ++--- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tests/security/authn_policy/scripts/authn_policy.sh b/tests/security/authn_policy/scripts/authn_policy.sh index d96d198b99..b901c5a266 100644 --- a/tests/security/authn_policy/scripts/authn_policy.sh +++ b/tests/security/authn_policy/scripts/authn_policy.sh @@ -20,16 +20,15 @@ set -u set -o pipefail source "${REPO_ROOT}/content/en/docs/tasks/security/authentication/authn-policy/snips.sh" -source "${REPO_ROOT}/tests/util/samples.sh" snip_setup_1 -sample_wait_for_deployment foo httpbin -sample_wait_for_deployment foo sleep -sample_wait_for_deployment bar httpbin -sample_wait_for_deployment bar sleep -sample_wait_for_deployment legacy httpbin -sample_wait_for_deployment legacy sleep +_wait_for_deployment foo httpbin +_wait_for_deployment foo sleep +_wait_for_deployment bar httpbin +_wait_for_deployment bar sleep +_wait_for_deployment legacy httpbin +_wait_for_deployment legacy sleep _run_and_verify_same snip_setup_2 "$snip_setup_2_out" _run_and_verify_same snip_setup_3 "$snip_setup_3_out" @@ -72,7 +71,7 @@ snip_enduser_authentication_1 snip_enduser_authentication_2 # Export the INGRESS_ environment variables -sample_set_ingress_environment_variables +_set_ingress_environment_variables _run_and_verify_same snip_enduser_authentication_3 "$snip_enduser_authentication_3_out" diff --git a/tests/security/authz_ingress/scripts/authz_ingress.sh b/tests/security/authz_ingress/scripts/authz_ingress.sh index 9f56e771e4..1033e706c2 100644 --- a/tests/security/authz_ingress/scripts/authz_ingress.sh +++ b/tests/security/authz_ingress/scripts/authz_ingress.sh @@ -20,18 +20,17 @@ set -u set -o pipefail source "${REPO_ROOT}/content/en/docs/tasks/security/authorization/authz-ingress/snips.sh" -source "${REPO_ROOT}/tests/util/samples.sh" export CLIENT_IP snip_before_you_begin_1 -sample_wait_for_deployment foo httpbin +_wait_for_deployment foo httpbin snip_before_you_begin_2 # Export the INGRESS_ environment variables -sample_set_ingress_environment_variables +_set_ingress_environment_variables _run_and_verify_same snip_before_you_begin_3 "$snip_before_you_begin_3_out" diff --git a/tests/trafficmanagement/ingress/scripts/ingress_sni_passthrough.sh b/tests/trafficmanagement/ingress/scripts/ingress_sni_passthrough.sh index 6b54ed71de..21b5e64e8e 100644 --- a/tests/trafficmanagement/ingress/scripts/ingress_sni_passthrough.sh +++ b/tests/trafficmanagement/ingress/scripts/ingress_sni_passthrough.sh @@ -20,7 +20,6 @@ set -u set -o pipefail source "${REPO_ROOT}/content/en/docs/tasks/traffic-management/ingress/ingress-sni-passthrough/snips.sh" -source "${REPO_ROOT}/tests/util/samples.sh" kubectl label namespace default istio-injection=enabled --overwrite @@ -38,9 +37,9 @@ snip_deploy_an_nginx_server_3 snip_deploy_an_nginx_server_4 # waiting for nginx deployment to start -sample_wait_for_deployment default my-nginx +_wait_for_deployment default my-nginx -# validate NGINX server was deployed successfully +# validate NGINX server was deployed successfully _run_and_verify_contains snip_deploy_an_nginx_server_5 "subject: CN=nginx.example.com" # configure an ingress gateway