Rename define.NewFixture to define.NewFixtureFromLocalBuild (#4562)

* rename define.NewFixture to define.NewFixtureFromLocalBuild * fix leftover test file
elastic · May 3, 2024 · f2011e4 · f2011e4
1 parent e7c4ac8
commit f2011e4
Show file tree

Hide file tree

Showing 26 changed files with 54 additions and 54 deletions.
diff --git a/pkg/testing/define/define.go b/pkg/testing/define/define.go
@@ -66,9 +66,9 @@ func Version() string {
 	return ver
 }
 
-// NewFixture returns a new Elastic Agent testing fixture with a LocalFetcher and
+// NewFixtureFromLocalBuild returns a new Elastic Agent testing fixture with a LocalFetcher and
 // the agent logging to the test logger.
-func NewFixture(t *testing.T, version string, opts ...atesting.FixtureOpt) (*atesting.Fixture, error) {
+func NewFixtureFromLocalBuild(t *testing.T, version string, opts ...atesting.FixtureOpt) (*atesting.Fixture, error) {
 	buildsDir := os.Getenv("AGENT_BUILD_DIR")
 	if buildsDir == "" {
 		projectDir, err := findProjectRoot()
@@ -82,7 +82,7 @@ func NewFixture(t *testing.T, version string, opts ...atesting.FixtureOpt) (*ate
 
 }
 
-// NewFixture returns a new Elastic Agent testing fixture with a LocalFetcher and
+// NewFixtureWithBinary returns a new Elastic Agent testing fixture with a LocalFetcher and
 // the agent logging to the test logger.
 func NewFixtureWithBinary(t *testing.T, version string, binary string, buildsDir string, opts ...atesting.FixtureOpt) (*atesting.Fixture, error) {
 	ver, err := semver.ParseVersion(version)

diff --git a/testing/integration/agent_long_running_leak_test.go b/testing/integration/agent_long_running_leak_test.go
@@ -103,7 +103,7 @@ func (runner *ExtendedRunner) SetupSuite() {
 		Privileged:     true,
 	}
 
-	fixture, err := define.NewFixture(runner.T(), define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(runner.T(), define.Version())
 	require.NoError(runner.T(), err)
 	runner.agentFixture = fixture
 
@@ -173,7 +173,7 @@ func (runner *ExtendedRunner) TestHandleLeak() {
 	// if the slope is increasing above a certain rate, fail the test
 	// A number of factors can change the slope during a test; shortened runtime (lots of handles allocated in the first few seconds, producing an upward slope),
 	// filebeat trying to open a large number of log files, etc
-	//handleSlopeFailure := 0.1
+	// handleSlopeFailure := 0.1
 	for _, mon := range runner.resourceWatchers {
 		handleSlopeFailure := 0.1
 
@@ -320,7 +320,7 @@ func (gm *goroutinesMonitor) Update(t *testing.T, fixture *atesting.Fixture) {
 }
 
 func (gm *goroutinesMonitor) GetSlopeHandlers() []tools.Slope {
-	//handleSlopeFailure := 0.1
+	// handleSlopeFailure := 0.1
 	slopes := []tools.Slope{}
 	for _, handle := range gm.handles {
 		slopes = append(slopes, handle.regGoroutines)

diff --git a/testing/integration/apm_propagation_test.go b/testing/integration/apm_propagation_test.go
@@ -56,7 +56,7 @@ func TestAPMConfig(t *testing.T) {
 		Group: Default,
 		Stack: &define.Stack{},
 	})
-	f, err := define.NewFixture(t, define.Version())
+	f, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	deadline := time.Now().Add(10 * time.Minute)
@@ -88,7 +88,7 @@ func TestAPMConfig(t *testing.T) {
 			return count > 0
 		}, 1*time.Minute, time.Second)
 
-		//change the configuration with a new environment and check that the update has been processed
+		// change the configuration with a new environment and check that the update has been processed
 		environment = environment + "-changed"
 		modifiedAgentConfig := generateAgentConfigForAPM(t, agentConfigTemplateString, info, environment)
 		t.Logf("Rendered agent modified config:\n%s", modifiedAgentConfig)
@@ -178,8 +178,8 @@ func countAPMTraces(ctx context.Context, t *testing.T, esClient *elasticsearch.C
 		Count int
 	}
 
-	//decoder := json.NewDecoder(response.Body)
-	//err = decoder.Decode(&body)
+	// decoder := json.NewDecoder(response.Body)
+	// err = decoder.Decode(&body)
 	bodyBytes, _ := io.ReadAll(response.Body)
 
 	t.Logf("received ES response: %s", bodyBytes)

diff --git a/testing/integration/container_cmd_test.go b/testing/integration/container_cmd_test.go
@@ -38,7 +38,7 @@ func TestContainerCMD(t *testing.T) {
 	})
 	ctx := context.Background()
 
-	agentFixture, err := define.NewFixture(t, define.Version())
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	createPolicyReq := kibana.AgentPolicy{

diff --git a/testing/integration/delay_enroll_test.go b/testing/integration/delay_enroll_test.go
@@ -36,7 +36,7 @@ func TestDelayEnroll(t *testing.T) {
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 
-	agentFixture, err := define.NewFixture(t, define.Version())
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	// 1. Create a policy in Fleet with monitoring enabled.

diff --git a/testing/integration/diagnostics_test.go b/testing/integration/diagnostics_test.go
@@ -132,7 +132,7 @@ func TestDiagnosticsOptionalValues(t *testing.T) {
 		Local: false,
 	})
 
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -184,7 +184,7 @@ func TestDiagnosticsCommand(t *testing.T) {
 		Local: false,
 	})
 
-	f, err := define.NewFixture(t, define.Version())
+	f, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))

diff --git a/testing/integration/endpoint_security_test.go b/testing/integration/endpoint_security_test.go
@@ -166,7 +166,7 @@ func testInstallAndCLIUninstallWithEndpointSecurity(t *testing.T, info *define.I
 	defer cancel()
 
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err, "could not create agent fixture")
 
 	t.Log("Enrolling the agent in Fleet")
@@ -226,7 +226,7 @@ func testInstallAndCLIUninstallWithEndpointSecurity(t *testing.T, info *define.I
 
 func testInstallAndUnenrollWithEndpointSecurity(t *testing.T, info *define.Info, protected bool) {
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Log("Enrolling the agent in Fleet")
@@ -339,7 +339,7 @@ func testInstallAndUnenrollWithEndpointSecurity(t *testing.T, info *define.Info,
 
 func testInstallWithEndpointSecurityAndRemoveEndpointIntegration(t *testing.T, info *define.Info, protected bool) {
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Log("Enrolling the agent in Fleet")
@@ -511,7 +511,7 @@ func TestEndpointSecurityNonDefaultBasePath(t *testing.T) {
 	defer cn()
 
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Log("Enrolling the agent in Fleet")
@@ -589,7 +589,7 @@ func TestEndpointSecurityUnprivileged(t *testing.T) {
 	defer cn()
 
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Log("Enrolling the agent in Fleet")
@@ -665,7 +665,7 @@ func TestEndpointLogsAreCollectedInDiagnostics(t *testing.T) {
 	defer cn()
 
 	// Get path to agent executable.
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Log("Enrolling the agent in Fleet")

diff --git a/testing/integration/fake_test.go b/testing/integration/fake_test.go
@@ -77,7 +77,7 @@ func TestFakeComponent(t *testing.T) {
 		Local: true,
 	})
 
-	f, err := define.NewFixture(t, define.Version())
+	f, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))

diff --git a/testing/integration/fqdn_test.go b/testing/integration/fqdn_test.go
@@ -42,7 +42,7 @@ func TestFQDN(t *testing.T) {
 		Sudo:  true,
 	})
 
-	agentFixture, err := define.NewFixture(t, define.Version())
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	externalIP, err := getExternalIP()

diff --git a/testing/integration/install_privileged_test.go b/testing/integration/install_privileged_test.go
@@ -35,7 +35,7 @@ func TestInstallPrivilegedWithoutBasePath(t *testing.T) {
 	})
 
 	// Get path to Elastic Agent executable
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -87,7 +87,7 @@ func TestInstallPrivilegedWithBasePath(t *testing.T) {
 	})
 
 	// Get path to Elastic Agent executable
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))

diff --git a/testing/integration/install_test.go b/testing/integration/install_test.go
@@ -38,7 +38,7 @@ func TestInstallWithoutBasePath(t *testing.T) {
 	})
 
 	// Get path to Elastic Agent executable
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -105,7 +105,7 @@ func TestInstallWithBasePath(t *testing.T) {
 	})
 
 	// Get path to Elastic Agent executable
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -200,7 +200,7 @@ func TestRepeatedInstallUninstall(t *testing.T) {
 
 			topPath := filepath.Join(defaultBasePath, "Elastic", "Agent")
 			// Get path to Elastic Agent executable
-			fixture, err := define.NewFixture(t, define.Version())
+			fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 			require.NoError(t, err)
 
 			ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(maxRunTime))

diff --git a/testing/integration/logs_ingestion_test.go b/testing/integration/logs_ingestion_test.go
@@ -49,7 +49,7 @@ func TestLogIngestionFleetManaged(t *testing.T) {
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 
-	agentFixture, err := define.NewFixture(t, define.Version())
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	// 1. Create a policy in Fleet with monitoring enabled.
@@ -117,7 +117,7 @@ func TestDebLogIngestFleetManaged(t *testing.T) {
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 
-	agentFixture, err := define.NewFixture(t, define.Version(), atesting.WithPackageFormat("deb"))
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), atesting.WithPackageFormat("deb"))
 	require.NoError(t, err)
 
 	// 1. Create a policy in Fleet with monitoring enabled.
@@ -185,7 +185,7 @@ func TestRpmLogIngestFleetManaged(t *testing.T) {
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()
 
-	agentFixture, err := define.NewFixture(t, define.Version(), atesting.WithPackageFormat("rpm"))
+	agentFixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), atesting.WithPackageFormat("rpm"))
 	require.NoError(t, err)
 
 	// 1. Create a policy in Fleet with monitoring enabled.
@@ -281,7 +281,7 @@ func testMonitoringLogsAreShipped(
 			"add_cloud_metadata: received error failed with http status code 404",                                                                                                                             // okay for the cloud metadata to not work
 			"add_cloud_metadata: received error failed fetching EC2 Identity Document: not found, Signing",                                                                                                    // okay for the cloud metadata to not work
 			"add_cloud_metadata: received error failed fetching EC2 Identity Document: operation error ec2imds: GetInstanceIdentityDocument, http response error StatusCode: 404, request to EC2 IMDS failed", // okay for the cloud metadata to not work
-			"failed to invoke rollback watcher: failed to start Upgrade Watcher: fork/exec /var/lib/elastic-agent/elastic-agent: no such file or directory",                                                   //on debian this happens probably need to fix.
+			"failed to invoke rollback watcher: failed to start Upgrade Watcher: fork/exec /var/lib/elastic-agent/elastic-agent: no such file or directory",                                                   // on debian this happens probably need to fix.
 		})
 	})
 	t.Logf("error logs: Got %d documents", len(docs.Hits.Hits))

