未验证 提交 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
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
......
......@@ -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"
......
......@@ -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) {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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) {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
)
......
......@@ -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) {
......
......@@ -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"
......
......@@ -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"
......
......@@ -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) {
......
......@@ -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"
)
......
......@@ -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"
)
......
......@@ -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"
)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册