mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-01-07 05:57:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

standardize import of "k8s.io/client-go/kubernetes/fake"

Browse Source
This commit is contained in:
Ryan Richard
2025-12-22 10:34:53 -08:00
parent 3c4c272607
commit 44509d016e
42 changed files with 213 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go
View File

@@ -19,7 +19,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
k8sinformers "k8s.io/client-go/informers"
kubernetesfake "k8s.io/client-go/kubernetes/fake"
kubefake "k8s.io/client-go/kubernetes/fake"
kubetesting "k8s.io/client-go/testing"
supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1"
@@ -180,7 +180,7 @@ func TestFederationDomainControllerFilterSecret(t *testing.T) {
)
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewClientset(),
kubefake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
@@ -243,7 +243,7 @@ func TestNewFederationDomainSecretsControllerFilterFederationDomain(t *testing.T
)
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewClientset(),
kubefake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
@@ -362,7 +362,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
tests := []struct {
name string
storage func(**supervisorconfigv1alpha1.FederationDomain, **corev1.Secret)
client func(*supervisorfake.Clientset, *kubernetesfake.Clientset)
client func(*supervisorfake.Clientset, *kubefake.Clientset)
secretHelper func(*mocksecrethelper.MockSecretHelper)
wantFederationDomainActions []kubetesting.Action
wantSecretActions []kubetesting.Action
@@ -408,7 +408,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil)
secretHelper.EXPECT().ObserveActiveSecretAndUpdateParentFederationDomain(goodFederationDomain, goodSecret).Times(1).Return(goodFederationDomainWithTokenSigningKey)
},
client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) {
client: func(c *supervisorfake.Clientset, _ *kubefake.Clientset) {
c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, goodFederationDomainWithJWKS, nil
})
@@ -431,7 +431,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil)
secretHelper.EXPECT().ObserveActiveSecretAndUpdateParentFederationDomain(goodFederationDomain, goodSecret).Times(1).Return(goodFederationDomainWithTokenSigningKey)
},
client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) {
client: func(c *supervisorfake.Clientset, _ *kubefake.Clientset) {
c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, goodFederationDomainWithJWKSAndTokenSigningKey, nil
})
@@ -495,7 +495,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil)
secretHelper.EXPECT().IsValid(goodFederationDomain, goodSecret).Times(1).Return(false)
},
client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) {
client: func(_ *supervisorfake.Clientset, c *kubefake.Clientset) {
c.PrependReactor("get", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some get error")
})
@@ -513,7 +513,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper: func(secretHelper *mocksecrethelper.MockSecretHelper) {
secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil)
},
client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) {
client: func(_ *supervisorfake.Clientset, c *kubefake.Clientset) {
c.PrependReactor("create", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some create error")
})
@@ -530,7 +530,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil)
secretHelper.EXPECT().IsValid(goodFederationDomain, goodSecret).Times(2).Return(false)
},
client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) {
client: func(_ *supervisorfake.Clientset, c *kubefake.Clientset) {
c.PrependReactor("update", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some update error")
})
@@ -551,7 +551,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().IsValid(goodFederationDomain, invalidSecret).Times(3).Return(false)
secretHelper.EXPECT().ObserveActiveSecretAndUpdateParentFederationDomain(goodFederationDomain, goodSecret).Times(1).Return(goodFederationDomainWithTokenSigningKey)
},
client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) {
client: func(_ *supervisorfake.Clientset, c *kubefake.Clientset) {
once := sync.Once{}
c.PrependReactor("update", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) {
var err error
@@ -580,7 +580,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().IsValid(goodFederationDomain, invalidSecret).Times(2).Return(false)
secretHelper.EXPECT().ObserveActiveSecretAndUpdateParentFederationDomain(goodFederationDomain, goodSecret).Times(1).Return(goodFederationDomainWithTokenSigningKey)
},
client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) {
client: func(c *supervisorfake.Clientset, _ *kubefake.Clientset) {
c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some get error")
})
@@ -604,7 +604,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
secretHelper.EXPECT().IsValid(goodFederationDomain, invalidSecret).Times(2).Return(false)
secretHelper.EXPECT().ObserveActiveSecretAndUpdateParentFederationDomain(goodFederationDomain, goodSecret).Times(1).Return(goodFederationDomainWithTokenSigningKey)
},
client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) {
client: func(c *supervisorfake.Clientset, _ *kubefake.Clientset) {
once := sync.Once{}
c.PrependReactor("update", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) {
var err error
@@ -636,8 +636,8 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient := supervisorfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewClientset()
kubeInformerClient := kubernetesfake.NewClientset()
kubeAPIClient := kubefake.NewClientset()
kubeInformerClient := kubefake.NewClientset()
federationDomain := goodFederationDomain.DeepCopy()
secret := goodSecret.DeepCopy()

26
internal/controller/supervisorconfig/generator/supervisor_secrets_test.go
View File

@@ -17,7 +17,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
k8sinformers "k8s.io/client-go/informers"
kubernetesfake "k8s.io/client-go/kubernetes/fake"
kubefake "k8s.io/client-go/kubernetes/fake"
kubetesting "k8s.io/client-go/testing"
"go.pinniped.dev/internal/controllerlib"
@@ -104,7 +104,7 @@ func TestSupervisorSecretsControllerFilterSecret(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewClientset(),
kubefake.NewClientset(),
0,
).Core().V1().Secrets()
withInformer := testutil.NewObservableWithInformerOption()
@@ -131,7 +131,7 @@ func TestSupervisorSecretsControllerFilterSecret(t *testing.T) {
func TestSupervisorSecretsControllerInitialEvent(t *testing.T) {
initialEventOption := testutil.NewObservableWithInitialEventOption()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewClientset(),
kubefake.NewClientset(),
0,
).Core().V1().Secrets()
_ = NewSupervisorSecretsController(
@@ -199,7 +199,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
name string
storedSecret func(**corev1.Secret)
generateKey func() ([]byte, error)
apiClient func(*testing.T, *kubernetesfake.Clientset)
apiClient func(*testing.T, *kubefake.Clientset)
wantError string
wantActions []kubetesting.Action
wantCallbackSecret []byte
@@ -256,7 +256,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
*secret = nil
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("create", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some create error")
})
@@ -271,7 +271,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("update", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some update error")
})
@@ -287,7 +287,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("get", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, errors.New("some get error")
})
@@ -302,7 +302,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("update", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
var err error
once.Do(func() {
@@ -324,7 +324,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("get", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, otherGeneratedSecret, nil
})
@@ -361,7 +361,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("get", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, apierrors.NewNotFound(secretsGVR.GroupResource(), generatedSecretName)
})
@@ -380,7 +380,7 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
storedSecret: func(secret **corev1.Secret) {
(*secret).Data["key"] = []byte("too short") // force updating
},
apiClient: func(t *testing.T, client *kubernetesfake.Clientset) {
apiClient: func(t *testing.T, client *kubefake.Clientset) {
client.PrependReactor("get", "secrets", func(action kubetesting.Action) (bool, runtime.Object, error) {
return true, nil, apierrors.NewNotFound(secretsGVR.GroupResource(), generatedSecretName)
})
@@ -420,11 +420,11 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
}
}
apiClient := kubernetesfake.NewClientset()
apiClient := kubefake.NewClientset()
if test.apiClient != nil {
test.apiClient(t, apiClient)
}
informerClient := kubernetesfake.NewClientset()
informerClient := kubefake.NewClientset()
storedSecret := generatedSecret.DeepCopy()
if test.storedSecret != nil {