From e8c026143c234e05100dc1539db8aa1e4fc1db83 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Thu, 16 Jul 2020 10:52:07 +0200 Subject: [PATCH] [Ingest Manager] Do not compare err with custom type (#19980) * fix error comparison in enroll --- x-pack/elastic-agent/CHANGELOG.asciidoc | 1 + x-pack/elastic-agent/pkg/agent/cmd/enroll.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc index ba97b9eb2cf..8dabfa00e28 100644 --- a/x-pack/elastic-agent/CHANGELOG.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.asciidoc @@ -50,6 +50,7 @@ - Properly stops subprocess on shutdown {pull}19567[19567] - Forward revision number of the configuration to the endpoint. {pull}19759[19759] - Remove support for logs type and use logfile {pull}19761[19761] +- Avoid comparing uncomparable types on enroll {issue}19976[19976] ==== New features diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go index c7243926ced..1c79ebdae8d 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go @@ -122,7 +122,7 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, args backExp := backoff.NewExpBackoff(signal, 60*time.Second, 10*time.Minute) - for err == fleetapi.ErrTooManyRequests { + for errors.Is(err, fleetapi.ErrTooManyRequests) { fmt.Fprintln(streams.Out, "Too many requests on the remote server, will retry in a moment.") backExp.Wait() fmt.Fprintln(streams.Out, "Retrying to enroll...")