From 77c3981b22bbfe13e6b57c0d451fdde96725c2c2 Mon Sep 17 00:00:00 2001
From: urso <steffen.siering@elastic.co>
Date: Tue, 29 Jun 2021 23:59:01 +0200
Subject: [PATCH] update

---
 x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
index 6b62c0f6528..8a1a1563bfc 100644
--- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
+++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
@@ -268,9 +268,6 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	localFleetServer := c.options.FleetServer.ConnStr != ""
-	proxyDisabled := c.options.FleetServer.ProxyDisabled || localFleetServer
-
 	fleetConfig, err := createFleetServerBootstrapConfig(
 		c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken,
 		c.options.FleetServer.PolicyID,
@@ -278,7 +275,7 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) {
 		c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA,
 		c.options.FleetServer.Headers,
 		c.options.FleetServer.ProxyURL,
-		proxyDisabled,
+		c.options.FleetServer.ProxyDisabled,
 		c.options.FleetServer.ProxyHeaders,
 	)
 	if err != nil {
@@ -465,7 +462,8 @@ func (c *enrollCmd) enroll(ctx context.Context, persistentConfig map[string]inte
 		return err
 	}
 
-	if c.options.FleetServer.ConnStr != "" {
+	localFleetServer := c.options.FleetServer.ConnStr != ""
+	if localFleetServer {
 		serverConfig, err := createFleetServerBootstrapConfig(
 			c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken,
 			c.options.FleetServer.PolicyID,
@@ -776,6 +774,8 @@ func createFleetServerBootstrapConfig(
 	proxyDisabled bool,
 	proxyHeaders map[string]string,
 ) (*configuration.FleetAgentConfig, error) {
+	localFleetServer := connStr != ""
+
 	es, err := configuration.ElasticsearchFromConnStr(connStr, serviceToken)
 	if err != nil {
 		return nil, err
@@ -826,6 +826,10 @@ func createFleetServerBootstrapConfig(
 		}
 	}
 
+	if localFleetServer {
+		cfg.Client.Transport.Proxy.Disable = true
+	}
+
 	if err := cfg.Valid(); err != nil {
 		return nil, errors.New(err, "invalid enrollment options", errors.TypeConfig)
 	}