make fix-golangci-lint

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

Author: erikgb

internal/approver/evaluator/extensions_test.go

@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	disallowedX509KeyUsages = []interface{}{
+	disallowedX509KeyUsages = []any{
 		x509.KeyUsageContentCommitment,
 		x509.KeyUsageDataEncipherment,
 		x509.KeyUsageKeyAgreement,
@@ -39,12 +39,12 @@ var (
 		x509.KeyUsageDecipherOnly,
 	}
 
-	allowedX509KeyUsages = []interface{}{
+	allowedX509KeyUsages = []any{
 		x509.KeyUsageDigitalSignature,
 		x509.KeyUsageKeyEncipherment,
 	}
 
-	disallowedX509ExtKeyUsages = []interface{}{
+	disallowedX509ExtKeyUsages = []any{
 		x509.ExtKeyUsageAny,
 		x509.ExtKeyUsageCodeSigning,
 		x509.ExtKeyUsageEmailProtection,
@@ -59,7 +59,7 @@ var (
 		x509.ExtKeyUsageMicrosoftKernelCodeSigning,
 	}
 
-	allowedX509ExtKeyUsages = []interface{}{
+	allowedX509ExtKeyUsages = []any{
 		x509.ExtKeyUsageServerAuth,
 		x509.ExtKeyUsageClientAuth,
 	}
@@ -301,13 +301,13 @@ func Test_validateKeyUsageExtension(t *testing.T) {
 }
 
 // Adapted from https://github.com/mxschmitt/golang-combinations
-func powerset(set []interface{}) (subsets [][]interface{}) {
+func powerset(set []any) (subsets [][]any) {
 	length := uint(len(set))
 
 	// Go through all possible combinations of objects
 	// from 1 (only first object in subset) to 2^length (all objects in subset)
 	for subsetBits := 1; subsetBits < (1 << length); subsetBits++ {
-		var subset []interface{}
+		var subset []any
 
 		for object := range length {
 			// checks if object is contained in subset

internal/csi/driver/driver.go

@@ -23,6 +23,7 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
+	"maps"
 	"net/url"
 	"strings"
 	"sync"
@@ -437,19 +438,15 @@ func (d *Driver) Run(ctx context.Context) error {
 		d.driver.Stop()
 	}()
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		updateRetryPeriod := time.Second * 5
 		d.camanager.run(ctx, updateRetryPeriod)
-	}()
+	})
 
 	if d.hasRuntimeConfiguration() {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			d.watchRuntimeConfigurationSource(ctx)
-		}()
+		})
 	}
 
 	wg.Add(1)
@@ -534,9 +531,7 @@ func (d *Driver) generateRequest(meta metadata.Metadata) (*manager.CertificateRe
 		annotations.SPIFFEIdentityAnnnotationKey: spiffeID,
 	}
 
-	for key, value := range d.certificateRequestAnnotations {
-		crAnnotations[key] = value
-	}
+	maps.Copy(crAnnotations, d.certificateRequestAnnotations)
 
 	return &manager.CertificateRequestBundle{
 		Request: &x509.CertificateRequest{

test/e2e/e2e_test.go

@@ -26,7 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/cert-manager/csi-driver-spiffe/test/e2e/framework/config"
-
 	_ "github.com/cert-manager/csi-driver-spiffe/test/e2e/suite"
 )