From fb6ec15f2439123d154c7b58583c0d7a0863aa5d Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Thu, 19 Mar 2026 12:46:08 -0700 Subject: [PATCH] remove some now-unused linter directives --- cmd/pinniped/cmd/kubeconfig_test.go | 3 +-- internal/controller/apicerts/apiservice_updater_test.go | 3 +-- internal/controller/apicerts/update_api_service_test.go | 3 +-- internal/controller/kubecertagent/kubecertagent_test.go | 3 +-- internal/crud/crud_test.go | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/pinniped/cmd/kubeconfig_test.go b/cmd/pinniped/cmd/kubeconfig_test.go index 5142d0d52..83ed8d128 100644 --- a/cmd/pinniped/cmd/kubeconfig_test.go +++ b/cmd/pinniped/cmd/kubeconfig_test.go @@ -1,4 +1,4 @@ -// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package cmd @@ -3858,7 +3858,6 @@ 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 := kubefake.NewClientset() if tt.kubeObjects != nil { diff --git a/internal/controller/apicerts/apiservice_updater_test.go b/internal/controller/apicerts/apiservice_updater_test.go index 603c50101..448e9f5cd 100644 --- a/internal/controller/apicerts/apiservice_updater_test.go +++ b/internal/controller/apicerts/apiservice_updater_test.go @@ -1,4 +1,4 @@ -// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package apicerts @@ -150,7 +150,6 @@ func TestAPIServiceUpdaterControllerSync(t *testing.T) { kubeInformerClient = kubefake.NewClientset() kubeInformers = k8sinformers.NewSharedInformerFactory(kubeInformerClient, 0) - //nolint:staticcheck // as of v0.35.0, this package does not offer a NewClientset() function aggregatorAPIClient = aggregatorfake.NewSimpleClientset() }) diff --git a/internal/controller/apicerts/update_api_service_test.go b/internal/controller/apicerts/update_api_service_test.go index ddd6fe7bb..6f3b87c7e 100644 --- a/internal/controller/apicerts/update_api_service_test.go +++ b/internal/controller/apicerts/update_api_service_test.go @@ -1,4 +1,4 @@ -// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package apicerts @@ -206,7 +206,6 @@ 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) diff --git a/internal/controller/kubecertagent/kubecertagent_test.go b/internal/controller/kubecertagent/kubecertagent_test.go index eb8ba951b..42530f0c2 100644 --- a/internal/controller/kubecertagent/kubecertagent_test.go +++ b/internal/controller/kubecertagent/kubecertagent_test.go @@ -1,4 +1,4 @@ -// Copyright 2021-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2021-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package kubecertagent @@ -1781,7 +1781,6 @@ func TestAgentController(t *testing.T) { 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) diff --git a/internal/crud/crud_test.go b/internal/crud/crud_test.go index 9dd396c30..34966f940 100644 --- a/internal/crud/crud_test.go +++ b/internal/crud/crud_test.go @@ -1,4 +1,4 @@ -// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package crud @@ -1291,7 +1291,6 @@ 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 := kubefake.NewSimpleClientset() if tt.mocks != nil { tt.mocks(t, client)