From 0af407b5864e2bcd07091fcf22eee4870230c88a Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 11 Jan 2022 19:33:25 -0500 Subject: [PATCH] fix test failures For some reason 1.9 seems to require an explicit Datacenter name making these RPC requests. In newer versions it works with the empty string. --- agent/consul/leader_connect_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/agent/consul/leader_connect_test.go b/agent/consul/leader_connect_test.go index ade371f6f42c..a241cfa45c51 100644 --- a/agent/consul/leader_connect_test.go +++ b/agent/consul/leader_connect_test.go @@ -341,7 +341,9 @@ func TestCAManager_RenewIntermediate_Secondary(t *testing.T) { codec := rpcClient(t, s2) roots := structs.IndexedCARoots{} - err = msgpackrpc.CallWithCodec(codec, "ConnectCA.Roots", &structs.DCSpecificRequest{}, &roots) + err = msgpackrpc.CallWithCodec(codec, "ConnectCA.Roots", &structs.DCSpecificRequest{ + Datacenter: "dc2", + }, &roots) require.NoError(err) require.Len(roots.Roots, 1) @@ -359,7 +361,7 @@ func TestCAManager_RenewIntermediate_Secondary(t *testing.T) { } csr, _ := connect.TestCSR(t, spiffeService) - req := structs.CASignRequest{CSR: csr} + req := structs.CASignRequest{CSR: csr, Datacenter: "dc2"} cert := structs.IssuedCert{} err = msgpackrpc.CallWithCodec(codec, "ConnectCA.Sign", &req, &cert) require.NoError(err)