simplify some things

e2e/_suites/fleet/features/apm_integration.feature

@@ -6,8 +6,8 @@ Scenarios for APM
 Scenario Outline: Deploying a <image> stand-alone agent with fleet server mode
   Given a "<image>" stand-alone agent is deployed with fleet server mode
     And the stand-alone agent is listed in Fleet as "online"
-  When the "Elastic APM" integration is added to the policy
-  Then the "Elastic APM" datasource is shown in the policy
+  When the "Elastic APM" integration is added in the policy
+  Then the "Elastic APM" datasource is shown in the policy as added
     And the "apm-server" process is in the "started" state on the host
 
 

e2e/_suites/fleet/fleet.go

@@ -177,8 +177,6 @@ func (fts *FleetTestSuite) contributeSteps(s *godog.ScenarioContext) {
 	s.Step(`^the "([^"]*)" docker container is stopped$`, fts.theDockerContainerIsStopped)
 	s.Step(`^there is no new data in the index after agent shuts down$`, fts.thereIsNoNewDataInTheIndexAfterAgentShutsDown)
 	s.Step(`^the stand-alone agent is listed in Fleet as "([^"]*)"$`, fts.theStandaloneAgentIsListedInFleetWithStatus)
-	s.Step(`^the "([^"]*)" integration is added to the policy$`, fts.theIntegrationIsAddedToThePolicy)
-	s.Step(`^the "([^"]*)" datasource is shown in the policy$`, fts.thePolicyShowsTheDatasourceAdded)
 }
 
 func (fts *FleetTestSuite) theStandaloneAgentIsListedInFleetWithStatus(desiredStatus string) error {

e2e/_suites/fleet/stand-alone.go

@@ -24,29 +24,26 @@ import (
 )
 
 func (fts *FleetTestSuite) aStandaloneAgentIsDeployed(image string) error {
-	fts.StandAlone = true
-	return fts.startAgent(image, "", nil)
+	return fts.startStandAloneAgent(image, "", nil)
 }
 
 func (fts *FleetTestSuite) bootstrapFleetServerFromAStandaloneAgent(image string) error {
-	fts.StandAlone = true
 	fleetPolicy, err := fts.kibanaClient.GetDefaultPolicy(true)
 	if err != nil {
 		return err
 	}
 	fts.FleetServerPolicy = fleetPolicy
-	return fts.startAgent(image, "", map[string]string{"fleetServerMode": "1"})
+	return fts.startStandAloneAgent(image, "", map[string]string{"fleetServerMode": "1"})
 }
 
 func (fts *FleetTestSuite) aStandaloneAgentIsDeployedWithFleetServerModeOnCloud(image string) error {
-	fts.StandAlone = true
 	fleetPolicy, err := fts.kibanaClient.GetDefaultPolicy(true)
 	if err != nil {
 		return err
 	}
 	fts.FleetServerPolicy = fleetPolicy
 	volume := path.Join(config.OpDir(), "compose", "services", "elastic-agent", "apm-legacy")
-	return fts.startAgent(image, "docker-compose-cloud.yml", map[string]string{"apmVolume": volume})
+	return fts.startStandAloneAgent(image, "docker-compose-cloud.yml", map[string]string{"apmVolume": volume})
 }
 
 func (fts *FleetTestSuite) thereIsNewDataInTheIndexFromAgent() error {
@@ -94,8 +91,8 @@ func (fts *FleetTestSuite) thereIsNoNewDataInTheIndexAfterAgentShutsDown() error
 	return elasticsearch.AssertHitsAreNotPresent(result)
 }
 
-func (fts *FleetTestSuite) startAgent(image string, composeFilename string, env map[string]string) error {
-
+func (fts *FleetTestSuite) startStandAloneAgent(image string, composeFilename string, env map[string]string) error {
+	fts.StandAlone = true
 	log.Trace("Deploying an agent to Fleet")
 
 	dockerImageTag := common.AgentVersion
@@ -156,12 +153,7 @@ func (fts *FleetTestSuite) startAgent(image string, composeFilename string, env
 	return nil
 }
 
-func (fts *FleetTestSuite) theIntegrationIsAddedToThePolicy(packageName string) error {
-	return theIntegrationIsOperatedInThePolicy(fts.kibanaClient, fts.FleetServerPolicy, packageName, "added")
-}
-
 func (fts *FleetTestSuite) thePolicyShowsTheDatasourceAdded(packageName string) error {
-	fts.StandAlone = true
 	log.WithFields(log.Fields{
 		"policyID": fts.FleetServerPolicy.ID,
 		"package":  packageName,