Attempt to make test more reliable by querying ES directly (#8422)

Attempt to make the TestFIPSAgentConnectingToFIPSFleetServerInECHFRH
test more reliable by querying ES for agents running the cloud policy
instead of gathering agents from Kibana.

Author: michel-laterman

testing/integration/ess/fleetserver_fips_test.go

@@ -11,19 +11,17 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/url"
+	"strings"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/elastic-agent-libs/kibana"
 	"github.com/elastic/elastic-agent/pkg/testing/define"
 	"github.com/elastic/elastic-agent/pkg/testing/tools/fleettools"
 	"github.com/elastic/elastic-agent/testing/integration"
 )
 
-const cloudAgentPolicyID = "policy-elastic-agent-on-cloud"
-
 // TestFIPSAgentConnectingToFIPSFleetServerInECHFRH ensures that a FIPS-capable Elastic Agent
 // running in an ECH FRH (FedRamp High) environment is able to successfully connect to its
 // own local Fleet Server instance (which, by definition should also be FIPS-capable and
@@ -62,30 +60,47 @@ func TestFIPSAgentConnectingToFIPSFleetServerInECHFRH(t *testing.T) {
 
 	require.Equalf(t, "HEALTHY", body.Status, "response status code: %d", resp.StatusCode)
 
-	// Get all Agents
+	// Get agent running cloud policy
 	require.Eventually(t, func() bool {
 		ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
 		defer cancel()
-		agents, err := info.KibanaClient.ListAgents(ctx, kibana.ListAgentsRequest{})
+
+		searchResp, err := info.ESClient.Search(info.ESClient.Search.WithContext(ctx), info.ESClient.Search.WithIndex(".fleet-agents"), info.ESClient.Search.WithBody(strings.NewReader(`{
+          "query": {
+	    "term": {
+	      "policy_id": "policy-elastic-agent-on-cloud"
+	    }
+	  }
+	}`)))
 		require.NoError(t, err)
+		defer searchResp.Body.Close()
+		require.Equal(t, http.StatusOK, searchResp.StatusCode)
 
-		// Find Fleet Server's own Agent and get its status and whether it's
-		// FIPS-capable
-		var agentStatus string
-		var agentIsFIPS bool
-		for _, item := range agents.Items {
-			if item.PolicyID == cloudAgentPolicyID {
-				t.Logf("Found fleet-server entry: %+v", item)
-				agentStatus = item.Status
-				agentIsFIPS = item.LocalMetadata.Elastic.Agent.FIPS
-				break
-			}
-		}
+		respObj := struct {
+			Hits struct {
+				Total struct {
+					Value int `json:"value"`
+				} `json:"total"`
+				Hits []struct {
+					Source struct {
+						LocalMetadata struct {
+							Elastic struct {
+								Agent struct {
+									FIPS bool `json:"fips"`
+								} `json:"agent"`
+							} `json:"elastic"`
+						} `json:"local_metadata"`
+						LastCheckinStatus string `json:"last_checkin_status"`
+						LastCheckinReason string `json:"last_checkin_reason"`
+					} `json:"_source"`
+				} `json:"hits"`
+			} `json:"hits"`
+		}{}
 
-		// Check that this Agent is online (i.e. healthy) and is FIPS-capable. This
-		// will prove that a FIPS-capable Agent is able to connect to a FIPS-capable
-		// Fleet Server, with both running in ECH.
-		require.Equal(t, "online", agentStatus)
-		return agentIsFIPS
+		err = json.NewDecoder(searchResp.Body).Decode(&respObj)
+		require.NoError(t, err)
+		require.Equal(t, 1, respObj.Hits.Total.Value, "expected only one hit from the ES query")
+		t.Logf("FIPS: %v, Status: %s", respObj.Hits.Hits[0].Source.LocalMetadata.Elastic.Agent.FIPS, respObj.Hits.Hits[0].Source.LastCheckinStatus)
+		return respObj.Hits.Hits[0].Source.LocalMetadata.Elastic.Agent.FIPS && respObj.Hits.Hits[0].Source.LastCheckinStatus == "online"
 	}, 10*time.Second, 200*time.Millisecond, "Fleet Server's Elastic Agent should be healthy and FIPS-capable")
 }