Skip to content

Commit

Permalink
remove repeat imports
Browse files Browse the repository at this point in the history 
Signed-off-by: aSquare14 <[email protected]>
  • Loading branch information
@asquare14 @kmova
asquare14 authored and kmova committed May 6, 2021
1 parent 4c20dd4 commit cabfcfa
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 28 deletions.
23 changes: 11 additions & 12 deletions pkg/kubernetes/api/core/v1/persistentvolume/kubernetes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"testing"

errors "github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand All @@ -36,24 +35,24 @@ func fakeGetClientSetForPathErr(fakeConfigPath string) (cli *kubernetes.Clientse
return nil, errors.New("fake error")
}

func fakeGetOk(cli *kubernetes.Clientset, name string, opts metav1.GetOptions) (*corev1.PersistentVolume, error) {
return &corev1.PersistentVolume{}, nil
func fakeGetOk(cli *kubernetes.Clientset, name string, opts metav1.GetOptions) (*v1.PersistentVolume, error) {
return &v1.PersistentVolume{}, nil
}

func fakeListOk(cli *kubernetes.Clientset, opts metav1.ListOptions) (*corev1.PersistentVolumeList, error) {
return &corev1.PersistentVolumeList{}, nil
func fakeListOk(cli *kubernetes.Clientset, opts metav1.ListOptions) (*v1.PersistentVolumeList, error) {
return &v1.PersistentVolumeList{}, nil
}

func fakeDeleteOk(cli *kubernetes.Clientset, name string, opts *metav1.DeleteOptions) error {
return nil
}

func fakeListErr(cli *kubernetes.Clientset, opts metav1.ListOptions) (*corev1.PersistentVolumeList, error) {
return &corev1.PersistentVolumeList{}, errors.New("some error")
func fakeListErr(cli *kubernetes.Clientset, opts metav1.ListOptions) (*v1.PersistentVolumeList, error) {
return &v1.PersistentVolumeList{}, errors.New("some error")
}

func fakeGetErr(cli *kubernetes.Clientset, name string, opts metav1.GetOptions) (*corev1.PersistentVolume, error) {
return &corev1.PersistentVolume{}, errors.New("some error")
func fakeGetErr(cli *kubernetes.Clientset, name string, opts metav1.GetOptions) (*v1.PersistentVolume, error) {
return &v1.PersistentVolume{}, errors.New("some error")
}

func fakeDeleteErr(cli *kubernetes.Clientset, name string, opts *metav1.DeleteOptions) error {
Expand Down Expand Up @@ -82,11 +81,11 @@ func fakeGetClientSetErr() (clientset *kubernetes.Clientset, err error) {

func fakeClientSet(k *Kubeclient) {}

func fakeCreateFnOk(cli *kubernetes.Clientset, pv *corev1.PersistentVolume) (*corev1.PersistentVolume, error) {
return &corev1.PersistentVolume{}, nil
func fakeCreateFnOk(cli *kubernetes.Clientset, pv *v1.PersistentVolume) (*v1.PersistentVolume, error) {
return &v1.PersistentVolume{}, nil
}

func fakeCreateFnErr(cli *kubernetes.Clientset, pv *corev1.PersistentVolume) (*corev1.PersistentVolume, error) {
func fakeCreateFnErr(cli *kubernetes.Clientset, pv *v1.PersistentVolume) (*v1.PersistentVolume, error) {
return nil, errors.New("failed to create PV")
}

Expand Down
23 changes: 11 additions & 12 deletions pkg/kubernetes/api/core/v1/persistentvolumeclaim/kubernetes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"testing"

errors "github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand All @@ -36,24 +35,24 @@ func fakeGetClientSetForPathErr(fakeConfigPath string) (cli *kubernetes.Clientse
return nil, errors.New("fake error")
}

func fakeGetOk(cli *kubernetes.Clientset, name, namespace string, opts metav1.GetOptions) (*corev1.PersistentVolumeClaim, error) {
return &corev1.PersistentVolumeClaim{}, nil
func fakeGetOk(cli *kubernetes.Clientset, name, namespace string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error) {
return &v1.PersistentVolumeClaim{}, nil
}

func fakeListOk(cli *kubernetes.Clientset, namespace string, opts metav1.ListOptions) (*corev1.PersistentVolumeClaimList, error) {
return &corev1.PersistentVolumeClaimList{}, nil
func fakeListOk(cli *kubernetes.Clientset, namespace string, opts metav1.ListOptions) (*v1.PersistentVolumeClaimList, error) {
return &v1.PersistentVolumeClaimList{}, nil
}

func fakeDeleteOk(cli *kubernetes.Clientset, name, namespace string, opts *metav1.DeleteOptions) error {
return nil
}

func fakeListErr(cli *kubernetes.Clientset, namespace string, opts metav1.ListOptions) (*corev1.PersistentVolumeClaimList, error) {
return &corev1.PersistentVolumeClaimList{}, errors.New("some error")
func fakeListErr(cli *kubernetes.Clientset, namespace string, opts metav1.ListOptions) (*v1.PersistentVolumeClaimList, error) {
return &v1.PersistentVolumeClaimList{}, errors.New("some error")
}

func fakeGetErr(cli *kubernetes.Clientset, name, namespace string, opts metav1.GetOptions) (*corev1.PersistentVolumeClaim, error) {
return &corev1.PersistentVolumeClaim{}, errors.New("some error")
func fakeGetErr(cli *kubernetes.Clientset, name, namespace string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error) {
return &v1.PersistentVolumeClaim{}, errors.New("some error")
}

func fakeDeleteErr(cli *kubernetes.Clientset, name, namespace string, opts *metav1.DeleteOptions) error {
Expand Down Expand Up @@ -82,11 +81,11 @@ func fakeGetClientSetErr() (clientset *kubernetes.Clientset, err error) {

func fakeClientSet(k *Kubeclient) {}

func fakeCreateFnOk(cli *kubernetes.Clientset, namespace string, pvc *corev1.PersistentVolumeClaim) (*corev1.PersistentVolumeClaim, error) {
return &corev1.PersistentVolumeClaim{}, nil
func fakeCreateFnOk(cli *kubernetes.Clientset, namespace string, pvc *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) {
return &v1.PersistentVolumeClaim{}, nil
}

func fakeCreateFnErr(cli *kubernetes.Clientset, namespace string, pvc *corev1.PersistentVolumeClaim) (*corev1.PersistentVolumeClaim, error) {
func fakeCreateFnErr(cli *kubernetes.Clientset, namespace string, pvc *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) {
return nil, errors.New("failed to create PVC")
}

Expand Down
7 changes: 3 additions & 4 deletions pkg/kubernetes/api/core/v1/pod/kubernetes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
client "k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes"
)

Expand Down Expand Up @@ -53,7 +52,7 @@ func fakeGetErrfn(cli *clientset.Clientset, namespace, name string, opts metav1.
}

func fakeSetClientset(k *KubeClient) {
k.clientset = &client.Clientset{}
k.clientset = &clientset.Clientset{}
}

func fakeSetNilClientset(k *KubeClient) {
Expand Down Expand Up @@ -193,11 +192,11 @@ func TestGetClientSetForPathOrDirect(t *testing.T) {

func TestWithClientsetBuildOption(t *testing.T) {
tests := map[string]struct {
Clientset *client.Clientset
Clientset *clientset.Clientset
expectKubeClientEmpty bool
}{
"Clientset is empty": {nil, true},
"Clientset is not empty": {&client.Clientset{}, false},
"Clientset is not empty": {&clientset.Clientset{}, false},
}

for name, mock := range tests {
Expand Down

0 comments on commit cabfcfa

Please sign in to comment.