[Elastic Agent] Handle case where policy doesn't contain Fleet connec…

…tion information (#25707) (#25714) * Handle case where policy doesn't contain Fleet connection information. * Add changelog entry. (cherry picked from commit e86109e) Co-authored-by: Blake Rouse <[email protected]>
elastic · May 14, 2021 · 71251ef · 71251ef
1 parent 9c86f4d
commit 71251ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -65,6 +65,8 @@
 - Fixed issue when unversioned home is set and invoked watcher failing with ENOENT {issue}25371[25371]
 - Fixed Elastic Agent: expecting Dict and received *transpiler.Key for '0' {issue}24453[24453]
 - Fix AckBatch to do nothing when no actions passed {pull}25562[25562]
+- Add error log entry when listener creation fails {issue}23483[23482]
+- Handle case where policy doesn't contain Fleet connection information {pull}25707[25707]
 
 ==== New features
 

diff --git a/...tic-agent/pkg/agent/application/pipeline/actions/handlers/handler_action_policy_change.go b/...tic-agent/pkg/agent/application/pipeline/actions/handlers/handler_action_policy_change.go
@@ -100,6 +100,14 @@ func (h *PolicyChange) handleFleetServerHosts(ctx context.Context, c *config.Con
 	if len(h.setters) == 0 {
 		return nil
 	}
+	data, err := c.ToMapStr()
+	if err != nil {
+		return errors.New(err, "could not convert the configuration from the policy", errors.TypeConfig)
+	}
+	if _, ok := data["fleet"]; !ok {
+		// no fleet information in the configuration (skip checking client)
+		return nil
+	}
 
 	cfg, err := configuration.NewFromConfig(c)
 	if err != nil {