From bd3cf2cf4487433f9904cfccefee8fdf4f035913 Mon Sep 17 00:00:00 2001 From: "Roland.Ma" Date: Mon, 10 May 2021 10:07:15 +0000 Subject: [PATCH] fix ut error for api repo Signed-off-by: Roland.Ma --- .../auditing/v1alpha1/v1alpha1_suite_test.go | 55 ------------------- .../devops/v1alpha1/s2ibinary_types_test.go | 14 +++++ .../devops/v1alpha1/s2ibuilder_types_test.go | 13 +++++ .../v1alpha1/s2ibuildertemplate_types_test.go | 13 +++++ .../api/devops/v1alpha1/s2irun_types_test.go | 13 +++++ .../devops/v1alpha1/v1alpha1_suite_test.go | 55 ------------------- .../v1alpha3/devopsproject_types_test.go | 13 +++++ .../devops/v1alpha3/pipeline_types_test.go | 12 ++++ .../devops/v1alpha3/v1alpha3_suite_test.go | 55 ------------------- .../api/iam/v1alpha2/group_test.go | 13 +++++ .../api/iam/v1alpha2/groupbinding_test.go | 13 +++++ .../api/iam/v1alpha2/types_test.go | 13 +++++ .../api/iam/v1alpha2/v1alpha2_suite_test.go | 55 ------------------- .../namespacenetworkpolicy_types_test.go | 13 +++++ .../network/v1alpha1/v1alpha1_suite_test.go | 55 ------------------- .../api/quota/v1alpha2/types_test.go | 13 +++++ .../api/quota/v1alpha2/v1alpha2_suite_test.go | 55 ------------------- .../v1alpha2/servicepolicy_types_test.go | 13 +++++ .../v1alpha2/strategy_types_test.go | 12 ++++ .../v1alpha2/v1alpha2_suite_test.go | 55 ------------------- .../tenant/v1alpha1/v1alpha1_suite_test.go | 55 ------------------- .../tenant/v1alpha1/workspace_types_test.go | 13 +++++ .../tenant/v1alpha2/v1alpha2_suite_test.go | 55 ------------------- .../v1alpha2/workspacetemplate_types_test.go | 13 +++++ 24 files changed, 194 insertions(+), 495 deletions(-) delete mode 100644 staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go delete mode 100644 staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go diff --git a/staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go deleted file mode 100644 index 70d9a172a..000000000 --- a/staging/src/kubesphere.io/api/auditing/v1alpha1/v1alpha1_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go index e2fddc14b..96a51e4dc 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibinary_types_test.go @@ -17,20 +17,34 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageS2iBinary(t *testing.T) { + + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &S2iBinary{ + TypeMeta: metav1.TypeMeta{ + Kind: "S2iBinary", + APIVersion: "devops.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go index 51c34d0b0..faf6ed76c 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types_test.go @@ -17,20 +17,33 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageS2iBuilder(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &S2iBuilder{ + TypeMeta: metav1.TypeMeta{ + Kind: "S2iBuilder", + APIVersion: "devops.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go index 7079fa87b..3b76c31ea 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuildertemplate_types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageS2iBuilderTemplate(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &S2iBuilderTemplate{ + TypeMeta: metav1.TypeMeta{ + Kind: "S2iBuilderTemplate", + APIVersion: "devops.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }} diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go index ced0b4e78..051c3adba 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/s2irun_types_test.go @@ -17,20 +17,33 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageS2iRun(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &S2iRun{ + TypeMeta: metav1.TypeMeta{ + Kind: "S2iRun", + APIVersion: "devops.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go deleted file mode 100644 index 788f02663..000000000 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/v1alpha1_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2020 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go index 70dfb11dc..fd85b1ebb 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha3/devopsproject_types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha3 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageDevOpsProject(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &DevOpsProject{ + TypeMeta: metav1.TypeMeta{ + Kind: "DevOpsProject", + APIVersion: "devops.kubesphere.io/v1alpha3", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }} diff --git a/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go index 4f65c52aa..c041a0427 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha3/pipeline_types_test.go @@ -17,20 +17,32 @@ limitations under the License. package v1alpha3 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStoragePipeline(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &Pipeline{ + TypeMeta: metav1.TypeMeta{ + Kind: "Pipeline", + APIVersion: "devops.kubesphere.io/v1alpha3", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go b/staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go deleted file mode 100644 index 177d28f35..000000000 --- a/staging/src/kubesphere.io/api/devops/v1alpha3/v1alpha3_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2020 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha3 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go index d41462893..7d6ab9878 100644 --- a/staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/group_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageGroup(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &Group{ + TypeMeta: metav1.TypeMeta{ + Kind: "Group", + APIVersion: "iam.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }} diff --git a/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go index c5789ab0e..c6af4419d 100644 --- a/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/groupbinding_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageGroupBinding(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &GroupBinding{ + TypeMeta: metav1.TypeMeta{ + Kind: "GroupBinding", + APIVersion: "iam.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, diff --git a/staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go index 6101c88a5..4bd55bc78 100644 --- a/staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go +++ b/staging/src/kubesphere.io/api/iam/v1alpha2/types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageUser(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &User{ + TypeMeta: metav1.TypeMeta{ + Kind: "User", + APIVersion: "iam.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }} diff --git a/staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go deleted file mode 100644 index 8730454a8..000000000 --- a/staging/src/kubesphere.io/api/iam/v1alpha2/v1alpha2_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha2 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go index 1a61695b1..c59fd3e62 100644 --- a/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go +++ b/staging/src/kubesphere.io/api/network/v1alpha1/namespacenetworkpolicy_types_test.go @@ -17,20 +17,33 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageNamespaceNetworkPolicy(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &NamespaceNetworkPolicy{ + TypeMeta: metav1.TypeMeta{ + Kind: "NamespaceNetworkPolicy", + APIVersion: "network.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go deleted file mode 100644 index 2206160be..000000000 --- a/staging/src/kubesphere.io/api/network/v1alpha1/v1alpha1_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go b/staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go index 356957c18..9737fd664 100644 --- a/staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go +++ b/staging/src/kubesphere.io/api/quota/v1alpha2/types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageResourceQuota(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &ResourceQuota{ + TypeMeta: metav1.TypeMeta{ + Kind: "ResourceQuota", + APIVersion: "quota.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }, diff --git a/staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go deleted file mode 100644 index 717d9ce14..000000000 --- a/staging/src/kubesphere.io/api/quota/v1alpha2/v1alpha2_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2020 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha2 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go index 623360f1d..67b3c0f33 100644 --- a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/servicepolicy_types_test.go @@ -17,22 +17,35 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "istio.io/api/networking/v1alpha3" + "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" ) func TestStorageServicePolicy(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &ServicePolicy{ + TypeMeta: metav1.TypeMeta{ + Kind: "ServicePolicy", + APIVersion: "servicemesh.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go index c67da6e04..4741c655f 100644 --- a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go +++ b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/strategy_types_test.go @@ -18,11 +18,13 @@ package v1alpha2 import ( "io/ioutil" + "log" "testing" apinetworkingv1alpha3 "istio.io/api/networking/v1alpha3" "k8s.io/apimachinery/pkg/util/json" "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" "github.com/onsi/gomega" "golang.org/x/net/context" @@ -31,11 +33,21 @@ import ( ) func TestStorageStrategy(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", Namespace: "default", } created := &Strategy{ + TypeMeta: metav1.TypeMeta{ + Kind: "Strategy", + APIVersion: "servicemesh.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", Namespace: "default", diff --git a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go deleted file mode 100644 index 17192bd5f..000000000 --- a/staging/src/kubesphere.io/api/servicemesh/v1alpha2/v1alpha2_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha2 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go deleted file mode 100644 index 70d9a172a..000000000 --- a/staging/src/kubesphere.io/api/tenant/v1alpha1/v1alpha1_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha1 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go index 4110663d4..3433c670e 100644 --- a/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha1/workspace_types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha1 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageWorkspace(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &Workspace{ + TypeMeta: metav1.TypeMeta{ + Kind: "Workspace", + APIVersion: "tenant.kubesphere.io/v1alpha1", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", }} diff --git a/staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go deleted file mode 100644 index 8730454a8..000000000 --- a/staging/src/kubesphere.io/api/tenant/v1alpha2/v1alpha2_suite_test.go +++ /dev/null @@ -1,55 +0,0 @@ -/* -Copyright 2019 The KubeSphere Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v1alpha2 - -import ( - "log" - "os" - "path/filepath" - "testing" - - "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest" -) - -var cfg *rest.Config -var c client.Client - -func TestMain(m *testing.M) { - t := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "..", "config", "crds")}, - } - - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - log.Fatal(err) - } - - if cfg, err = t.Start(); err != nil { - log.Fatal(err) - } - - if c, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}); err != nil { - log.Fatal(err) - } - - code := m.Run() - t.Stop() - os.Exit(code) -} diff --git a/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go b/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go index 4f1482651..2ae4329e5 100644 --- a/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go +++ b/staging/src/kubesphere.io/api/tenant/v1alpha2/workspacetemplate_types_test.go @@ -17,19 +17,32 @@ limitations under the License. package v1alpha2 import ( + "log" "testing" "github.com/onsi/gomega" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) func TestStorageWorkspaceTemplate(t *testing.T) { + err := SchemeBuilder.AddToScheme(scheme.Scheme) + if err != nil { + log.Fatal(err) + } + c := fake.NewFakeClientWithScheme(scheme.Scheme) + key := types.NamespacedName{ Name: "foo", } created := &WorkspaceTemplate{ + TypeMeta: metav1.TypeMeta{ + Kind: "WorkspaceTemplate", + APIVersion: "tenant.kubesphere.io/v1alpha2", + }, ObjectMeta: metav1.ObjectMeta{ Name: "foo", },