From 24e8081146b71a3f81def3ac18a0df1e7b51976e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 14:59:22 +0100 Subject: [PATCH 1/2] build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436) * build(deps): bump github.com/elastic/elastic-agent-libs Bumps [github.com/elastic/elastic-agent-libs](https://github.com/elastic/elastic-agent-libs) from 0.18.5 to 0.18.6. - [Release notes](https://github.com/elastic/elastic-agent-libs/releases) - [Commits](https://github.com/elastic/elastic-agent-libs/compare/v0.18.5...v0.18.6) --- updated-dependencies: - dependency-name: github.com/elastic/elastic-agent-libs dependency-type: direct:production update-type: version-update:semver-patch ... 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 ff1e859528c96757555626b116c268130aa3eb36) # Conflicts: # NOTICE.txt # go.mod # go.sum # testing/go.mod # testing/go.sum --- NOTICE.txt | 8 ++++++++ go.mod | 6 ++++++ go.sum | 9 +++++++++ testing/go.mod | 4 ++++ testing/go.sum | 7 +++++++ 5 files changed, 34 insertions(+) diff --git a/NOTICE.txt b/NOTICE.txt index c6c1a9733..657a47cb4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -661,11 +661,19 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs +<<<<<<< HEAD Version: v0.18.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.1/LICENSE: +======= +Version: v0.18.6 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.6/LICENSE: +>>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index bc61ea52e..2f20f8e79 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,15 @@ require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/dgraph-io/ristretto v0.2.0 github.com/docker/go-units v0.5.0 +<<<<<<< HEAD github.com/elastic/elastic-agent-client/v7 v7.17.0 github.com/elastic/elastic-agent-libs v0.18.1 github.com/elastic/elastic-agent-system-metrics v0.11.7 +======= + github.com/elastic/elastic-agent-client/v7 v7.17.1 + github.com/elastic/elastic-agent-libs v0.18.6 + github.com/elastic/elastic-agent-system-metrics v0.11.8 +>>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/go-elasticsearch/v8 v8.17.0 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.6.0 diff --git a/go.sum b/go.sum index c6a428437..1344e9918 100644 --- a/go.sum +++ b/go.sum @@ -31,12 +31,21 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +<<<<<<< HEAD github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c= github.com/elastic/elastic-agent-libs v0.18.1/go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U= github.com/elastic/elastic-agent-system-metrics v0.11.7 h1:1xm2okCM0eQZ4jivZgUFSlt6HAn/nPgKB/Fj8eLG6mY= github.com/elastic/elastic-agent-system-metrics v0.11.7/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI= +======= +github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= +github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= +github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw= +github.com/elastic/elastic-agent-libs v0.18.6/go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno= +github.com/elastic/elastic-agent-system-metrics v0.11.8 h1:O12rj3Gojqa9UX8gA6Dj1XDIGeZXgXOAvxQbvC+XLbA= +github.com/elastic/elastic-agent-system-metrics v0.11.8/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag= +>>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0= diff --git a/testing/go.mod b/testing/go.mod index 9c929e821..4a1770b93 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -33,7 +33,11 @@ require ( github.com/distribution/reference v0.5.0 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect +<<<<<<< HEAD github.com/elastic/elastic-agent-libs v0.18.1 // indirect +======= + github.com/elastic/elastic-agent-libs v0.18.6 // indirect +>>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/testing/go.sum b/testing/go.sum index f2b286005..39c47716e 100644 --- a/testing/go.sum +++ b/testing/go.sum @@ -37,10 +37,17 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +<<<<<<< HEAD github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c= github.com/elastic/elastic-agent-libs v0.18.1/go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U= +======= +github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= +github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= +github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw= +github.com/elastic/elastic-agent-libs v0.18.6/go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno= +>>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw= github.com/elastic/go-sysinfo v1.15.0/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk= github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk= From eb1a68708c1ece64fe2a5a0e68e9e96b20c39c8f Mon Sep 17 00:00:00 2001 From: michel-laterman Date: Mon, 10 Feb 2025 14:35:05 -0800 Subject: [PATCH 2/2] Fix conflicts --- NOTICE.txt | 16 ++++------------ go.mod | 6 ------ go.sum | 9 --------- testing/go.mod | 6 +----- testing/go.sum | 7 ------- 5 files changed, 5 insertions(+), 39 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 657a47cb4..d901072a6 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -428,11 +428,11 @@ Contents of probable licence file $GOMODCACHE/github.com/docker/go-units@v0.5.0/ -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-client/v7 -Version: v7.17.0 +Version: v7.17.1 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.17.0/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.17.1/LICENSE.txt: ELASTIC LICENSE AGREEMENT @@ -661,19 +661,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -<<<<<<< HEAD -Version: v0.18.1 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.1/LICENSE: -======= Version: v0.18.6 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.18.6/LICENSE: ->>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) Apache License Version 2.0, January 2004 @@ -880,11 +872,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-system-metrics -Version: v0.11.7 +Version: v0.11.8 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.7/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.11.8/LICENSE.txt: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 2f20f8e79..ef2647eb0 100644 --- a/go.mod +++ b/go.mod @@ -8,15 +8,9 @@ require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/dgraph-io/ristretto v0.2.0 github.com/docker/go-units v0.5.0 -<<<<<<< HEAD - github.com/elastic/elastic-agent-client/v7 v7.17.0 - github.com/elastic/elastic-agent-libs v0.18.1 - github.com/elastic/elastic-agent-system-metrics v0.11.7 -======= github.com/elastic/elastic-agent-client/v7 v7.17.1 github.com/elastic/elastic-agent-libs v0.18.6 github.com/elastic/elastic-agent-system-metrics v0.11.8 ->>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/go-elasticsearch/v8 v8.17.0 github.com/elastic/go-ucfg v0.8.8 github.com/fxamacker/cbor/v2 v2.6.0 diff --git a/go.sum b/go.sum index 1344e9918..f3a958d35 100644 --- a/go.sum +++ b/go.sum @@ -31,21 +31,12 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -<<<<<<< HEAD -github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= -github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c= -github.com/elastic/elastic-agent-libs v0.18.1/go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U= -github.com/elastic/elastic-agent-system-metrics v0.11.7 h1:1xm2okCM0eQZ4jivZgUFSlt6HAn/nPgKB/Fj8eLG6mY= -github.com/elastic/elastic-agent-system-metrics v0.11.7/go.mod h1:nzkrGajQA29YNcfP62gfzhxX9an3/xdQ3RmfQNw9YTI= -======= github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw= github.com/elastic/elastic-agent-libs v0.18.6/go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno= github.com/elastic/elastic-agent-system-metrics v0.11.8 h1:O12rj3Gojqa9UX8gA6Dj1XDIGeZXgXOAvxQbvC+XLbA= github.com/elastic/elastic-agent-system-metrics v0.11.8/go.mod h1:FgtshyeVEAxNqRoFkdL0MpCW0rHxQGFNEKjIsxfcrag= ->>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0= diff --git a/testing/go.mod b/testing/go.mod index 4a1770b93..8af57875d 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -12,7 +12,7 @@ replace ( require ( github.com/Shopify/toxiproxy v2.1.4+incompatible github.com/docker/docker v26.1.5+incompatible - github.com/elastic/elastic-agent-client/v7 v7.17.0 + github.com/elastic/elastic-agent-client/v7 v7.17.1 github.com/elastic/fleet-server/pkg/api v0.0.0-00010101000000-000000000000 github.com/elastic/fleet-server/v7 v7.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.10.0 @@ -33,11 +33,7 @@ require ( github.com/distribution/reference v0.5.0 // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect -<<<<<<< HEAD - github.com/elastic/elastic-agent-libs v0.18.1 // indirect -======= github.com/elastic/elastic-agent-libs v0.18.6 // indirect ->>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/testing/go.sum b/testing/go.sum index 39c47716e..faaa48cf2 100644 --- a/testing/go.sum +++ b/testing/go.sum @@ -37,17 +37,10 @@ github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -<<<<<<< HEAD -github.com/elastic/elastic-agent-client/v7 v7.17.0 h1:TPLrEHF4kJ3RkmQzZPffrniY4WeW4vriHZbOAzM1hFo= -github.com/elastic/elastic-agent-client/v7 v7.17.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI= -github.com/elastic/elastic-agent-libs v0.18.1 h1:dE6jf/D9bP8eRMQsV7KKpKV/G8zQzwMFBTj1w4e716c= -github.com/elastic/elastic-agent-libs v0.18.1/go.mod h1:rWdyrrAFzZwgNNi41Tsqhlt2c2GdXWhCEwcsnqISJ2U= -======= github.com/elastic/elastic-agent-client/v7 v7.17.1 h1:ORCDXzFs1JyhI5neWbTAPWCwaFi+BtKojSLiCpaAbf0= github.com/elastic/elastic-agent-client/v7 v7.17.1/go.mod h1:jzDEz8agLzinQEbEgLOuVM3wl6SoMybHnarQBTN1wYM= github.com/elastic/elastic-agent-libs v0.18.6 h1:tIIFv+lNHRro/QdJQA5LnjP7L3xPQYWVlJdOJ7T6zKw= github.com/elastic/elastic-agent-libs v0.18.6/go.mod h1:NNivmXK440JX06At6l7+itRJzZovbVnofogDXdskQno= ->>>>>>> ff1e859 (build(deps): bump github.com/elastic/elastic-agent-libs from 0.18.5 to 0.18.6 (#4436)) github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95M4Xw= github.com/elastic/go-sysinfo v1.15.0/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk= github.com/elastic/go-ucfg v0.8.8 h1:54KIF/2zFKfl0MzsSOCGOsZ3O2bnjFQJ0nDJcLhviyk=