Merge branch 'main' into api-gateway-stricter-validation

hashicorp · Feb 17, 2023 · 250ee78 · 250ee78
2 parents 70084e6 + ee99d5c
commit 250ee78
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/agent/xds/testing.go b/agent/xds/testing.go
@@ -85,6 +85,8 @@ type TestEnvoy struct {
 	EnvoyVersion string
 
 	deltaStream *TestADSDeltaStream // Incremental v3
+
+	closed bool
 }
 
 // NewTestEnvoy creates a TestEnvoy instance.
@@ -225,9 +227,9 @@ func (e *TestEnvoy) Close() error {
 	defer e.mu.Unlock()
 
 	// unblock the recv chans to simulate recv errors when client disconnects
-	if e.deltaStream != nil && e.deltaStream.recvCh != nil {
+	if !e.closed && e.deltaStream.recvCh != nil {
 		close(e.deltaStream.recvCh)
-		e.deltaStream = nil
+		e.closed = true
 	}
 	if e.cancel != nil {
 		e.cancel()