Enhance artifact fetcher to download FIPS-compliant Agent artifacts

Author: ycombinator

pkg/testing/fetch_test.go

@@ -7,8 +7,27 @@ package testing
 import (
 	"errors"
 	gtesting "testing"
+
+	"github.com/stretchr/testify/require"
 )
 
+func TestGetPackagePrefix(t *gtesting.T) {
+	tests := map[string]struct {
+		fipsOnly bool
+		expected string
+	}{
+		"fips":    {fipsOnly: true, expected: "fips-"},
+		"no_fips": {fipsOnly: false, expected: ""},
+	}
+
+	for name, tc := range tests {
+		t.Run(name, func(t *gtesting.T) {
+			actual := GetPackagePrefix(tc.fipsOnly)
+			require.Equal(t, tc.expected, actual)
+		})
+	}
+}
+
 func TestGetPackageSuffix(t *gtesting.T) {
 	tests := map[string]struct {
 		os       string

pkg/testing/fetcher.go

@@ -40,6 +40,15 @@ var packageArchMap = map[string]string{
 	"darwin-arm64-targz": "darwin-aarch64.tar.gz",
 }
 
+// GetPackagePrefix returns the prefix right before the version component of the Elastic
+// Agent's artifact name, based on the given parameter values.
+func GetPackagePrefix(fipsOnly bool) string {
+	if fipsOnly {
+		return "fips-"
+	}
+	return ""
+}
+
 // GetPackageSuffix returns the suffix ending for the builds of Elastic Agent based on the
 // operating system and architecture.
 func GetPackageSuffix(operatingSystem string, architecture string, packageFormat string) (string, error) {

pkg/testing/fetcher_artifact.go

@@ -26,6 +26,7 @@ type httpDoer interface {
 
 type artifactFetcher struct {
 	snapshotOnly bool
+	fipsOnly     bool
 
 	doer httpDoer
 }
@@ -39,6 +40,13 @@ func WithArtifactSnapshotOnly() artifactFetcherOpt {
 	}
 }
 
+// WithArtifactFIPSOnly sets the ArtifactFetcher to only pull a FIPS-compliant build.
+func WithArtifactFIPSOnly() artifactFetcherOpt {
+	return func(f *artifactFetcher) {
+		f.fipsOnly = true
+	}
+}
+
 // ArtifactFetcher returns a fetcher that pulls the binary of the Elastic Agent from the Elastic artifacts API.
 //
 // It tries to pull the latest version and if it cannot find that version it tries to pull a SNAPSHOT build for
@@ -60,6 +68,7 @@ func (f *artifactFetcher) Name() string {
 
 // Fetch fetches the Elastic Agent and places the resulting binary at the path.
 func (f *artifactFetcher) Fetch(ctx context.Context, operatingSystem string, architecture string, version string, packageFormat string) (FetcherResult, error) {
+	prefix := GetPackagePrefix(f.fipsOnly)
 	suffix, err := GetPackageSuffix(operatingSystem, architecture, packageFormat)
 	if err != nil {
 		return nil, err
@@ -84,7 +93,7 @@ func (f *artifactFetcher) Fetch(ctx context.Context, operatingSystem string, arc
 	}
 
 	// this remote path cannot have the build metadata in it
-	srcPath := fmt.Sprintf("elastic-agent-%s-%s", ver.VersionWithPrerelease(), suffix)
+	srcPath := fmt.Sprintf("elastic-agent-%s-%s-%s", prefix, ver.VersionWithPrerelease(), suffix)
 	downloadSrc := fmt.Sprintf("%s%s", uri, srcPath)
 
 	return &artifactResult{