diff --git a/testing/integration/metrics_monitoring_test.go b/testing/integration/metrics_monitoring_test.go
@@ -47,7 +47,7 @@ func TestMetricsMonitoringCorrectBinaries(t *testing.T) {
 }
 
 func (runner *MetricsRunner) SetupSuite() {
-	fixture, err := define.NewFixture(runner.T(), define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(runner.T(), define.Version())
 	require.NoError(runner.T(), err)
 	runner.agentFixture = fixture
 

diff --git a/testing/integration/otel_test.go b/testing/integration/otel_test.go
@@ -128,7 +128,7 @@ func TestOtelFileProcessing(t *testing.T) {
 	cfgFilePath := filepath.Join(tempDir, "otel.yml")
 	require.NoError(t, os.WriteFile(cfgFilePath, []byte(fileProcessingConfig), 0600))
 
-	fixture, err := define.NewFixture(t, define.Version(), aTesting.WithAdditionalArgs([]string{"--config", cfgFilePath}))
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), aTesting.WithAdditionalArgs([]string{"--config", cfgFilePath}))
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -250,7 +250,7 @@ func TestOtelAPMIngestion(t *testing.T) {
 	require.NoError(t, os.WriteFile(cfgFilePath, []byte(apmConfig), 0600))
 	require.NoError(t, os.WriteFile(filepath.Join(tempDir, fileName), []byte{}, 0600))
 
-	fixture, err := define.NewFixture(t, define.Version(), aTesting.WithAdditionalArgs([]string{"--config", cfgFilePath}))
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version(), aTesting.WithAdditionalArgs([]string{"--config", cfgFilePath}))
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))

