admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump github.com/emicklei/go-restful-openapi to v2.9.2-0.20230507070325-d6acc08e570c (#5669)

Browse Source
This commit is contained in:
hongming
2023-05-09 10:13:45 +08:00
committed by GitHub
parent 16c2dbc693
commit 673fdde52c
160 changed files with 709 additions and 4635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSES/vendor/github.com/emicklei/go-restful-openapi/LICENSE → LICENSES/vendor/github.com/emicklei/go-restful-openapi/v2/LICENSE generated vendored
View File

@@ -1,4 +1,4 @@
= vendor/github.com/emicklei/go-restful-openapi licensed under: =
= vendor/github.com/emicklei/go-restful-openapi/v2 licensed under: =
Copyright (c) 2017 Ernest Micklei
@@ -22,4 +22,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= vendor/github.com/emicklei/go-restful-openapi/LICENSE b1ce415d97e837c8677d332b274d4f0b
= vendor/github.com/emicklei/go-restful-openapi/v2/LICENSE b1ce415d97e837c8677d332b274d4f0b

25
LICENSES/vendor/github.com/emicklei/go-restful/LICENSE generated vendored
View File

@@ -1,25 +0,0 @@
= vendor/github.com/emicklei/go-restful licensed under: =
Copyright (c) 2012,2013 Ernest Micklei
MIT License
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= vendor/github.com/emicklei/go-restful/LICENSE 2ebc1c12a0f4eae5394522e31961e1de

2
LICENSES/vendor/github.com/emicklei/go-restful/v3/LICENSE generated vendored
View File

@@ -22,4 +22,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
= vendor/github.com/emicklei/go-restful/LICENSE 2ebc1c12a0f4eae5394522e31961e1de
= vendor/github.com/emicklei/go-restful/v3/LICENSE 2ebc1c12a0f4eae5394522e31961e1de

10
go.mod
View File

@@ -23,8 +23,8 @@ require (
github.com/elastic/go-elasticsearch/v5 v5.6.1
github.com/elastic/go-elasticsearch/v6 v6.8.2
github.com/elastic/go-elasticsearch/v7 v7.3.0
github.com/emicklei/go-restful v2.16.0+incompatible
github.com/emicklei/go-restful-openapi v1.4.1
github.com/emicklei/go-restful-openapi/v2 v2.9.1
github.com/emicklei/go-restful/v3 v3.10.2
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/fatih/structs v1.1.0
github.com/fsnotify/fsnotify v1.6.0
@@ -143,7 +143,6 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/efficientgo/tools/core v0.0.0-20220225185207-fe763185946b // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -338,9 +337,8 @@ replace (
github.com/elastic/go-elasticsearch/v5 => github.com/elastic/go-elasticsearch/v5 v5.6.1
github.com/elastic/go-elasticsearch/v6 => github.com/elastic/go-elasticsearch/v6 v6.8.2
github.com/elastic/go-elasticsearch/v7 => github.com/elastic/go-elasticsearch/v7 v7.3.0
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
github.com/emicklei/go-restful-openapi => github.com/emicklei/go-restful-openapi v1.4.1
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.10.1
github.com/emicklei/go-restful-openapi/v2 => github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c
github.com/emicklei/go-restful/v3 => github.com/emicklei/go-restful/v3 v3.10.2
github.com/emirpasic/gods => github.com/emirpasic/gods v1.12.0
github.com/evanphx/json-patch => github.com/evanphx/json-patch v5.6.0+incompatible
github.com/evanphx/json-patch/v5 => github.com/evanphx/json-patch/v5 v5.6.0

13
go.sum
View File

@@ -264,7 +264,6 @@ github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8
github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs=
@@ -496,12 +495,12 @@ github.com/elastic/go-elasticsearch/v7 v7.3.0 h1:H29Nqf9cB9dVxX6LwS+zTDC2D4t9s+8
github.com/elastic/go-elasticsearch/v7 v7.3.0/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
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 v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM=
github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful-openapi v1.4.1 h1:SocVTIQWnXyit4dotTrwmncBAjtRaBmfcHjo3XGcCm4=
github.com/emicklei/go-restful-openapi v1.4.1/go.mod h1:kWQ8rQMVQ6G6lePwjDveJ00KjAUr/jq6z1X8DrDP3Gc=
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful v2.11.2-0.20200112161605-a7c079c43d51+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c h1:Fr2oTQtTLMbCXMdhUnnsrDVRTPauJLFYHtNtcc/RSL0=
github.com/emicklei/go-restful-openapi/v2 v2.9.2-0.20230507070325-d6acc08e570c/go.mod h1:I//7paNAkpeGWmBYZ2JLq/timz5YWI/bcUeBMstEfKo=
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=

2
pkg/api/alerting/v2alpha1/types.go
View File

@@ -24,7 +24,7 @@ import (
"strings"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/pkg/errors"
prommodel "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/model/timestamp"

2
pkg/api/alerting/v2alpha1/types_test.go
View File

@@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/prometheus/prometheus/rules"
"github.com/stretchr/testify/assert"
)

2
pkg/api/auditing/v1alpha1/types.go
View File

@@ -20,7 +20,7 @@ import (
"strconv"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/simple/client/auditing"
)

2
pkg/api/auditing/v1alpha1/types_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/stretchr/testify/assert"
)

2
pkg/api/events/v1alpha1/types.go
View File

@@ -20,7 +20,7 @@ import (
"strconv"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/simple/client/events"
)

2
pkg/api/events/v1alpha1/types_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/stretchr/testify/assert"
)

