From 1807af552ed465c8d1f29df24d62e3e563ef5c18 Mon Sep 17 00:00:00 2001
From: Paul Banks <banks@banksco.de>
Date: Mon, 20 Jan 2020 14:56:56 +0000
Subject: [PATCH] Fix TestAPI_DiscoveryChain_Get flake (#7082)

---
 api/discovery_chain_test.go |  2 ++
 sdk/testutil/server.go      | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/api/discovery_chain_test.go b/api/discovery_chain_test.go
index d38bcb76e7..f43f0f93f0 100644
--- a/api/discovery_chain_test.go
+++ b/api/discovery_chain_test.go
@@ -20,6 +20,8 @@ func TestAPI_DiscoveryChain_Get(t *testing.T) {
 	config_entries := c.ConfigEntries()
 	discoverychain := c.DiscoveryChain()
 
+	s.WaitForActiveCARoot(t)
+
 	require.True(t, t.Run("read default chain", func(t *testing.T) {
 		resp, _, err := discoverychain.Get("web", nil, nil)
 		require.NoError(t, err)
diff --git a/sdk/testutil/server.go b/sdk/testutil/server.go
index 6091754e1d..a28591ef14 100644
--- a/sdk/testutil/server.go
+++ b/sdk/testutil/server.go
@@ -423,6 +423,27 @@ func (s *TestServer) WaitForLeader(t *testing.T) {
 	})
 }
 
+// WaitForActiveCARoot waits until the server can return a Connect CA meaning
+// connect has completed bootstrapping and is ready to use.
+func (s *TestServer) WaitForActiveCARoot(t *testing.T) {
+	retry.Run(t, func(r *retry.R) {
+		// Query the API and check the status code.
+		url := s.url("/v1/agent/connect/ca/roots")
+		resp, err := s.HTTPClient.Get(url)
+		if err != nil {
+			r.Fatalf("failed http get '%s': %v", url, err)
+		}
+		defer resp.Body.Close()
+		// Roots will return an error status until it's been bootstrapped. We could
+		// parse the body and sanity check but that causes either import cycles
+		// since this is used in both `api` and consul test or duplication. The 200
+		// is all we really need to wait for.
+		if err := s.requireOK(resp); err != nil {
+			r.Fatal("failed OK response", err)
+		}
+	})
+}
+
 // WaitForSerfCheck ensures we have a node with serfHealth check registered
 // Behavior mirrors testrpc.WaitForTestAgent but avoids the dependency cycle in api pkg
 func (s *TestServer) WaitForSerfCheck(t *testing.T) {