diff --git a/testing/integration/package_version_test.go b/testing/integration/package_version_test.go
@@ -37,7 +37,7 @@ func TestPackageVersion(t *testing.T) {
 		Local: true,
 	})
 
-	f, err := define.NewFixture(t, define.Version())
+	f, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
@@ -68,7 +68,7 @@ func TestComponentBuildHashInDiagnostics(t *testing.T) {
 	})
 	ctx := context.Background()
 
-	f, err := define.NewFixture(t, define.Version())
+	f, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err, "could not create new fixture")
 
 	err = f.Prepare(ctx)

diff --git a/testing/integration/proxy_url_test.go b/testing/integration/proxy_url_test.go
@@ -58,11 +58,11 @@ func SetupTest(t *testing.T) *ProxyURL {
 		proxytest.WithRequestLog("proxy-2", t.Logf),
 		proxytest.WithVerboseLog())
 
-	f, err := define.NewFixture(t,
+	f, err := define.NewFixtureFromLocalBuild(t,
 		p.agentVersion,
 		integrationtest.WithAllowErrors(),
 		integrationtest.WithLogOutput())
-	require.NoError(t, err, "SetupTest: NewFixture failed")
+	require.NoError(t, err, "SetupTest: NewFixtureFromLocalBuild failed")
 
 	ctx, cancel := testcontext.WithDeadline(t, context.Background(), time.Now().Add(10*time.Minute))
 	defer cancel()

diff --git a/testing/integration/upgrade_broken_package_test.go b/testing/integration/upgrade_broken_package_test.go
@@ -39,7 +39,7 @@ func TestUpgradeBrokenPackageVersion(t *testing.T) {
 
 	// Start at the build version as we want to test the retry
 	// logic that is in the build.
-	startFixture, err := define.NewFixture(t, define.Version())
+	startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	// Upgrade to an old build.

diff --git a/testing/integration/upgrade_downgrade_test.go b/testing/integration/upgrade_downgrade_test.go
@@ -47,7 +47,7 @@ func TestStandaloneDowngradeToSpecificSnapshotBuild(t *testing.T) {
 
 	// start at the build version as we want to test the retry
 	// logic that is in the build.
-	startFixture, err := define.NewFixture(t, define.Version())
+	startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 	startVersion, err := startFixture.ExecVersion(ctx)
 	require.NoError(t, err)

diff --git a/testing/integration/upgrade_fleet_test.go b/testing/integration/upgrade_fleet_test.go
@@ -69,7 +69,7 @@ func testFleetManagedUpgrade(t *testing.T, info *define.Info, unprivileged bool)
 
 	// Start at the build version as we want to test the retry
 	// logic that is in the build.
-	startFixture, err := define.NewFixture(t, define.Version())
+	startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 	err = startFixture.Prepare(ctx)
 	require.NoError(t, err)
@@ -171,7 +171,7 @@ func testFleetAirGappedUpgrade(t *testing.T, stack *define.Info, unprivileged bo
 			"It should not affect the connection to the stack. Host: %s, response body: %s",
 		stack.KibanaClient.URL, host, body)
 
-	fixture, err := define.NewFixture(t, define.Version())
+	fixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 	err = fixture.Prepare(ctx)
 	require.NoError(t, err)

diff --git a/testing/integration/upgrade_gpg_test.go b/testing/integration/upgrade_gpg_test.go
@@ -42,7 +42,7 @@ func TestStandaloneUpgradeWithGPGFallback(t *testing.T) {
 
 	// Start at the build version as we want to test the retry
 	// logic that is in the build.
-	startFixture, err := define.NewFixture(t, define.Version())
+	startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 	startVersionInfo, err := startFixture.ExecVersion(ctx)
 	require.NoError(t, err)
@@ -111,7 +111,7 @@ func TestStandaloneUpgradeWithGPGFallbackOneRemoteFailing(t *testing.T) {
 
 	// Start at the build version as we want to test the retry
 	// logic that is in the build.
-	startFixture, err := define.NewFixture(t, define.Version())
+	startFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	// Upgrade to an old build.

diff --git a/testing/integration/upgrade_rollback_test.go b/testing/integration/upgrade_rollback_test.go
@@ -63,7 +63,7 @@ func TestStandaloneUpgradeRollback(t *testing.T) {
 	require.NoError(t, err, "failed to get start agent build version info")
 
 	// Upgrade to the build under test.
-	endFixture, err := define.NewFixture(t, define.Version())
+	endFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Logf("Testing Elastic Agent upgrade from %s to %s...", upgradeFromVersion, define.Version())
@@ -178,7 +178,7 @@ func TestStandaloneUpgradeRollbackOnRestarts(t *testing.T) {
 	require.NoError(t, err, "failed to get start agent build version info")
 
 	// Upgrade to the build under test.
-	endFixture, err := define.NewFixture(t, define.Version())
+	endFixture, err := define.NewFixtureFromLocalBuild(t, define.Version())
 	require.NoError(t, err)
 
 	t.Logf("Testing Elastic Agent upgrade from %s to %s...", upgradeFromVersion, define.Version())