From 07b28cdb2b8526f67a3e11fc035aabf6a16f8424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 May 2026 14:24:00 +0200 Subject: [PATCH 1/2] build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100) * build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.2.5 to 5.3.0. - [Release notes](https://github.com/go-chi/chi/releases) - [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md) - [Commits](https://github.com/go-chi/chi/compare/v5.2.5...v5.3.0) --- updated-dependencies: - dependency-name: github.com/go-chi/chi/v5 dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] (cherry picked from commit cfc925778a1e310f00db32cc3c621ae0352534fe) # Conflicts: # go.mod --- NOTICE-fips.txt | 4 ++-- NOTICE.txt | 4 ++-- go.mod | 5 +++++ go.sum | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt index 37ce0dfb32..a6da4c7c81 100644 --- a/NOTICE-fips.txt +++ b/NOTICE-fips.txt @@ -1505,11 +1505,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/go-chi/chi/v5 -Version: v5.2.5 +Version: v5.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.2.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.3.0/LICENSE: Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. diff --git a/NOTICE.txt b/NOTICE.txt index 0470fd514e..fb828374b4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1505,11 +1505,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/go-chi/chi/v5 -Version: v5.2.5 +Version: v5.3.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.2.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-chi/chi/v5@v5.3.0/LICENSE: Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc. diff --git a/go.mod b/go.mod index 069196b67c..2e622be582 100644 --- a/go.mod +++ b/go.mod @@ -12,8 +12,13 @@ require ( github.com/elastic/go-elasticsearch/v8 v8.19.6 github.com/elastic/go-ucfg v0.9.1 github.com/fxamacker/cbor/v2 v2.9.2 +<<<<<<< HEAD github.com/go-chi/chi/v5 v5.2.5 github.com/gofrs/uuid v4.4.0+incompatible +======= + github.com/go-chi/chi/v5 v5.3.0 + github.com/gofrs/uuid/v5 v5.4.0 +>>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-version v1.9.0 diff --git a/go.sum b/go.sum index 60bc80255e..fe875603fc 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh78= github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= -github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= -github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= +github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM= +github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= From 2f4974dc338994784c9c47bc472891607432475e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 26 May 2026 15:49:09 +0000 Subject: [PATCH 2/2] fix: resolve go.mod merge conflicts - accept chi v5.3.0, keep gofrs/uuid v4 Agent-Logs-Url: https://github.com/elastic/fleet-server/sessions/02eaab04-56ec-4844-b7e7-74a29dc120c8 Co-authored-by: ebeahan <7226265+ebeahan@users.noreply.github.com> --- go.mod | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 2e622be582..52b674afc0 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,8 @@ require ( github.com/elastic/go-elasticsearch/v8 v8.19.6 github.com/elastic/go-ucfg v0.9.1 github.com/fxamacker/cbor/v2 v2.9.2 -<<<<<<< HEAD - github.com/go-chi/chi/v5 v5.2.5 - github.com/gofrs/uuid v4.4.0+incompatible -======= github.com/go-chi/chi/v5 v5.3.0 - github.com/gofrs/uuid/v5 v5.4.0 ->>>>>>> cfc9257 (build(deps): bump github.com/go-chi/chi/v5 from 5.2.5 to 5.3.0 (#7100)) + github.com/gofrs/uuid v4.4.0+incompatible github.com/google/go-cmp v0.7.0 github.com/hashicorp/go-cleanhttp v0.5.2 github.com/hashicorp/go-version v1.9.0