From 2ec8dcf1abd1e8bd7ae5ebe34506fac129cdf578 Mon Sep 17 00:00:00 2001 From: Paolo Chila Date: Wed, 10 Sep 2025 16:32:51 +0200 Subject: [PATCH 1/3] Allow overriding AGENT_PACKAGE_VERSION and MANIFEST_URL when USE_PACKAGE_VERSION=true --- dev-tools/mage/settings.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index 17bf18e225f..503451c2c38 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -162,17 +162,18 @@ func initGlobals() { versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER") - agentPackageVersion = EnvOr(agentPackageVersionEnvVar, "") - - ManifestURL = EnvOr(ManifestUrlEnvVar, "") - PackagingFromManifest = ManifestURL != "" - // order matters this must be called last as it will override some of the // values above err = initPackageVersion() if err != nil { panic(fmt.Errorf("failed to init package version: %w", err)) } + + agentPackageVersion = EnvOr(agentPackageVersionEnvVar, agentPackageVersion) + + ManifestURL = EnvOr(ManifestUrlEnvVar, ManifestURL) + PackagingFromManifest = ManifestURL != "" + } // ProjectType specifies the type of project (OSS vs X-Pack). From f280b438695639854dd9076c6833d703095799b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paolo=20Chil=C3=A0?= Date: Thu, 11 Sep 2025 13:40:26 +0200 Subject: [PATCH 2/3] Update dev-tools/mage/settings.go --- dev-tools/mage/settings.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index 503451c2c38..a4b505ea69e 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -162,8 +162,8 @@ func initGlobals() { versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER") - // order matters this must be called last as it will override some of the - // values above + // order matters: this will override some of the values. Those values can be used + // as fallback for the variables below (mainly agentPackageVersion and ManifestURL) err = initPackageVersion() if err != nil { panic(fmt.Errorf("failed to init package version: %w", err)) From b6c45eb17b7c911aec65ca805f9cee6a6fb3b705 Mon Sep 17 00:00:00 2001 From: Paolo Chila Date: Thu, 11 Sep 2025 15:31:10 +0200 Subject: [PATCH 3/3] fix lint errors --- dev-tools/mage/settings.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go index a4b505ea69e..b8ef231ce52 100644 --- a/dev-tools/mage/settings.go +++ b/dev-tools/mage/settings.go @@ -162,7 +162,7 @@ func initGlobals() { versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER") - // order matters: this will override some of the values. Those values can be used + // order matters: this will override some of the values. Those values can be used // as fallback for the variables below (mainly agentPackageVersion and ManifestURL) err = initPackageVersion() if err != nil {