diff --git a/test/integration/connect/envoy/case-badauthz/setup.sh b/test/integration/connect/envoy/case-badauthz/setup.sh index ce54101f72..eb4f3de93b 100644 --- a/test/integration/connect/envoy/case-badauthz/setup.sh +++ b/test/integration/connect/envoy/case-badauthz/setup.sh @@ -5,5 +5,7 @@ set -eEuo pipefail # Setup deny intention setup_upsert_l4_intention s1 s2 deny +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-basic/setup.sh b/test/integration/connect/envoy/case-basic/setup.sh index a74435b3b1..e8321972b3 100644 --- a/test/integration/connect/envoy/case-basic/setup.sh +++ b/test/integration/connect/envoy/case-basic/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-centralconf/s1.hcl b/test/integration/connect/envoy/case-centralconf/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-centralconf/s1.hcl rename to test/integration/connect/envoy/case-centralconf/service_s1.hcl diff --git a/test/integration/connect/envoy/case-centralconf/s2.hcl b/test/integration/connect/envoy/case-centralconf/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-centralconf/s2.hcl rename to test/integration/connect/envoy/case-centralconf/service_s2.hcl diff --git a/test/integration/connect/envoy/case-centralconf/setup.sh b/test/integration/connect/envoy/case-centralconf/setup.sh index 2fce60c16c..dce23006bc 100644 --- a/test/integration/connect/envoy/case-centralconf/setup.sh +++ b/test/integration/connect/envoy/case-centralconf/setup.sh @@ -7,5 +7,7 @@ wait_for_config_entry proxy-defaults global wait_for_config_entry service-defaults s1 wait_for_config_entry service-defaults s2 +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh index 44289c54dc..c6380b061a 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/primary/setup.sh @@ -10,5 +10,7 @@ wait_for_config_entry service-resolver s2 wait_for_config_entry service-defaults s2 secondary wait_for_config_entry service-resolver s2 secondary +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/gateway.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/gateway.hcl rename to test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/s1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh index a3d6260210..2dc07d3594 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-none/secondary/setup.sh @@ -6,6 +6,8 @@ set -eEuo pipefail wait_for_config_entry service-defaults s2 secondary wait_for_config_entry service-resolver s2 secondary +register_services secondary + gen_envoy_bootstrap s2 19002 secondary gen_envoy_bootstrap mesh-gateway 19003 secondary true retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh index 44289c54dc..c6380b061a 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/primary/setup.sh @@ -10,5 +10,7 @@ wait_for_config_entry service-resolver s2 wait_for_config_entry service-defaults s2 secondary wait_for_config_entry service-resolver s2 secondary +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/gateway.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/gateway.hcl rename to test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/s1.hcl b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/s1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh index a3d6260210..2dc07d3594 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-dc-failover-gateways-remote/secondary/setup.sh @@ -6,6 +6,8 @@ set -eEuo pipefail wait_for_config_entry service-defaults s2 secondary wait_for_config_entry service-resolver s2 secondary +register_services secondary + gen_envoy_bootstrap s2 19002 secondary gen_envoy_bootstrap mesh-gateway 19003 secondary true retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-defaultsubset/s2-v1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/s2-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-defaultsubset/s2-v2.hcl rename to test/integration/connect/envoy/case-cfg-resolver-defaultsubset/service_s2-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh index 76a10debb5..519bba361c 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-defaultsubset/setup.sh @@ -6,8 +6,10 @@ set -euo pipefail wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 +register_services primary + # s2 is retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2-v1 19001 gen_envoy_bootstrap s2-v2 19002 -gen_envoy_bootstrap s2 19003 \ No newline at end of file +gen_envoy_bootstrap s2 19003 diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-features/s2-v1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/s2-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-features/s2-v2.hcl rename to test/integration/connect/envoy/case-cfg-resolver-features/service_s2-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh index e12ec121ba..519bba361c 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-features/setup.sh @@ -6,6 +6,8 @@ set -euo pipefail wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 +register_services primary + # s2 is retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2-v1 19001 diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/s2-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/s2-v1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh index cef81d2211..c15ca43ccf 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-subset-onlypassing/setup.sh @@ -2,6 +2,8 @@ set -euo pipefail +register_services primary + # wait for service registration wait_for_agent_service_register s1 wait_for_agent_service_register s2 @@ -16,4 +18,4 @@ wait_for_config_entry service-resolver s2 gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 -gen_envoy_bootstrap s2-v1 19002 \ No newline at end of file +gen_envoy_bootstrap s2-v1 19002 diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3-v1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3-v2.hcl rename to test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-subset-redirect/s3.hcl rename to test/integration/connect/envoy/case-cfg-resolver-subset-redirect/service_s3.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh index 8482ad3a1a..606d5a791e 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-subset-redirect/setup.sh @@ -7,9 +7,11 @@ wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 wait_for_config_entry service-resolver s3 +register_services primary + # s2, s3, and s3-v1 are retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 gen_envoy_bootstrap s3-v1 19002 gen_envoy_bootstrap s3-v2 19003 -gen_envoy_bootstrap s3 19004 \ No newline at end of file +gen_envoy_bootstrap s3 19004 diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3-v1.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3-v1.hcl rename to test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3-v2.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3-v2.hcl rename to test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-svc-failover/s3.hcl rename to test/integration/connect/envoy/case-cfg-resolver-svc-failover/service_s3.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh index 8482ad3a1a..606d5a791e 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-svc-failover/setup.sh @@ -7,9 +7,11 @@ wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 wait_for_config_entry service-resolver s3 +register_services primary + # s2, s3, and s3-v1 are retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 gen_envoy_bootstrap s3-v1 19002 gen_envoy_bootstrap s3-v2 19003 -gen_envoy_bootstrap s3 19004 \ No newline at end of file +gen_envoy_bootstrap s3 19004 diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/s3.hcl rename to test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/service_s3.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh index 582377619f..ceae3b110f 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-http/setup.sh @@ -6,6 +6,8 @@ set -eEuo pipefail wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary -gen_envoy_bootstrap s3 19002 primary \ No newline at end of file +gen_envoy_bootstrap s3 19002 primary diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/s3.hcl b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/s3.hcl rename to test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/service_s3.hcl diff --git a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh index 582377619f..ceae3b110f 100644 --- a/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh +++ b/test/integration/connect/envoy/case-cfg-resolver-svc-redirect-tcp/setup.sh @@ -6,6 +6,8 @@ set -eEuo pipefail wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary -gen_envoy_bootstrap s3 19002 primary \ No newline at end of file +gen_envoy_bootstrap s3 19002 primary diff --git a/test/integration/connect/envoy/case-cfg-router-features/s2-v1.hcl b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-router-features/s2-v1.hcl rename to test/integration/connect/envoy/case-cfg-router-features/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-router-features/s2-v2.hcl b/test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-router-features/s2-v2.hcl rename to test/integration/connect/envoy/case-cfg-router-features/service_s2-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-router-features/setup.sh b/test/integration/connect/envoy/case-cfg-router-features/setup.sh index 8aef529c35..0319800fca 100644 --- a/test/integration/connect/envoy/case-cfg-router-features/setup.sh +++ b/test/integration/connect/envoy/case-cfg-router-features/setup.sh @@ -7,6 +7,8 @@ wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 wait_for_config_entry service-router s2 +register_services primary + # s2 is retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2-v1 19001 diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/s2-v1.hcl b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-splitter-features/s2-v1.hcl rename to test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/s2-v2.hcl b/test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-cfg-splitter-features/s2-v2.hcl rename to test/integration/connect/envoy/case-cfg-splitter-features/service_s2-v2.hcl diff --git a/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh b/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh index 048cc079ed..fe0967a383 100644 --- a/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh +++ b/test/integration/connect/envoy/case-cfg-splitter-features/setup.sh @@ -7,6 +7,8 @@ wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 wait_for_config_entry service-splitter s2 +register_services primary + # s2 is retained just to have a honeypot for bad envoy configs to route into gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2-v1 19001 diff --git a/test/integration/connect/envoy/case-consul-exec/setup.sh b/test/integration/connect/envoy/case-consul-exec/setup.sh index a2dd572e96..f7397d5945 100644 --- a/test/integration/connect/envoy/case-consul-exec/setup.sh +++ b/test/integration/connect/envoy/case-consul-exec/setup.sh @@ -1,3 +1,5 @@ #!/bin/bash set -eEuo pipefail + +register_services primary diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/s1.hcl b/test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-dogstatsd-udp/s1.hcl rename to test/integration/connect/envoy/case-dogstatsd-udp/service_s1.hcl diff --git a/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh b/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh +++ b/test/integration/connect/envoy/case-dogstatsd-udp/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-gateway-without-services/gateway.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateway-without-services/gateway.hcl rename to test/integration/connect/envoy/case-gateway-without-services/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-gateway-without-services/s1.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateway-without-services/s1.hcl rename to test/integration/connect/envoy/case-gateway-without-services/service_s1.hcl diff --git a/test/integration/connect/envoy/case-gateway-without-services/s2.hcl b/test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateway-without-services/s2.hcl rename to test/integration/connect/envoy/case-gateway-without-services/service_s2.hcl diff --git a/test/integration/connect/envoy/case-gateway-without-services/setup.sh b/test/integration/connect/envoy/case-gateway-without-services/setup.sh index 3ffc060511..8625e0f359 100644 --- a/test/integration/connect/envoy/case-gateway-without-services/setup.sh +++ b/test/integration/connect/envoy/case-gateway-without-services/setup.sh @@ -2,4 +2,6 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap mesh-gateway 19000 primary true diff --git a/test/integration/connect/envoy/case-gateways-local/primary/gateway.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-local/primary/gateway.hcl rename to test/integration/connect/envoy/case-gateways-local/primary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-gateways-local/primary/s1.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-local/primary/s1.hcl rename to test/integration/connect/envoy/case-gateways-local/primary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-gateways-local/primary/s2.hcl b/test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-local/primary/s2.hcl rename to test/integration/connect/envoy/case-gateways-local/primary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-gateways-local/primary/setup.sh b/test/integration/connect/envoy/case-gateways-local/primary/setup.sh index 4212445dba..705d500be2 100644 --- a/test/integration/connect/envoy/case-gateways-local/primary/setup.sh +++ b/test/integration/connect/envoy/case-gateways-local/primary/setup.sh @@ -2,6 +2,8 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap mesh-gateway 19002 primary true retry_default docker_consul primary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=secondary" >/dev/null diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/gateway.hcl b/test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-local/secondary/gateway.hcl rename to test/integration/connect/envoy/case-gateways-local/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/s1.hcl b/test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-local/secondary/s1.hcl rename to test/integration/connect/envoy/case-gateways-local/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh b/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh index b27daa4b2a..30b1810b52 100644 --- a/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh +++ b/test/integration/connect/envoy/case-gateways-local/secondary/setup.sh @@ -2,6 +2,8 @@ set -eEuo pipefail +register_services secondary + gen_envoy_bootstrap s2 19001 secondary gen_envoy_bootstrap mesh-gateway 19003 secondary true -retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null \ No newline at end of file +retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/s1.hcl b/test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-remote/primary/s1.hcl rename to test/integration/connect/envoy/case-gateways-remote/primary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/s2.hcl b/test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-remote/primary/s2.hcl rename to test/integration/connect/envoy/case-gateways-remote/primary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh b/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh index 4263deb9a8..fe0325032d 100644 --- a/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh +++ b/test/integration/connect/envoy/case-gateways-remote/primary/setup.sh @@ -2,4 +2,6 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/gateway.hcl b/test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-remote/secondary/gateway.hcl rename to test/integration/connect/envoy/case-gateways-remote/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/s1.hcl b/test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-gateways-remote/secondary/s1.hcl rename to test/integration/connect/envoy/case-gateways-remote/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh b/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh index b27daa4b2a..30b1810b52 100644 --- a/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh +++ b/test/integration/connect/envoy/case-gateways-remote/secondary/setup.sh @@ -2,6 +2,8 @@ set -eEuo pipefail +register_services secondary + gen_envoy_bootstrap s2 19001 secondary gen_envoy_bootstrap mesh-gateway 19003 secondary true -retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null \ No newline at end of file +retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-grpc/s1.hcl b/test/integration/connect/envoy/case-grpc/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-grpc/s1.hcl rename to test/integration/connect/envoy/case-grpc/service_s1.hcl diff --git a/test/integration/connect/envoy/case-grpc/s2.hcl b/test/integration/connect/envoy/case-grpc/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-grpc/s2.hcl rename to test/integration/connect/envoy/case-grpc/service_s2.hcl diff --git a/test/integration/connect/envoy/case-grpc/setup.sh b/test/integration/connect/envoy/case-grpc/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-grpc/setup.sh +++ b/test/integration/connect/envoy/case-grpc/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-http-badauthz/s1.hcl b/test/integration/connect/envoy/case-http-badauthz/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-http-badauthz/s1.hcl rename to test/integration/connect/envoy/case-http-badauthz/service_s1.hcl diff --git a/test/integration/connect/envoy/case-http-badauthz/s2.hcl b/test/integration/connect/envoy/case-http-badauthz/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-http-badauthz/s2.hcl rename to test/integration/connect/envoy/case-http-badauthz/service_s2.hcl diff --git a/test/integration/connect/envoy/case-http-badauthz/setup.sh b/test/integration/connect/envoy/case-http-badauthz/setup.sh index ce54101f72..eb4f3de93b 100644 --- a/test/integration/connect/envoy/case-http-badauthz/setup.sh +++ b/test/integration/connect/envoy/case-http-badauthz/setup.sh @@ -5,5 +5,7 @@ set -eEuo pipefail # Setup deny intention setup_upsert_l4_intention s1 s2 deny +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-http/s1.hcl b/test/integration/connect/envoy/case-http/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-http/s1.hcl rename to test/integration/connect/envoy/case-http/service_s1.hcl diff --git a/test/integration/connect/envoy/case-http/s2.hcl b/test/integration/connect/envoy/case-http/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-http/s2.hcl rename to test/integration/connect/envoy/case-http/service_s2.hcl diff --git a/test/integration/connect/envoy/case-http/setup.sh b/test/integration/connect/envoy/case-http/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-http/setup.sh +++ b/test/integration/connect/envoy/case-http/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-grpc/gateway.hcl rename to test/integration/connect/envoy/case-ingress-gateway-grpc/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/s1.hcl b/test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-grpc/s1.hcl rename to test/integration/connect/envoy/case-ingress-gateway-grpc/service_s1.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh index 7aa6018976..93bfefee48 100644 --- a/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh +++ b/test/integration/connect/envoy/case-ingress-gateway-grpc/setup.sh @@ -5,6 +5,8 @@ set -euo pipefail # wait for bootstrap to apply config entries wait_for_config_entry ingress-gateway ingress-gateway +register_services primary + gen_envoy_bootstrap ingress-gateway 20000 primary true gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-http/gateway.hcl rename to test/integration/connect/envoy/case-ingress-gateway-http/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh index d40eb196a1..fd46866e43 100644 --- a/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh +++ b/test/integration/connect/envoy/case-ingress-gateway-http/setup.sh @@ -7,6 +7,8 @@ wait_for_config_entry ingress-gateway ingress-gateway wait_for_config_entry proxy-defaults global wait_for_config_entry service-router router +register_services primary + gen_envoy_bootstrap ingress-gateway 20000 primary true gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-multiple-services/gateway.hcl rename to test/integration/connect/envoy/case-ingress-gateway-multiple-services/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh index 9a2c4ab9ed..dd732cc0ad 100644 --- a/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh +++ b/test/integration/connect/envoy/case-ingress-gateway-multiple-services/setup.sh @@ -6,6 +6,8 @@ set -euo pipefail wait_for_config_entry ingress-gateway ingress-gateway wait_for_config_entry proxy-defaults global +register_services primary + gen_envoy_bootstrap ingress-gateway 20000 primary true gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-simple/gateway.hcl rename to test/integration/connect/envoy/case-ingress-gateway-simple/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh index 7aa6018976..93bfefee48 100644 --- a/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh +++ b/test/integration/connect/envoy/case-ingress-gateway-simple/setup.sh @@ -5,6 +5,8 @@ set -euo pipefail # wait for bootstrap to apply config entries wait_for_config_entry ingress-gateway ingress-gateway +register_services primary + gen_envoy_bootstrap ingress-gateway 20000 primary true gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/gateway.hcl b/test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-gateway-tls/gateway.hcl rename to test/integration/connect/envoy/case-ingress-gateway-tls/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh b/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh index 7aa6018976..93bfefee48 100644 --- a/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh +++ b/test/integration/connect/envoy/case-ingress-gateway-tls/setup.sh @@ -5,6 +5,8 @@ set -euo pipefail # wait for bootstrap to apply config entries wait_for_config_entry ingress-gateway ingress-gateway +register_services primary + gen_envoy_bootstrap ingress-gateway 20000 primary true gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/gateway.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/gateway.hcl rename to test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/ingress.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/ingress.hcl rename to test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_ingress.hcl diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/s1.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/s1.hcl rename to test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/s2.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/s2.hcl rename to test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh index f5531627ab..1d8641064e 100644 --- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh +++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/primary/setup.sh @@ -6,6 +6,8 @@ set -eEuo pipefail wait_for_config_entry ingress-gateway ingress-gateway wait_for_config_entry proxy-defaults global +register_services primary + gen_envoy_bootstrap mesh-gateway 19002 primary true gen_envoy_bootstrap ingress-gateway 20000 primary true retry_default docker_consul primary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=secondary" >/dev/null diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/gateway.hcl b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/gateway.hcl rename to test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh index 8bd31bb039..c3ec8b3c6c 100644 --- a/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh +++ b/test/integration/connect/envoy/case-ingress-mesh-gateways-resolver/secondary/setup.sh @@ -2,6 +2,8 @@ set -eEuo pipefail +register_services secondary + gen_envoy_bootstrap s1 19001 secondary gen_envoy_bootstrap s2 19002 secondary gen_envoy_bootstrap mesh-gateway 19003 secondary true diff --git a/test/integration/connect/envoy/case-l7-intentions/setup.sh b/test/integration/connect/envoy/case-l7-intentions/setup.sh index 58290b3740..33e147b099 100644 --- a/test/integration/connect/envoy/case-l7-intentions/setup.sh +++ b/test/integration/connect/envoy/case-l7-intentions/setup.sh @@ -6,5 +6,7 @@ set -euo pipefail wait_for_config_entry service-defaults s2 wait_for_config_entry service-intentions s2 +register_services primary + gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/s1.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-multidc-rsa-ca/primary/s1.hcl rename to test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/s2.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-multidc-rsa-ca/primary/s2.hcl rename to test/integration/connect/envoy/case-multidc-rsa-ca/primary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh index ac7c2720f0..4f99d7244b 100644 --- a/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh +++ b/test/integration/connect/envoy/case-multidc-rsa-ca/primary/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary retry_default docker_consul primary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=secondary" >/dev/null diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/s1.hcl b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-multidc-rsa-ca/secondary/s1.hcl rename to test/integration/connect/envoy/case-multidc-rsa-ca/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh index 6ea888c41c..97b4802236 100644 --- a/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh +++ b/test/integration/connect/envoy/case-multidc-rsa-ca/secondary/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services secondary + gen_envoy_bootstrap s2 19001 secondary -retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null \ No newline at end of file +retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-prometheus/s1.hcl b/test/integration/connect/envoy/case-prometheus/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-prometheus/s1.hcl rename to test/integration/connect/envoy/case-prometheus/service_s1.hcl diff --git a/test/integration/connect/envoy/case-prometheus/s2.hcl b/test/integration/connect/envoy/case-prometheus/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-prometheus/s2.hcl rename to test/integration/connect/envoy/case-prometheus/service_s2.hcl diff --git a/test/integration/connect/envoy/case-prometheus/setup.sh b/test/integration/connect/envoy/case-prometheus/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-prometheus/setup.sh +++ b/test/integration/connect/envoy/case-prometheus/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-stats-proxy/s1.hcl b/test/integration/connect/envoy/case-stats-proxy/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-stats-proxy/s1.hcl rename to test/integration/connect/envoy/case-stats-proxy/service_s1.hcl diff --git a/test/integration/connect/envoy/case-stats-proxy/s2.hcl b/test/integration/connect/envoy/case-stats-proxy/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-stats-proxy/s2.hcl rename to test/integration/connect/envoy/case-stats-proxy/service_s2.hcl diff --git a/test/integration/connect/envoy/case-stats-proxy/setup.sh b/test/integration/connect/envoy/case-stats-proxy/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-stats-proxy/setup.sh +++ b/test/integration/connect/envoy/case-stats-proxy/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-statsd-udp/s1.hcl b/test/integration/connect/envoy/case-statsd-udp/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-statsd-udp/s1.hcl rename to test/integration/connect/envoy/case-statsd-udp/service_s1.hcl diff --git a/test/integration/connect/envoy/case-statsd-udp/setup.sh b/test/integration/connect/envoy/case-statsd-udp/setup.sh index 89c9345f15..fe12061e3b 100644 --- a/test/integration/connect/envoy/case-statsd-udp/setup.sh +++ b/test/integration/connect/envoy/case-statsd-udp/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap s2 19001 diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-hostnames/gateway.hcl rename to test/integration/connect/envoy/case-terminating-gateway-hostnames/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/s1.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-hostnames/s1.hcl rename to test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s1.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/s4.hcl b/test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-hostnames/s4.hcl rename to test/integration/connect/envoy/case-terminating-gateway-hostnames/service_s4.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh index 94c79d2fb5..df98bbbbfb 100644 --- a/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh +++ b/test/integration/connect/envoy/case-terminating-gateway-hostnames/setup.sh @@ -5,5 +5,7 @@ set -euo pipefail # wait for bootstrap to apply config entries wait_for_config_entry terminating-gateway terminating-gateway +register_services primary + gen_envoy_bootstrap terminating-gateway 20000 primary true gen_envoy_bootstrap s1 19000 diff --git a/test/integration/connect/envoy/case-terminating-gateway-simple/gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-simple/gateway.hcl rename to test/integration/connect/envoy/case-terminating-gateway-simple/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh index 94c79d2fb5..df98bbbbfb 100644 --- a/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh +++ b/test/integration/connect/envoy/case-terminating-gateway-simple/setup.sh @@ -5,5 +5,7 @@ set -euo pipefail # wait for bootstrap to apply config entries wait_for_config_entry terminating-gateway terminating-gateway +register_services primary + gen_envoy_bootstrap terminating-gateway 20000 primary true gen_envoy_bootstrap s1 19000 diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-subsets/gateway.hcl rename to test/integration/connect/envoy/case-terminating-gateway-subsets/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/s2-v1.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-subsets/s2-v1.hcl rename to test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v1.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/s2-v2.hcl b/test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-subsets/s2-v2.hcl rename to test/integration/connect/envoy/case-terminating-gateway-subsets/service_s2-v2.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh index 4ccc96e198..850b47c68c 100644 --- a/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh +++ b/test/integration/connect/envoy/case-terminating-gateway-subsets/setup.sh @@ -7,6 +7,8 @@ wait_for_config_entry terminating-gateway terminating-gateway wait_for_config_entry proxy-defaults global wait_for_config_entry service-resolver s2 +register_services primary + # terminating gateway will act as s2's proxy gen_envoy_bootstrap s1 19000 gen_envoy_bootstrap terminating-gateway 20000 primary true diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/gateway.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-without-services/gateway.hcl rename to test/integration/connect/envoy/case-terminating-gateway-without-services/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/s1.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-without-services/s1.hcl rename to test/integration/connect/envoy/case-terminating-gateway-without-services/service_s1.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/s2.hcl b/test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-terminating-gateway-without-services/s2.hcl rename to test/integration/connect/envoy/case-terminating-gateway-without-services/service_s2.hcl diff --git a/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh b/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh index 57cd5ab051..7a88962526 100644 --- a/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh +++ b/test/integration/connect/envoy/case-terminating-gateway-without-services/setup.sh @@ -2,4 +2,6 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap terminating-gateway 19000 primary true diff --git a/test/integration/connect/envoy/case-upstream-config/s1.hcl b/test/integration/connect/envoy/case-upstream-config/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-upstream-config/s1.hcl rename to test/integration/connect/envoy/case-upstream-config/service_s1.hcl diff --git a/test/integration/connect/envoy/case-upstream-config/s2.hcl b/test/integration/connect/envoy/case-upstream-config/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-upstream-config/s2.hcl rename to test/integration/connect/envoy/case-upstream-config/service_s2.hcl diff --git a/test/integration/connect/envoy/case-upstream-config/setup.sh b/test/integration/connect/envoy/case-upstream-config/setup.sh index a74435b3b1..e8321972b3 100644 --- a/test/integration/connect/envoy/case-upstream-config/setup.sh +++ b/test/integration/connect/envoy/case-upstream-config/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/gateway.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/primary/gateway.hcl rename to test/integration/connect/envoy/case-wanfed-gw/primary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/s1.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/primary/s1.hcl rename to test/integration/connect/envoy/case-wanfed-gw/primary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/s2.hcl b/test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/primary/s2.hcl rename to test/integration/connect/envoy/case-wanfed-gw/primary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh b/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh index 67d4f0d6fa..9dc09f4b8f 100644 --- a/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh +++ b/test/integration/connect/envoy/case-wanfed-gw/primary/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap mesh-gateway 19000 primary true retry_default docker_consul primary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=secondary" >/dev/null diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/gateway.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/secondary/gateway.hcl rename to test/integration/connect/envoy/case-wanfed-gw/secondary/service_gateway.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/s1.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/secondary/s1.hcl rename to test/integration/connect/envoy/case-wanfed-gw/secondary/service_s1.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/s2.hcl b/test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-wanfed-gw/secondary/s2.hcl rename to test/integration/connect/envoy/case-wanfed-gw/secondary/service_s2.hcl diff --git a/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh b/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh index 4f74938023..f9d892c215 100644 --- a/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh +++ b/test/integration/connect/envoy/case-wanfed-gw/secondary/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services secondary + gen_envoy_bootstrap mesh-gateway 19001 secondary true retry_default docker_consul secondary curl -s "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null diff --git a/test/integration/connect/envoy/case-zipkin/s1.hcl b/test/integration/connect/envoy/case-zipkin/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/case-zipkin/s1.hcl rename to test/integration/connect/envoy/case-zipkin/service_s1.hcl diff --git a/test/integration/connect/envoy/case-zipkin/s2.hcl b/test/integration/connect/envoy/case-zipkin/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/case-zipkin/s2.hcl rename to test/integration/connect/envoy/case-zipkin/service_s2.hcl diff --git a/test/integration/connect/envoy/case-zipkin/setup.sh b/test/integration/connect/envoy/case-zipkin/setup.sh index 0655ef2a21..e8321972b3 100644 --- a/test/integration/connect/envoy/case-zipkin/setup.sh +++ b/test/integration/connect/envoy/case-zipkin/setup.sh @@ -2,5 +2,7 @@ set -eEuo pipefail +register_services primary + gen_envoy_bootstrap s1 19000 primary -gen_envoy_bootstrap s2 19001 primary \ No newline at end of file +gen_envoy_bootstrap s2 19001 primary diff --git a/test/integration/connect/envoy/consul-base-cfg/s1.hcl b/test/integration/connect/envoy/consul-base-cfg/service_s1.hcl similarity index 100% rename from test/integration/connect/envoy/consul-base-cfg/s1.hcl rename to test/integration/connect/envoy/consul-base-cfg/service_s1.hcl diff --git a/test/integration/connect/envoy/consul-base-cfg/s2.hcl b/test/integration/connect/envoy/consul-base-cfg/service_s2.hcl similarity index 100% rename from test/integration/connect/envoy/consul-base-cfg/s2.hcl rename to test/integration/connect/envoy/consul-base-cfg/service_s2.hcl diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash index 7c514fb4a3..e9792674e8 100755 --- a/test/integration/connect/envoy/helpers.bash +++ b/test/integration/connect/envoy/helpers.bash @@ -702,6 +702,11 @@ function delete_config_entry { retry_default curl -sL -XDELETE "http://127.0.0.1:8500/v1/config/${KIND}/${NAME}" } +function register_services { + local DC=${1:-primary} + docker_consul_exec ${DC} sh -c "consul services register /workdir/${DC}/register/service_*.hcl" +} + function setup_upsert_l4_intention { local SOURCE=$1 local DESTINATION=$2 diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index f54d43334d..52d83e0c5f 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -51,10 +51,10 @@ function init_workdir { # don't wipe logs between runs as they are already split and we need them to # upload as artifacts later. rm -rf workdir/${DC} - mkdir -p workdir/${DC}/{consul,envoy,bats,statsd,data} + mkdir -p workdir/${DC}/{consul,register,envoy,bats,statsd,data} # Reload consul config from defaults - cp consul-base-cfg/* workdir/${DC}/consul/ + cp consul-base-cfg/*.hcl workdir/${DC}/consul/ # Add any overrides if there are any (no op if not) find ${CASE_DIR} -maxdepth 1 -name '*.hcl' -type f -exec cp -f {} workdir/${DC}/consul \; @@ -71,6 +71,9 @@ function init_workdir { find ${CASE_DIR}/${DC} -type f -name '*.bats' -exec cp -f {} workdir/${DC}/bats \; fi + # move all of the registration files OUT of the consul config dir now + find workdir/${DC}/consul -type f -name 'service_*.hcl' -exec mv -f {} workdir/${DC}/register \; + if test -d "${CASE_DIR}/data" then cp -r ${CASE_DIR}/data/* workdir/${DC}/data