test(e2e): fix TLS test retry with RequestAssert

The 'ApisixTls and Ingress with same certificate but different hosts'
test was consistently failing due to two compounding issues:

1. Control-plane / data-plane propagation delay: the control plane
   confirms the api7.com SSL object, but APISIX data plane may not
   have loaded it yet when the HTTPS request is made.

2. Non-retryable Eventually block: NewAPISIXHttpsClient uses
   GinkgoT() as the httpexpect reporter. On TLS error, httpexpect
   calls GinkgoT().Fatalf() -> runtime.Goexit(), which exits the
   goroutine immediately. gomega's Eventually cannot retry because
   the goroutine is gone.

Fix: replace the raw Eventually+httpexpect blocks with s.RequestAssert,
which already exists in the scaffold and uses ErrorReporter (stores
errors instead of calling FailNow). Transient TLS errors are now
returned as retryable errors, letting Eventually poll until the data
plane is fully ready.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Foo Bar

Makefile

@@ -194,7 +194,7 @@ kind-down:
 		|| echo "kind cluster does not exist"
 
 .PHONY: kind-load-images
-kind-load-images: pull-infra-images build-e2e-echo-server-image kind-load-ingress-image kind-load-adc-image
+kind-load-images: pull-infra-images kind-load-ingress-image kind-load-adc-image
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
 	@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)  --name $(KIND_NAME)
@@ -222,17 +222,13 @@ kind-load-adc-image:
 	@docker tag ghcr.io/api7/adc:$(ADC_VERSION) ghcr.io/api7/adc:dev
 	@kind load docker-image ghcr.io/api7/adc:dev --name $(KIND_NAME)
 
-.PHONY: build-e2e-echo-server-image
-build-e2e-echo-server-image:
-	@CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/e2e-echo-server ./cmd/e2e-echo-server
-	@docker build -f test/e2e/images/echo-server.Dockerfile -t jmalloc/echo-server:latest .
-
 .PHONY: pull-infra-images
 pull-infra-images:
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)
 	@docker pull kennethreitz/httpbin:latest
+	@docker pull jmalloc/echo-server:latest
 	@docker pull ghcr.io/api7/adc:dev
 	@docker pull apache/apisix:dev
 	@docker pull openresty/openresty:1.27.1.2-4-bullseye-fat

cmd/e2e-echo-server/main.go

@@ -424,22 +424,25 @@ spec:
 			assert.True(GinkgoT(), sniFound["api7.com"], "api7.com should be in SNIs")
 
 			By("test HTTPS request to api6.com")
-			Eventually(func() int {
-				return s.NewAPISIXHttpsClient("api6.com").
-					GET("/get").
-					WithHost("api6.com").
-					Expect().
-					Raw().StatusCode
-			}).WithTimeout(30 * time.Second).ProbeEvery(1 * time.Second).Should(Equal(http.StatusOK))
+			s.RequestAssert(&scaffold.RequestAssert{
+				Client:  s.NewAPISIXHttpsClient("api6.com"),
+				Path:    "/get",
+				Host:    "api6.com",
+				Checks:  []scaffold.ResponseCheckFunc{scaffold.WithExpectedStatus(http.StatusOK)},
+				Timeout: 30 * time.Second,
+			})
 
 			By("test HTTPS request to api7.com")
-			Eventually(func() int {
-				return s.NewAPISIXHttpsClient("api7.com").
-					GET("/get").
-					WithHost("api7.com").
-					Expect().
-					Raw().StatusCode
-			}).WithTimeout(30 * time.Second).ProbeEvery(1 * time.Second).Should(Equal(http.StatusOK))
+			// Use RequestAssert so that transient TLS errors while the data plane
+			// is loading the freshly-created SSL object are retried via ErrorReporter
+			// instead of causing an immediate fatal failure through GinkgoT().
+			s.RequestAssert(&scaffold.RequestAssert{
+				Client:  s.NewAPISIXHttpsClient("api7.com"),
+				Path:    "/get",
+				Host:    "api7.com",
+				Checks:  []scaffold.ResponseCheckFunc{scaffold.WithExpectedStatus(http.StatusOK)},
+				Timeout: 30 * time.Second,
+			})
 		})
 
 	})