Enroll options contains parsable URI after FromFleetConfig call (#9594)

* Enroll options contains parsable URI after FromFleetConfig call

* fix TestComputeEnrollOptions

Author: michalpristas

internal/pkg/agent/application/coordinator/coordinator_unit_test.go

@@ -1914,7 +1914,7 @@ func TestComputeEnrollOptions(t *testing.T) {
 	assert.NotNil(t, options)
 
 	assert.Equal(t, "123", options.EnrollAPIKey, "EnrollAPIKey mismatch")
-	assert.Equal(t, "localhost:1234", options.URL, "URL mismatch")
+	assert.Equal(t, "http://localhost:1234", options.URL, "URL mismatch")
 
 	assert.Equal(t, []string{"sha1", "sha2"}, options.CASha256, "CASha256 mismatch")
 	assert.Equal(t, true, options.Insecure, "Insecure mismatch")

internal/pkg/agent/application/enroll/options.go

@@ -7,6 +7,7 @@ package enroll
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/elastic/elastic-agent-libs/transport/httpcommon"
@@ -177,6 +178,12 @@ func FromFleetConfig(cfg *configuration.FleetAgentConfig) EnrollOptions {
 		options.URL = cfg.Client.Hosts[0]
 	}
 
+	// URL at this point may not be parsable by url.Parse (missing protocol)
+	if host := options.URL; len(host) > 0 && !strings.HasPrefix(host, string(remote.ProtocolHTTPS)+"://") &&
+		!strings.HasPrefix(host, string(remote.ProtocolHTTP)+"://") {
+		options.URL = string(cfg.Client.Protocol) + "://" + host
+	}
+
 	if cfg.Client.Transport.TLS != nil {
 		options.CAs = cfg.Client.Transport.TLS.CAs
 		options.CASha256 = cfg.Client.Transport.TLS.CASha256

internal/pkg/agent/application/enroll/options_test.go

@@ -380,7 +380,7 @@ func TestFromFleetConfig(t *testing.T) {
 			"default config",
 			defaultFleetAgentCfg,
 			EnrollOptions{
-				URL:          defaultFleetAgentCfg.Client.Host,
+				URL:          string(defaultFleetAgentCfg.Client.Protocol) + "://" + defaultFleetAgentCfg.Client.Host,
 				EnrollAPIKey: defaultFleetAgentCfg.AccessAPIKey,
 				ProxyHeaders: make(map[string]string),
 			},