未验证 提交 08c4845a 编写于 作者: S Shu Muto 提交者: GitHub

Bump go-restful from v2 to v3 (#5652)

To make go-restful as go module compatible, bump it from v2 to v3.

But v3.3.0 or later have issue that breaks http response body,
if the response has boolean value.
So use v3.2.0 for now.
上级 4ca49553
...@@ -4,9 +4,9 @@ go 1.15 ...@@ -4,9 +4,9 @@ go 1.15
require ( require (
github.com/docker/distribution v2.7.1+incompatible 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 // 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/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/prometheus/client_golang v1.7.1 github.com/prometheus/client_golang v1.7.1
......
...@@ -94,9 +94,10 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn ...@@ -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 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= 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 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.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/v3 v3.2.0 h1:bYqC4/ykCzQbUVO2c9h1J4XYTD1ApVxsZ1HWEFZY87s=
github.com/emicklei/go-restful v2.13.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= 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/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/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= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
......
...@@ -17,7 +17,7 @@ package auth ...@@ -17,7 +17,7 @@ package auth
import ( import (
"net/http" "net/http"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api"
"github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/errors"
......
...@@ -17,7 +17,7 @@ package auth ...@@ -17,7 +17,7 @@ package auth
import ( import (
"testing" "testing"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
) )
func TestIntegrationHandler_Install(t *testing.T) { func TestIntegrationHandler_Install(t *testing.T) {
......
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"testing" "testing"
"time" "time"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api"
"github.com/kubernetes/dashboard/src/app/backend/client" "github.com/kubernetes/dashboard/src/app/backend/client"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
package api package api
import ( import (
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/authorization/v1" v1 "k8s.io/api/authorization/v1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
......
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"log" "log"
"strings" "strings"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/authorization/v1" v1 "k8s.io/api/authorization/v1"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......
...@@ -19,7 +19,7 @@ import ( ...@@ -19,7 +19,7 @@ import (
"net/http" "net/http"
"testing" "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/args"
"github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/errors"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
......
...@@ -18,7 +18,7 @@ import ( ...@@ -18,7 +18,7 @@ import (
"log" "log"
"net/http" "net/http"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
) )
......
...@@ -27,7 +27,7 @@ import ( ...@@ -27,7 +27,7 @@ import (
"github.com/kubernetes/dashboard/src/app/backend/plugin" "github.com/kubernetes/dashboard/src/app/backend/plugin"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
"golang.org/x/net/xsrftoken" "golang.org/x/net/xsrftoken"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
......
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"reflect" "reflect"
"strings" "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/args"
"github.com/kubernetes/dashboard/src/app/backend/auth" "github.com/kubernetes/dashboard/src/app/backend/auth"
authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api"
......
...@@ -17,7 +17,7 @@ package handler ...@@ -17,7 +17,7 @@ package handler
import ( import (
"io" "io"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/errors"
) )
......
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
"golang.org/x/net/xsrftoken" "golang.org/x/net/xsrftoken"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
......
...@@ -18,7 +18,7 @@ import ( ...@@ -18,7 +18,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api"
"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
) )
......
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"net/http" "net/http"
"sync" "sync"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"gopkg.in/igm/sockjs-go.v2/sockjs" "gopkg.in/igm/sockjs-go.v2/sockjs"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
......
...@@ -17,7 +17,7 @@ package integration ...@@ -17,7 +17,7 @@ package integration
import ( import (
"net/http" "net/http"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/integration/api" "github.com/kubernetes/dashboard/src/app/backend/integration/api"
) )
......
...@@ -17,7 +17,7 @@ package integration ...@@ -17,7 +17,7 @@ package integration
import ( import (
"testing" "testing"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
) )
func TestIntegrationHandler_Install(t *testing.T) { func TestIntegrationHandler_Install(t *testing.T) {
......
...@@ -17,7 +17,7 @@ package heapster ...@@ -17,7 +17,7 @@ package heapster
import ( import (
"fmt" "fmt"
"github.com/emicklei/go-restful/log" "github.com/emicklei/go-restful/v3/log"
"github.com/kubernetes/dashboard/src/app/backend/api" "github.com/kubernetes/dashboard/src/app/backend/api"
metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
...@@ -17,7 +17,7 @@ package sidecar ...@@ -17,7 +17,7 @@ package sidecar
import ( import (
"fmt" "fmt"
"github.com/emicklei/go-restful/log" "github.com/emicklei/go-restful/v3/log"
"github.com/kubernetes/dashboard/src/app/backend/api" "github.com/kubernetes/dashboard/src/app/backend/api"
metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api" metricapi "github.com/kubernetes/dashboard/src/app/backend/integration/metric/api"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
......
...@@ -17,7 +17,7 @@ package plugin ...@@ -17,7 +17,7 @@ package plugin
import ( import (
"net/http" "net/http"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/handler/parser" "github.com/kubernetes/dashboard/src/app/backend/handler/parser"
apiErrors "k8s.io/apimachinery/pkg/api/errors" apiErrors "k8s.io/apimachinery/pkg/api/errors"
) )
......
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"github.com/kubernetes/dashboard/src/app/backend/plugin/apis/v1alpha1" "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" authApi "github.com/kubernetes/dashboard/src/app/backend/auth/api"
clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api"
"github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned" "github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned"
......
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/plugin/apis/v1alpha1" "github.com/kubernetes/dashboard/src/app/backend/plugin/apis/v1alpha1"
fakePluginClientset "github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned/fake" fakePluginClientset "github.com/kubernetes/dashboard/src/app/backend/plugin/client/clientset/versioned/fake"
......
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"github.com/kubernetes/dashboard/src/app/backend/handler/parser" "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" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api"
"github.com/kubernetes/dashboard/src/app/backend/errors" "github.com/kubernetes/dashboard/src/app/backend/errors"
) )
......
...@@ -17,7 +17,7 @@ package plugin ...@@ -17,7 +17,7 @@ package plugin
import ( import (
"testing" "testing"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
) )
func TestIntegrationHandler_Install(t *testing.T) { func TestIntegrationHandler_Install(t *testing.T) {
......
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/resource/dataselect" "github.com/kubernetes/dashboard/src/app/backend/resource/dataselect"
......
...@@ -17,7 +17,7 @@ package settings ...@@ -17,7 +17,7 @@ package settings
import ( import (
"net/http" "net/http"
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/args"
clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api" clientapi "github.com/kubernetes/dashboard/src/app/backend/client/api"
......
...@@ -17,7 +17,7 @@ package settings ...@@ -17,7 +17,7 @@ package settings
import ( import (
"testing" "testing"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
) )
func TestIntegrationHandler_Install(t *testing.T) { func TestIntegrationHandler_Install(t *testing.T) {
......
...@@ -17,7 +17,7 @@ package systembanner ...@@ -17,7 +17,7 @@ package systembanner
import ( import (
"net/http" "net/http"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/systembanner/api" "github.com/kubernetes/dashboard/src/app/backend/systembanner/api"
) )
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
package validation package validation
import ( 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/args"
"github.com/kubernetes/dashboard/src/app/backend/client" "github.com/kubernetes/dashboard/src/app/backend/client"
) )
......
...@@ -21,7 +21,7 @@ import ( ...@@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"testing" "testing"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful/v3"
"github.com/kubernetes/dashboard/src/app/backend/client" "github.com/kubernetes/dashboard/src/app/backend/client"
) )
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册