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

The download helpers contain nothing FIPS-specific; removing the tag allows them to be used by any e2e test regardless of FIPS stance. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

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

github-actions · 2026-03-23T17:05:02Z

@Mergifyio backport 9.2 9.3

mergify · 2026-03-23T17:05:18Z

backport 9.2 9.3

✅ Backports have been created

Details

#6649 [9.2](backport #6611) e2e: extract shared elastic-agent download helpers from AgentInstallSuite has been created for branch 9.2
#6650 [9.3](backport #6611) e2e: extract shared elastic-agent download helpers from AgentInstallSuite has been created for branch 9.3

…uite (#6611) * e2e: extract shared elastic-agent download helpers from AgentInstallSuite 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> * refactor(e2e): remove FileReplacer abstraction, restore original suite 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> * refactor(e2e): use os.TempDir() instead of os.UserCacheDir() for agent 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> * chore(e2e): preserve commented-out Artifact fields from pre-refactor code Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(e2e): restore comments removed during refactor Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(e2e): restore "Use local fleet-server" comment in extractTar Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(e2e): gofmt fixes Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(e2e): remove !requirefips build tag from agent_download.go The download helpers contain nothing FIPS-specific; removing the tag allows them to be used by any e2e test regardless of FIPS stance. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Update testing/e2e/agent_download.go Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> * Update testing/e2e/agent_download.go Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> * Update testing/e2e/agent_download.go Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> * Update testing/e2e/agent_download.go Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> * Update testing/e2e/agent_download.go Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> * chore(e2e): check artifacts API HTTP status before decoding response Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore(e2e): check sha512 fetch HTTP status before reading response Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> (cherry picked from commit 3c2c3c2)

…uite (#6611) (#6650) * e2e: extract shared elastic-agent download helpers from AgentInstallSuite 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. * refactor(e2e): remove FileReplacer abstraction, restore original suite 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. * refactor(e2e): use os.TempDir() instead of os.UserCacheDir() for agent cache Avoids persistent cache growth in ~/Library/Caches (macOS) or ~/.cache (Linux). TempDir is cleared on reboot and is appropriate for CI/test artifacts. * chore(e2e): preserve commented-out Artifact fields from pre-refactor code * chore(e2e): restore comments removed during refactor * chore(e2e): restore "Use local fleet-server" comment in extractTar * chore(e2e): gofmt fixes * chore(e2e): remove !requirefips build tag from agent_download.go The download helpers contain nothing FIPS-specific; removing the tag allows them to be used by any e2e test regardless of FIPS stance. * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * chore(e2e): check artifacts API HTTP status before decoding response * chore(e2e): check sha512 fetch HTTP status before reading response --------- (cherry picked from commit 3c2c3c2) Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

…uite (#6611) (#6649) * e2e: extract shared elastic-agent download helpers from AgentInstallSuite 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. * refactor(e2e): remove FileReplacer abstraction, restore original suite 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. * refactor(e2e): use os.TempDir() instead of os.UserCacheDir() for agent cache Avoids persistent cache growth in ~/Library/Caches (macOS) or ~/.cache (Linux). TempDir is cleared on reboot and is appropriate for CI/test artifacts. * chore(e2e): preserve commented-out Artifact fields from pre-refactor code * chore(e2e): restore comments removed during refactor * chore(e2e): restore "Use local fleet-server" comment in extractTar * chore(e2e): gofmt fixes * chore(e2e): remove !requirefips build tag from agent_download.go The download helpers contain nothing FIPS-specific; removing the tag allows them to be used by any e2e test regardless of FIPS stance. * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * Update testing/e2e/agent_download.go * chore(e2e): check artifacts API HTTP status before decoding response * chore(e2e): check sha512 fetch HTTP status before reading response --------- (cherry picked from commit 3c2c3c2) Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

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

[OpAMP] Add TestOpAMPWithEDOTCollector E2E test #6612

Merged

chore(e2e): gofmt fixes

a9f5b2f

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

michel-laterman reviewed Mar 18, 2026

View reviewed changes

ycombinator and others added 8 commits March 20, 2026 13:17

chore(e2e): remove !requirefips build tag from agent_download.go

9ce46ec

The download helpers contain nothing FIPS-specific; removing the tag allows them to be used by any e2e test regardless of FIPS stance. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Update testing/e2e/agent_download.go

5b3219e

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

Update testing/e2e/agent_download.go

0293b66

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

Update testing/e2e/agent_download.go

e198e57

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

Update testing/e2e/agent_download.go

ffea3d6

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

Update testing/e2e/agent_download.go

fb4f42d

Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>

chore(e2e): check artifacts API HTTP status before decoding response

325c651

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

chore(e2e): check sha512 fetch HTTP status before reading response

07bbf1c

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

ycombinator requested a review from michel-laterman March 20, 2026 20:24

michel-laterman approved these changes Mar 23, 2026

View reviewed changes

ycombinator merged commit 3c2c3c2 into elastic:main Mar 23, 2026
10 checks passed

ycombinator deleted the e2e-agent-download-refactor branch March 23, 2026 17:03

ycombinator added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Mar 23, 2026

ycombinator added the backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches label Mar 23, 2026

mergify Bot mentioned this pull request Mar 23, 2026

[9.2](backport #6611) e2e: extract shared elastic-agent download helpers from AgentInstallSuite #6649

Merged

mergify Bot mentioned this pull request Mar 23, 2026

[9.3](backport #6611) e2e: extract shared elastic-agent download helpers from AgentInstallSuite #6650

Merged

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 merged 15 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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

mergify Bot commented Mar 23, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Mar 23, 2026

Uh oh!

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

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ycombinator commented Mar 18, 2026 •

edited

Loading

mergify Bot commented Mar 23, 2026 •

edited

Loading