Skip to content

Skip FIPS components when packaging elastic-agent from a Manifest #7486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2025
Merged

Skip FIPS components when packaging elastic-agent from a Manifest #7486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions dev-tools/mage/checksums.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ func ChecksumsWithManifest(requiredPackage string, versionedFlatPath string, ver
// Iterate over the external binaries that we care about for packaging agent
for _, spec := range manifest.ExpectedBinaries {
// If the individual package doesn't match the expected prefix, then continue
if !strings.HasPrefix(pkgName, spec.BinaryName) {
// FIXME temporarily skip fips packages until elastic-agent FIPS is in place
if !strings.HasPrefix(pkgName, spec.BinaryName) || strings.Contains(pkgName, "-fips-") {
if mg.Verbose() {
log.Printf(">>>>>>> Package [%s] skipped", pkgName)
}
continue
}

Expand Down Expand Up @@ -197,7 +201,8 @@ func getComponentVersion(componentName string, requiredPackage string, component
// Only care about the external binaries that we want to package
for _, spec := range manifest.ExpectedBinaries {
// If the given component name doesn't match the external binary component, skip
if componentName != spec.ProjectName {
// FIXME temporarily skip fips packages until elastic-agent FIPS is in place
if componentName != spec.ProjectName || strings.Contains(pkgName, "-fips-") {
continue
}

Expand Down
Loading