refactor: rename _wait_for_istio to _wait_for_resource (#16571)

Signed-off-by: Aritra Dey <[email protected]>

Author: AritraDey-Dev

content/en/docs/examples/bookinfo/test.sh

@@ -52,8 +52,8 @@ else
     _verify_like snip_determine_the_ingress_ip_and_port_2 "$snip_determine_the_ingress_ip_and_port_2_out"
 
     # give config some time to propagate
-    _wait_for_istio gateway default bookinfo-gateway
-    _wait_for_istio virtualservice default bookinfo
+    _wait_for_resource gateway default bookinfo-gateway
+    _wait_for_resource virtualservice default bookinfo
 
     # export the INGRESS_ environment variables
     _set_ingress_environment_variables

content/en/docs/ops/configuration/mesh/app-health-check/test.sh

@@ -38,7 +38,7 @@ snip_liveness_and_readiness_probes_using_the_command_approach_1
 
 snip_liveness_and_readiness_probes_using_the_command_approach_2
 
-_wait_for_istio peerauthentication istio-io-health default
+_wait_for_resource peerauthentication istio-io-health default
 
 snip_liveness_and_readiness_probes_using_the_command_approach_3
 

content/en/docs/ops/configuration/traffic-management/network-topologies/test.sh

@@ -44,8 +44,8 @@ else
     snip_deploy_httpbin_gateway
 
     # wait for for the rules to propagate
-    _wait_for_istio gateway httpbin httpbin-gateway
-    _wait_for_istio virtualservice httpbin httpbin
+    _wait_for_resource gateway httpbin httpbin-gateway
+    _wait_for_resource virtualservice httpbin httpbin
 
     snip_export_gateway_url
 fi

content/en/docs/setup/additional-setup/getting-started-istio-apis/test.sh

@@ -57,7 +57,7 @@ _verify_like snip_deploy_the_sample_application_4 "$snip_deploy_the_sample_appli
 
 # Open to outside traffic
 _verify_contains snip_open_the_application_to_outside_traffic_1 "$snip_open_the_application_to_outside_traffic_1_out"
-_wait_for_istio gateway default bookinfo-gateway
+_wait_for_resource gateway default bookinfo-gateway
 
 # Ensure no issues with configuration - istioctl analyze
 _verify_contains snip_open_the_application_to_outside_traffic_2 "$snip_open_the_application_to_outside_traffic_2_out"

content/en/docs/tasks/observability/metrics/tcp-metrics/test.sh

@@ -42,13 +42,13 @@ _verify_same snip_collecting_new_telemetry_data_2 "$snip_collecting_new_telemetr
 
 # Apply the destination rules
 snip_collecting_new_telemetry_data_3
-_wait_for_istio destinationrule default ratings
-_wait_for_istio destinationrule default reviews
+_wait_for_resource destinationrule default ratings
+_wait_for_resource destinationrule default reviews
 
 # Create the virtual services
 _verify_same snip_collecting_new_telemetry_data_6 "$snip_collecting_new_telemetry_data_6_out"
-_wait_for_istio virtualservice default reviews
-_wait_for_istio virtualservice default ratings
+_wait_for_resource virtualservice default reviews
+_wait_for_resource virtualservice default ratings
 
 # Get GATEWAY_URL
 # export the INGRESS_ environment variables

content/en/docs/tasks/security/authentication/authn-policy/test.sh

@@ -42,31 +42,31 @@ _verify_like  snip_auto_mutual_tls_1 "$snip_auto_mutual_tls_1_out"
 _verify_same  snip_auto_mutual_tls_2 "$snip_auto_mutual_tls_2_out"
 
 snip_globally_enabling_istio_mutual_tls_in_strict_mode_1
-_wait_for_istio peerauthentication istio-system default
+_wait_for_resource peerauthentication istio-system default
 
 _verify_same  snip_globally_enabling_istio_mutual_tls_in_strict_mode_2 "$snip_globally_enabling_istio_mutual_tls_in_strict_mode_2_out"
 
 snip_cleanup_part_1_1
 
 snip_namespacewide_policy_1
-_wait_for_istio peerauthentication foo default
+_wait_for_resource peerauthentication foo default
 
 _verify_same  snip_namespacewide_policy_2 "$snip_namespacewide_policy_2_out"
 
 snip_enable_mutual_tls_per_workload_1
 snip_enable_mutual_tls_per_workload_2
-_wait_for_istio peerauthentication bar httpbin
+_wait_for_resource peerauthentication bar httpbin
 
 # Ignore snip_enable_mutual_tls_per_workload_4()--it's just text.
 
 snip_enable_mutual_tls_per_workload_4
-_wait_for_istio peerauthentication bar httpbin
+_wait_for_resource peerauthentication bar httpbin
 
 _verify_same  snip_enable_mutual_tls_per_workload_5 "$snip_enable_mutual_tls_per_workload_5_out"
 
 snip_policy_precedence_1
 snip_policy_precedence_2
-_wait_for_istio peerauthentication foo overwrite-example
+_wait_for_resource peerauthentication foo overwrite-example
 
 snip_cleanup_part_2_1
 
@@ -75,8 +75,8 @@ if [ "$GATEWAY_API" == "true" ]; then
     snip_enduser_authentication_3
 else
     snip_enduser_authentication_1
-    _wait_for_istio gateway foo httpbin-gateway
-    _wait_for_istio virtualservice foo httpbin
+    _wait_for_resource gateway foo httpbin-gateway
+    _wait_for_resource virtualservice foo httpbin
 
     # Export the INGRESS_ environment variables
     _set_ingress_environment_variables
@@ -86,10 +86,10 @@ _verify_same  snip_enduser_authentication_4 "$snip_enduser_authentication_4_out"
 
 if [ "$GATEWAY_API" == "true" ]; then
     snip_enduser_authentication_6
-    _wait_for_istio requestauthentication foo jwt-example
+    _wait_for_resource requestauthentication foo jwt-example
 else
     snip_enduser_authentication_5
-    _wait_for_istio requestauthentication istio-system jwt-example
+    _wait_for_resource requestauthentication istio-system jwt-example
 fi
 
 _verify_same  snip_enduser_authentication_7 "$snip_enduser_authentication_7_out"
@@ -107,20 +107,20 @@ _verify_contains  snip_enduser_authentication_12 "$expected"
 
 if [ "$GATEWAY_API" == "true" ]; then
     snip_require_a_valid_token_2
-    _wait_for_istio authorizationpolicy foo frontend-ingress
+    _wait_for_resource authorizationpolicy foo frontend-ingress
 else
     snip_require_a_valid_token_1
-    _wait_for_istio authorizationpolicy istio-system frontend-ingress
+    _wait_for_resource authorizationpolicy istio-system frontend-ingress
 fi
 
 _verify_same  snip_require_a_valid_token_3 "$snip_require_a_valid_token_3_out"
 
 if [ "$GATEWAY_API" == "true" ]; then
     snip_require_valid_tokens_perpath_2
-    _wait_for_istio authorizationpolicy foo frontend-ingress
+    _wait_for_resource authorizationpolicy foo frontend-ingress
 else
     snip_require_valid_tokens_perpath_1
-    _wait_for_istio authorizationpolicy istio-system frontend-ingress
+    _wait_for_resource authorizationpolicy istio-system frontend-ingress
 fi
 
 _verify_same  snip_require_valid_tokens_perpath_3 "$snip_require_valid_tokens_perpath_3_out"

content/en/docs/tasks/security/authentication/claim-to-header/test.sh

@@ -40,7 +40,7 @@ export TOKEN_GROUP
 _verify_same  snip_before_you_begin_2 "$snip_before_you_begin_2_out"
 
 snip_allow_requests_with_valid_jwt_and_listtyped_claims_1
-_wait_for_istio requestauthentication foo jwt-example
+_wait_for_resource requestauthentication foo jwt-example
 
 _verify_same snip_allow_requests_with_valid_jwt_and_listtyped_claims_2 "$snip_allow_requests_with_valid_jwt_and_listtyped_claims_2_out"
 

content/en/docs/tasks/security/authentication/mtls-migration/test.sh

@@ -44,7 +44,7 @@ _verify_same snip_set_up_the_cluster_4 "$snip_set_up_the_cluster_4_out"
 
 # configure_mtls_foo_peerauthentication
 snip_lock_down_to_mutual_tls_by_namespace_1
-_wait_for_istio peerauthentication foo default
+_wait_for_resource peerauthentication foo default
 
 # Disable errors, since the next command is expected to return an error.
 set +e
@@ -59,7 +59,7 @@ set -o pipefail
 
 # configure_mtls_entire_mesh
 snip_lock_down_mutual_tls_for_the_entire_mesh_1
-_wait_for_istio peerauthentication istio-system default
+_wait_for_resource peerauthentication istio-system default
 
 # Disable errors, since the next command is expected to return an error.
 set +e

content/en/docs/tasks/security/authorization/authz-deny/test.sh

@@ -33,21 +33,21 @@ _wait_for_deployment foo curl
 _verify_same snip_before_you_begin_2 "$snip_before_you_begin_2_out"
 
 snip_explicitly_deny_a_request_1
-_wait_for_istio authorizationpolicy foo deny-method-get
+_wait_for_resource authorizationpolicy foo deny-method-get
 
 _verify_same snip_explicitly_deny_a_request_2 "$snip_explicitly_deny_a_request_2_out"
 
 _verify_same snip_explicitly_deny_a_request_3 "$snip_explicitly_deny_a_request_3_out"
 
 snip_explicitly_deny_a_request_4
-_wait_for_istio authorizationpolicy foo deny-method-get
+_wait_for_resource authorizationpolicy foo deny-method-get
 
 _verify_same snip_explicitly_deny_a_request_5 "$snip_explicitly_deny_a_request_5_out"
 
 _verify_same snip_explicitly_deny_a_request_6 "$snip_explicitly_deny_a_request_6_out"
 
 snip_explicitly_deny_a_request_7
-_wait_for_istio authorizationpolicy foo allow-path-ip
+_wait_for_resource authorizationpolicy foo allow-path-ip
 
 _verify_same snip_explicitly_deny_a_request_8 "$snip_explicitly_deny_a_request_8_out"
 

content/en/docs/tasks/security/authorization/authz-http/test.sh

@@ -91,30 +91,30 @@ startup_bookinfo_sample
 # TODO: Using reviews-v3 in this test. Should update the doc to do so as well, to make sure ratings request
 #       are configured when it demonstrates denial of access to the ratings service.
 kubectl apply -f samples/bookinfo/networking/virtual-service-reviews-v3.yaml
-_wait_for_istio virtualservice default reviews
+_wait_for_resource virtualservice default reviews
 
 snip_configure_access_control_for_workloads_using_http_traffic_1
-_wait_for_istio authorizationpolicy default allow-nothing
+_wait_for_resource authorizationpolicy default allow-nothing
 
 # Verify we don't have access.
 verify 403 "RBAC: access denied"
 
 snip_configure_access_control_for_workloads_using_http_traffic_2
-_wait_for_istio authorizationpolicy default productpage-viewer
+_wait_for_resource authorizationpolicy default productpage-viewer
 
 # Verify we have access to the productpage, but not to details and reviews.
 verify 200 "William Shakespeare" "Error fetching product details" "Error fetching product reviews"
 
 snip_configure_access_control_for_workloads_using_http_traffic_3
 snip_configure_access_control_for_workloads_using_http_traffic_4
-_wait_for_istio authorizationpolicy default details-viewer
-_wait_for_istio authorizationpolicy default reviews-viewer
+_wait_for_resource authorizationpolicy default details-viewer
+_wait_for_resource authorizationpolicy default reviews-viewer
 
 # Verify we have access to the productpage, but ratings are still not available.
 verify 200 "William Shakespeare" "Ratings service is currently unavailable"
 
 snip_configure_access_control_for_workloads_using_http_traffic_5
-_wait_for_istio authorizationpolicy default ratings-viewer
+_wait_for_resource authorizationpolicy default ratings-viewer
 
 # Verify we now have access.
 verify 200 "William Shakespeare" "Book Details" "Book Reviews"