mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-07-27 10:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix deprecation of NewSimpleClientset by using NewClientset or ignoring

Browse Source
This commit is contained in:
Ryan Richard
2025-12-19 12:00:56 -08:00
parent 10444fb9a3
commit 9d1c65c3e6
48 changed files with 180 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/pinniped/cmd/kubeconfig_test.go
+3
View File
@@ -3858,14 +3858,17 @@ func TestGetKubeconfig(t *testing.T) {
if tt.getClientsetErr != nil {
return nil, nil, nil, tt.getClientsetErr
}
//nolint:staticcheck // as of v0.35.0, this package does not offer a NewClientset() function
fakeAggregatorClient := aggregatorfake.NewSimpleClientset(tt.apiServiceObjects...)
fakeKubeClient := fake.NewClientset()
if tt.kubeObjects != nil {
kubeObjects := tt.kubeObjects(string(testServerCA))
fakeKubeClient = fake.NewClientset(kubeObjects...)
}
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakeConciergeClient := conciergefake.NewSimpleClientset()
if tt.conciergeObjects != nil {
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakeConciergeClient = conciergefake.NewSimpleClientset(tt.conciergeObjects(string(testServerCA), testServer.URL)...)
}
if len(tt.conciergeReactions) > 0 {
cmd/pinniped/cmd/whoami_test.go
+1
View File
@@ -293,6 +293,7 @@ func TestWhoami(t *testing.T) {
if test.gettingClientsetErr != nil {
return nil, nil, nil, test.gettingClientsetErr
}
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
conciergeClient := conciergefake.NewSimpleClientset()
conciergeClient.PrependReactor("create", "whoamirequests", func(_ kubetesting.Action) (bool, runtime.Object, error) {
if test.callingAPIErr != nil {
internal/admissionpluginconfig/admissionpluginconfig_test.go
+2 -2
View File
@@ -235,10 +235,10 @@ func TestConfigureAdmissionPlugins(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClient := kubernetesfake.NewSimpleClientset()
kubeClient := kubernetesfake.NewClientset()
kubeClient.Resources = tt.availableAPIResources
// Unfortunately, kubernetesfake.NewSimpleClientset() does not support using reactors to
// Unfortunately, NewClientset() does not support using reactors to
// cause discovery to return errors. Instead, we will make our own fake implementation of the
// discovery client's interface and only mock the parts that we need for this test.
discoveryClient := newFakeDiscoveryClient(kubeClient)
internal/clusterhost/clusterhost_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2021-2023 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package clusterhost
@@ -143,7 +143,7 @@ func TestHasControlPlaneNodes(t *testing.T) {
for _, tt := range tests {
test := tt
t.Run(test.name, func(t *testing.T) {
kubeClient := kubernetesfake.NewSimpleClientset()
kubeClient := kubernetesfake.NewClientset()
if test.listNodesErr != nil {
listNodesErr := test.listNodesErr
kubeClient.PrependReactor(
internal/controller/apicerts/apiservice_updater_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package apicerts
@@ -148,8 +148,9 @@ func TestAPIServiceUpdaterControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
//nolint:staticcheck // as of v0.35.0, this package does not offer a NewClientset() function
aggregatorAPIClient = aggregatorfake.NewSimpleClientset()
})
internal/controller/apicerts/certs_expirer_test.go
+4 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package apicerts
@@ -90,7 +90,7 @@ func TestExpirerControllerFilters(t *testing.T) {
t.Parallel()
secretsInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
withInformer := testutil.NewObservableWithInformerOption()
@@ -224,7 +224,7 @@ func TestExpirerControllerSync(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
kubeAPIClient := kubernetesfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewClientset()
if test.configKubeAPIClient != nil {
test.configKubeAPIClient(kubeAPIClient)
}
@@ -232,7 +232,7 @@ func TestExpirerControllerSync(t *testing.T) {
testRV := "rv_001"
testUID := types.UID("uid_002")
kubeInformerClient := kubernetesfake.NewSimpleClientset()
kubeInformerClient := kubernetesfake.NewClientset()
name := certsSecretResourceName
namespace := "some-namespace"
if test.fillSecretData != nil {
internal/controller/apicerts/certs_manager_test.go
+3 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package apicerts
@@ -170,9 +170,9 @@ func TestManagerControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
kubeAPIClient = kubernetesfake.NewSimpleClientset()
kubeAPIClient = kubernetesfake.NewClientset()
})
it.After(func() {
internal/controller/apicerts/certs_observer_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package apicerts
@@ -144,7 +144,7 @@ func TestObserverControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
dynamicCertProvider = dynamiccert.NewServingCert(name)
})
internal/controller/apicerts/update_api_service_test.go
+2 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package apicerts
@@ -206,6 +206,7 @@ func TestUpdateAPIService(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
ctx := context.Background()
//nolint:staticcheck // as of v0.35.0, this package does not offer a NewClientset() function
client := aggregatorv1fake.NewSimpleClientset()
if tt.mocks != nil {
tt.mocks(client)
internal/controller/authenticator/cachecleaner/cachecleaner_test.go
+2 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package cachecleaner
@@ -137,6 +137,7 @@ 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?
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakeClient := conciergefake.NewSimpleClientset(tt.objects...)
informers := conciergeinformers.NewSharedInformerFactory(fakeClient, 0)
cache := authncache.New()
internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go
+6 -3
View File
@@ -2987,12 +2987,13 @@ func TestController(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset(tt.jwtAuthenticators...)
if tt.configClient != nil {
tt.configClient(pinnipedAPIClient)
}
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
kubeInformers := k8sinformers.NewSharedInformerFactory(kubernetesfake.NewSimpleClientset(tt.secretsAndConfigMaps...), 0)
kubeInformers := k8sinformers.NewSharedInformerFactory(kubernetesfake.NewClientset(tt.secretsAndConfigMaps...), 0)
cache := authncache.New()
logger, log := plog.TestLogger(t)
@@ -3535,9 +3536,10 @@ func TestControllerFilterSecret(t *testing.T) {
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset()
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
observableInformers := testutil.NewObservableWithInformerOption()
@@ -3595,9 +3597,10 @@ func TestControllerFilterConfigMap(t *testing.T) {
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset()
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
observableInformers := testutil.NewObservableWithInformerOption()
internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go
+6 -3
View File
@@ -2118,12 +2118,13 @@ func TestController(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset(tt.webhookAuthenticators...)
if tt.configClient != nil {
tt.configClient(pinnipedAPIClient)
}
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
kubeInformers := k8sinformers.NewSharedInformerFactory(kubernetesfake.NewSimpleClientset(tt.secretsAndConfigMaps...), 0)
kubeInformers := k8sinformers.NewSharedInformerFactory(kubernetesfake.NewClientset(tt.secretsAndConfigMaps...), 0)
cache := authncache.New()
logger, log := plog.TestLogger(t)
@@ -2377,9 +2378,10 @@ func TestControllerFilterSecret(t *testing.T) {
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset()
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
observableInformers := testutil.NewObservableWithInformerOption()
@@ -2440,9 +2442,10 @@ func TestControllerFilterConfigMap(t *testing.T) {
nowDoesntMatter := time.Date(1122, time.September, 33, 4, 55, 56, 778899, time.Local)
frozenClock := clocktesting.NewFakeClock(nowDoesntMatter)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := conciergefake.NewSimpleClientset()
pinnipedInformers := conciergeinformers.NewSharedInformerFactory(pinnipedAPIClient, 0)
observableInformers := testutil.NewObservableWithInformerOption()
internal/controller/impersonatorconfig/impersonator_config_test.go
+4 -2
View File
@@ -1128,14 +1128,16 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
queue = &testQueue{}
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient = conciergefake.NewSimpleClientset()
pinnipedInformers = conciergeinformers.NewSharedInformerFactoryWithOptions(pinnipedInformerClient, 0)
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactoryWithOptions(kubeInformerClient, 0,
k8sinformers.WithNamespace(installedInNamespace),
)
kubeAPIClient = kubernetesfake.NewSimpleClientset()
kubeAPIClient = kubernetesfake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient = conciergefake.NewSimpleClientset()
frozenNow = time.Date(2021, time.March, 2, 7, 42, 0, 0, time.Local)
mTLSClientCertProvider = dynamiccert.NewCA(name)
internal/controller/kubecertagent/kubecertagent_test.go
+2
View File
@@ -1777,9 +1777,11 @@ func TestAgentController(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
conciergeClientset := conciergefake.NewSimpleClientset(tt.pinnipedObjects...)
conciergeInformers := conciergeinformers.NewSharedInformerFactory(conciergeClientset, 0)
//nolint:staticcheck // using NewClientset() is possible here, but it will require updating test expectations
kubeClientset := kubefake.NewSimpleClientset(tt.kubeObjects...)
if tt.addKubeReactions != nil {
tt.addKubeReactions(kubeClientset)
internal/controller/kubecertagent/legacypodcleaner_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2021-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package kubecertagent
@@ -142,7 +142,7 @@ func TestLegacyPodCleanerController(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClientset := kubefake.NewSimpleClientset(tt.kubeObjects...)
kubeClientset := kubefake.NewClientset(tt.kubeObjects...)
if tt.addKubeReactions != nil {
tt.addKubeReactions(kubeClientset)
}
internal/controller/serviceaccounttokencleanup/legacy_service_account_token_cleanup_controller_test.go
+3 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2023-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2023-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package serviceaccounttokencleanup
@@ -173,8 +173,8 @@ func TestSync(t *testing.T) {
func setupKubernetes(t *testing.T, namespace string) (*kubernetesfake.Clientset, kubeinformers.SharedInformerFactory) {
t.Helper()
kubeAPIClient := kubernetesfake.NewSimpleClientset()
kubeInformerClient := kubernetesfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewClientset()
kubeInformerClient := kubernetesfake.NewClientset()
kubeInformers := kubeinformers.NewSharedInformerFactory(
kubeInformerClient,
internal/controller/supervisorconfig/activedirectoryupstreamwatcher/active_directory_upstream_watcher_test.go
+9 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package activedirectoryupstreamwatcher
@@ -95,10 +95,11 @@ func TestActiveDirectoryUpstreamWatcherControllerFilterSecrets(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
activeDirectoryIDPInformer := pinnipedInformers.IDP().V1alpha1().ActiveDirectoryIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -140,10 +141,11 @@ func TestActiveDirectoryUpstreamWatcherControllerFilterConfigMaps(t *testing.T)
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
activeDirectoryIDPInformer := pinnipedInformers.IDP().V1alpha1().ActiveDirectoryIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -185,10 +187,11 @@ func TestActiveDirectoryUpstreamWatcherControllerFilterActiveDirectoryIdentityPr
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
activeDirectoryIDPInformer := pinnipedInformers.IDP().V1alpha1().ActiveDirectoryIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -2307,9 +2310,10 @@ func TestActiveDirectoryUpstreamWatcherControllerSync(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...)
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
fakeKubeClient := fake.NewSimpleClientset(tt.inputK8sObjects...)
fakeKubeClient := fake.NewClientset(tt.inputK8sObjects...)
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
cache.SetActiveDirectoryIdentityProviders([]upstreamprovider.UpstreamLDAPIdentityProviderI{
internal/controller/supervisorconfig/federation_domain_watcher_test.go
+3 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package supervisorconfig
@@ -2087,7 +2087,9 @@ func TestTestFederationDomainWatcherControllerSync(t *testing.T) {
t.Parallel()
federationDomainsSetter := &fakeFederationDomainsSetter{}
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := supervisorfake.NewSimpleClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient := supervisorfake.NewSimpleClientset()
for _, o := range tt.inputObjects {
require.NoError(t, pinnipedAPIClient.Tracker().Add(o))
internal/controller/supervisorconfig/generator/federation_domain_secrets_test.go
+9 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package generator
@@ -180,10 +180,11 @@ func TestFederationDomainControllerFilterSecret(t *testing.T) {
)
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().FederationDomains()
@@ -242,10 +243,11 @@ func TestNewFederationDomainSecretsControllerFilterFederationDomain(t *testing.T
)
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().FederationDomains()
@@ -629,11 +631,13 @@ func TestFederationDomainSecretsControllerSync(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := supervisorfake.NewSimpleClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient := supervisorfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewSimpleClientset()
kubeInformerClient := kubernetesfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewClientset()
kubeInformerClient := kubernetesfake.NewClientset()
federationDomain := goodFederationDomain.DeepCopy()
secret := goodSecret.DeepCopy()
internal/controller/supervisorconfig/generator/supervisor_secrets_test.go
+5 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package generator
@@ -104,7 +104,7 @@ func TestSupervisorSecretsControllerFilterSecret(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.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.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
_ = NewSupervisorSecretsController(
@@ -420,11 +420,11 @@ func TestSupervisorSecretsControllerSync(t *testing.T) {
}
}
apiClient := kubernetesfake.NewSimpleClientset()
apiClient := kubernetesfake.NewClientset()
if test.apiClient != nil {
test.apiClient(t, apiClient)
}
informerClient := kubernetesfake.NewSimpleClientset()
informerClient := kubernetesfake.NewClientset()
storedSecret := generatedSecret.DeepCopy()
if test.storedSecret != nil {
internal/controller/supervisorconfig/githubupstreamwatcher/github_upstream_watcher_test.go
+16 -7
View File
@@ -2437,10 +2437,11 @@ func TestController(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakeSupervisorClient := supervisorfake.NewSimpleClientset(tt.githubIdentityProviders...)
supervisorInformers := supervisorinformers.NewSharedInformerFactory(fakeSupervisorClient, 0)
fakeKubeClient := kubernetesfake.NewSimpleClientset(tt.secretsAndConfigMaps...)
fakeKubeClient := kubernetesfake.NewClientset(tt.secretsAndConfigMaps...)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(fakeKubeClient, 0)
idpCache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
@@ -2830,14 +2831,16 @@ func TestController_OnlyWantActions(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakeSupervisorClient := supervisorfake.NewSimpleClientset(tt.githubIdentityProviders...)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorInformers := supervisorinformers.NewSharedInformerFactory(supervisorfake.NewSimpleClientset(tt.githubIdentityProviders...), 0)
if tt.addSupervisorReactors != nil {
tt.addSupervisorReactors(fakeSupervisorClient)
}
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(tt.secrets...), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(tt.secrets...), 0)
logger, _ := plog.TestLogger(t)
@@ -2957,7 +2960,7 @@ func TestGitHubUpstreamWatcherControllerFilterSecret(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0)
logger, _ := plog.TestLogger(t)
@@ -2967,7 +2970,9 @@ func TestGitHubUpstreamWatcherControllerFilterSecret(t *testing.T) {
_ = New(
"some-namespace",
dynamicupstreamprovider.NewDynamicUpstreamIDPProvider(),
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorinformers.NewSharedInformerFactory(supervisorfake.NewSimpleClientset(), 0).IDP().V1alpha1().GitHubIdentityProviders(),
secretInformer,
kubeInformers.Core().V1().ConfigMaps(),
@@ -3018,14 +3023,16 @@ func TestGitHubUpstreamWatcherControllerFilterConfigMaps(t *testing.T) {
logger, _ := plog.TestLogger(t)
observableInformers := testutil.NewObservableWithInformerOption()
configMapInformer := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0).Core().V1().ConfigMaps()
configMapInformer := k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0).Core().V1().ConfigMaps()
_ = New(
namespace,
dynamicupstreamprovider.NewDynamicUpstreamIDPProvider(),
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorinformers.NewSharedInformerFactory(supervisorfake.NewSimpleClientset(), 0).IDP().V1alpha1().GitHubIdentityProviders(),
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0).Core().V1().Secrets(),
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0).Core().V1().Secrets(),
configMapInformer,
logger,
observableInformers.WithInformer,
@@ -3074,15 +3081,17 @@ func TestGitHubUpstreamWatcherControllerFilterGitHubIDP(t *testing.T) {
logger, _ := plog.TestLogger(t)
observableInformers := testutil.NewObservableWithInformerOption()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
gitHubIdentityProviderInformer := supervisorinformers.NewSharedInformerFactory(supervisorfake.NewSimpleClientset(), 0).IDP().V1alpha1().GitHubIdentityProviders()
_ = New(
namespace,
dynamicupstreamprovider.NewDynamicUpstreamIDPProvider(),
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
gitHubIdentityProviderInformer,
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0).Core().V1().Secrets(),
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewSimpleClientset(), 0).Core().V1().ConfigMaps(),
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0).Core().V1().Secrets(),
k8sinformers.NewSharedInformerFactoryWithOptions(kubernetesfake.NewClientset(), 0).Core().V1().ConfigMaps(),
logger,
observableInformers.WithInformer,
clock.RealClock{},
internal/controller/supervisorconfig/jwks_observer_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package supervisorconfig
@@ -167,8 +167,9 @@ func TestJWKSObserverControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient = supervisorfake.NewSimpleClientset()
pinnipedInformers = supervisorinformers.NewSharedInformerFactory(pinnipedInformerClient, 0)
issuerToJWKSSetter = &fakeIssuerToJWKSMapSetter{}
internal/controller/supervisorconfig/jwks_writer_test.go
+9 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package supervisorconfig
@@ -171,10 +171,11 @@ func TestJWKSWriterControllerFilterSecret(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().FederationDomains()
@@ -224,10 +225,11 @@ func TestJWKSWriterControllerFilterFederationDomain(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
federationDomainInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().FederationDomains()
@@ -673,8 +675,8 @@ func TestJWKSWriterControllerSync(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
kubeAPIClient := kubernetesfake.NewSimpleClientset()
kubeInformerClient := kubernetesfake.NewSimpleClientset()
kubeAPIClient := kubernetesfake.NewClientset()
kubeInformerClient := kubernetesfake.NewClientset()
for _, secret := range test.secrets {
require.NoError(t, kubeAPIClient.Tracker().Add(secret))
require.NoError(t, kubeInformerClient.Tracker().Add(secret))
@@ -683,7 +685,9 @@ func TestJWKSWriterControllerSync(t *testing.T) {
test.configKubeClient(kubeAPIClient)
}
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedAPIClient := supervisorfake.NewSimpleClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient := supervisorfake.NewSimpleClientset()
for _, federationDomain := range test.federationDomains {
require.NoError(t, pinnipedAPIClient.Tracker().Add(federationDomain))
internal/controller/supervisorconfig/ldapupstreamwatcher/ldap_upstream_watcher_test.go
+9 -5
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package ldapupstreamwatcher
@@ -94,10 +94,11 @@ func TestLDAPUpstreamWatcherControllerFilterSecrets(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
ldapIDPInformer := pinnipedInformers.IDP().V1alpha1().LDAPIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -139,10 +140,11 @@ func TestLDAPUpstreamWatcherControllerFilterConfigMaps(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
ldapIDPInformer := pinnipedInformers.IDP().V1alpha1().LDAPIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -184,10 +186,11 @@ func TestLDAPUpstreamWatcherControllerFilterLDAPIdentityProviders(t *testing.T)
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
ldapIDPInformer := pinnipedInformers.IDP().V1alpha1().LDAPIdentityProviders()
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
secretInformer := kubeInformers.Core().V1().Secrets()
configMapInformer := kubeInformers.Core().V1().ConfigMaps()
@@ -1405,9 +1408,10 @@ func TestLDAPUpstreamWatcherControllerSync(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...)
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
fakeKubeClient := fake.NewSimpleClientset(tt.inputSecrets...)
fakeKubeClient := fake.NewClientset(tt.inputSecrets...)
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
cache.SetLDAPIdentityProviders([]upstreamprovider.UpstreamLDAPIdentityProviderI{
internal/controller/supervisorconfig/oidcclientwatcher/oidc_client_watcher_test.go
+8 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2022-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package oidcclientwatcher
@@ -63,10 +63,11 @@ func TestOIDCClientWatcherControllerFilterSecret(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
oidcClientsInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().OIDCClients()
@@ -132,10 +133,11 @@ func TestOIDCClientWatcherControllerFilterOIDCClient(t *testing.T) {
t.Parallel()
secretInformer := k8sinformers.NewSharedInformerFactory(
kubernetesfake.NewSimpleClientset(),
kubernetesfake.NewClientset(),
0,
).Core().V1().Secrets()
oidcClientsInformer := supervisorinformers.NewSharedInformerFactory(
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorfake.NewSimpleClientset(),
0,
).Config().V1alpha1().OIDCClients()
@@ -956,10 +958,12 @@ func TestOIDCClientWatcherControllerSync(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputObjects...)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClientForInformers := supervisorfake.NewSimpleClientset(tt.inputObjects...)
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClientForInformers, 0)
fakeKubeClient := kubernetesfake.NewSimpleClientset(tt.inputSecrets...)
fakeKubeClient := kubernetesfake.NewClientset(tt.inputSecrets...)
kubeInformers := k8sinformers.NewSharedInformerFactoryWithOptions(fakeKubeClient, 0)
controller := NewOIDCClientWatcherController(
internal/controller/supervisorconfig/oidcupstreamwatcher/oidc_upstream_watcher_test.go
+6 -3
View File
@@ -101,9 +101,10 @@ func TestOIDCUpstreamWatcherControllerFilterSecret(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
cache.SetOIDCIdentityProviders([]upstreamprovider.UpstreamOIDCIdentityProviderI{
@@ -161,9 +162,10 @@ func TestOIDCUpstreamWatcherControllerFilterConfigMaps(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset()
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
fakeKubeClient := fake.NewSimpleClientset()
fakeKubeClient := fake.NewClientset()
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
cache.SetOIDCIdentityProviders([]upstreamprovider.UpstreamOIDCIdentityProviderI{
@@ -1760,9 +1762,10 @@ func TestOIDCUpstreamWatcherControllerSync(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
fakePinnipedClient := supervisorfake.NewSimpleClientset(tt.inputUpstreams...)
pinnipedInformers := supervisorinformers.NewSharedInformerFactory(fakePinnipedClient, 0)
fakeKubeClient := fake.NewSimpleClientset(tt.inputResources...)
fakeKubeClient := fake.NewClientset(tt.inputResources...)
kubeInformers := informers.NewSharedInformerFactory(fakeKubeClient, 0)
cache := dynamicupstreamprovider.NewDynamicUpstreamIDPProvider()
cache.SetOIDCIdentityProviders([]upstreamprovider.UpstreamOIDCIdentityProviderI{
internal/controller/supervisorconfig/tls_cert_observer_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package supervisorconfig
@@ -180,8 +180,9 @@ func TestTLSCertObserverControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
pinnipedInformerClient = supervisorfake.NewSimpleClientset()
pinnipedInformers = supervisorinformers.NewSharedInformerFactory(pinnipedInformerClient, 0)
issuerTLSCertSetter = &fakeIssuerTLSCertSetter{}
internal/controller/supervisorstorage/garbage_collector_test.go
+3 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package supervisorstorage
@@ -179,8 +179,8 @@ func TestGarbageCollectorControllerSync(t *testing.T) {
cancelContext, cancelContextCancelFunc = context.WithCancel(context.Background())
kubeInformerClient = kubernetesfake.NewSimpleClientset()
kubeClient = kubernetesfake.NewSimpleClientset()
kubeInformerClient = kubernetesfake.NewClientset()
kubeClient = kubernetesfake.NewClientset()
kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0)
frozenNow = time.Now().UTC()
fakeClock = clocktesting.NewFakeClock(frozenNow)
internal/controller/tlsconfigutil/tls_config_util_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2024-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package tlsconfigutil
@@ -474,7 +474,7 @@ func TestValidateTLSConfig(t *testing.T) {
var secretsInformer corev1informers.SecretInformer
var configMapInformer corev1informers.ConfigMapInformer
fakeClient := fake.NewSimpleClientset(tt.k8sObjects...)
fakeClient := fake.NewClientset(tt.k8sObjects...)
sharedInformers := informers.NewSharedInformerFactory(fakeClient, 0)
configMapInformer = sharedInformers.Core().V1().ConfigMaps()
secretsInformer = sharedInformers.Core().V1().Secrets()
internal/controllerlib/test/integration/examplecontroller/controller/creating_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package controller
@@ -93,7 +93,7 @@ func TestNewExampleCreatingController(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
for i := range tt.args.services {
service := tt.args.services[i]
err := kubeClient.Tracker().Add(service)
internal/crud/crud_test.go
+2 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package crud
@@ -1291,6 +1291,7 @@ func TestStorage(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
//nolint:staticcheck // using NewClientset() is possible here, but it will require updating test expectations
client := fake.NewSimpleClientset()
if tt.mocks != nil {
tt.mocks(t, client)
internal/deploymentref/deploymentref_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2021-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package deploymentref
@@ -107,7 +107,7 @@ func TestNew(t *testing.T) {
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
client := kubefake.NewSimpleClientset(test.apiObjects...)
client := kubefake.NewClientset(test.apiObjects...)
if test.client != nil {
test.client(client)
}
internal/federationdomain/clientregistry/clientregistry_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2021-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package clientregistry
@@ -256,8 +256,9 @@ func TestClientManager(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
t.Parallel()
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
secrets := kubeClient.CoreV1().Secrets(testNamespace)
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients(testNamespace)
subject := NewClientManager(
internal/federationdomain/endpoints/auth/auth_handler_test.go
+4 -2
View File
@@ -4232,7 +4232,8 @@ func TestAuthorizationEndpoint(t *testing.T) { //nolint:gocyclo
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
secretsClient := kubeClient.CoreV1().Secrets("some-namespace")
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients("some-namespace")
@@ -4268,7 +4269,8 @@ func TestAuthorizationEndpoint(t *testing.T) { //nolint:gocyclo
// Double-check that we are re-using the happy path test case here as we intend.
require.Equal(t, "OIDC upstream browser flow happy path using GET without a CSRF cookie", test.name)
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
secretsClient := kubeClient.CoreV1().Secrets("some-namespace")
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients("some-namespace")
internal/federationdomain/endpoints/callback/callback_handler_test.go
+2 -1
View File
@@ -2166,7 +2166,8 @@ func TestCallbackEndpoint(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
secrets := kubeClient.CoreV1().Secrets("some-namespace")
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients("some-namespace")
internal/federationdomain/endpoints/login/post_login_handler_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2022-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package login
@@ -1296,7 +1296,8 @@ func TestPostLoginEndpoint(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
secretsClient := kubeClient.CoreV1().Secrets("some-namespace")
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients("some-namespace")
internal/federationdomain/endpoints/token/token_handler_test.go
+3 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package token
@@ -5216,7 +5216,8 @@ func exchangeAuthcodeForTokens(
test.modifyAuthRequest(authRequest)
}
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
secrets = kubeClient.CoreV1().Secrets("some-namespace")
oidcClientsClient := supervisorClient.ConfigV1alpha1().OIDCClients("some-namespace")
internal/federationdomain/endpointsmanager/manager_test.go
+2 -1
View File
@@ -345,8 +345,9 @@ func TestManager(t *testing.T) {
Build(),
).BuildDynamicUpstreamIDPProvider()
kubeClient = fake.NewSimpleClientset()
kubeClient = fake.NewClientset()
secretsClient := kubeClient.CoreV1().Secrets("some-namespace")
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
oidcClientsClient := supervisorfake.NewSimpleClientset().ConfigV1alpha1().OIDCClients("some-namespace")
cache := secret.Cache{}
internal/fositestorage/accesstoken/accesstoken_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package accesstoken
@@ -294,7 +294,7 @@ func TestCreateWithoutRequesterID(t *testing.T) {
}
func makeTestSubject(lifetimeFunc timeouts.StorageLifetime) (context.Context, *fake.Clientset, corev1client.SecretInterface, RevocationStorage) {
client := fake.NewSimpleClientset()
client := fake.NewClientset()
secrets := client.CoreV1().Secrets(namespace)
return context.Background(),
client,
internal/fositestorage/authorizationcode/authorizationcode_test.go
+3 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package authorizationcode
@@ -277,7 +277,7 @@ func TestCreateWithWrongRequesterDataTypes(t *testing.T) {
}
func makeTestSubject(lifetimeFunc timeouts.StorageLifetime) (context.Context, *fake.Clientset, corev1client.SecretInterface, fositeoauth2.AuthorizeCodeStorage) {
client := fake.NewSimpleClientset()
client := fake.NewClientset()
secrets := client.CoreV1().Secrets(namespace)
return context.Background(),
client,
@@ -387,7 +387,7 @@ func TestFuzzAndJSONNewValidEmptyAuthorizeCodeSession(t *testing.T) {
const name = "fuzz" // value is irrelevant
ctx := context.Background()
secrets := fake.NewSimpleClientset().CoreV1().Secrets(name)
secrets := fake.NewClientset().CoreV1().Secrets(name)
storage := New(secrets, func() time.Time { return fakeNow }, func(requester fosite.Requester) time.Duration { return lifetime })
// issue a create using the fuzzed request to confirm that marshalling works
internal/fositestorage/openidconnect/openidconnect_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package openidconnect
@@ -217,7 +217,7 @@ func TestAuthcodeHasNoDot(t *testing.T) {
}
func makeTestSubject(lifetimeFunc timeouts.StorageLifetime) (context.Context, *fake.Clientset, corev1client.SecretInterface, openid.OpenIDConnectRequestStorage) {
client := fake.NewSimpleClientset()
client := fake.NewClientset()
secrets := client.CoreV1().Secrets(namespace)
return context.Background(),
client,
internal/fositestorage/pkce/pkce_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package pkce
@@ -215,7 +215,7 @@ func TestCreateWithWrongRequesterDataTypes(t *testing.T) {
}
func makeTestSubject(lifetimeFunc timeouts.StorageLifetime) (context.Context, *fake.Clientset, corev1client.SecretInterface, pkce.PKCERequestStorage) {
client := fake.NewSimpleClientset()
client := fake.NewClientset()
secrets := client.CoreV1().Secrets(namespace)
return context.Background(),
client,
internal/fositestorage/refreshtoken/refreshtoken_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package refreshtoken
@@ -351,7 +351,7 @@ func TestCreateWithoutRequesterID(t *testing.T) {
}
func makeTestSubject(lifetimeFunc timeouts.StorageLifetime) (context.Context, *fake.Clientset, corev1client.SecretInterface, RevocationStorage) {
client := fake.NewSimpleClientset()
client := fake.NewClientset()
secrets := client.CoreV1().Secrets(namespace)
return context.Background(),
client,
internal/leaderelection/leaderelection_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2021-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package leaderelection
@@ -61,7 +61,7 @@ func Test_releaseLock_Update(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
internalClient := kubefake.NewSimpleClientset()
internalClient := kubefake.NewClientset()
isLeader := &isLeaderTracker{tracker: &atomic.Bool{}}
leaderElectorCtx, cancel := context.WithCancel(context.Background())
internal/localuserauthenticator/localuserauthenticator_test.go
+2 -2
View File
@@ -1,4 +1,4 @@
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package localuserauthenticator
@@ -50,7 +50,7 @@ func TestWebhook(t *testing.T) {
group0, group1 := "some-group-0", "some-group-1"
groups := group0 + " , " + group1
kubeClient := kubernetesfake.NewSimpleClientset()
kubeClient := kubernetesfake.NewClientset()
addSecretToFakeClientTracker(t, kubeClient, user, password, groups)
addSecretToFakeClientTracker(t, kubeClient, otherUser, otherPassword, groups)
addSecretToFakeClientTracker(t, kubeClient, colonUser, colonPassword, groups)
internal/oidcclientsecretstorage/oidcclientsecretstorage_test.go
+4 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2022-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2022-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package oidcclientsecretstorage
@@ -117,7 +117,7 @@ func TestGet(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
if tt.secret != nil {
require.NoError(t, kubeClient.Tracker().Add(tt.secret))
}
@@ -326,7 +326,7 @@ func TestSet(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
if tt.seedSecret != nil {
require.NoError(t, kubeClient.Tracker().Add(tt.seedSecret))
}
@@ -390,7 +390,7 @@ func TestGetStorageSecret(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
kubeClient := fake.NewSimpleClientset()
kubeClient := fake.NewClientset()
require.NoError(t, kubeClient.Tracker().Add(tt.secret))
subject := New(kubeClient.CoreV1().Secrets("some-namespace"))
internal/registry/clientsecretrequest/rest_test.go
+2 -1
View File
@@ -1628,7 +1628,7 @@ func TestCreate(t *testing.T) {
testutil.SetGlobalKlogLevel(t, originalKLogLevel) //nolint:staticcheck // old test of code using trace.Log()
})
kubeClient := kubefake.NewSimpleClientset()
kubeClient := kubefake.NewClientset()
secretsClient := kubeClient.CoreV1().Secrets(namespace)
// Production code depends on secrets having a resource version.
// Our seedHashes mechanism with the fake client unfortunately does not cause a resourceVersion to be set on the secret.
@@ -1644,6 +1644,7 @@ func TestCreate(t *testing.T) {
tt.seedHashes(oidcClientSecretStore)
}
//nolint:staticcheck // our codegen does not yet generate a NewClientset() function
supervisorClient := supervisorfake.NewSimpleClientset()
if tt.seedOIDCClients != nil {
for _, client := range tt.seedOIDCClients {
internal/tokenclient/tokenclient_test.go
+4 -4
View File
@@ -1,4 +1,4 @@
// Copyright 2023-2024 the Pinniped contributors. All Rights Reserved.
// Copyright 2023-2025 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package tokenclient
@@ -30,7 +30,7 @@ const (
func TestNew(t *testing.T) {
mockWhatToDoWithTokenFunc := *new(WhatToDoWithTokenFunc)
mockClient := fake.NewSimpleClientset().CoreV1().ServiceAccounts("")
mockClient := fake.NewClientset().CoreV1().ServiceAccounts("")
mockTime := time.Now()
mockClock := clocktesting.NewFakeClock(mockTime)
logger, _ := plog.TestLogger(t)
@@ -171,7 +171,7 @@ func TestFetchToken(t *testing.T) {
require.NotEmpty(t, tt.serviceAccountName)
mockClient := fake.NewSimpleClientset()
mockClient := fake.NewClientset()
tokenClient := New(
tt.serviceAccountName,
mockClient.CoreV1().ServiceAccounts("any-namespace-works"),
@@ -322,7 +322,7 @@ func TestStart(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
mockClient := fake.NewSimpleClientset()
mockClient := fake.NewClientset()
logger, _ := plog.TestLogger(t)
var mutex sync.Mutex