From b7df6275a9246151f7b63c52e1a012669e2efeea Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Tue, 12 Mar 2024 14:03:34 +0100 Subject: [PATCH] upgrade go-restful to v3 (#1580) --- module/apmrestful/filter.go | 2 +- module/apmrestful/filter_example_test.go | 2 +- module/apmrestful/filter_test.go | 2 +- module/apmrestful/go.mod | 5 +---- module/apmrestful/go.sum | 10 ++-------- 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/module/apmrestful/filter.go b/module/apmrestful/filter.go index be70fb8ea..937835b95 100644 --- a/module/apmrestful/filter.go +++ b/module/apmrestful/filter.go @@ -20,7 +20,7 @@ package apmrestful // import "go.elastic.co/apm/module/apmrestful/v2" import ( "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "go.elastic.co/apm/module/apmhttp/v2" "go.elastic.co/apm/v2" diff --git a/module/apmrestful/filter_example_test.go b/module/apmrestful/filter_example_test.go index 37ede4b21..1f8eee3c9 100644 --- a/module/apmrestful/filter_example_test.go +++ b/module/apmrestful/filter_example_test.go @@ -18,7 +18,7 @@ package apmrestful_test import ( - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "go.elastic.co/apm/module/apmrestful/v2" ) diff --git a/module/apmrestful/filter_test.go b/module/apmrestful/filter_test.go index 61a1e64c9..f59ba108a 100644 --- a/module/apmrestful/filter_test.go +++ b/module/apmrestful/filter_test.go @@ -26,7 +26,7 @@ import ( "net/url" "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/module/apmrestful/go.mod b/module/apmrestful/go.mod index 36c4871f9..5070073ee 100644 --- a/module/apmrestful/go.mod +++ b/module/apmrestful/go.mod @@ -1,7 +1,7 @@ module go.elastic.co/apm/module/apmrestful/v2 require ( - github.com/emicklei/go-restful v2.9.6+incompatible + github.com/emicklei/go-restful/v3 v3.12.0 github.com/stretchr/testify v1.8.4 go.elastic.co/apm/module/apmhttp/v2 v2.4.8 go.elastic.co/apm/v2 v2.4.8 @@ -14,9 +14,6 @@ require ( github.com/elastic/go-windows v1.0.0 // indirect github.com/google/go-cmp v0.5.4 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect - github.com/json-iterator/go v1.1.5 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 // indirect diff --git a/module/apmrestful/go.sum b/module/apmrestful/go.sum index 73255564a..69b901634 100644 --- a/module/apmrestful/go.sum +++ b/module/apmrestful/go.sum @@ -7,24 +7,18 @@ github.com/elastic/go-sysinfo v1.7.1 h1:Wx4DSARcKLllpKT2TnFVdSUJOsybqMYCNQZq1/wO github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY= github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= -github.com/emicklei/go-restful v2.9.6+incompatible h1:tfrHha8zJ01ywiOEC1miGY8st1/igzWB8OmvPgoYX7w= -github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk= +github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= -github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE= -github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=