Merge 65d5aea into backport/NET-3893/container-logs/externally-prime-…

…seagull
hashicorp · May 31, 2023 · 44cd5c2 · 44cd5c2
2 parents db9b75d + 65d5aea
commit 44cd5c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/test/integration/consul-container/libs/cluster/agent.go b/test/integration/consul-container/libs/cluster/agent.go
@@ -2,6 +2,7 @@ package cluster
 
 import (
 	"context"
+	"io"
 
 	"github.com/testcontainers/testcontainers-go"
 
@@ -19,6 +20,7 @@ type Agent interface {
 	GetAgentName() string
 	GetPartition() string
 	GetPod() testcontainers.Container
+	Logs(context.Context) (io.ReadCloser, error)
 	ClaimAdminPort() (int, error)
 	GetConfig() Config
 	GetInfo() AgentInfo

diff --git a/test/integration/consul-container/libs/cluster/container.go b/test/integration/consul-container/libs/cluster/container.go
@@ -64,6 +64,10 @@ func (c *consulContainerNode) GetPod() testcontainers.Container {
 	return c.pod
 }
 
+func (c *consulContainerNode) Logs(context context.Context) (io.ReadCloser, error) {
+	return c.container.Logs(context)
+}
+
 func (c *consulContainerNode) ClaimAdminPort() (int, error) {
 	if c.nextAdminPortOffset >= MaxEnvoyOnNode {
 		return 0, fmt.Errorf("running out of envoy admin port, max %d, already claimed %d",