From d991db50faeb5fbbc602cb08b4524a63f72a8c4a Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Wed, 31 May 2023 13:48:52 -0400 Subject: [PATCH] backport of commit 65d5aeaaac207e134a6ab2f0742e8d5a34c90154 (#17531) Co-authored-by: Poonam Jadhav --- test/integration/consul-container/libs/cluster/agent.go | 2 ++ test/integration/consul-container/libs/cluster/container.go | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/test/integration/consul-container/libs/cluster/agent.go b/test/integration/consul-container/libs/cluster/agent.go index ec525780bb1d..7c89fb92c526 100644 --- 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 index dfda21615978..bd56ac4e800d 100644 --- 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",