make fix-golangci-lint

Signed-off-by: Erik Godding Boye <[email protected]>

Author: erikgb

driver/server.go

@@ -101,7 +101,7 @@ func parseEndpoint(ep string) (string, string, error) {
 }
 
 func loggingInterceptor(log logr.Logger) grpc.UnaryServerInterceptor {
-	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
 		log := log.WithValues("rpc_method", info.FullMethod, "request", protosanitizer.StripSecrets(req))
 		log.V(3).Info("handling request")
 		resp, err := handler(ctx, req)

examples/simple/main.go

@@ -36,14 +36,13 @@ import (
 	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
 	"github.com/cert-manager/cert-manager/pkg/util/pki"
-	"k8s.io/client-go/rest"
-	"k8s.io/klog/v2/klogr"
-	"k8s.io/utils/clock"
-
 	"github.com/cert-manager/csi-lib/driver"
 	"github.com/cert-manager/csi-lib/manager"
 	"github.com/cert-manager/csi-lib/metadata"
 	"github.com/cert-manager/csi-lib/storage"
+	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2/klogr"
+	"k8s.io/utils/clock"
 )
 
 const (
@@ -345,7 +344,7 @@ func keyUsagesFromAttributes(usagesCSV string) []cmapi.KeyUsage {
 	}
 
 	var keyUsages []cmapi.KeyUsage
-	for _, usage := range strings.Split(usagesCSV, ",") {
+	for usage := range strings.SplitSeq(usagesCSV, ",") {
 		keyUsages = append(keyUsages, cmapi.KeyUsage(strings.TrimSpace(usage)))
 	}
 

manager/manager.go

@@ -170,7 +170,7 @@ func NewManager(opts Options) (*Manager, error) {
 	// registered with the factory
 	lister := informerFactory.Certmanager().V1().CertificateRequests().Lister()
 	if _, err := informerFactory.Certmanager().V1().CertificateRequests().Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
-		DeleteFunc: func(obj interface{}) {
+		DeleteFunc: func(obj any) {
 			requestToPrivateKeyLock.Lock()
 			defer requestToPrivateKeyLock.Unlock()
 			key, ok := obj.(string)

manager/manager_test.go

@@ -46,8 +46,7 @@ import (
 )
 
 func TestManager_ManageVolumeImmediate_issueOnceAndSucceed(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	opts := newDefaultTestOptions(t)
 	m, err := NewManager(opts)
@@ -251,8 +250,7 @@ func TestManager_ResumesManagementOfExistingVolumes(t *testing.T) {
 }
 
 func TestManager_ManageVolume_beginsManagingAndProceedsIfNotReady(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	opts := newDefaultTestOptions(t)
 	m, err := NewManager(opts)

storage/memory.go

@@ -18,6 +18,7 @@ package storage
 
 import (
 	"encoding/json"
+	"maps"
 	"sync"
 
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
@@ -133,9 +134,7 @@ func (m *MemoryFS) WriteFiles(meta metadata.Metadata, files map[string][]byte) e
 	if !ok {
 		return ErrNotFound
 	}
-	for k, v := range files {
-		vol[k] = v
-	}
+	maps.Copy(vol, files)
 	return nil
 }
 
@@ -148,8 +147,6 @@ func (m *MemoryFS) ReadFiles(volumeID string) (map[string][]byte, error) {
 	}
 	// make a copy of the map to ensure no races can occur
 	cpy := make(map[string][]byte)
-	for k, v := range vol {
-		cpy[k] = v
-	}
+	maps.Copy(cpy, vol)
 	return cpy, nil
 }

test/integration/issuance_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package integration
 
 import (
-	"context"
 	"crypto"
 	"crypto/x509"
 	"os"
@@ -62,8 +61,7 @@ vnEIALrtIClFU6D/mTU5wyHhN29llwfjUgJrmYWqoWTZSiwGS6YmZpry
 -----END CERTIFICATE-----`)
 
 func TestIssuesCertificate(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	store := storage.NewMemoryFS()
 	clock := fakeclock.NewFakeClock(time.Now())
@@ -127,8 +125,7 @@ func TestIssuesCertificate(t *testing.T) {
 }
 
 func TestManager_CleansUpOldRequests(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	store := storage.NewMemoryFS()
 	clock := fakeclock.NewFakeClock(time.Now())