diff --git a/go.mod b/go.mod index a3a37915101614fcba651157f250d6796e88286c..de636baeaa3c015bb57bf00e0d1ee7ad563fcf29 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.15 require ( github.com/docker/distribution v2.7.1+incompatible - // emicklei/go-restful v2.14.0 or later breaks http response body if it has boolean value. + // emicklei/go-restful v3.3.0 or later breaks http response body if it has boolean value. // See emicklei/go-restful#449 - github.com/emicklei/go-restful v2.13.0+incompatible + github.com/emicklei/go-restful/v3 v3.2.0 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/opencontainers/go-digest v1.0.0 // indirect github.com/prometheus/client_golang v1.7.1 diff --git a/go.sum b/go.sum index e3e2b8349261771cc780ea35682fa00361b84192..1207a32290dc0033b56fd4d7f39280edb0f855f9 100644 --- a/go.sum +++ b/go.sum @@ -94,9 +94,10 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.13.0+incompatible h1:XwckZriGdbXs1EoZ7Y1MdH6hWqZ4XnkFSiEibNi5BXg= -github.com/emicklei/go-restful v2.13.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.2.0 h1:bYqC4/ykCzQbUVO2c9h1J4XYTD1ApVxsZ1HWEFZY87s= +github.com/emicklei/go-restful/v3 v3.2.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= diff --git a/src/app/backend/auth/handler.go b/src/app/backend/auth/handler.go index ebc3cc0f680683dad52ed5cf72591e991ee4902b..45a7a075864b53965feefbf9f03c7dd0a8b53549 100644 --- a/src/app/backend/auth/handler.go +++ b/src/app/backend/auth/handler.go @@ -17,7 +17,7 @@ package auth import ( "net/http" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" "github.com/kubernetes/dashboard/src/app/backend/errors" diff --git a/src/app/backend/auth/handler_test.go b/src/app/backend/auth/handler_test.go index 75ebd4d383b5196ae2d9e260624be52c71d787d4..23119f4546e5afb13a3cc42129b83a7aa7aa7736 100644 --- a/src/app/backend/auth/handler_test.go +++ b/src/app/backend/auth/handler_test.go @@ -17,7 +17,7 @@ package auth import ( "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" ) func TestIntegrationHandler_Install(t *testing.T) { diff --git a/src/app/backend/auth/manager_test.go b/src/app/backend/auth/manager_test.go index f6b15e27cf61d1925f160c70a23536d797aa127c..0c84f278ea5c447d6a3c090c7ae4e61ca6013e31 100644 --- a/src/app/backend/auth/manager_test.go +++ b/src/app/backend/auth/manager_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" "github.com/kubernetes/dashboard/src/app/backend/client" diff --git a/src/app/backend/client/api/types.go b/src/app/backend/client/api/types.go index 862709aa78fc186142b49e62a3e751033f0d85a7..ba432ac52f2d380a29d07a16cb966bc8b7dcf9c0 100644 --- a/src/app/backend/client/api/types.go +++ b/src/app/backend/client/api/types.go @@ -15,7 +15,7 @@ package api import ( - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" v1 "k8s.io/api/authorization/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/runtime" diff --git a/src/app/backend/client/manager.go b/src/app/backend/client/manager.go index 848f6bd7de50979a9b2b9e7023ad8f9c0033be12..00be644bd8f085db1f66895c49f70f39d71e02cb 100644 --- a/src/app/backend/client/manager.go +++ b/src/app/backend/client/manager.go @@ -19,7 +19,7 @@ import ( "log" "strings" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" v1 "k8s.io/api/authorization/v1" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/src/app/backend/client/manager_test.go b/src/app/backend/client/manager_test.go index 07b3f0fcd9c1b63652f22f49b5f662bcefeb96ac..222f1be5e96d7431705ed5830996c630fe713737 100644 --- a/src/app/backend/client/manager_test.go +++ b/src/app/backend/client/manager_test.go @@ -19,7 +19,7 @@ import ( "net/http" "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/args" "github.com/kubernetes/dashboard/src/app/backend/errors" "k8s.io/client-go/rest" diff --git a/src/app/backend/errors/handler.go b/src/app/backend/errors/handler.go index 2d4b28ff209f1ccfeaff9e663dc21e01d794046b..f35f6946818c3652751d5f336a458c951aa3426d 100644 --- a/src/app/backend/errors/handler.go +++ b/src/app/backend/errors/handler.go @@ -18,7 +18,7 @@ import ( "log" "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/src/app/backend/handler/apihandler.go b/src/app/backend/handler/apihandler.go index 1935723b319cb005b660dee28bd0569e7fc5a5e6..510c8bb9f715c8ce87d38d47bb5c1995664711cc 100644 --- a/src/app/backend/handler/apihandler.go +++ b/src/app/backend/handler/apihandler.go @@ -27,7 +27,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/plugin" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "golang.org/x/net/xsrftoken" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/remotecommand" diff --git a/src/app/backend/handler/apihandler_test.go b/src/app/backend/handler/apihandler_test.go index 660b9edd0dacf09e8b0665a93021ce84705449d6..a543f4bf6bb8fb69ecd2b8741a329402b89604b8 100644 --- a/src/app/backend/handler/apihandler_test.go +++ b/src/app/backend/handler/apihandler_test.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/args" "github.com/kubernetes/dashboard/src/app/backend/auth" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" diff --git a/src/app/backend/handler/download.go b/src/app/backend/handler/download.go index 7fe853d941e4cf34738b00ec8b58453cbcb11c5c..d3a759c480380e7a1b75bce69b51ce565fec68c6 100644 --- a/src/app/backend/handler/download.go +++ b/src/app/backend/handler/download.go @@ -17,7 +17,7 @@ package handler import ( "io" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/errors" ) diff --git a/src/app/backend/handler/filter.go b/src/app/backend/handler/filter.go index ed0d8dcd26b5c3b26f268b34069063118a0ef872..4bb8cc844f107e0227e0197c0a96b7b04f660eac 100644 --- a/src/app/backend/handler/filter.go +++ b/src/app/backend/handler/filter.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "golang.org/x/net/xsrftoken" utilnet "k8s.io/apimachinery/pkg/util/net" diff --git a/src/app/backend/handler/parser/parser.go b/src/app/backend/handler/parser/parser.go index 3c0eb37b10dfec9eda410997c7f6154c4a41fea1..2dd05e10ce803b7724cf991bf0e27582551b8521 100644 --- a/src/app/backend/handler/parser/parser.go +++ b/src/app/backend/handler/parser/parser.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" ) diff --git a/src/app/backend/handler/terminal.go b/src/app/backend/handler/terminal.go index 05fe6da18f3b28fb03eeedf93fe7c18db26f12b0..a3e18981b0815992d58d023405ecb538c809cfc2 100755 --- a/src/app/backend/handler/terminal.go +++ b/src/app/backend/handler/terminal.go @@ -24,7 +24,7 @@ import ( "net/http" "sync" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "gopkg.in/igm/sockjs-go.v2/sockjs" v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" diff --git a/src/app/backend/integration/handler.go b/src/app/backend/integration/handler.go index deb94e81a400c7b3eeaa755c88a793cecc48863b..62c439eaa139d0cd5aa91cdb52ec4623bed2516b 100644 --- a/src/app/backend/integration/handler.go +++ b/src/app/backend/integration/handler.go @@ -17,7 +17,7 @@ package integration import ( "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/integration/api" ) diff --git a/src/app/backend/integration/handler_test.go b/src/app/backend/integration/handler_test.go index 3937f16649b1a50419ee2b1c3123ba8baffc8892..480b259ef0727f4451442194ec29fcd9f768f44b 100644 --- a/src/app/backend/integration/handler_test.go +++ b/src/app/backend/integration/handler_test.go @@ -17,7 +17,7 @@ package integration import ( "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" ) func TestIntegrationHandler_Install(t *testing.T) { diff --git a/src/app/backend/integration/metric/heapster/selector.go b/src/app/backend/integration/metric/heapster/selector.go index 942c2098df0a100bdd1a5815a9377157844ec50d..74648e4a29dad4af81a15a3da3dddc502cfeb173 100644 --- a/src/app/backend/integration/metric/heapster/selector.go +++ b/src/app/backend/integration/metric/heapster/selector.go @@ -17,7 +17,7 @@ package heapster import ( "fmt" - "github.com/emicklei/go-restful/log" + "github.com/emicklei/go-restful/v3/log" "github.com/kubernetes/dashboard/src/app/backend/api" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" v1 "k8s.io/api/core/v1" diff --git a/src/app/backend/integration/metric/sidecar/selector.go b/src/app/backend/integration/metric/sidecar/selector.go index 69951c3ffa37972db0028a4b3270fa15ad614b4c..9efabe2cbd10eb7c4b0b2d8b1f18b187c3ff2911 100644 --- a/src/app/backend/integration/metric/sidecar/selector.go +++ b/src/app/backend/integration/metric/sidecar/selector.go @@ -17,7 +17,7 @@ package sidecar import ( "fmt" - "github.com/emicklei/go-restful/log" + "github.com/emicklei/go-restful/v3/log" "github.com/kubernetes/dashboard/src/app/backend/api" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" v1 "k8s.io/api/core/v1" diff --git a/src/app/backend/plugin/config.go b/src/app/backend/plugin/config.go index 87477560e0fcf0d66730f92f0d5cf8574ceb21a5..8559f877011b3774e3318ebb160a2616338c8924 100644 --- a/src/app/backend/plugin/config.go +++ b/src/app/backend/plugin/config.go @@ -17,7 +17,7 @@ package plugin import ( "net/http" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/handler/parser" apiErrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/src/app/backend/plugin/config_test.go b/src/app/backend/plugin/config_test.go index fc0989a55543e2415fca7580c6a9b7c6b55f6533..cab4a8e5234c331acf4b7709eca30e9dbbca4bea 100644 --- a/src/app/backend/plugin/config_test.go +++ b/src/app/backend/plugin/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/plugin/apis/v1alpha1" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" "github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned" diff --git a/src/app/backend/plugin/detail_test.go b/src/app/backend/plugin/detail_test.go index 77b14fcdf6a9f20ea7ab7f97778692a96eb13035..14fdddb49d477c2b1264eb8ed5febc46d9e3d2b3 100644 --- a/src/app/backend/plugin/detail_test.go +++ b/src/app/backend/plugin/detail_test.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "testing" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/plugin/apis/v1alpha1" fakePluginClientset "github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned/fake" diff --git a/src/app/backend/plugin/handler.go b/src/app/backend/plugin/handler.go index 356f1db4eae004babad20828f20f14089050d237..86cf8d0d5a1f2a373b3bfc70d071d2e2d7e97d64 100644 --- a/src/app/backend/plugin/handler.go +++ b/src/app/backend/plugin/handler.go @@ -21,7 +21,7 @@ import ( "github.com/kubernetes/dashboard/src/app/backend/handler/parser" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" "github.com/kubernetes/dashboard/src/app/backend/errors" ) diff --git a/src/app/backend/plugin/handler_test.go b/src/app/backend/plugin/handler_test.go index 294262feb94273c9960562dc7bf8bb3af2a14090..76099222e780084c29911fa9ab94cd14357fde64 100644 --- a/src/app/backend/plugin/handler_test.go +++ b/src/app/backend/plugin/handler_test.go @@ -17,7 +17,7 @@ package plugin import ( "testing" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" ) func TestIntegrationHandler_Install(t *testing.T) { diff --git a/src/app/backend/plugin/list_test.go b/src/app/backend/plugin/list_test.go index 47fb095dd15838e0aedffc2b81bbe2ceafdd8283..0a03e187f4df58fd11bfac44e4e77a30f46c2a4b 100644 --- a/src/app/backend/plugin/list_test.go +++ b/src/app/backend/plugin/list_test.go @@ -20,7 +20,7 @@ import ( "net/http/httptest" "testing" - "github.com/emicklei/go-restful" + "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" diff --git a/src/app/backend/settings/handler.go b/src/app/backend/settings/handler.go index c9a96124589b50cb462597bb74dec3c1374d32a7..2cde8e87632e741e4e125469794c9a7203089a26 100644 --- a/src/app/backend/settings/handler.go +++ b/src/app/backend/settings/handler.go @@ -17,7 +17,7 @@ package settings import ( "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/args" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" diff --git a/src/app/backend/settings/handler_test.go b/src/app/backend/settings/handler_test.go index fedd2f465eea320d9f0ba75623baf13a6425f4d9..78a6c8132fdd4a92cd278672a0a3ae1a71bcad70 100644 --- a/src/app/backend/settings/handler_test.go +++ b/src/app/backend/settings/handler_test.go @@ -17,7 +17,7 @@ package settings import ( "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" ) func TestIntegrationHandler_Install(t *testing.T) { diff --git a/src/app/backend/systembanner/handler.go b/src/app/backend/systembanner/handler.go index 4ac03f9ccc9757e1f89796458270c5ad667c7e97..68ded88fea09db338372949523edd689791ee218 100644 --- a/src/app/backend/systembanner/handler.go +++ b/src/app/backend/systembanner/handler.go @@ -17,7 +17,7 @@ package systembanner import ( "net/http" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/systembanner/api" ) diff --git a/src/app/backend/validation/validateloginstatus.go b/src/app/backend/validation/validateloginstatus.go index 2aecded1910e6d977b0c453da4b2667a371031a9..9233a31099903f0a36e0ec92cad964dd86ba9782 100644 --- a/src/app/backend/validation/validateloginstatus.go +++ b/src/app/backend/validation/validateloginstatus.go @@ -15,7 +15,7 @@ package validation import ( - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/args" "github.com/kubernetes/dashboard/src/app/backend/client" ) diff --git a/src/app/backend/validation/validateloginstatus_test.go b/src/app/backend/validation/validateloginstatus_test.go index 095c02c8ba525d2d3ee35c310f5e53947cdec3e7..a9b7718588fd34666a3d04b0f0d52fe7b543ba63 100644 --- a/src/app/backend/validation/validateloginstatus_test.go +++ b/src/app/backend/validation/validateloginstatus_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - restful "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful/v3" "github.com/kubernetes/dashboard/src/app/backend/client" )