From 7dc49ece1446edf5a05b0b62ee827ffdc6fc5ed6 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 11 Aug 2020 17:10:28 +0200 Subject: [PATCH] Build Heartbeat for Agent from the OSS directory --- x-pack/elastic-agent/magefile.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/x-pack/elastic-agent/magefile.go b/x-pack/elastic-agent/magefile.go index 2d634d6fce1..c1d36ef0ccc 100644 --- a/x-pack/elastic-agent/magefile.go +++ b/x-pack/elastic-agent/magefile.go @@ -523,15 +523,24 @@ func packageAgent(requiredPackages []string, packagingFn func()) { defer os.RemoveAll(dropPath) defer os.Unsetenv(agentDropPath) - packedBeats := []string{"filebeat", "heartbeat", "metricbeat"} + packedBeats := []struct { + name string + relPath string + }{ + {"filebeat", ".."}, + {"metricbeat", ".."}, + + // Built from the OSS directory + {"heartbeat", "../.."}, + } for _, b := range packedBeats { - pwd, err := filepath.Abs(filepath.Join("..", b)) + pwd, err := filepath.Abs(filepath.Join(b.relPath, b.name)) if err != nil { panic(err) } - if requiredPackagesPresent(pwd, b, version, requiredPackages) { + if requiredPackagesPresent(pwd, b.name, version, requiredPackages) { continue }