diff --git a/.golangci.yaml b/.golangci.yaml index 3219728ad..a9a4923a3 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -127,16 +127,20 @@ linters-settings: alias: conciergeclientset - pkg: go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/scheme alias: conciergeclientsetscheme -# - pkg: go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake -# alias: conciergefake + - pkg: go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake + alias: conciergefake - pkg: go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned alias: supervisorclientset - pkg: go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/scheme alias: supervisorclientsetscheme -# - pkg: go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake -# alias: supervisorfake + - pkg: go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake + alias: supervisorfake - pkg: go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1 alias: idpv1alpha1 + - pkg: go.pinniped.dev/generated/latest/client/concierge/informers/externalversions + alias: conciergeinformers + - pkg: go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions + alias: supervisorinformers # Pinniped internal - pkg: go.pinniped.dev/internal/concierge/scheme alias: conciergescheme diff --git a/cmd/pinniped/cmd/kubeconfig_test.go b/cmd/pinniped/cmd/kubeconfig_test.go index 035060472..3e0ae2687 100644 --- a/cmd/pinniped/cmd/kubeconfig_test.go +++ b/cmd/pinniped/cmd/kubeconfig_test.go @@ -23,7 +23,7 @@ import ( authenticationv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" conciergeconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" - fakeconciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/here" "go.pinniped.dev/internal/testutil" @@ -3247,9 +3247,9 @@ func TestGetKubeconfig(t *testing.T) { if tt.getClientsetErr != nil { return nil, tt.getClientsetErr } - fake := fakeconciergeclientset.NewSimpleClientset() + fake := conciergefake.NewSimpleClientset() if tt.conciergeObjects != nil { - fake = fakeconciergeclientset.NewSimpleClientset(tt.conciergeObjects(string(testServerCA), testServer.URL)...) + fake = conciergefake.NewSimpleClientset(tt.conciergeObjects(string(testServerCA), testServer.URL)...) } if len(tt.conciergeReactions) > 0 { fake.ReactionChain = append(tt.conciergeReactions, fake.ReactionChain...) diff --git a/cmd/pinniped/cmd/whoami_test.go b/cmd/pinniped/cmd/whoami_test.go index e40bd15ca..408f34879 100644 --- a/cmd/pinniped/cmd/whoami_test.go +++ b/cmd/pinniped/cmd/whoami_test.go @@ -15,7 +15,7 @@ import ( identityv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/identity/v1alpha1" conciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned" - fakeconciergeclientset "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" "go.pinniped.dev/internal/constable" "go.pinniped.dev/internal/here" ) @@ -284,7 +284,7 @@ func TestWhoami(t *testing.T) { if test.gettingClientsetErr != nil { return nil, test.gettingClientsetErr } - clientset := fakeconciergeclientset.NewSimpleClientset() + clientset := conciergefake.NewSimpleClientset() clientset.PrependReactor("create", "whoamirequests", func(_ kubetesting.Action) (bool, runtime.Object, error) { if test.callingAPIErr != nil { return true, nil, test.callingAPIErr diff --git a/internal/controller/authenticator/cachecleaner/cachecleaner_test.go b/internal/controller/authenticator/cachecleaner/cachecleaner_test.go index c72068829..8837d9483 100644 --- a/internal/controller/authenticator/cachecleaner/cachecleaner_test.go +++ b/internal/controller/authenticator/cachecleaner/cachecleaner_test.go @@ -13,8 +13,8 @@ import ( "k8s.io/apiserver/pkg/authentication/authenticator" authenticationv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergeinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" controllerAuthenticator "go.pinniped.dev/internal/controller/authenticator" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" @@ -136,8 +136,8 @@ func TestController(t *testing.T) { t.Run(tt.name, func(t *testing.T) { // When we have t.Parallel() here, this test blocks pretty consistently...y tho? - fakeClient := pinnipedfake.NewSimpleClientset(tt.objects...) - informers := pinnipedinformers.NewSharedInformerFactory(fakeClient, 0) + fakeClient := conciergefake.NewSimpleClientset(tt.objects...) + informers := conciergeinformers.NewSharedInformerFactory(fakeClient, 0) cache := authncache.New() if tt.initialCache != nil { tt.initialCache(t, cache) diff --git a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go index 6126716b1..deff9907b 100644 --- a/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go +++ b/internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go @@ -34,8 +34,8 @@ import ( clocktesting "k8s.io/utils/clock/testing" authenticationv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergeinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/crypto/ptls" @@ -581,7 +581,7 @@ func TestController(t *testing.T) { syncKey controllerlib.Key jwtAuthenticators []runtime.Object // for modifying the clients to hack in arbitrary api responses - configClient func(*pinnipedfake.Clientset) + configClient func(*conciergefake.Clientset) wantClose bool // Only errors that are non-config related errors are returned from the sync loop. // Errors such as url.Parse of the issuer are not returned as they imply a user error. @@ -1612,7 +1612,7 @@ func TestController(t *testing.T) { }, }, syncKey: controllerlib.Key{Name: "test-name"}, - configClient: func(client *pinnipedfake.Clientset) { + configClient: func(client *conciergefake.Clientset) { client.PrependReactor( "update", "jwtauthenticators", @@ -1666,11 +1666,11 @@ func TestController(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - pinnipedAPIClient := pinnipedfake.NewSimpleClientset(tt.jwtAuthenticators...) + pinnipedAPIClient := conciergefake.NewSimpleClientset(tt.jwtAuthenticators...) if tt.configClient != nil { tt.configClient(pinnipedAPIClient) } - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(pinnipedAPIClient, 0) + pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0) cache := authncache.New() var log bytes.Buffer diff --git a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go index 53da3ce83..e923f0ebb 100644 --- a/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go +++ b/internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/utils/ptr" authenticationv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/authentication/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergeinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/controller/authenticator/authncache" "go.pinniped.dev/internal/controllerlib" @@ -363,7 +363,7 @@ func TestController(t *testing.T) { syncKey controllerlib.Key webhooks []runtime.Object // for modifying the clients to hack in arbitrary api responses - configClient func(*pinnipedfake.Clientset) + configClient func(*conciergefake.Clientset) wantSyncLoopErr testutil.RequireErrorStringFunc wantLogs []map[string]any wantActions func() []coretesting.Action @@ -1245,7 +1245,7 @@ func TestController(t *testing.T) { { name: "updateStatus: when update request fails: error will enqueue a resync", syncKey: controllerlib.Key{Name: "test-name"}, - configClient: func(client *pinnipedfake.Clientset) { + configClient: func(client *conciergefake.Clientset) { client.PrependReactor( "update", "webhookauthenticators", @@ -1309,11 +1309,11 @@ func TestController(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - pinnipedAPIClient := pinnipedfake.NewSimpleClientset(tt.webhooks...) + pinnipedAPIClient := conciergefake.NewSimpleClientset(tt.webhooks...) if tt.configClient != nil { tt.configClient(pinnipedAPIClient) } - informers := pinnipedinformers.NewSharedInformerFactory(pinnipedAPIClient, 0) + informers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0) cache := authncache.New() var log bytes.Buffer diff --git a/internal/controller/impersonatorconfig/impersonator_config_test.go b/internal/controller/impersonatorconfig/impersonator_config_test.go index ae40ee11e..19956387c 100644 --- a/internal/controller/impersonatorconfig/impersonator_config_test.go +++ b/internal/controller/impersonatorconfig/impersonator_config_test.go @@ -36,8 +36,8 @@ import ( clocktesting "k8s.io/utils/clock/testing" conciergeconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/concierge/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" + conciergefake "go.pinniped.dev/generated/latest/client/concierge/clientset/versioned/fake" + conciergeinformers "go.pinniped.dev/generated/latest/client/concierge/informers/externalversions" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/controller/apicerts" "go.pinniped.dev/internal/controllerlib" @@ -68,7 +68,7 @@ func TestImpersonatorConfigControllerOptions(t *testing.T) { it.Before(func() { r = require.New(t) observableWithInformerOption = testutil.NewObservableWithInformerOption() - pinnipedInformerFactory := pinnipedinformers.NewSharedInformerFactory(nil, 0) + pinnipedInformerFactory := conciergeinformers.NewSharedInformerFactory(nil, 0) sharedInformerFactory := k8sinformers.NewSharedInformerFactory(nil, 0) credIssuerInformer := pinnipedInformerFactory.Config().V1alpha1().CredentialIssuers() servicesInformer := sharedInformerFactory.Core().V1().Services() @@ -281,9 +281,9 @@ func TestImpersonatorConfigControllerSync(t *testing.T) { var subject controllerlib.Controller var kubeAPIClient *kubernetesfake.Clientset - var pinnipedAPIClient *pinnipedfake.Clientset - var pinnipedInformerClient *pinnipedfake.Clientset - var pinnipedInformers pinnipedinformers.SharedInformerFactory + var pinnipedAPIClient *conciergefake.Clientset + var pinnipedInformerClient *conciergefake.Clientset + var pinnipedInformers conciergeinformers.SharedInformerFactory var kubeInformerClient *kubernetesfake.Clientset var kubeInformers k8sinformers.SharedInformerFactory var cancelContext context.Context @@ -609,7 +609,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) { controllerlib.TestRunSynchronously(t, subject) } - var addCredentialIssuerToTrackers = func(credIssuer conciergeconfigv1alpha1.CredentialIssuer, informerClient *pinnipedfake.Clientset, mainClient *pinnipedfake.Clientset) { + var addCredentialIssuerToTrackers = func(credIssuer conciergeconfigv1alpha1.CredentialIssuer, informerClient *conciergefake.Clientset, mainClient *conciergefake.Clientset) { t.Logf("adding CredentialIssuer %s to informer and main clientsets", credIssuer.Name) r.NoError(informerClient.Tracker().Add(&credIssuer)) r.NoError(mainClient.Tracker().Add(&credIssuer)) @@ -1123,15 +1123,15 @@ func TestImpersonatorConfigControllerSync(t *testing.T) { queue = &testQueue{} cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background()) - pinnipedInformerClient = pinnipedfake.NewSimpleClientset() - pinnipedInformers = pinnipedinformers.NewSharedInformerFactoryWithOptions(pinnipedInformerClient, 0) + pinnipedInformerClient = conciergefake.NewSimpleClientset() + pinnipedInformers = conciergeinformers.NewSharedInformerFactoryWithOptions(pinnipedInformerClient, 0) kubeInformerClient = kubernetesfake.NewSimpleClientset() kubeInformers = k8sinformers.NewSharedInformerFactoryWithOptions(kubeInformerClient, 0, k8sinformers.WithNamespace(installedInNamespace), ) kubeAPIClient = kubernetesfake.NewSimpleClientset() - pinnipedAPIClient = pinnipedfake.NewSimpleClientset() + pinnipedAPIClient = conciergefake.NewSimpleClientset() frozenNow = time.Date(2021, time.March, 2, 7, 42, 0, 0, time.Local) mTLSClientCertProvider = dynamiccert.NewCA(name) diff --git a/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go b/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go index 3b8aa9b2b..c8bded274 100644 --- a/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go +++ b/internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/client-go/kubernetes/fake" idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/controller/supervisorconfig/upstreamwatchers" "go.pinniped.dev/internal/controllerlib" @@ -74,8 +74,8 @@ func TestActiveDirectoryUpstreamWatcherControllerFilterSecrets(t *testing.T) { t.Run(test.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset() - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset() + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) activeDirectoryIDPInformer := pinnipedInformers.IDP().V1alpha1().ActiveDirectoryIdentityProviders() fakeKubeClient := fake.NewSimpleClientset() kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) @@ -118,8 +118,8 @@ func TestActiveDirectoryUpstreamWatcherControllerFilterActiveDirectoryIdentityPr t.Run(test.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset() - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset() + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) activeDirectoryIDPInformer := pinnipedInformers.IDP().V1alpha1().ActiveDirectoryIdentityProviders() fakeKubeClient := fake.NewSimpleClientset() kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) @@ -2003,8 +2003,8 @@ func TestActiveDirectoryUpstreamWatcherControllerSync(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset(tt.inputUpstreams...) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...) + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) fakeKubeClient := fake.NewSimpleClientset(tt.inputSecrets...) kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider() diff --git a/internal/controller/supervisorconfig/federation_domain_watcher_test.go b/internal/controller/supervisorconfig/federation_domain_watcher_test.go index 2190d533f..d51c4f61b 100644 --- a/internal/controller/supervisorconfig/federation_domain_watcher_test.go +++ b/internal/controller/supervisorconfig/federation_domain_watcher_test.go @@ -24,8 +24,8 @@ import ( supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/celtransformer" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/federationdomain/federationdomainproviders" @@ -38,10 +38,10 @@ import ( func TestFederationDomainWatcherControllerInformerFilters(t *testing.T) { t.Parallel() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactoryWithOptions(nil, 0).Config().V1alpha1().FederationDomains() - oidcIdentityProviderInformer := pinnipedinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().OIDCIdentityProviders() - ldapIdentityProviderInformer := pinnipedinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().LDAPIdentityProviders() - adIdentityProviderInformer := pinnipedinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().ActiveDirectoryIdentityProviders() + federationDomainInformer := supervisorinformers.NewSharedInformerFactoryWithOptions(nil, 0).Config().V1alpha1().FederationDomains() + oidcIdentityProviderInformer := supervisorinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().OIDCIdentityProviders() + ldapIdentityProviderInformer := supervisorinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().LDAPIdentityProviders() + adIdentityProviderInformer := supervisorinformers.NewSharedInformerFactoryWithOptions(nil, 0).IDP().V1alpha1().ActiveDirectoryIdentityProviders() tests := []struct { name string @@ -521,7 +521,7 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) { tests := []struct { name string inputObjects []runtime.Object - configClient func(*pinnipedfake.Clientset) + configClient func(*supervisorfake.Clientset) wantErr string wantStatusUpdates []*supervisorconfigv1alpha1.FederationDomain wantFDIssuers []*federationdomainproviders.FederationDomainIssuer @@ -671,7 +671,7 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) { federationDomain2, oidcIdentityProvider, }, - configClient: func(client *pinnipedfake.Clientset) { + configClient: func(client *supervisorfake.Clientset) { client.PrependReactor( "update", "federationdomains", @@ -736,7 +736,7 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) { federationDomain2, oidcIdentityProvider, }, - configClient: func(client *pinnipedfake.Clientset) { + configClient: func(client *supervisorfake.Clientset) { client.PrependReactor( "update", "federationdomains", @@ -2002,8 +2002,8 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) { t.Parallel() federationDomainsSetter := &fakeFederationDomainsSetter{} - pinnipedAPIClient := pinnipedfake.NewSimpleClientset() - pinnipedInformerClient := pinnipedfake.NewSimpleClientset() + pinnipedAPIClient := supervisorfake.NewSimpleClientset() + pinnipedInformerClient := supervisorfake.NewSimpleClientset() for _, o := range tt.inputObjects { require.NoError(t, pinnipedAPIClient.Tracker().Add(o)) require.NoError(t, pinnipedInformerClient.Tracker().Add(o)) @@ -2011,7 +2011,7 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) { if tt.configClient != nil { tt.configClient(pinnipedAPIClient) } - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) controller := NewFederationDomainWatcherController( federationDomainsSetter, diff --git a/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go b/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go index 8abd82f58..9d58a5809 100644 --- a/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go +++ b/internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go @@ -23,8 +23,8 @@ import ( kubetesting "k8s.io/client-go/testing" supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/mocks/mocksecrethelper" "go.pinniped.dev/internal/testutil" @@ -183,8 +183,8 @@ func TestFederationDomainControllerFilterSecret(t *testing.T) { kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + federationDomainInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().FederationDomains() withInformer := testutil.NewObservableWithInformerOption() @@ -245,8 +245,8 @@ func TestNewFederationDomainSecretsControllerFilterFederationDomain(t *testing.T kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + federationDomainInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().FederationDomains() withInformer := testutil.NewObservableWithInformerOption() @@ -360,7 +360,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) { tests := []struct { name string storage func(**supervisorconfigv1alpha1.FederationDomain, **corev1.Secret) - client func(*pinnipedfake.Clientset, *kubernetesfake.Clientset) + client func(*supervisorfake.Clientset, *kubernetesfake.Clientset) secretHelper func(*mocksecrethelper.MockSecretHelper) wantFederationDomainActions []kubetesting.Action wantSecretActions []kubetesting.Action @@ -406,7 +406,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 *pinnipedfake.Clientset, _ *kubernetesfake.Clientset) { + client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) { c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, goodFederationDomainWithJWKS, nil }) @@ -429,7 +429,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 *pinnipedfake.Clientset, _ *kubernetesfake.Clientset) { + client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) { c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, goodFederationDomainWithJWKSAndTokenSigningKey, nil }) @@ -493,7 +493,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(_ *pinnipedfake.Clientset, c *kubernetesfake.Clientset) { + client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) { c.PrependReactor("get", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some get error") }) @@ -511,7 +511,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) { secretHelper: func(secretHelper *mocksecrethelper.MockSecretHelper) { secretHelper.EXPECT().Generate(goodFederationDomain).Times(1).Return(goodSecret, nil) }, - client: func(_ *pinnipedfake.Clientset, c *kubernetesfake.Clientset) { + client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) { c.PrependReactor("create", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some create error") }) @@ -528,7 +528,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(_ *pinnipedfake.Clientset, c *kubernetesfake.Clientset) { + client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) { c.PrependReactor("update", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some update error") }) @@ -549,7 +549,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(_ *pinnipedfake.Clientset, c *kubernetesfake.Clientset) { + client: func(_ *supervisorfake.Clientset, c *kubernetesfake.Clientset) { once := sync.Once{} c.PrependReactor("update", "secrets", func(_ kubetesting.Action) (bool, runtime.Object, error) { var err error @@ -578,7 +578,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 *pinnipedfake.Clientset, _ *kubernetesfake.Clientset) { + client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) { c.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some get error") }) @@ -602,7 +602,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 *pinnipedfake.Clientset, _ *kubernetesfake.Clientset) { + client: func(c *supervisorfake.Clientset, _ *kubernetesfake.Clientset) { once := sync.Once{} c.PrependReactor("update", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { var err error @@ -629,8 +629,8 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - pinnipedAPIClient := pinnipedfake.NewSimpleClientset() - pinnipedInformerClient := pinnipedfake.NewSimpleClientset() + pinnipedAPIClient := supervisorfake.NewSimpleClientset() + pinnipedInformerClient := supervisorfake.NewSimpleClientset() kubeAPIClient := kubernetesfake.NewSimpleClientset() kubeInformerClient := kubernetesfake.NewSimpleClientset() @@ -657,7 +657,7 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) { kubeInformerClient, 0, ) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory( + pinnipedInformers := supervisorinformers.NewSharedInformerFactory( pinnipedInformerClient, 0, ) diff --git a/internal/controller/supervisorconfig/jwks_observer_test.go b/internal/controller/supervisorconfig/jwks_observer_test.go index 60d8cbb91..7cfb04a72 100644 --- a/internal/controller/supervisorconfig/jwks_observer_test.go +++ b/internal/controller/supervisorconfig/jwks_observer_test.go @@ -18,8 +18,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) @@ -37,7 +37,7 @@ func TestJWKSObserverControllerInformerFilters(t *testing.T) { r = require.New(t) observableWithInformerOption = testutil.NewObservableWithInformerOption() secretsInformer := k8sinformers.NewSharedInformerFactory(nil, 0).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory(nil, 0).Config().V1alpha1().FederationDomains() + federationDomainInformer := supervisorinformers.NewSharedInformerFactory(nil, 0).Config().V1alpha1().FederationDomains() _ = NewJWKSObserverController( nil, secretsInformer, @@ -125,9 +125,9 @@ func TestJWKSObserverControllerSync(t *testing.T) { var ( r *require.Assertions subject controllerlib.Controller - pinnipedInformerClient *pinnipedfake.Clientset + pinnipedInformerClient *supervisorfake.Clientset kubeInformerClient *kubernetesfake.Clientset - pinnipedInformers pinnipedinformers.SharedInformerFactory + pinnipedInformers supervisorinformers.SharedInformerFactory kubeInformers k8sinformers.SharedInformerFactory cancelContext context.Context cancelContextCancelFunc context.CancelFunc @@ -169,8 +169,8 @@ func TestJWKSObserverControllerSync(t *testing.T) { kubeInformerClient = kubernetesfake.NewSimpleClientset() kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0) - pinnipedInformerClient = pinnipedfake.NewSimpleClientset() - pinnipedInformers = pinnipedinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) + pinnipedInformerClient = supervisorfake.NewSimpleClientset() + pinnipedInformers = supervisorinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) issuerToJWKSSetter = &fakeIssuerToJWKSMapSetter{} unrelatedSecret := &corev1.Secret{ diff --git a/internal/controller/supervisorconfig/jwks_writer_test.go b/internal/controller/supervisorconfig/jwks_writer_test.go index 247f6df56..e28bc5951 100644 --- a/internal/controller/supervisorconfig/jwks_writer_test.go +++ b/internal/controller/supervisorconfig/jwks_writer_test.go @@ -23,8 +23,8 @@ import ( kubetesting "k8s.io/client-go/testing" supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) @@ -174,8 +174,8 @@ func TestJWKSWriterControllerFilterSecret(t *testing.T) { kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + federationDomainInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().FederationDomains() withInformer := testutil.NewObservableWithInformerOption() @@ -227,8 +227,8 @@ func TestJWKSWriterControllerFilterFederationDomain(t *testing.T) { kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + federationDomainInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().FederationDomains() withInformer := testutil.NewObservableWithInformerOption() @@ -331,7 +331,7 @@ func TestJWKSWriterControllerSync(t *testing.T) { key controllerlib.Key secrets []*corev1.Secret configKubeClient func(*kubernetesfake.Clientset) - configPinnipedClient func(*pinnipedfake.Clientset) + configPinnipedClient func(*supervisorfake.Clientset) federationDomains []*supervisorconfigv1alpha1.FederationDomain generateKeyErr error wantGenerateKeyCount int @@ -640,7 +640,7 @@ func TestJWKSWriterControllerSync(t *testing.T) { federationDomains: []*supervisorconfigv1alpha1.FederationDomain{ goodFederationDomain, }, - configPinnipedClient: func(client *pinnipedfake.Clientset) { + configPinnipedClient: func(client *supervisorfake.Clientset) { client.PrependReactor("get", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some get error") }) @@ -653,7 +653,7 @@ func TestJWKSWriterControllerSync(t *testing.T) { federationDomains: []*supervisorconfigv1alpha1.FederationDomain{ goodFederationDomain, }, - configPinnipedClient: func(client *pinnipedfake.Clientset) { + configPinnipedClient: func(client *supervisorfake.Clientset) { client.PrependReactor("update", "federationdomains", func(_ kubetesting.Action) (bool, runtime.Object, error) { return true, nil, errors.New("some update error") }) @@ -683,8 +683,8 @@ func TestJWKSWriterControllerSync(t *testing.T) { test.configKubeClient(kubeAPIClient) } - pinnipedAPIClient := pinnipedfake.NewSimpleClientset() - pinnipedInformerClient := pinnipedfake.NewSimpleClientset() + pinnipedAPIClient := supervisorfake.NewSimpleClientset() + pinnipedInformerClient := supervisorfake.NewSimpleClientset() for _, federationDomain := range test.federationDomains { require.NoError(t, pinnipedAPIClient.Tracker().Add(federationDomain)) require.NoError(t, pinnipedInformerClient.Tracker().Add(federationDomain)) @@ -697,7 +697,7 @@ func TestJWKSWriterControllerSync(t *testing.T) { kubeInformerClient, 0, ) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory( + pinnipedInformers := supervisorinformers.NewSharedInformerFactory( pinnipedInformerClient, 0, ) diff --git a/internal/controller/supervisorconfig/ldapupstreamwatcher/ldap_upstream_watcher_test.go b/internal/controller/supervisorconfig/ldapupstreamwatcher/ldap_upstream_watcher_test.go index b42068912..c5f313d4a 100644 --- a/internal/controller/supervisorconfig/ldapupstreamwatcher/ldap_upstream_watcher_test.go +++ b/internal/controller/supervisorconfig/ldapupstreamwatcher/ldap_upstream_watcher_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/client-go/kubernetes/fake" idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/controller/supervisorconfig/upstreamwatchers" "go.pinniped.dev/internal/controllerlib" @@ -73,8 +73,8 @@ func TestLDAPUpstreamWatcherControllerFilterSecrets(t *testing.T) { t.Run(test.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset() - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset() + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) ldapIDPInformer := pinnipedInformers.IDP().V1alpha1().LDAPIdentityProviders() fakeKubeClient := fake.NewSimpleClientset() kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) @@ -117,8 +117,8 @@ func TestLDAPUpstreamWatcherControllerFilterLDAPIdentityProviders(t *testing.T) t.Run(test.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset() - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset() + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) ldapIDPInformer := pinnipedInformers.IDP().V1alpha1().LDAPIdentityProviders() fakeKubeClient := fake.NewSimpleClientset() kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) @@ -1132,8 +1132,8 @@ func TestLDAPUpstreamWatcherControllerSync(t *testing.T) { t.Run(tt.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset(tt.inputUpstreams...) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...) + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) fakeKubeClient := fake.NewSimpleClientset(tt.inputSecrets...) kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider() diff --git a/internal/controller/supervisorconfig/oidcclientwatcher/oidc_client_watcher_test.go b/internal/controller/supervisorconfig/oidcclientwatcher/oidc_client_watcher_test.go index 7e4aadf9a..ba64c71d8 100644 --- a/internal/controller/supervisorconfig/oidcclientwatcher/oidc_client_watcher_test.go +++ b/internal/controller/supervisorconfig/oidcclientwatcher/oidc_client_watcher_test.go @@ -17,8 +17,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) @@ -66,8 +66,8 @@ func TestOIDCClientWatcherControllerFilterSecret(t *testing.T) { kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - oidcClientsInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + oidcClientsInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().OIDCClients() withInformer := testutil.NewObservableWithInformerOption() @@ -135,8 +135,8 @@ func TestOIDCClientWatcherControllerFilterOIDCClient(t *testing.T) { kubernetesfake.NewSimpleClientset(), 0, ).Core().V1().Secrets() - oidcClientsInformer := pinnipedinformers.NewSharedInformerFactory( - pinnipedfake.NewSimpleClientset(), + oidcClientsInformer := supervisorinformers.NewSharedInformerFactory( + supervisorfake.NewSimpleClientset(), 0, ).Config().V1alpha1().OIDCClients() withInformer := testutil.NewObservableWithInformerOption() @@ -956,9 +956,9 @@ func TestOIDCClientWatcherControllerSync(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset(tt.inputObjects...) - fakePinnipedClientForInformers := pinnipedfake.NewSimpleClientset(tt.inputObjects...) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClientForInformers, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputObjects...) + fakePinnipedClientForInformers := supervisorfake.NewSimpleClientset(tt.inputObjects...) + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClientForInformers, 0) fakeKubeClient := kubernetesfake.NewSimpleClientset(tt.inputSecrets...) kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(fakeKubeClient, 0) diff --git a/internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go b/internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go index 4221eb968..ab813242d 100644 --- a/internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go +++ b/internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/kubernetes/fake" idpv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/idp/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/certauthority" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/federationdomain/dynamicupstreamprovider" @@ -76,8 +76,8 @@ func TestOIDCUpstreamWatcherControllerFilterSecret(t *testing.T) { t.Run(test.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset() - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset() + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) fakeKubeClient := fake.NewSimpleClientset() kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider() @@ -1409,8 +1409,8 @@ oidc: issuer did not match the issuer returned by provider, expected "` + testIs for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { t.Parallel() - fakePinnipedClient := pinnipedfake.NewSimpleClientset(tt.inputUpstreams...) - pinnipedInformers := pinnipedinformers.NewSharedInformerFactory(fakePinnipedClient, 0) + fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...) + pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0) fakeKubeClient := fake.NewSimpleClientset(tt.inputSecrets...) kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0) testLog := testlogger.NewLegacy(t) //nolint:staticcheck // old test with lots of log statements diff --git a/internal/controller/supervisorconfig/tls_cert_observer_test.go b/internal/controller/supervisorconfig/tls_cert_observer_test.go index 01a33e865..4a019516a 100644 --- a/internal/controller/supervisorconfig/tls_cert_observer_test.go +++ b/internal/controller/supervisorconfig/tls_cert_observer_test.go @@ -19,8 +19,8 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" supervisorconfigv1alpha1 "go.pinniped.dev/generated/latest/apis/supervisor/config/v1alpha1" - pinnipedfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" - pinnipedinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" + supervisorfake "go.pinniped.dev/generated/latest/client/supervisor/clientset/versioned/fake" + supervisorinformers "go.pinniped.dev/generated/latest/client/supervisor/informers/externalversions" "go.pinniped.dev/internal/controllerlib" "go.pinniped.dev/internal/testutil" ) @@ -38,7 +38,7 @@ func TestTLSCertObserverControllerInformerFilters(t *testing.T) { r = require.New(t) observableWithInformerOption = testutil.NewObservableWithInformerOption() secretsInformer := k8sinformers.NewSharedInformerFactory(nil, 0).Core().V1().Secrets() - federationDomainInformer := pinnipedinformers.NewSharedInformerFactory(nil, 0).Config().V1alpha1().FederationDomains() + federationDomainInformer := supervisorinformers.NewSharedInformerFactory(nil, 0).Config().V1alpha1().FederationDomains() _ = NewTLSCertObserverController( nil, "", // don't care about the secret name for this test @@ -131,9 +131,9 @@ func TestTLSCertObserverControllerSync(t *testing.T) { var ( r *require.Assertions subject controllerlib.Controller - pinnipedInformerClient *pinnipedfake.Clientset + pinnipedInformerClient *supervisorfake.Clientset kubeInformerClient *kubernetesfake.Clientset - pinnipedInformers pinnipedinformers.SharedInformerFactory + pinnipedInformers supervisorinformers.SharedInformerFactory kubeInformers k8sinformers.SharedInformerFactory cancelContext context.Context cancelContextCancelFunc context.CancelFunc @@ -182,8 +182,8 @@ func TestTLSCertObserverControllerSync(t *testing.T) { kubeInformerClient = kubernetesfake.NewSimpleClientset() kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0) - pinnipedInformerClient = pinnipedfake.NewSimpleClientset() - pinnipedInformers = pinnipedinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) + pinnipedInformerClient = supervisorfake.NewSimpleClientset() + pinnipedInformers = supervisorinformers.NewSharedInformerFactory(pinnipedInformerClient, 0) issuerTLSCertSetter = &fakeIssuerTLSCertSetter{} unrelatedSecret := &corev1.Secret{