e2e: extract shared elastic-agent download helpers from AgentInstallSuite by ycombinator · Pull Request #6611 · elastic/fleet-server

ycombinator · 2026-03-18T16:09:18Z

Summary

Extracts downloadElasticAgent, extractAgentArchive, and internal tar/zip helpers from AgentInstallSuite into a new testing/e2e/agent_download.go file so other E2E tests can reuse them without duplication. There will be a follow up PR that adds an E2E test for [OpAMP][E2E Test] Verify that EDOT Collectors can talk to Fleet over OpAMP #6394, and that test will also need to download Elastic Agent / EDOT Collector.
Adds download caching: the archive is stored in os.UserCacheDir()/fleet-server-e2e/ and reused on subsequent runs if the remote .sha512 checksum matches, avoiding repeated 600 MB downloads
AgentInstallSuite updated to call the shared helpers; behaviour is unchanged

🤖 Generated with Claude Code

mergify · 2026-03-18T16:09:55Z

This pull request does not have a backport label. Could you fix it @ycombinator? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit
backport-active-all is the label that automatically backports to all active branches.
backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

…uite Extract downloadElasticAgent, extractAgentArchive (and internal tar/zip helpers) into a new agent_download.go file so they can be reused by other E2E tests without duplication. Improvements over the original inline methods: - Caching: the downloaded archive is stored in os.UserCacheDir() and reused on subsequent runs if the remote .sha512 checksum matches, avoiding repeated 600 MB downloads - ExtractFilter callback: lets callers limit which entries are written to disk (complementing the existing FileReplacer) - Explicit chmod after extraction: ensures execute bits are preserved regardless of the process umask AgentInstallSuite is updated to call the shared helpers; behaviour is unchanged. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…e methods Replace the FileReplacer callback with the original extractZip/extractTar/copyFleetServer suite methods on AgentInstallSuite, matching the pre-refactor approach. The shared downloadElasticAgent function (with caching) remains in agent_download.go. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…t cache Avoids persistent cache growth in ~/Library/Caches (macOS) or ~/.cache (Linux). TempDir is cleared on reboot and is appropriate for CI/test artifacts. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…code Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

michel-laterman

Mostly nitpicks, but we really should check return status codes before handling the response bodies

michel-laterman · 2026-03-18T21:33:37Z

testing/e2e/agent_download.go

+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+//go:build e2e && !requirefips


Do we need !requirefips?

michel-laterman · 2026-03-18T21:39:28Z

testing/e2e/agent_download.go

+func agentCacheDir() string {
+	return filepath.Join(os.TempDir(), "fleet-server-e2e")
+}


Should we clean the cache on suite teardown?

michel-laterman · 2026-03-18T21:40:52Z

testing/e2e/agent_download.go

+	if len(draSplit) == 3 {
+		draVersion = draSplit[0] + "-" + draSplit[2] // remove hash
+	} else if len(draSplit) > 3 {
+		t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %s", draVersion)


Suggested change

t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %s", draVersion)

t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %v", draSplit)

michel-laterman · 2026-03-18T21:41:44Z

testing/e2e/agent_download.go

+	} else if len(draSplit) > 3 {
+		t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %s", draVersion)
+	}
+	t.Logf("Using ELASTICSEARCH_VERSION=%s for agent download", draVersion)


Suggested change

t.Logf("Using ELASTICSEARCH_VERSION=%s for agent download", draVersion)

t.Logf("Using version %s for agent download", draVersion)

michel-laterman · 2026-03-18T21:42:40Z

testing/e2e/agent_download.go

+	}
+	t.Logf("Using ELASTICSEARCH_VERSION=%s for agent download", draVersion)
+
+	req, err := http.NewRequestWithContext(ctx, "GET", "https://artifacts-api.elastic.co/v1/search/"+draVersion, nil)


Suggested change

req, err := http.NewRequestWithContext(ctx, "GET", "https://artifacts-api.elastic.co/v1/search/"+draVersion, nil)

