From cf4aaf51c87a83e2b4422dcf13616615f68b736d Mon Sep 17 00:00:00 2001 From: Hongchao Deng Date: Mon, 22 Nov 2021 18:47:47 +0800 Subject: [PATCH] fix imports --- pkg/addon/addon.go | 18 +++++++++--------- pkg/apiserver/rest/usecase/envbinding_test.go | 5 +++-- pkg/cloudprovider/aliyun.go | 2 +- test/e2e-apiserver-test/addon_test.go | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkg/addon/addon.go b/pkg/addon/addon.go index 8efb24c73..1e73c91f3 100644 --- a/pkg/addon/addon.go +++ b/pkg/addon/addon.go @@ -11,11 +11,18 @@ import ( "sync" "time" - v1 "k8s.io/api/core/v1" - "cuelang.org/go/cue" cueyaml "cuelang.org/go/encoding/yaml" "github.com/google/go-github/v32/github" + "github.com/pkg/errors" + "golang.org/x/oauth2" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + k8syaml "k8s.io/apimachinery/pkg/runtime/serializer/yaml" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/yaml" + common2 "github.com/oam-dev/kubevela/apis/core.oam.dev/common" "github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1" "github.com/oam-dev/kubevela/apis/types" @@ -26,13 +33,6 @@ import ( "github.com/oam-dev/kubevela/pkg/oam/util" "github.com/oam-dev/kubevela/pkg/utils" "github.com/oam-dev/kubevela/pkg/utils/common" - "github.com/pkg/errors" - "golang.org/x/oauth2" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - k8syaml "k8s.io/apimachinery/pkg/runtime/serializer/yaml" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/yaml" ) const ( diff --git a/pkg/apiserver/rest/usecase/envbinding_test.go b/pkg/apiserver/rest/usecase/envbinding_test.go index 5e9b65181..8f421e6bd 100644 --- a/pkg/apiserver/rest/usecase/envbinding_test.go +++ b/pkg/apiserver/rest/usecase/envbinding_test.go @@ -20,10 +20,11 @@ import ( "context" "github.com/google/go-cmp/cmp" - "github.com/oam-dev/kubevela/pkg/apiserver/model" - apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/rest/apis/v1" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + + "github.com/oam-dev/kubevela/pkg/apiserver/model" + apisv1 "github.com/oam-dev/kubevela/pkg/apiserver/rest/apis/v1" ) var _ = Describe("Test envBindingUsecase functions", func() { diff --git a/pkg/cloudprovider/aliyun.go b/pkg/cloudprovider/aliyun.go index cfd4f65bd..1c3146cb5 100644 --- a/pkg/cloudprovider/aliyun.go +++ b/pkg/cloudprovider/aliyun.go @@ -190,7 +190,7 @@ func (provider *AliyunCloudProvider) CreateCloudCluster(ctx context.Context, clu }, Spec: v1beta12.ConfigurationSpec{ BaseConfigurationSpec: v1beta12.BaseConfigurationSpec{ - Path: "alibaba/cs/dedicated-kubernetes", + Path: "alibaba/cs/dedicated-kubernetes", ProviderReference: &types.Reference{ Name: terraformProviderName, Namespace: ns, diff --git a/test/e2e-apiserver-test/addon_test.go b/test/e2e-apiserver-test/addon_test.go index f2785b1c2..65b2e396d 100644 --- a/test/e2e-apiserver-test/addon_test.go +++ b/test/e2e-apiserver-test/addon_test.go @@ -9,14 +9,14 @@ import ( "os" "time" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" "github.com/pkg/errors" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1" "github.com/oam-dev/kubevela/pkg/addon" apis "github.com/oam-dev/kubevela/pkg/apiserver/rest/apis/v1" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" ) const baseURL = "http://127.0.0.1:8000"