From d8cef2bcda5e3efa31903ebe14286312ade8707c Mon Sep 17 00:00:00 2001 From: dkkb Date: Tue, 15 Jun 2021 16:53:02 +0800 Subject: [PATCH 1/2] Improve the s3 uploader for better performance. Signed-off-by: dkkb --- pkg/models/devops/s2ibinary_handler.go | 2 +- pkg/models/openpitrix/applications.go | 6 ++-- pkg/models/openpitrix/applicationversions.go | 4 +-- pkg/models/openpitrix/attachments.go | 3 +- pkg/simple/client/s3/fake/fakes3.go | 2 +- pkg/simple/client/s3/fake/fakes3_test.go | 2 +- pkg/simple/client/s3/interface.go | 6 ++-- pkg/simple/client/s3/s3.go | 35 ++++++++++++++++++-- pkg/simple/client/s3/s3_test.go | 14 ++++++++ 9 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 pkg/simple/client/s3/s3_test.go diff --git a/pkg/models/devops/s2ibinary_handler.go b/pkg/models/devops/s2ibinary_handler.go index ff17bc280..786bcf9b1 100644 --- a/pkg/models/devops/s2ibinary_handler.go +++ b/pkg/models/devops/s2ibinary_handler.go @@ -103,7 +103,7 @@ func (s *s2iBinaryUploader) UploadS2iBinary(namespace, name, md5 string, fileHea copy.Spec.FileName = fileHeader.Filename copy.Spec.DownloadURL = fmt.Sprintf(GetS2iBinaryURL, namespace, name, copy.Spec.FileName) - err = s.s3Client.Upload(fmt.Sprintf("%s-%s", namespace, name), copy.Spec.FileName, binFile) + err = s.s3Client.Upload(fmt.Sprintf("%s-%s", namespace, name), copy.Spec.FileName, binFile, int(fileHeader.Size)) if err != nil { if aerr, ok := err.(awserr.Error); ok { switch aerr.Code() { diff --git a/pkg/models/openpitrix/applications.go b/pkg/models/openpitrix/applications.go index f9a856330..a69d165c3 100644 --- a/pkg/models/openpitrix/applications.go +++ b/pkg/models/openpitrix/applications.go @@ -115,7 +115,7 @@ func (c *applicationOperator) createApp(app *v1alpha1.HelmApplication, iconData if len(iconData) != 0 { // save icon attachment iconId := idutils.GetUuid(v1alpha1.HelmAttachmentPrefix) - err = c.backingStoreClient.Upload(iconId, iconId, bytes.NewBuffer(iconData)) + err = c.backingStoreClient.Upload(iconId, iconId, bytes.NewBuffer(iconData), len(iconData)) if err != nil { klog.Errorf("save icon attachment failed, error: %s", err) return nil, err @@ -498,7 +498,7 @@ func (c *applicationOperator) modifyAppAttachment(app *v1alpha1.HelmApplication, // add attachment to app add := idutils.GetUuid("att-") *attachments = append(*attachments, add) - err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent)) + err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent), len(request.AttachmentContent)) if err != nil { return "", err } else { @@ -517,7 +517,7 @@ func (c *applicationOperator) modifyAppAttachment(app *v1alpha1.HelmApplication, } if len(request.AttachmentContent) != 0 { add := idutils.GetUuid("att-") - err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent)) + err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent), len(request.AttachmentContent)) if err != nil { return "", err } else { diff --git a/pkg/models/openpitrix/applicationversions.go b/pkg/models/openpitrix/applicationversions.go index 4671551f5..70851938f 100644 --- a/pkg/models/openpitrix/applicationversions.go +++ b/pkg/models/openpitrix/applicationversions.go @@ -202,7 +202,7 @@ func (c *applicationOperator) ModifyAppVersion(id string, request *ModifyAppVers spec.Created = &now // 3. save chart data to s3 storage, just overwrite the legacy data - err = c.backingStoreClient.Upload(dataKeyInStorage(versionCopy.GetWorkspace(), versionCopy.Name), versionCopy.Name, bytes.NewReader(request.Package)) + err = c.backingStoreClient.Upload(dataKeyInStorage(versionCopy.GetWorkspace(), versionCopy.Name), versionCopy.Name, bytes.NewBuffer(request.Package), len(request.Package)) if err != nil { klog.Errorf("upload chart for app version: %s/%s failed, error: %s", versionCopy.GetWorkspace(), versionCopy.GetTrueName(), err) @@ -490,7 +490,7 @@ func (c *applicationOperator) createApplicationVersion(ver *v1alpha1.HelmApplica klog.Errorf("decode error: %s", err) return nil, err } else { - err = c.backingStoreClient.Upload(dataKeyInStorage(ver.GetWorkspace(), ver.Name), ver.Name, bytes.NewReader(ver.Spec.Data)) + err = c.backingStoreClient.Upload(dataKeyInStorage(ver.GetWorkspace(), ver.Name), ver.Name, bytes.NewBuffer(ver.Spec.Data), len(ver.Spec.Data)) if err != nil { klog.Errorf("upload chart for app version: %s/%s failed, error: %s", ver.GetWorkspace(), ver.GetTrueName(), err) diff --git a/pkg/models/openpitrix/attachments.go b/pkg/models/openpitrix/attachments.go index 799dfba4e..80eaea8a5 100644 --- a/pkg/models/openpitrix/attachments.go +++ b/pkg/models/openpitrix/attachments.go @@ -15,7 +15,6 @@ package openpitrix import ( "bytes" - "github.com/go-openapi/strfmt" "k8s.io/klog" @@ -65,7 +64,7 @@ func (c *attachmentOperator) CreateAttachment(data []byte) (*Attachment, error) } id := idutils.GetUuid36(v1alpha1.HelmAttachmentPrefix) - err := c.backingStoreClient.Upload(id, id, bytes.NewBuffer(data)) + err := c.backingStoreClient.Upload(id, id, bytes.NewBuffer(data), len(data)) if err != nil { klog.Errorf("upload attachment failed, err: %s", err) return nil, err diff --git a/pkg/simple/client/s3/fake/fakes3.go b/pkg/simple/client/s3/fake/fakes3.go index 84f0b088b..36cd9583a 100644 --- a/pkg/simple/client/s3/fake/fakes3.go +++ b/pkg/simple/client/s3/fake/fakes3.go @@ -43,7 +43,7 @@ type Object struct { Body io.Reader } -func (s *FakeS3) Upload(key, fileName string, body io.Reader) error { +func (s *FakeS3) Upload(key, fileName string, body io.Reader, size int) error { s.Storage[key] = &Object{ Key: key, FileName: fileName, diff --git a/pkg/simple/client/s3/fake/fakes3_test.go b/pkg/simple/client/s3/fake/fakes3_test.go index 4fcc540ff..948f410af 100644 --- a/pkg/simple/client/s3/fake/fakes3_test.go +++ b/pkg/simple/client/s3/fake/fakes3_test.go @@ -25,7 +25,7 @@ func TestFakeS3(t *testing.T) { s3 := NewFakeS3() key := "hello" fileName := "world" - err := s3.Upload(key, fileName, nil) + err := s3.Upload(key, fileName, nil, 0) if err != nil { t.Fatal(err) } diff --git a/pkg/simple/client/s3/interface.go b/pkg/simple/client/s3/interface.go index 681c9dc54..54a6dffdf 100644 --- a/pkg/simple/client/s3/interface.go +++ b/pkg/simple/client/s3/interface.go @@ -16,16 +16,14 @@ limitations under the License. package s3 -import ( - "io" -) +import "io" type Interface interface { //read the content, caller should close the io.ReadCloser. Read(key string) ([]byte, error) // Upload uploads a object to storage and returns object location if succeeded - Upload(key, fileName string, body io.Reader) error + Upload(key, fileName string, body io.Reader, size int) error GetDownloadURL(key string, fileName string) (string, error) diff --git a/pkg/simple/client/s3/s3.go b/pkg/simple/client/s3/s3.go index 0d418acf8..75a9caa96 100644 --- a/pkg/simple/client/s3/s3.go +++ b/pkg/simple/client/s3/s3.go @@ -19,6 +19,7 @@ package s3 import ( "fmt" "io" + "math" "time" "code.cloudfoundry.org/bytefmt" @@ -36,10 +37,40 @@ type Client struct { bucket string } -func (s *Client) Upload(key, fileName string, body io.Reader) error { +const ( + DefaultPartSize = 5 * bytefmt.MEGABYTE + // MinConcurrency is the minimum concurrency when uploading a part to Amazon S3, + // it's also the default value of Concurrency in aws-sdk-go. + MinConcurrency = 5 + // MaxConcurrency is the maximum concurrency to limit the goroutines. + MaxConcurrency = 128 +) + +// calculateConcurrency calculates the concurrency for better performance, +// make the concurrency in range [5, 128]. +func calculateConcurrency(size int) int { + if size <= 0 { + return MinConcurrency + } + c := int(math.Ceil(float64(size) / float64(DefaultPartSize))) + if c < MinConcurrency { + return MinConcurrency + } else if c > MaxConcurrency { + return MaxConcurrency + } + return c +} + +// Upload use Multipart upload to upload a single object as a set of parts. +// If the data length is known to be large, it is recommended to pass in the data length, +// it will helps to calculate concurrency. Otherwise, `size` can be 0, +// use 5 as default upload concurrency, same as aws-sdk-go. +// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html for more details. +func (s *Client) Upload(key, fileName string, body io.Reader, size int) error { uploader := s3manager.NewUploader(s.s3Session, func(uploader *s3manager.Uploader) { - uploader.PartSize = 5 * bytefmt.MEGABYTE + uploader.PartSize = DefaultPartSize uploader.LeavePartsOnError = true + uploader.Concurrency = calculateConcurrency(size) }) _, err := uploader.Upload(&s3manager.UploadInput{ Bucket: aws.String(s.bucket), diff --git a/pkg/simple/client/s3/s3_test.go b/pkg/simple/client/s3/s3_test.go new file mode 100644 index 000000000..fb1385d9d --- /dev/null +++ b/pkg/simple/client/s3/s3_test.go @@ -0,0 +1,14 @@ +package s3 + +import ( + "testing" + + "gotest.tools/assert" +) + +func TestCalculateConcurrency(t *testing.T) { + assert.Equal(t, 5, calculateConcurrency(1*1024*1024)) + assert.Equal(t, 5, calculateConcurrency(5*1024*1024)) + assert.Equal(t, 20, calculateConcurrency(99*1024*1024)) + assert.Equal(t, 128, calculateConcurrency(129*5*1024*1024)) +} From e26f70d0ca2c3e1fa66981c0708bc8dd44e8666b Mon Sep 17 00:00:00 2001 From: Zhengyi Lai Date: Sun, 27 Jun 2021 20:37:51 +0800 Subject: [PATCH 2/2] Execute go imports to format files Signed-off-by: Zhengyi Lai --- pkg/api/alerting/v2alpha1/types.go | 2 +- pkg/api/auditing/v1alpha1/types.go | 2 +- pkg/api/events/v1alpha1/types.go | 2 +- pkg/api/logging/v1alpha2/types.go | 2 +- pkg/api/metering/v1alpha1/types.go | 2 +- pkg/api/utils.go | 2 +- pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go | 2 +- pkg/apis/network/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/apis/notification/v2beta1/zz_generated.deepcopy.go | 2 +- pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go | 2 +- pkg/apis/types/v1beta1/zz_generated.deepcopy.go | 2 +- pkg/apiserver/apiserver.go | 2 +- .../authentication/identityprovider/aliyunidaas/idaas_test.go | 2 +- .../authentication/identityprovider/github/github_test.go | 2 +- .../authentication/identityprovider/ldap/ldap_test.go | 2 +- pkg/apiserver/authentication/identityprovider/oidc/oidc.go | 4 ++-- .../authentication/identityprovider/oidc/oidc_test.go | 4 ++-- pkg/apiserver/authentication/oauth/oauth_options_test.go | 2 +- pkg/apiserver/authentication/token/jwt.go | 2 +- pkg/apiserver/config/config_test.go | 2 +- pkg/apiserver/query/types.go | 2 +- pkg/apiserver/query/types_test.go | 2 +- pkg/apiserver/runtime/runtime.go | 2 +- .../devopscredential/devopscredential_controller.go | 2 +- pkg/controller/devopsproject/devopsproject_controller.go | 2 +- pkg/controller/pipeline/pipeline_controller.go | 2 +- pkg/kapis/alerting/v1/register.go | 2 +- pkg/kapis/alerting/v2alpha1/handler.go | 2 +- pkg/kapis/alerting/v2alpha1/register.go | 2 +- pkg/kapis/cluster/v1alpha1/handler.go | 4 ++-- pkg/kapis/cluster/v1alpha1/register.go | 2 +- pkg/kapis/config/v1alpha2/register.go | 2 +- pkg/kapis/devops/v1alpha2/devops.go | 2 +- pkg/kapis/devops/v1alpha2/pipeline_sonar.go | 2 +- pkg/kapis/devops/v1alpha2/register.go | 2 +- pkg/kapis/devops/v1alpha2/s2ibinary.go | 2 +- pkg/kapis/devops/v1alpha3/handler.go | 2 +- pkg/kapis/devops/v1alpha3/register.go | 2 +- pkg/kapis/generic/generic.go | 2 +- pkg/kapis/generic/generic_test.go | 2 +- pkg/kapis/iam/v1alpha2/handler.go | 2 +- pkg/kapis/iam/v1alpha2/register.go | 2 +- pkg/kapis/kubeedge/v1alpha1/register.go | 2 +- pkg/kapis/metering/v1alpha1/handler.go | 2 +- pkg/kapis/metering/v1alpha1/register.go | 2 +- pkg/kapis/monitoring/v1alpha3/handler.go | 2 +- pkg/kapis/monitoring/v1alpha3/helper.go | 2 +- pkg/kapis/monitoring/v1alpha3/meter.go | 2 +- pkg/kapis/monitoring/v1alpha3/register.go | 2 +- pkg/kapis/network/v1alpha2/handler.go | 2 +- pkg/kapis/notification/v1/register.go | 2 +- pkg/kapis/notification/v2beta1/handler.go | 2 +- pkg/kapis/notification/v2beta1/register.go | 2 +- pkg/kapis/oauth/handler.go | 2 +- pkg/kapis/oauth/register.go | 2 +- pkg/kapis/operations/v1alpha2/handler.go | 2 +- pkg/kapis/operations/v1alpha2/register.go | 2 +- pkg/kapis/resources/v1alpha2/handler.go | 2 +- pkg/kapis/resources/v1alpha2/register.go | 2 +- pkg/kapis/resources/v1alpha3/handler.go | 2 +- pkg/kapis/resources/v1alpha3/register.go | 2 +- pkg/kapis/servicemesh/metrics/install/install.go | 2 +- pkg/kapis/servicemesh/metrics/v1alpha2/handler.go | 2 +- pkg/kapis/servicemesh/metrics/v1alpha2/register.go | 2 +- pkg/kapis/tenant/v1alpha2/handler.go | 2 +- pkg/kapis/tenant/v1alpha2/metering.go | 2 +- pkg/kapis/tenant/v1alpha2/register.go | 2 +- pkg/kapis/terminal/v1alpha2/handler.go | 2 +- pkg/kapis/terminal/v1alpha2/register.go | 2 +- pkg/kapis/version/register.go | 2 +- pkg/models/devops/project_pipeline_sonar_handler.go | 2 +- pkg/models/devops/s2ibinary_handler.go | 2 +- pkg/models/git/git.go | 2 +- pkg/models/openpitrix/attachments.go | 1 + pkg/models/registries/image.go | 2 +- pkg/models/registries/image_type.go | 2 +- pkg/models/registries/manifest.go | 2 +- pkg/models/registries/registries.go | 2 +- pkg/server/errors/errors.go | 2 +- pkg/server/params/params.go | 2 +- pkg/server/params/params_test.go | 3 +-- pkg/simple/client/devops/fake/fakedevops.go | 2 +- pkg/simple/client/devops/jenkins/build.go | 2 +- pkg/simple/client/devops/jenkins/credential.go | 2 +- pkg/simple/client/devops/jenkins/project.go | 2 +- pkg/simple/client/devops/jenkins/project_pipeline.go | 2 +- pkg/simple/client/devops/jenkins/request.go | 2 +- pkg/simple/client/es/versions/v5/v5.go | 2 +- pkg/simple/client/es/versions/v6/v6.go | 2 +- pkg/simple/client/es/versions/v7/v7.go | 2 +- pkg/utils/idutils/id_utils.go | 2 +- pkg/utils/metrics/metrics.go | 2 +- tools/cmd/doc-gen/main.go | 2 +- 95 files changed, 98 insertions(+), 98 deletions(-) diff --git a/pkg/api/alerting/v2alpha1/types.go b/pkg/api/alerting/v2alpha1/types.go index 3b218b355..04c8f66b4 100644 --- a/pkg/api/alerting/v2alpha1/types.go +++ b/pkg/api/alerting/v2alpha1/types.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/pkg/errors" prommodel "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/timestamp" diff --git a/pkg/api/auditing/v1alpha1/types.go b/pkg/api/auditing/v1alpha1/types.go index 2629cd9a9..64a2cb598 100644 --- a/pkg/api/auditing/v1alpha1/types.go +++ b/pkg/api/auditing/v1alpha1/types.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "kubesphere.io/kubesphere/pkg/simple/client/auditing" ) diff --git a/pkg/api/events/v1alpha1/types.go b/pkg/api/events/v1alpha1/types.go index 02effcc5f..e33343832 100644 --- a/pkg/api/events/v1alpha1/types.go +++ b/pkg/api/events/v1alpha1/types.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "kubesphere.io/kubesphere/pkg/simple/client/events" ) diff --git a/pkg/api/logging/v1alpha2/types.go b/pkg/api/logging/v1alpha2/types.go index 4f8c40fa2..7214f1a06 100644 --- a/pkg/api/logging/v1alpha2/types.go +++ b/pkg/api/logging/v1alpha2/types.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "kubesphere.io/kubesphere/pkg/simple/client/logging" ) diff --git a/pkg/api/metering/v1alpha1/types.go b/pkg/api/metering/v1alpha1/types.go index f6917e971..91b8382a1 100644 --- a/pkg/api/metering/v1alpha1/types.go +++ b/pkg/api/metering/v1alpha1/types.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "kubesphere.io/kubesphere/pkg/apiserver/query" model "kubesphere.io/kubesphere/pkg/models/monitoring" diff --git a/pkg/api/utils.go b/pkg/api/utils.go index d1d249f64..32421d4b4 100644 --- a/pkg/api/utils.go +++ b/pkg/api/utils.go @@ -21,7 +21,7 @@ import ( "runtime" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" ) diff --git a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go index aab83f9d2..2ab652e2e 100644 --- a/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go @@ -23,7 +23,7 @@ package v1alpha1 import ( auditregistrationv1alpha1 "k8s.io/api/auditregistration/v1alpha1" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go index 00f90c63f..64e01c809 100644 --- a/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go index 86305a898..9e094eef5 100644 --- a/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go index 8e508884b..eeea9ac2f 100644 --- a/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/network/v1alpha1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/api/networking/v1" + v1 "k8s.io/api/networking/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go b/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go index 559800ecb..2ca64d5e1 100644 --- a/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go +++ b/pkg/apis/notification/v2beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v2beta1 import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go index c9cdd094f..9552e5204 100644 --- a/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1alpha2 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go b/pkg/apis/types/v1beta1/zz_generated.deepcopy.go index 87d37a8c8..29ac85c4f 100644 --- a/pkg/apis/types/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/types/v1beta1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/api/rbac/v1" + v1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index ca523abf0..723e8e5dc 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -30,7 +30,7 @@ import ( "strconv" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" urlruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" diff --git a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go index 8febe023c..eb3f31082 100644 --- a/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go +++ b/pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go @@ -21,7 +21,7 @@ import ( "testing" "golang.org/x/oauth2" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" diff --git a/pkg/apiserver/authentication/identityprovider/github/github_test.go b/pkg/apiserver/authentication/identityprovider/github/github_test.go index 223bc83de..f13bbea54 100644 --- a/pkg/apiserver/authentication/identityprovider/github/github_test.go +++ b/pkg/apiserver/authentication/identityprovider/github/github_test.go @@ -30,7 +30,7 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" "golang.org/x/oauth2" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" diff --git a/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go b/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go index 2ef011329..375ab5b68 100644 --- a/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go +++ b/pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" ) diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc.go index c52e70765..bd071c488 100644 --- a/pkg/apiserver/authentication/identityprovider/oidc/oidc.go +++ b/pkg/apiserver/authentication/identityprovider/oidc/oidc.go @@ -27,8 +27,8 @@ import ( "kubesphere.io/kubesphere/pkg/utils/sliceutil" - "github.com/coreos/go-oidc" - "github.com/form3tech-oss/jwt-go" + oidc "github.com/coreos/go-oidc" + jwt "github.com/dgrijalva/jwt-go" "github.com/mitchellh/mapstructure" "golang.org/x/oauth2" diff --git a/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go b/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go index 3b6bf7c67..fcee3b023 100644 --- a/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go +++ b/pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go @@ -32,11 +32,11 @@ import ( "testing" "time" - "github.com/form3tech-oss/jwt-go" + jwt "github.com/dgrijalva/jwt-go" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "gopkg.in/square/go-jose.v2" + jose "gopkg.in/square/go-jose.v2" "kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" diff --git a/pkg/apiserver/authentication/oauth/oauth_options_test.go b/pkg/apiserver/authentication/oauth/oauth_options_test.go index 70f43ac07..b34eea9d8 100644 --- a/pkg/apiserver/authentication/oauth/oauth_options_test.go +++ b/pkg/apiserver/authentication/oauth/oauth_options_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "gopkg.in/yaml.v3" + yaml "gopkg.in/yaml.v3" ) func TestDefaultAuthOptions(t *testing.T) { diff --git a/pkg/apiserver/authentication/token/jwt.go b/pkg/apiserver/authentication/token/jwt.go index dfa40b48c..7a8822ab9 100644 --- a/pkg/apiserver/authentication/token/jwt.go +++ b/pkg/apiserver/authentication/token/jwt.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/form3tech-oss/jwt-go" + jwt "github.com/dgrijalva/jwt-go" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/klog" ) diff --git a/pkg/apiserver/config/config_test.go b/pkg/apiserver/config/config_test.go index d0834cf28..a69609329 100644 --- a/pkg/apiserver/config/config_test.go +++ b/pkg/apiserver/config/config_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth" diff --git a/pkg/apiserver/query/types.go b/pkg/apiserver/query/types.go index 4392c8e90..14e5a92b9 100644 --- a/pkg/apiserver/query/types.go +++ b/pkg/apiserver/query/types.go @@ -19,7 +19,7 @@ package query import ( "strconv" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/labels" "kubesphere.io/kubesphere/pkg/utils/sliceutil" diff --git a/pkg/apiserver/query/types_test.go b/pkg/apiserver/query/types_test.go index 1c7ee5dbb..03b022368 100644 --- a/pkg/apiserver/query/types_test.go +++ b/pkg/apiserver/query/types_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/apiserver/runtime/runtime.go b/pkg/apiserver/runtime/runtime.go index bb98f772b..58500cdca 100644 --- a/pkg/apiserver/runtime/runtime.go +++ b/pkg/apiserver/runtime/runtime.go @@ -17,7 +17,7 @@ limitations under the License. package runtime import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/controller/devopscredential/devopscredential_controller.go b/pkg/controller/devopscredential/devopscredential_controller.go index 6e5c6788a..50a902a4a 100644 --- a/pkg/controller/devopscredential/devopscredential_controller.go +++ b/pkg/controller/devopscredential/devopscredential_controller.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/devopsproject/devopsproject_controller.go b/pkg/controller/devopsproject/devopsproject_controller.go index 6ac4bcf20..67be4f984 100644 --- a/pkg/controller/devopsproject/devopsproject_controller.go +++ b/pkg/controller/devopsproject/devopsproject_controller.go @@ -23,7 +23,7 @@ import ( "reflect" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/pipeline/pipeline_controller.go b/pkg/controller/pipeline/pipeline_controller.go index 21ec16214..bca028e5d 100644 --- a/pkg/controller/pipeline/pipeline_controller.go +++ b/pkg/controller/pipeline/pipeline_controller.go @@ -23,7 +23,7 @@ import ( "reflect" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapis/alerting/v1/register.go b/pkg/kapis/alerting/v1/register.go index 2118d332c..763c2538c 100644 --- a/pkg/kapis/alerting/v1/register.go +++ b/pkg/kapis/alerting/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "kubesphere.io/kubesphere/pkg/kapis/generic" diff --git a/pkg/kapis/alerting/v2alpha1/handler.go b/pkg/kapis/alerting/v2alpha1/handler.go index 020f77a3c..07bb063b1 100644 --- a/pkg/kapis/alerting/v2alpha1/handler.go +++ b/pkg/kapis/alerting/v2alpha1/handler.go @@ -17,7 +17,7 @@ limitations under the License. package v2alpha1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "k8s.io/klog" diff --git a/pkg/kapis/alerting/v2alpha1/register.go b/pkg/kapis/alerting/v2alpha1/register.go index a53286976..832bfb527 100644 --- a/pkg/kapis/alerting/v2alpha1/register.go +++ b/pkg/kapis/alerting/v2alpha1/register.go @@ -19,7 +19,7 @@ package v2alpha1 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kapis/cluster/v1alpha1/handler.go b/pkg/kapis/cluster/v1alpha1/handler.go index 7a230a5d4..10713dfc2 100644 --- a/pkg/kapis/cluster/v1alpha1/handler.go +++ b/pkg/kapis/cluster/v1alpha1/handler.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/emicklei/go-restful" - "gopkg.in/yaml.v2" + restful "github.com/emicklei/go-restful" + yaml "gopkg.in/yaml.v2" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/kapis/cluster/v1alpha1/register.go b/pkg/kapis/cluster/v1alpha1/register.go index 6b48374bb..8f0e7d1ca 100644 --- a/pkg/kapis/cluster/v1alpha1/register.go +++ b/pkg/kapis/cluster/v1alpha1/register.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" k8sinformers "k8s.io/client-go/informers" diff --git a/pkg/kapis/config/v1alpha2/register.go b/pkg/kapis/config/v1alpha2/register.go index f941beeae..0bb88729c 100644 --- a/pkg/kapis/config/v1alpha2/register.go +++ b/pkg/kapis/config/v1alpha2/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha2 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" kubesphereconfig "kubesphere.io/kubesphere/pkg/apiserver/config" diff --git a/pkg/kapis/devops/v1alpha2/devops.go b/pkg/kapis/devops/v1alpha2/devops.go index 5050bb360..168529a7c 100644 --- a/pkg/kapis/devops/v1alpha2/devops.go +++ b/pkg/kapis/devops/v1alpha2/devops.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apiserver/pkg/authentication/user" log "k8s.io/klog" "k8s.io/klog/v2" diff --git a/pkg/kapis/devops/v1alpha2/pipeline_sonar.go b/pkg/kapis/devops/v1alpha2/pipeline_sonar.go index 648d43ee9..e8f4e5aec 100644 --- a/pkg/kapis/devops/v1alpha2/pipeline_sonar.go +++ b/pkg/kapis/devops/v1alpha2/pipeline_sonar.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha2 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/devops/v1alpha2/register.go b/pkg/kapis/devops/v1alpha2/register.go index 91f280a58..f291389d8 100644 --- a/pkg/kapis/devops/v1alpha2/register.go +++ b/pkg/kapis/devops/v1alpha2/register.go @@ -22,7 +22,7 @@ import ( "net/url" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/proxy" diff --git a/pkg/kapis/devops/v1alpha2/s2ibinary.go b/pkg/kapis/devops/v1alpha2/s2ibinary.go index ac2aff78e..49cd2fbda 100644 --- a/pkg/kapis/devops/v1alpha2/s2ibinary.go +++ b/pkg/kapis/devops/v1alpha2/s2ibinary.go @@ -21,7 +21,7 @@ import ( "net/http" "code.cloudfoundry.org/bytefmt" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/devops/v1alpha3/handler.go b/pkg/kapis/devops/v1alpha3/handler.go index 783ed2e33..04bd524dc 100644 --- a/pkg/kapis/devops/v1alpha3/handler.go +++ b/pkg/kapis/devops/v1alpha3/handler.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha3 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/informers" diff --git a/pkg/kapis/devops/v1alpha3/register.go b/pkg/kapis/devops/v1alpha3/register.go index 15c63bccf..69f57e758 100644 --- a/pkg/kapis/devops/v1alpha3/register.go +++ b/pkg/kapis/devops/v1alpha3/register.go @@ -21,7 +21,7 @@ package v1alpha3 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kapis/generic/generic.go b/pkg/kapis/generic/generic.go index 41a67e472..6b56ab057 100644 --- a/pkg/kapis/generic/generic.go +++ b/pkg/kapis/generic/generic.go @@ -22,7 +22,7 @@ import ( "net/url" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/proxy" "k8s.io/klog" diff --git a/pkg/kapis/generic/generic_test.go b/pkg/kapis/generic/generic_test.go index fb6b1d8c5..31f61ee2b 100644 --- a/pkg/kapis/generic/generic_test.go +++ b/pkg/kapis/generic/generic_test.go @@ -21,7 +21,7 @@ import ( "net/url" "testing" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/google/go-cmp/cmp" ) diff --git a/pkg/kapis/iam/v1alpha2/handler.go b/pkg/kapis/iam/v1alpha2/handler.go index 24ddb7260..1374864b7 100644 --- a/pkg/kapis/iam/v1alpha2/handler.go +++ b/pkg/kapis/iam/v1alpha2/handler.go @@ -25,7 +25,7 @@ import ( "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/models/auth" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog" diff --git a/pkg/kapis/iam/v1alpha2/register.go b/pkg/kapis/iam/v1alpha2/register.go index fc85db188..bf9df7897 100644 --- a/pkg/kapis/iam/v1alpha2/register.go +++ b/pkg/kapis/iam/v1alpha2/register.go @@ -21,7 +21,7 @@ import ( "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" rbacv1 "k8s.io/api/rbac/v1" v1 "k8s.io/api/rbac/v1" diff --git a/pkg/kapis/kubeedge/v1alpha1/register.go b/pkg/kapis/kubeedge/v1alpha1/register.go index 781afc7c3..9ddc91a05 100644 --- a/pkg/kapis/kubeedge/v1alpha1/register.go +++ b/pkg/kapis/kubeedge/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "kubesphere.io/kubesphere/pkg/kapis/generic" diff --git a/pkg/kapis/metering/v1alpha1/handler.go b/pkg/kapis/metering/v1alpha1/handler.go index 499bb3c53..8faf50ead 100644 --- a/pkg/kapis/metering/v1alpha1/handler.go +++ b/pkg/kapis/metering/v1alpha1/handler.go @@ -19,7 +19,7 @@ package v1alpha1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/client-go/kubernetes" openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" diff --git a/pkg/kapis/metering/v1alpha1/register.go b/pkg/kapis/metering/v1alpha1/register.go index c7bbce0ab..dc01365dd 100644 --- a/pkg/kapis/metering/v1alpha1/register.go +++ b/pkg/kapis/metering/v1alpha1/register.go @@ -24,7 +24,7 @@ import ( "kubesphere.io/kubesphere/pkg/client/clientset/versioned" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/monitoring/v1alpha3/handler.go b/pkg/kapis/monitoring/v1alpha3/handler.go index 05384ffa3..c23397029 100644 --- a/pkg/kapis/monitoring/v1alpha3/handler.go +++ b/pkg/kapis/monitoring/v1alpha3/handler.go @@ -23,6 +23,7 @@ import ( "regexp" "strings" + restful "github.com/emicklei/go-restful" "k8s.io/klog" openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix" @@ -31,7 +32,6 @@ import ( "kubesphere.io/kubesphere/pkg/client/clientset/versioned" "kubesphere.io/kubesphere/pkg/models/openpitrix" - "github.com/emicklei/go-restful" "k8s.io/client-go/kubernetes" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/monitoring/v1alpha3/helper.go b/pkg/kapis/monitoring/v1alpha3/helper.go index d574cced7..01422f254 100644 --- a/pkg/kapis/monitoring/v1alpha3/helper.go +++ b/pkg/kapis/monitoring/v1alpha3/helper.go @@ -29,7 +29,7 @@ import ( "github.com/jszwec/csvutil" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/pkg/errors" corev1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapis/monitoring/v1alpha3/meter.go b/pkg/kapis/monitoring/v1alpha3/meter.go index 8895ab628..2078dd40e 100644 --- a/pkg/kapis/monitoring/v1alpha3/meter.go +++ b/pkg/kapis/monitoring/v1alpha3/meter.go @@ -7,7 +7,7 @@ import ( "kubesphere.io/kubesphere/pkg/models/openpitrix" "kubesphere.io/kubesphere/pkg/server/params" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/klog" diff --git a/pkg/kapis/monitoring/v1alpha3/register.go b/pkg/kapis/monitoring/v1alpha3/register.go index 93ab68b9d..3118a139c 100644 --- a/pkg/kapis/monitoring/v1alpha3/register.go +++ b/pkg/kapis/monitoring/v1alpha3/register.go @@ -24,7 +24,7 @@ import ( "kubesphere.io/kubesphere/pkg/client/clientset/versioned" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/network/v1alpha2/handler.go b/pkg/kapis/network/v1alpha2/handler.go index d8c404499..d9a218baf 100644 --- a/pkg/kapis/network/v1alpha2/handler.go +++ b/pkg/kapis/network/v1alpha2/handler.go @@ -22,7 +22,7 @@ import ( "net/http" "net/url" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/notification/v1/register.go b/pkg/kapis/notification/v1/register.go index 10b60af08..695627385 100644 --- a/pkg/kapis/notification/v1/register.go +++ b/pkg/kapis/notification/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "kubesphere.io/kubesphere/pkg/kapis/generic" diff --git a/pkg/kapis/notification/v2beta1/handler.go b/pkg/kapis/notification/v2beta1/handler.go index eeec19dad..35f304844 100644 --- a/pkg/kapis/notification/v2beta1/handler.go +++ b/pkg/kapis/notification/v2beta1/handler.go @@ -17,7 +17,7 @@ limitations under the License. package v2beta1 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" "k8s.io/klog" diff --git a/pkg/kapis/notification/v2beta1/register.go b/pkg/kapis/notification/v2beta1/register.go index 3e8f9ad01..93eef0f52 100644 --- a/pkg/kapis/notification/v2beta1/register.go +++ b/pkg/kapis/notification/v2beta1/register.go @@ -21,7 +21,7 @@ package v2beta1 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" openapi "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/oauth/handler.go b/pkg/kapis/oauth/handler.go index ac3b37d13..a339c04da 100644 --- a/pkg/kapis/oauth/handler.go +++ b/pkg/kapis/oauth/handler.go @@ -23,7 +23,7 @@ import ( "kubesphere.io/kubesphere/pkg/server/errors" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/apiserver/pkg/authentication/user" diff --git a/pkg/kapis/oauth/register.go b/pkg/kapis/oauth/register.go index 9a49cf949..03da39823 100644 --- a/pkg/kapis/oauth/register.go +++ b/pkg/kapis/oauth/register.go @@ -19,7 +19,7 @@ package oauth import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/operations/v1alpha2/handler.go b/pkg/kapis/operations/v1alpha2/handler.go index 18c59389c..519b731cb 100644 --- a/pkg/kapis/operations/v1alpha2/handler.go +++ b/pkg/kapis/operations/v1alpha2/handler.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/operations/v1alpha2/register.go b/pkg/kapis/operations/v1alpha2/register.go index 104dd0e0a..087c87a62 100644 --- a/pkg/kapis/operations/v1alpha2/register.go +++ b/pkg/kapis/operations/v1alpha2/register.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/resources/v1alpha2/handler.go b/pkg/kapis/resources/v1alpha2/handler.go index 0840c5150..1a3d16159 100644 --- a/pkg/kapis/resources/v1alpha2/handler.go +++ b/pkg/kapis/resources/v1alpha2/handler.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" k8serr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/resources/v1alpha2/register.go b/pkg/kapis/resources/v1alpha2/register.go index 53ab1af00..db359a67b 100644 --- a/pkg/kapis/resources/v1alpha2/register.go +++ b/pkg/kapis/resources/v1alpha2/register.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/kapis/resources/v1alpha3/handler.go b/pkg/kapis/resources/v1alpha3/handler.go index 4f7e63d40..269d3fb41 100644 --- a/pkg/kapis/resources/v1alpha3/handler.go +++ b/pkg/kapis/resources/v1alpha3/handler.go @@ -19,7 +19,7 @@ package v1alpha3 import ( "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/resources/v1alpha3/register.go b/pkg/kapis/resources/v1alpha3/register.go index 933d0aca4..aae52c049 100644 --- a/pkg/kapis/resources/v1alpha3/register.go +++ b/pkg/kapis/resources/v1alpha3/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha3 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/cache" diff --git a/pkg/kapis/servicemesh/metrics/install/install.go b/pkg/kapis/servicemesh/metrics/install/install.go index e17c6f179..ffb02b191 100644 --- a/pkg/kapis/servicemesh/metrics/install/install.go +++ b/pkg/kapis/servicemesh/metrics/install/install.go @@ -17,7 +17,7 @@ limitations under the License. package install import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" urlruntime "k8s.io/apimachinery/pkg/util/runtime" "kubesphere.io/kubesphere/pkg/apiserver/runtime" diff --git a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go index fb1142d35..780053fb5 100644 --- a/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go +++ b/pkg/kapis/servicemesh/metrics/v1alpha2/handler.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/api" diff --git a/pkg/kapis/servicemesh/metrics/v1alpha2/register.go b/pkg/kapis/servicemesh/metrics/v1alpha2/register.go index 211bee4ce..7beb0df78 100644 --- a/pkg/kapis/servicemesh/metrics/v1alpha2/register.go +++ b/pkg/kapis/servicemesh/metrics/v1alpha2/register.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kapis/tenant/v1alpha2/handler.go b/pkg/kapis/tenant/v1alpha2/handler.go index 9c132ebfb..78145df14 100644 --- a/pkg/kapis/tenant/v1alpha2/handler.go +++ b/pkg/kapis/tenant/v1alpha2/handler.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapis/tenant/v1alpha2/metering.go b/pkg/kapis/tenant/v1alpha2/metering.go index d507ac469..b41563b3a 100644 --- a/pkg/kapis/tenant/v1alpha2/metering.go +++ b/pkg/kapis/tenant/v1alpha2/metering.go @@ -3,7 +3,7 @@ package v1alpha2 import ( "fmt" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "strconv" diff --git a/pkg/kapis/tenant/v1alpha2/register.go b/pkg/kapis/tenant/v1alpha2/register.go index 82697cae3..a833e59a0 100644 --- a/pkg/kapis/tenant/v1alpha2/register.go +++ b/pkg/kapis/tenant/v1alpha2/register.go @@ -23,7 +23,7 @@ import ( "kubesphere.io/kubesphere/pkg/models/metering" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kapis/terminal/v1alpha2/handler.go b/pkg/kapis/terminal/v1alpha2/handler.go index aaa42c3aa..01e90ee8d 100644 --- a/pkg/kapis/terminal/v1alpha2/handler.go +++ b/pkg/kapis/terminal/v1alpha2/handler.go @@ -24,7 +24,7 @@ import ( "kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer" requestctx "kubesphere.io/kubesphere/pkg/apiserver/request" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/gorilla/websocket" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" diff --git a/pkg/kapis/terminal/v1alpha2/register.go b/pkg/kapis/terminal/v1alpha2/register.go index 402006340..8bd38129e 100644 --- a/pkg/kapis/terminal/v1alpha2/register.go +++ b/pkg/kapis/terminal/v1alpha2/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha2 import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapis/version/register.go b/pkg/kapis/version/register.go index 456c85300..bb32c1d07 100644 --- a/pkg/kapis/version/register.go +++ b/pkg/kapis/version/register.go @@ -17,7 +17,7 @@ limitations under the License. package version import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" "k8s.io/klog" diff --git a/pkg/models/devops/project_pipeline_sonar_handler.go b/pkg/models/devops/project_pipeline_sonar_handler.go index 71f04b34a..e7afa647e 100644 --- a/pkg/models/devops/project_pipeline_sonar_handler.go +++ b/pkg/models/devops/project_pipeline_sonar_handler.go @@ -19,7 +19,7 @@ package devops import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/server/errors" diff --git a/pkg/models/devops/s2ibinary_handler.go b/pkg/models/devops/s2ibinary_handler.go index 786bcf9b1..8f2cc78e6 100644 --- a/pkg/models/devops/s2ibinary_handler.go +++ b/pkg/models/devops/s2ibinary_handler.go @@ -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" + restful "github.com/emicklei/go-restful" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" "k8s.io/klog" diff --git a/pkg/models/git/git.go b/pkg/models/git/git.go index 5f63f8dc9..12998c1d5 100644 --- a/pkg/models/git/git.go +++ b/pkg/models/git/git.go @@ -19,7 +19,7 @@ package git import ( "fmt" - "gopkg.in/src-d/go-git.v4" + git "gopkg.in/src-d/go-git.v4" "gopkg.in/src-d/go-git.v4/config" "gopkg.in/src-d/go-git.v4/plumbing/transport/http" "gopkg.in/src-d/go-git.v4/storage/memory" diff --git a/pkg/models/openpitrix/attachments.go b/pkg/models/openpitrix/attachments.go index 80eaea8a5..cf58b223d 100644 --- a/pkg/models/openpitrix/attachments.go +++ b/pkg/models/openpitrix/attachments.go @@ -15,6 +15,7 @@ package openpitrix import ( "bytes" + "github.com/go-openapi/strfmt" "k8s.io/klog" diff --git a/pkg/models/registries/image.go b/pkg/models/registries/image.go index 1850bbb36..113687856 100644 --- a/pkg/models/registries/image.go +++ b/pkg/models/registries/image.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/docker/distribution/reference" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" log "k8s.io/klog" ) diff --git a/pkg/models/registries/image_type.go b/pkg/models/registries/image_type.go index 0d0c9f0c7..95f36ef76 100644 --- a/pkg/models/registries/image_type.go +++ b/pkg/models/registries/image_type.go @@ -19,7 +19,7 @@ package registries import ( "time" - "github.com/opencontainers/go-digest" + digest "github.com/opencontainers/go-digest" ) // ImageBlobInfo describes the info of an image. diff --git a/pkg/models/registries/manifest.go b/pkg/models/registries/manifest.go index 0ab036959..a1e64bd66 100644 --- a/pkg/models/registries/manifest.go +++ b/pkg/models/registries/manifest.go @@ -22,7 +22,7 @@ import ( "net/http" "github.com/docker/distribution/manifest/schema2" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" log "k8s.io/klog" ) diff --git a/pkg/models/registries/registries.go b/pkg/models/registries/registries.go index a7faef8d2..ad0476f3e 100644 --- a/pkg/models/registries/registries.go +++ b/pkg/models/registries/registries.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/informers" "k8s.io/klog" diff --git a/pkg/server/errors/errors.go b/pkg/server/errors/errors.go index 7bc0ebb45..88d3d94b4 100644 --- a/pkg/server/errors/errors.go +++ b/pkg/server/errors/errors.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" ) type Error struct { diff --git a/pkg/server/params/params.go b/pkg/server/params/params.go index 0f33e90be..2f603882d 100644 --- a/pkg/server/params/params.go +++ b/pkg/server/params/params.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" ) const ( diff --git a/pkg/server/params/params_test.go b/pkg/server/params/params_test.go index 33c60d6a9..4889c100a 100644 --- a/pkg/server/params/params_test.go +++ b/pkg/server/params/params_test.go @@ -22,9 +22,8 @@ import ( "reflect" "testing" + restful "github.com/emicklei/go-restful" "gotest.tools/assert" - - "github.com/emicklei/go-restful" ) func TestParseConditions(t *testing.T) { diff --git a/pkg/simple/client/devops/fake/fakedevops.go b/pkg/simple/client/devops/fake/fakedevops.go index 25fa6b830..d3ebca1d5 100644 --- a/pkg/simple/client/devops/fake/fakedevops.go +++ b/pkg/simple/client/devops/fake/fakedevops.go @@ -23,7 +23,7 @@ import ( "net/url" "strings" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" diff --git a/pkg/simple/client/devops/jenkins/build.go b/pkg/simple/client/devops/jenkins/build.go index 830d60400..b9b2aa9a4 100644 --- a/pkg/simple/client/devops/jenkins/build.go +++ b/pkg/simple/client/devops/jenkins/build.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "kubesphere.io/kubesphere/pkg/simple/client/devops" ) diff --git a/pkg/simple/client/devops/jenkins/credential.go b/pkg/simple/client/devops/jenkins/credential.go index 4c0fd9637..a5a8754e1 100644 --- a/pkg/simple/client/devops/jenkins/credential.go +++ b/pkg/simple/client/devops/jenkins/credential.go @@ -19,7 +19,7 @@ import ( "net/http" "strconv" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" v1 "k8s.io/api/core/v1" "k8s.io/klog" diff --git a/pkg/simple/client/devops/jenkins/project.go b/pkg/simple/client/devops/jenkins/project.go index 31cd36b7b..f67b0cf18 100644 --- a/pkg/simple/client/devops/jenkins/project.go +++ b/pkg/simple/client/devops/jenkins/project.go @@ -17,7 +17,7 @@ limitations under the License. package jenkins import ( - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" "kubesphere.io/kubesphere/pkg/simple/client/devops" diff --git a/pkg/simple/client/devops/jenkins/project_pipeline.go b/pkg/simple/client/devops/jenkins/project_pipeline.go index 6b38a3e8c..88b34f7d2 100644 --- a/pkg/simple/client/devops/jenkins/project_pipeline.go +++ b/pkg/simple/client/devops/jenkins/project_pipeline.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "k8s.io/klog" devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" diff --git a/pkg/simple/client/devops/jenkins/request.go b/pkg/simple/client/devops/jenkins/request.go index 647b9ac0d..df83d7923 100644 --- a/pkg/simple/client/devops/jenkins/request.go +++ b/pkg/simple/client/devops/jenkins/request.go @@ -29,7 +29,7 @@ import ( "path/filepath" "strings" - "github.com/form3tech-oss/jwt-go" + jwt "github.com/dgrijalva/jwt-go" authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token" "kubesphere.io/kubesphere/pkg/simple/client/devops" diff --git a/pkg/simple/client/es/versions/v5/v5.go b/pkg/simple/client/es/versions/v5/v5.go index 42e32d356..faac9081d 100644 --- a/pkg/simple/client/es/versions/v5/v5.go +++ b/pkg/simple/client/es/versions/v5/v5.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "time" - "github.com/elastic/go-elasticsearch/v5" + elasticsearch "github.com/elastic/go-elasticsearch/v5" "github.com/elastic/go-elasticsearch/v5/esapi" ) diff --git a/pkg/simple/client/es/versions/v6/v6.go b/pkg/simple/client/es/versions/v6/v6.go index b18754496..0b8ab9ead 100644 --- a/pkg/simple/client/es/versions/v6/v6.go +++ b/pkg/simple/client/es/versions/v6/v6.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "time" - "github.com/elastic/go-elasticsearch/v6" + elasticsearch "github.com/elastic/go-elasticsearch/v6" "github.com/elastic/go-elasticsearch/v6/esapi" ) diff --git a/pkg/simple/client/es/versions/v7/v7.go b/pkg/simple/client/es/versions/v7/v7.go index b85a6dce0..bb27983b1 100644 --- a/pkg/simple/client/es/versions/v7/v7.go +++ b/pkg/simple/client/es/versions/v7/v7.go @@ -24,7 +24,7 @@ import ( "io/ioutil" "time" - "github.com/elastic/go-elasticsearch/v7" + elasticsearch "github.com/elastic/go-elasticsearch/v7" "github.com/elastic/go-elasticsearch/v7/esapi" ) diff --git a/pkg/utils/idutils/id_utils.go b/pkg/utils/idutils/id_utils.go index 42c4a9967..362913ac8 100644 --- a/pkg/utils/idutils/id_utils.go +++ b/pkg/utils/idutils/id_utils.go @@ -22,7 +22,7 @@ import ( "github.com/golang/example/stringutil" "github.com/sony/sonyflake" - "github.com/speps/go-hashids" + hashids "github.com/speps/go-hashids" "kubesphere.io/kubesphere/pkg/utils/stringutils" ) diff --git a/pkg/utils/metrics/metrics.go b/pkg/utils/metrics/metrics.go index 016398e44..aaa543721 100644 --- a/pkg/utils/metrics/metrics.go +++ b/pkg/utils/metrics/metrics.go @@ -20,7 +20,7 @@ package metrics import ( "net/http" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" apimachineryversion "k8s.io/apimachinery/pkg/version" diff --git a/tools/cmd/doc-gen/main.go b/tools/cmd/doc-gen/main.go index 4a59379a6..2039c9e27 100644 --- a/tools/cmd/doc-gen/main.go +++ b/tools/cmd/doc-gen/main.go @@ -27,7 +27,7 @@ import ( "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" "kubesphere.io/kubesphere/pkg/version" - "github.com/emicklei/go-restful" + restful "github.com/emicklei/go-restful" restfulspec "github.com/emicklei/go-restful-openapi" "github.com/go-openapi/loads" "github.com/go-openapi/spec"