cleanups

Author: swiatekm

dev-tools/mage/settings.go

@@ -906,7 +906,9 @@ func (s *Settings) WithManifestInfo(ctx context.Context) (*Settings, error) {
 	// VersionWithBuildMetadata preserves the build ID for Independent Agent Releases while
 	// omitting the prerelease — snapshot state is captured in Build.Snapshot.
 	clone.Packaging.AgentPackageVersion = parsedVersion.VersionWithBuildMetadata()
-	clone.Build.AgentCoreCommitHash = agentCoreProject.CommitHash
+	if clone.Packaging.CoreSource == CoreSourceManifest {
+		clone.Build.AgentCoreCommitHash = agentCoreProject.CommitHash
+	}
 	clone.Build.DependenciesVersion = parsedVersion.VersionWithPrerelease()
 	return clone, nil
 }

magefile.go

@@ -645,48 +645,35 @@ func Package(ctx context.Context) error {
 		return errors.New("elastic-agent package is expected to build at least one platform package")
 	}
 
-	switch cfg.Packaging.CoreSource {
-	case devtools.CoreSourceLocal, "":
-		// Apply only snapshot and version from the manifest — not the commit hash.
-		// AgentCoreCommitHash() will return the git HEAD hash (the commit the
-		// compiler actually baked into the binary).
-		cfgWithManifest, err := cfg.WithManifestInfo(ctx)
-		if err != nil {
-			return fmt.Errorf("failed downloading manifest: %w", err)
-		}
-		cfg = cfg.WithSnapshot(cfgWithManifest.Build.Snapshot).WithAgentCoreVersion(cfgWithManifest.AgentCoreVersion())
-		ctx = devtools.ContextWithSettings(ctx, cfg)
-		mg.CtxDeps(ctx, PackageAgentCore)
-	case devtools.CoreSourceManifest:
-		var err error
-		cfg, err = cfg.WithManifestInfo(ctx)
-		if err != nil {
-			return fmt.Errorf("failed downloading manifest: %w", err)
-		}
-		if cfg.Packaging.Manifest == nil {
-			return errors.New("AGENT_CORE_SOURCE=manifest requires MANIFEST_URL to be set")
-		}
-		ctx = devtools.ContextWithSettings(ctx, cfg)
-	default:
-		return fmt.Errorf("unknown AGENT_CORE_SOURCE=%q (want %q or %q)",
-			cfg.Packaging.CoreSource, devtools.CoreSourceLocal, devtools.CoreSourceManifest)
+	cfg, err := cfg.WithManifestInfo(ctx)
+	if err != nil {
+		return fmt.Errorf("failed downloading manifest: %w", err)
 	}
 
-	pkgSpec, err := devtools.LoadElasticAgentPackageSpec(cfg.ElasticBeatsDir)
-	if err != nil {
-		return err
+	if cfg.Packaging.CoreSource == devtools.CoreSourceManifest && cfg.Packaging.Manifest == nil {
+		return errors.New("AGENT_CORE_SOURCE=manifest requires MANIFEST_URL to be set")
 	}
 
-	if cfg.Packaging.ManifestURL != "" {
+	pkgSpec, err := devtools.LoadElasticAgentPackageSpec(cfg.ElasticBeatsDir)
+
+	if cfg.Packaging.Manifest != nil {
 		var filters []packaging.ComponentFilter
-		if cfg.Packaging.CoreSource != devtools.CoreSourceManifest {
+		switch cfg.Packaging.CoreSource {
+		case devtools.CoreSourceLocal, "":
+			mg.CtxDeps(ctx, PackageAgentCore)
 			// Skip the manifest's elastic-agent-core; we compiled it above.
 			filters = append(filters, packaging.WithoutProjectName(devtools.AgentCoreProjectName))
+		case devtools.CoreSourceManifest:
+
+		default:
+			return fmt.Errorf("unknown AGENT_CORE_SOURCE=%q (want %q or %q)",
+				cfg.Packaging.CoreSource, devtools.CoreSourceLocal, devtools.CoreSourceManifest)
 		}
 		if err := downloadManifest(ctx, cfg, pkgSpec, filters...); err != nil {
 			return fmt.Errorf("failed downloading manifest components: %w", err)
 		}
 	}
+
 	return packageAgent(ctx, cfg, pkgSpec)
 }