test: use direct service registration in envoy integration tests (#9138)

This has the biggest impact on enterprise test cases that use namespaced
registrations, which prior to this change sometimes failed the initial
registration because the namespace was not yet created.

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

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

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

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

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

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

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

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
+gen_envoy_bootstrap s2 19003

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

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
+gen_envoy_bootstrap s2-v1 19002

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
+gen_envoy_bootstrap s3 19004

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
+gen_envoy_bootstrap s3 19004

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
+gen_envoy_bootstrap s3 19002 primary

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
+gen_envoy_bootstrap s3 19002 primary

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

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

test/integration/connect/envoy/case-consul-exec/setup.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
 set -eEuo pipefail
+
+register_services primary

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
+gen_envoy_bootstrap s2 19001 primary

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

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

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
+retry_default docker_consul secondary curl -s  "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null

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

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
+retry_default docker_consul secondary curl -s  "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null

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
+gen_envoy_bootstrap s2 19001 primary

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

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
+gen_envoy_bootstrap s2 19001 primary

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

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

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

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

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

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

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

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

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

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
+retry_default docker_consul secondary curl -s  "http://localhost:8500/v1/catalog/service/consul?dc=primary" >/dev/null

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
+gen_envoy_bootstrap s2 19001 primary

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
+gen_envoy_bootstrap s2 19001 primary

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