From e01c3585a5516964ca44d4b5a73a1731f282f64d Mon Sep 17 00:00:00 2001 From: Paul Banks Date: Fri, 27 Aug 2021 21:52:54 +0100 Subject: [PATCH] Fix integration tests in CI - serve SDS certs from the Docker image not a mounted path --- test/integration/connect/envoy/run-tests.sh | 2 -- test/integration/connect/envoy/test-sds-server/sds.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index b50b578697..fc5c1861a8 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -587,8 +587,6 @@ function run_container_jaeger { function run_container_test-sds-server { docker run -d --name $(container_name) \ $WORKDIR_SNIPPET \ - -v "$PWD/test-sds-server/certs:/usr/sds/certs" \ - -w /usr/sds \ $(network_snippet primary) \ "test-sds-server" } diff --git a/test/integration/connect/envoy/test-sds-server/sds.go b/test/integration/connect/envoy/test-sds-server/sds.go index 1715585475..1657e31a1a 100644 --- a/test/integration/connect/envoy/test-sds-server/sds.go +++ b/test/integration/connect/envoy/test-sds-server/sds.go @@ -140,7 +140,7 @@ func makeLoggerCallbacks(log hclog.Logger) *xds.CallbackFuncs { return nil }, StreamResponseFunc: func(id int64, req *discovery.DiscoveryRequest, resp *discovery.DiscoveryResponse) { - log.Trace("gRPC stream request", "id", id, + log.Trace("gRPC stream response", "id", id, "resp.typeURL", resp.TypeUrl, "resp.version", resp.VersionInfo, )