From d32e09aaf9e5d204204f1fdc9a7497a98cc816d7 Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Tue, 9 Aug 2022 16:09:40 +0530 Subject: [PATCH] Update go-restful libraries (#2509) Signed-off-by: Sanket Sudake --- go.mod | 5 +++-- go.sum | 15 +++++---------- pkg/controller/canaryConfigApi.go | 4 ++-- pkg/controller/environmentApi.go | 4 ++-- pkg/controller/functionApi.go | 4 ++-- pkg/controller/httpTriggerApi.go | 4 ++-- pkg/controller/mqTriggerApi.go | 4 ++-- pkg/controller/openapi.go | 4 ++-- pkg/controller/packageApi.go | 4 ++-- pkg/controller/storagesvc.go | 4 ++-- pkg/controller/timeTriggerApi.go | 4 ++-- pkg/controller/watchApi.go | 4 ++-- 12 files changed, 28 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 2fcaf459..9b51fed7 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/dustin/go-humanize v1.0.0 - github.com/emicklei/go-restful v2.15.0+incompatible - github.com/emicklei/go-restful-openapi v1.4.1 + github.com/emicklei/go-restful-openapi/v2 v2.9.0 + github.com/emicklei/go-restful/v3 v3.9.0 github.com/fatih/color v1.13.0 github.com/fsnotify/fsnotify v1.5.1 github.com/go-git/go-git/v5 v5.4.2 @@ -83,6 +83,7 @@ require ( github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect + github.com/emicklei/go-restful v2.15.0+incompatible // indirect github.com/emirpasic/gods v1.12.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.3 // indirect diff --git a/go.sum b/go.sum index 34a6cbec..372d6496 100644 --- a/go.sum +++ b/go.sum @@ -85,7 +85,6 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= @@ -208,11 +207,13 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7fo 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/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.6+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.15.0+incompatible h1:8KpYO/Xl/ZudZs5RNOEhWMBY4hmzlZhhRd9cu+jrZP4= github.com/emicklei/go-restful v2.15.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-openapi/v2 v2.9.0 h1:djsWqjhI0EVYfkLCCX6jZxUkLmYUq2q9tt09ZbixfyE= +github.com/emicklei/go-restful-openapi/v2 v2.9.0/go.mod h1:VKNgZyYviM1hnyrjD9RDzP2RuE94xTXxV+u6MGN4v4k= +github.com/emicklei/go-restful/v3 v3.7.3/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/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.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -279,19 +280,15 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= -github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/spec v0.0.0-20180415031709-bcff419492ee/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/swag v0.0.0-20180405201759-811b1089cde9/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= @@ -524,7 +521,6 @@ github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mailru/easyjson v0.0.0-20180323154445-8b799c424f57/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= @@ -870,7 +866,6 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/pkg/controller/canaryConfigApi.go b/pkg/controller/canaryConfigApi.go index 70651537..62199950 100644 --- a/pkg/controller/canaryConfigApi.go +++ b/pkg/controller/canaryConfigApi.go @@ -22,8 +22,8 @@ import ( "io" "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" "go.uber.org/zap" diff --git a/pkg/controller/environmentApi.go b/pkg/controller/environmentApi.go index 5202a5d2..1d58bae4 100644 --- a/pkg/controller/environmentApi.go +++ b/pkg/controller/environmentApi.go @@ -21,8 +21,8 @@ import ( "io" "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" "go.uber.org/zap" diff --git a/pkg/controller/functionApi.go b/pkg/controller/functionApi.go index 420bf271..bb97d3b5 100644 --- a/pkg/controller/functionApi.go +++ b/pkg/controller/functionApi.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" "github.com/pkg/errors" diff --git a/pkg/controller/httpTriggerApi.go b/pkg/controller/httpTriggerApi.go index 8bfc8811..1f5449d4 100644 --- a/pkg/controller/httpTriggerApi.go +++ b/pkg/controller/httpTriggerApi.go @@ -24,8 +24,8 @@ import ( "net/http" "sort" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/mqTriggerApi.go b/pkg/controller/mqTriggerApi.go index 8482b763..7a99d1f3 100644 --- a/pkg/controller/mqTriggerApi.go +++ b/pkg/controller/mqTriggerApi.go @@ -21,8 +21,8 @@ import ( "io" "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/openapi.go b/pkg/controller/openapi.go index 5b699990..b3523117 100644 --- a/pkg/controller/openapi.go +++ b/pkg/controller/openapi.go @@ -19,8 +19,8 @@ package controller import ( "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" ) diff --git a/pkg/controller/packageApi.go b/pkg/controller/packageApi.go index 5c701cb7..cdf26d3e 100644 --- a/pkg/controller/packageApi.go +++ b/pkg/controller/packageApi.go @@ -23,8 +23,8 @@ import ( "net/http" "github.com/dustin/go-humanize" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/storagesvc.go b/pkg/controller/storagesvc.go index 292a9bd0..d4cc8ac9 100644 --- a/pkg/controller/storagesvc.go +++ b/pkg/controller/storagesvc.go @@ -22,8 +22,8 @@ import ( "net/http/httputil" "net/url" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "go.uber.org/zap" ) diff --git a/pkg/controller/timeTriggerApi.go b/pkg/controller/timeTriggerApi.go index 613b2f2b..9f8415a4 100644 --- a/pkg/controller/timeTriggerApi.go +++ b/pkg/controller/timeTriggerApi.go @@ -21,8 +21,8 @@ import ( "io" "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" "github.com/robfig/cron" diff --git a/pkg/controller/watchApi.go b/pkg/controller/watchApi.go index 9477fba3..cd716ea1 100644 --- a/pkg/controller/watchApi.go +++ b/pkg/controller/watchApi.go @@ -21,8 +21,8 @@ import ( "io" "net/http" - "github.com/emicklei/go-restful" - restfulspec "github.com/emicklei/go-restful-openapi" + restfulspec "github.com/emicklei/go-restful-openapi/v2" + restful "github.com/emicklei/go-restful/v3" "github.com/go-openapi/spec" "github.com/gorilla/mux" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"