req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://artifacts-api.elastic.co/v1/search/"+draVersion, nil)

michel-laterman · 2026-03-18T21:43:39Z

testing/e2e/agent_download.go

+	resp, err := client.Do(req)
+	if err != nil {
+		t.Fatalf("failed to query artifacts API: %v", err)
+	}
+
+	var body SearchResp
+	err = json.NewDecoder(resp.Body).Decode(&body)
+	resp.Body.Close()


We should probably ensure a 200 return before decoding the response

michel-laterman · 2026-03-18T21:47:46Z

testing/e2e/agent_download.go

+	}
+	tmpName := tmp.Name()
+
+	req, err = http.NewRequestWithContext(ctx, "GET", pkg.URL, nil)


Suggested change

req, err = http.NewRequestWithContext(ctx, "GET", pkg.URL, nil)

req, err = http.NewRequestWithContext(ctx, http.MethodGet, pkg.URL, nil)

michel-laterman · 2026-03-18T21:53:14Z

testing/e2e/agent_download.go

+// first whitespace-delimited field is returned.
+func fetchRemoteSHA512(ctx context.Context, t *testing.T, client *http.Client, url string) string {
+	t.Helper()
+	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)


Suggested change

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)

req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)

michel-laterman · 2026-03-18T21:53:59Z

testing/e2e/agent_download.go

+		t.Fatalf("failed to fetch sha512 file: %v", err)
+	}
+	defer resp.Body.Close()
+	data, err := io.ReadAll(resp.Body)


Check response code before reading body

ycombinator requested a review from a team as a code owner March 18, 2026 16:09

ycombinator requested review from blakerouse and michel-laterman March 18, 2026 16:09

ycombinator marked this pull request as draft March 18, 2026 16:16

ycombinator force-pushed the e2e-agent-download-refactor branch from 6f69604 to 1ace6df Compare March 18, 2026 16:19

ycombinator and others added 5 commits March 18, 2026 09:28

chore(e2e): preserve commented-out Artifact fields from pre-refactor …

4399523

…code Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chore(e2e): restore comments removed during refactor

e930c79

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chore(e2e): restore "Use local fleet-server" comment in extractTar

7634168

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

ycombinator marked this pull request as ready for review March 18, 2026 16:57

ycombinator mentioned this pull request Mar 18, 2026

e2e: add TestOpAMPWithEDOTCollector #6612

Draft

chore(e2e): gofmt fixes

a9f5b2f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

michel-laterman reviewed Mar 18, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

e2e: extract shared elastic-agent download helpers from AgentInstallSuite#6611

e2e: extract shared elastic-agent download helpers from AgentInstallSuite#6611
ycombinator wants to merge 7 commits intoelastic:mainfrom
ycombinator:e2e-agent-download-refactor

ycombinator commented Mar 18, 2026 •

edited

Loading

Uh oh!

mergify bot commented Mar 18, 2026

Uh oh!

michel-laterman left a comment

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

michel-laterman Mar 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %s", draVersion)
	t.Fatalf("Unsupported ELASTICSEARCH_VERSION format, expected 3 segments got: %v", draSplit)

	t.Logf("Using ELASTICSEARCH_VERSION=%s for agent download", draVersion)
	t.Logf("Using version %s for agent download", draVersion)

	req, err := http.NewRequestWithContext(ctx, "GET", "https://artifacts-api.elastic.co/v1/search/"+draVersion, nil)
	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://artifacts-api.elastic.co/v1/search/"+draVersion, nil)

	req, err = http.NewRequestWithContext(ctx, "GET", pkg.URL, nil)
	req, err = http.NewRequestWithContext(ctx, http.MethodGet, pkg.URL, nil)

Conversation

ycombinator commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

mergify bot commented Mar 18, 2026

Uh oh!

michel-laterman left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ycombinator commented Mar 18, 2026 •

edited

Loading