2
pkg/api/logging/v1alpha2/types.go
View File

@@ -20,7 +20,7 @@ import (
"strconv"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/simple/client/logging"
)

2
pkg/api/logging/v1alpha2/types_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/stretchr/testify/assert"
)

2
pkg/api/metering/v1alpha1/types.go
View File

@@ -16,7 +16,7 @@ package v1alpha1
import (
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/apiserver/query"
model "kubesphere.io/kubesphere/pkg/models/monitoring"

2
pkg/api/metering/v1alpha1/types_test.go
View File

@@ -5,7 +5,7 @@ import (
"net/http"
"testing"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/stretchr/testify/assert"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring"

2
pkg/api/utils.go
View File

@@ -21,7 +21,7 @@ import (
"runtime"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"
)

2
pkg/apiserver/apiserver.go
View File

@@ -26,7 +26,7 @@ import (
"sync"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/apiserver/filters/dynamicresource.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"

2
pkg/apiserver/query/types.go
View File

@@ -19,7 +19,7 @@ package query
import (
"strconv"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/labels"
"kubesphere.io/kubesphere/pkg/utils/sliceutil"

2
pkg/apiserver/query/types_test.go
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"testing"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/google/go-cmp/cmp"
)

2
pkg/apiserver/runtime/runtime.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package runtime
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
)

2
pkg/kapis/alerting/v1/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/kapis/generic"

2
pkg/kapis/alerting/v2alpha1/handler.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v2alpha1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
"k8s.io/klog/v2"

4
pkg/kapis/alerting/v2alpha1/register.go
View File

@@ -19,8 +19,8 @@ package v2alpha1
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
"k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/kapis/alerting/v2beta1/handler.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v2beta1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
kapi "kubesphere.io/kubesphere/pkg/api"

4
pkg/kapis/alerting/v2beta1/register.go
View File

@@ -19,8 +19,8 @@ package v2beta1
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
alertingv2beta1 "kubesphere.io/api/alerting/v2beta1"

2
pkg/kapis/cluster/v1alpha1/handler.go
View File

@@ -27,7 +27,7 @@ import (
"strings"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"

4
pkg/kapis/cluster/v1alpha1/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha1
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
k8sinformers "k8s.io/client-go/informers"

2
pkg/kapis/config/v1alpha2/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1alpha2
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/simple/client/gpu"

2
pkg/kapis/devops/register.go
View File

@@ -19,7 +19,7 @@ package devops
import (
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/kapis/generic"

2
pkg/kapis/devops/register_test.go
View File

@@ -21,7 +21,7 @@ import (
"net/http/httptest"
"testing"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/stretchr/testify/assert"
)

2
pkg/kapis/edgeruntime/v1alpha1/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/kapis/generic"

2
pkg/kapis/gateway/v1alpha1/handler.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/apiserver/pkg/util/flushwriter"
"k8s.io/client-go/kubernetes"

4
pkg/kapis/gateway/v1alpha1/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha1
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
"kubesphere.io/api/gateway/v1alpha1"

2
pkg/kapis/generic/generic.go
View File

@@ -22,7 +22,7 @@ import (
"net/url"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/proxy"
"k8s.io/klog/v2"

2
pkg/kapis/generic/generic_test.go
View File

@@ -21,7 +21,7 @@ import (
"net/url"
"testing"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/google/go-cmp/cmp"
)

2
pkg/kapis/iam/v1alpha2/handler.go
View File

@@ -25,7 +25,7 @@ import (
"kubesphere.io/kubesphere/pkg/apiserver/request"
"kubesphere.io/kubesphere/pkg/models/auth"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"

4
pkg/kapis/iam/v1alpha2/register.go
View File

@@ -21,8 +21,8 @@ import (
"kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
rbacv1 "k8s.io/api/rbac/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/kapis/kubeedge/v1alpha1/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/kapis/generic"

2
pkg/kapis/metering/v1alpha1/handler.go
View File

@@ -19,7 +19,7 @@
package v1alpha1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/client-go/kubernetes"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"

4
pkg/kapis/metering/v1alpha1/register.go
View File

@@ -20,8 +20,8 @@ import (
"kubesphere.io/kubesphere/pkg/models/openpitrix"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/cache"

2
pkg/kapis/monitoring/v1alpha3/handler.go
View File

@@ -31,7 +31,7 @@ import (
"kubesphere.io/kubesphere/pkg/models/openpitrix"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"

2
pkg/kapis/monitoring/v1alpha3/helper.go
View File

@@ -29,7 +29,7 @@ import (
"github.com/jszwec/csvutil"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/pkg/errors"
corev1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/kapis/monitoring/v1alpha3/meter.go
View File

@@ -20,7 +20,7 @@ import (
"kubesphere.io/kubesphere/pkg/models/openpitrix"
"kubesphere.io/kubesphere/pkg/server/params"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/klog/v2"

4
pkg/kapis/monitoring/v1alpha3/register.go
View File

@@ -22,8 +22,8 @@ import (
monitoringdashboardv1alpha2 "kubesphere.io/monitoring-dashboard/api/v1alpha2"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"

2
pkg/kapis/network/v1alpha2/handler.go
View File

@@ -22,7 +22,7 @@ import (
"net/http"
"net/url"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/api"

4
pkg/kapis/network/v1alpha2/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha2
import (
"net/http"
restful "github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/apiserver/runtime"

2
pkg/kapis/notification/v1/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/kapis/generic"

2
pkg/kapis/notification/v2beta1/handler.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v2beta1
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

6
pkg/kapis/notification/v2beta1/register.go
View File

@@ -21,8 +21,8 @@ package v2beta1
import (
"net/http"
"github.com/emicklei/go-restful"
openapi "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
@@ -37,7 +37,7 @@ import (
const (
GroupName = "notification.kubesphere.io"
KeyOpenAPITags = openapi.KeyOpenAPITags
KeyOpenAPITags = restfulspec.KeyOpenAPITags
)
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2beta1"}

2
pkg/kapis/notification/v2beta2/handler.go
View File

@@ -18,7 +18,7 @@ package v2beta2
import (
"io"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

6
pkg/kapis/notification/v2beta2/register.go
View File

@@ -21,8 +21,8 @@ package v2beta2
import (
"net/http"
"github.com/emicklei/go-restful"
openapi "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
@@ -38,7 +38,7 @@ import (
const (
GroupName = "notification.kubesphere.io"
KeyOpenAPITags = openapi.KeyOpenAPITags
KeyOpenAPITags = restfulspec.KeyOpenAPITags
)
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2beta2"}

2
pkg/kapis/oauth/handler.go
View File

@@ -23,7 +23,7 @@ import (
"strings"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/golang-jwt/jwt/v4"
"gopkg.in/square/go-jose.v2"
apierrors "k8s.io/apimachinery/pkg/api/errors"

4
pkg/kapis/oauth/register.go
View File

@@ -21,8 +21,8 @@ import (
"kubesphere.io/kubesphere/pkg/apiserver/authentication"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/api"
"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"

5
pkg/kapis/openpitrix/v1/handler.go
View File

@@ -23,9 +23,7 @@ import (
"strings"
"time"
"kubesphere.io/kubesphere/pkg/utils/clusterclient"
restful "github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -44,6 +42,7 @@ import (
"kubesphere.io/kubesphere/pkg/server/params"
openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/simple/client/s3"
"kubesphere.io/kubesphere/pkg/utils/clusterclient"
"kubesphere.io/kubesphere/pkg/utils/idutils"
"kubesphere.io/kubesphere/pkg/utils/stringutils"
)

4
pkg/kapis/openpitrix/v1/register.go
View File

@@ -16,8 +16,8 @@ package v1
import (
"net/http"
restful "github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/kubesphere/pkg/api"

2
pkg/kapis/openpitrix/v2alpha1/handler.go
View File

@@ -14,7 +14,7 @@ limitations under the License.
package v2alpha1
import (
restful "github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"

4
pkg/kapis/openpitrix/v2alpha1/register.go
View File

@@ -16,8 +16,8 @@ package v2alpha1
import (
"net/http"
restful "github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"kubesphere.io/api/application/v1alpha1"

2
pkg/kapis/operations/v1alpha2/handler.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"

2
pkg/kapis/operations/v1alpha2/register.go
View File

@@ -19,7 +19,7 @@ package v1alpha2
import (
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"

2
pkg/kapis/resources/v1alpha2/handler.go
View File

@@ -22,7 +22,7 @@ import (
"strconv"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/core/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"

4
pkg/kapis/resources/v1alpha2/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha2
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"

2
pkg/kapis/resources/v1alpha3/handler.go
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"

2
pkg/kapis/resources/v1alpha3/handler_test.go
View File

@@ -25,7 +25,7 @@ import (
"testing"
"unsafe"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
"github.com/google/go-cmp/cmp"

4
pkg/kapis/resources/v1alpha3/register.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package v1alpha3
import (
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/cache"

2
pkg/kapis/servicemesh/metrics/install/install.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package install
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
urlruntime "k8s.io/apimachinery/pkg/util/runtime"
"kubesphere.io/kubesphere/pkg/apiserver/runtime"

2
pkg/kapis/servicemesh/metrics/v1alpha2/handler.go
View File

@@ -23,7 +23,7 @@ import (
"io"
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

2
pkg/kapis/servicemesh/metrics/v1alpha2/handler_test.go
View File

@@ -8,7 +8,7 @@ import (
"net/http/httptest"
"testing"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakek8s "k8s.io/client-go/kubernetes/fake"

4
pkg/kapis/servicemesh/metrics/v1alpha2/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha2
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"

2
pkg/kapis/tenant/v1alpha2/handler.go
View File

@@ -20,7 +20,7 @@ import (
"encoding/json"
"fmt"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/kapis/tenant/v1alpha2/metering.go
View File

@@ -16,7 +16,7 @@ package v1alpha2
import (
"fmt"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
"strconv"

4
pkg/kapis/tenant/v1alpha2/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha2
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"

2
pkg/kapis/tenant/v1alpha3/handler.go
View File

@@ -19,7 +19,7 @@ package v1alpha3
import (
"fmt"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"

4
pkg/kapis/tenant/v1alpha3/register.go
View File

@@ -19,8 +19,8 @@ package v1alpha3
import (
"net/http"
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
tenantv1alpha1 "kubesphere.io/api/tenant/v1alpha1"

2
pkg/kapis/terminal/v1alpha2/handler.go
View File

@@ -24,7 +24,7 @@ import (
"kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer"
requestctx "kubesphere.io/kubesphere/pkg/apiserver/request"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/gorilla/websocket"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"

4
pkg/kapis/terminal/v1alpha2/register.go
View File

@@ -17,8 +17,8 @@ limitations under the License.
package v1alpha2
import (
"github.com/emicklei/go-restful"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"

2
pkg/kapis/version/register.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package version
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
"k8s.io/klog/v2"

2
pkg/models/devops/project_pipeline_sonar_handler.go
View File

@@ -19,7 +19,7 @@ package devops
import (
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/server/errors"

2
pkg/models/devops/s2ibinary_handler.go
View File

@@ -26,7 +26,7 @@ import (
"code.cloudfoundry.org/bytefmt"
"github.com/aws/aws-sdk-go/aws/awserr"
awsS3 "github.com/aws/aws-sdk-go/service/s3"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"

2
pkg/models/notification/notification.go
View File

@@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"

2
pkg/models/registries/manifest.go
View File

@@ -22,7 +22,7 @@ import (
"net/http"
"github.com/docker/distribution/manifest/schema2"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
)

2
pkg/models/registries/registries.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/informers"
"k8s.io/klog/v2"

2
pkg/server/errors/errors.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
)
type Error struct {

2
pkg/server/healthz/healthz.go
View File

@@ -25,7 +25,7 @@ import (
"strings"
"sync"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apiserver/pkg/server/httplog"
"k8s.io/klog/v2"

2
pkg/server/params/params.go
View File

@@ -22,7 +22,7 @@ import (
"strconv"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
)
const (

2
pkg/server/params/params_test.go
View File

@@ -24,7 +24,7 @@ import (
"gotest.tools/assert"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
)
func TestParseConditions(t *testing.T) {

2
pkg/simple/client/devops/fake/fakedevops.go
View File

@@ -23,7 +23,7 @@ import (
"net/url"
"strings"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/core/v1"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"

2
pkg/simple/client/devops/jenkins/build.go
View File

@@ -22,7 +22,7 @@ import (
"strconv"
"time"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/devops/jenkins/credential.go
View File

@@ -19,7 +19,7 @@ import (
"net/http"
"strconv"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"

2
pkg/simple/client/devops/jenkins/project.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package jenkins
import (
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"

2
pkg/simple/client/devops/jenkins/project_pipeline.go
View File

@@ -20,7 +20,7 @@ import (
"fmt"
"net/http"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"

2
pkg/utils/metrics/metrics.go
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"sync"
"github.com/emicklei/go-restful"
"github.com/emicklei/go-restful/v3"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
apimachineryversion "k8s.io/apimachinery/pkg/version"

2
staging/src/kubesphere.io/api/go.mod
View File

@@ -34,7 +34,7 @@ require (
github.com/dennwc/varint v1.0.0 // indirect
github.com/docker/docker v20.10.24+incompatible // indirect
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect

4
staging/src/kubesphere.io/api/go.sum
View File

@@ -151,8 +151,8 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg
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/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful v2.11.2-0.20200112161605-a7c079c43d51+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.0/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/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

2
staging/src/kubesphere.io/client-go/go.mod
View File

@@ -13,7 +13,7 @@ require (
require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect

4
staging/src/kubesphere.io/client-go/go.sum
View File

@@ -15,8 +15,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.0/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/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

2
staging/src/kubesphere.io/utils/go.mod
View File

@@ -41,7 +41,7 @@ require (
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
github.com/fatih/color v1.13.0 // indirect

4
staging/src/kubesphere.io/utils/go.sum
View File

@@ -95,8 +95,8 @@ github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.9.0/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/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

2
tools/cmd/doc-gen/main.go
View File

@@ -23,7 +23,7 @@ import (
"log"
"os"
restfulspec "github.com/emicklei/go-restful-openapi"
restfulspec "github.com/emicklei/go-restful-openapi/v2"
"github.com/go-openapi/loads"
"github.com/go-openapi/spec"
"github.com/go-openapi/strfmt"

4
vendor/github.com/emicklei/go-restful-openapi/.travis.yml generated vendored
View File

@@ -1,4 +0,0 @@
language: go
go:
- 1.x

Some files were not shown because too many files have changed in this diff Show More