chore: reorder methods allphabetically

Author: mdelapenya

e2e/_suites/ingest-manager/fleet.go

@@ -429,32 +429,6 @@ func checkFleetConfiguration() error {
 	return nil
 }
 
-// isAgentOnline extracts the status for an agent, identified by its hotname
-// It will wuery Fleet's agents endpoint
-func isAgentOnline(hostname string) (bool, error) {
-	jsonResponse, err := getOnlineAgents()
-	if err != nil {
-		return false, err
-	}
-
-	agents := jsonResponse.Path("list")
-
-	for _, agent := range agents.Children() {
-		agentStatus := agent.Path("active").Data().(bool)
-		agentHostname := agent.Path("local_metadata.host.hostname").Data().(string)
-		if agentHostname == hostname {
-			log.WithFields(log.Fields{
-				"active":   agentStatus,
-				"hostname": hostname,
-			}).Debug("Agent status retrieved")
-
-			return agentStatus, nil
-		}
-	}
-
-	return false, fmt.Errorf("The agent '" + hostname + "' was not found in Fleet")
-}
-
 // createFleetConfiguration sends a POST request to Fleet forcing the
 // recreation of the configuration
 func createFleetConfiguration() error {
@@ -751,3 +725,29 @@ func getOnlineAgents() (*gabs.Container, error) {
 
 	return jsonResponse, nil
 }
+
+// isAgentOnline extracts the status for an agent, identified by its hotname
+// It will wuery Fleet's agents endpoint
+func isAgentOnline(hostname string) (bool, error) {
+	jsonResponse, err := getOnlineAgents()
+	if err != nil {
+		return false, err
+	}
+
+	agents := jsonResponse.Path("list")
+
+	for _, agent := range agents.Children() {
+		agentStatus := agent.Path("active").Data().(bool)
+		agentHostname := agent.Path("local_metadata.host.hostname").Data().(string)
+		if agentHostname == hostname {
+			log.WithFields(log.Fields{
+				"active":   agentStatus,
+				"hostname": hostname,
+			}).Debug("Agent status retrieved")
+
+			return agentStatus, nil
+		}
+	}
+
+	return false, fmt.Errorf("The agent '" + hostname + "' was not found in Fleet")
+}

e2e/_suites/ingest-manager/ingest-manager_test.go

@@ -249,15 +249,27 @@ func (imts *IngestManagerTestSuite) processStateOnTheHost(process string, state
 	return nil
 }
 
-func startAgent(profile string, serviceName string) error {
-	cmd := []string{"elastic-agent", "run"}
-	err := execCommandInService(profile, serviceName, cmd, true)
+func execCommandInService(profile string, serviceName string, cmds []string, detach bool) error {
+	serviceManager := services.NewServiceManager()
+
+	composes := []string{
+		profile,     // profile name
+		serviceName, // service
+	}
+	composeArgs := []string{"exec", "-T"}
+	if detach {
+		composeArgs = append(composeArgs, "-d")
+	}
+	composeArgs = append(composeArgs, serviceName)
+	composeArgs = append(composeArgs, cmds...)
+
+	err := serviceManager.RunCommand(profile, composes, composeArgs, profileEnv)
 	if err != nil {
 		log.WithFields(log.Fields{
-			"command": cmd,
+			"command": cmds,
 			"error":   err,
 			"service": serviceName,
-		}).Error("Could not run the agent")
+		}).Error("Could not execute command in container")
 
 		return err
 	}
@@ -295,27 +307,15 @@ func getContainerHostname(containerName string) (string, error) {
 	return hostname, nil
 }
 
-func execCommandInService(profile string, serviceName string, cmds []string, detach bool) error {
-	serviceManager := services.NewServiceManager()
-
-	composes := []string{
-		profile,     // profile name
-		serviceName, // service
-	}
-	composeArgs := []string{"exec", "-T"}
-	if detach {
-		composeArgs = append(composeArgs, "-d")
-	}
-	composeArgs = append(composeArgs, serviceName)
-	composeArgs = append(composeArgs, cmds...)
-
-	err := serviceManager.RunCommand(profile, composes, composeArgs, profileEnv)
+func startAgent(profile string, serviceName string) error {
+	cmd := []string{"elastic-agent", "run"}
+	err := execCommandInService(profile, serviceName, cmd, true)
 	if err != nil {
 		log.WithFields(log.Fields{
-			"command": cmds,
+			"command": cmd,
 			"error":   err,
 			"service": serviceName,
-		}).Error("Could not execute command in container")
+		}).Error("Could not run the agent")
 
 		return err
 	}