fix(compose/agent): refactor Unmarshal into Decode and remove agent_has_publish_ports

Author: pkoutsovasilis

internal/profile/config.go

@@ -5,14 +5,15 @@
 package profile
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
 
 	"github.com/elastic/go-ucfg/yaml"
 
 	"github.com/elastic/elastic-package/internal/common"
+
+	"github.com/mitchellh/mapstructure"
 )
 
 type config struct {
@@ -50,21 +51,15 @@ func (c *config) get(name string) (string, bool) {
 	}
 }
 
-func (c *config) Unmarshal(name string, out any) error {
+func (c *config) Decode(name string, out any) error {
 	v, err := c.settings.GetValue(name)
 	if err != nil {
 		if errors.Is(err, common.ErrKeyNotFound) {
 			return nil
 		}
 		return err
 	}
-
-	data, err := json.Marshal(v)
-	if err != nil {
-		return err
-	}
-
-	if err := json.Unmarshal(data, out); err != nil {
+	if err := mapstructure.Decode(v, out); err != nil {
 		return err
 	}
 

internal/profile/profile.go

@@ -161,8 +161,8 @@ func (profile *Profile) Config(name string, def string) string {
 	return def
 }
 
-func (profile *Profile) Unmarshal(name string, dst any) error {
-	return profile.config.Unmarshal(name, dst)
+func (profile *Profile) Decode(name string, dst any) error {
+	return profile.config.Decode(name, dst)
 }
 
 // RuntimeOverrides defines configuration overrides for the current session.

internal/stack/_static/docker-compose-stack.yml.tmpl

@@ -139,9 +139,7 @@ services:
       interval: 5s
     hostname: docker-fleet-agent
     env_file: "./elastic-agent.env"
-    {{- if eq (fact "agent_has_publish_ports") "true" }}
-    ports: {{ fact "agent_publish_ports" }}
-    {{- end }}
+    ports: [{{ fact "agent_publish_ports" }}]
     volumes:
     - "../certs/ca-cert.pem:/etc/ssl/certs/elastic-package.pem"
     - type: bind

internal/stack/resources.go

@@ -134,8 +134,13 @@ var (
 func applyResources(profile *profile.Profile, stackVersion string) error {
 	stackDir := filepath.Join(profile.ProfilePath, ProfileStackPath)
 
+	var agentPorts []string
+	if err := profile.Decode("stack.agent.ports", &agentPorts); err != nil {
+		return fmt.Errorf("failed to unmarshal stack.agent.ports: %w", err)
+	}
+
 	resourceManager := resource.NewManager()
-	facter := resource.StaticFacter{
+	resourceManager.AddFacter(resource.StaticFacter{
 		"registry_base_image":   PackageRegistryBaseImage,
 		"elasticsearch_version": stackVersion,
 		"kibana_version":        stackVersion,
@@ -152,21 +157,8 @@ func applyResources(profile *profile.Profile, stackVersion string) error {
 		"geoip_dir":            profile.Config(configGeoIPDir, "./ingest-geoip"),
 		"logstash_enabled":     profile.Config(configLogstashEnabled, "false"),
 		"self_monitor_enabled": profile.Config(configSelfMonitorEnabled, "false"),
-	}
-
-	var agentPorts []string
-	if err := profile.Unmarshal("stack.agent.ports", &agentPorts); err != nil {
-		return fmt.Errorf("failed to unmarshal stack.agent.ports: %w", err)
-	}
-
-	if len(agentPorts) > 0 {
-		facter["agent_has_publish_ports"] = "true"
-		facter["agent_publish_ports"] = fmt.Sprintf("[%s]", strings.Join(agentPorts, ","))
-	} else {
-		facter["agent_has_publish_ports"] = "false"
-	}
-
-	resourceManager.AddFacter(facter)
+		"agent_publish_ports":  strings.Join(agentPorts, ","),
+	})
 
 	if err := os.MkdirAll(stackDir, 0755); err != nil {
 		return fmt.Errorf("failed to create stack directory: %w", err)