Run go fix on codebase (#2299)

Just some stylistic cleanup.

Signed-off-by: Hayden <8418760+Hayden-IO@users.noreply.github.com>

Author: Hayden-IO

cmd/app/grpc.go

@@ -62,7 +62,7 @@ type grpcServer struct {
 }
 
 func PassFulcioConfigThruContext(cfg *config.FulcioConfig) grpc.UnaryServerInterceptor {
-	return func(ctx context.Context, req interface{}, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	return func(ctx context.Context, req any, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
 		// For each request, infuse context with our snapshot of the FulcioConfig.
 		// TODO(mattmoor): Consider periodically (every minute?) refreshing the ConfigMap
 		// from disk, so that we don't need to cycle pods to pick up config updates.
@@ -292,7 +292,7 @@ func createLegacyGRPCServer(cfg *config.FulcioConfig, unixDomainSocket string, v
 	return &grpcServer{myServer, unixDomainSocket, v2Server, nil}, nil
 }
 
-func panicRecoveryHandler(ctx context.Context, p interface{}) error {
+func panicRecoveryHandler(ctx context.Context, p any) error {
 	log.ContextLogger(ctx).Error(p)
 	return fmt.Errorf("panic: %v", p)
 }

cmd/app/serve.go

@@ -28,6 +28,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	"slices"
 	"strings"
 	"sync"
 	"syscall"
@@ -157,7 +158,7 @@ type logAdaptor struct {
 	logger *zap.SugaredLogger
 }
 
-func (la logAdaptor) Printf(s string, args ...interface{}) {
+func (la logAdaptor) Printf(s string, args ...any) {
 	la.logger.Infof(s, args...)
 }
 
@@ -431,11 +432,8 @@ func checkServeCmdConfigFile() error {
 		extWithDot := filepath.Ext(abspath)
 		ext := strings.TrimPrefix(extWithDot, ".")
 		var extIsValid bool
-		for _, validExt := range viper.SupportedExts {
-			if ext == validExt {
-				extIsValid = true
-				break
-			}
+		if slices.Contains(viper.SupportedExts, ext) {
+			extIsValid = true
 		}
 		if !extIsValid {
 			return fmt.Errorf("config file must have one of the following extensions: %s", strings.Join(viper.SupportedExts, ", "))

pkg/ca/common.go

@@ -20,6 +20,7 @@ import (
 	"crypto"
 	"crypto/x509"
 	"errors"
+	"slices"
 	"time"
 
 	"github.com/sigstore/fulcio/pkg/identity"
@@ -89,11 +90,8 @@ func VerifyCertChain(certs []*x509.Certificate, signer crypto.Signer) error {
 	// usage is set to satify extended key usage chainging
 	if len(certs) > 1 {
 		var hasExtKeyUsageCodeSigning bool
-		for _, extKeyUsage := range certs[0].ExtKeyUsage {
-			if extKeyUsage == x509.ExtKeyUsageCodeSigning {
-				hasExtKeyUsageCodeSigning = true
-				break
-			}
+		if slices.Contains(certs[0].ExtKeyUsage, x509.ExtKeyUsageCodeSigning) {
+			hasExtKeyUsageCodeSigning = true
 		}
 		if !hasExtKeyUsageCodeSigning {
 			return errors.New(`certificate must have extended key usage code signing set to sign code signing certificates`)

pkg/certmaker/template.go

@@ -40,7 +40,7 @@ var intermediateTemplate string
 //go:embed templates/leaf-template.json
 var leafTemplate string
 
-func ParseTemplate(input interface{}, parent *x509.Certificate, notAfter time.Time, publicKey crypto.PublicKey, commonName string) (*x509.Certificate, error) {
+func ParseTemplate(input any, parent *x509.Certificate, notAfter time.Time, publicKey crypto.PublicKey, commonName string) (*x509.Certificate, error) {
 	var content string
 
 	switch v := input.(type) {

pkg/certmaker/template_test.go

@@ -102,7 +102,7 @@ func TestParseTemplate(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			var content interface{}
+			var content any
 			if tt.filename == "nonexistent.json" {
 				content = struct{}{} // Use invalid type to trigger type error
 			} else {

pkg/config/config_test.go

@@ -891,8 +891,8 @@ func TestVerifierCacheWithCustomCA(t *testing.T) {
 			})
 		case "/keys":
 			w.Header().Set("Content-Type", "application/json")
-			json.NewEncoder(w).Encode(map[string]interface{}{
-				"keys": []interface{}{},
+			json.NewEncoder(w).Encode(map[string]any{
+				"keys": []any{},
 			})
 		default:
 			http.NotFound(w, r)
@@ -988,8 +988,8 @@ func TestVerifyK8sDefaultIssuer(t *testing.T) {
 			})
 		case "/keys":
 			w.Header().Set("Content-Type", "application/json")
-			json.NewEncoder(w).Encode(map[string]interface{}{
-				"keys": []interface{}{},
+			json.NewEncoder(w).Encode(map[string]any{
+				"keys": []any{},
 			})
 		default:
 			http.NotFound(w, r)

pkg/ctl/utils_test.go

@@ -37,7 +37,7 @@ func TestBuildCTChain(t *testing.T) {
 		t.Fatalf("CT chain length does not equal certificate chain length, got %v, expected %v", len(ctChain), len(certs))
 	}
 
-	for i := 0; i < len(certs); i++ {
+	for i := range certs {
 		if !reflect.DeepEqual(ctChain[i].Data, certs[i].Raw) {
 			t.Fatal("CT certificate and certificate do not match")
 		}

pkg/identity/buildkite/issuer_test.go

@@ -44,7 +44,7 @@ func TestIssuer(t *testing.T) {
 			Issuer:  "https://iss.example.com",
 			Subject: "organization:acme-inc:pipeline:bash-example:ref:refs/heads/main:commit:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:step:build",
 		}
-		claims, err := json.Marshal(map[string]interface{}{
+		claims, err := json.Marshal(map[string]any{
 			"aud":               "sigstore",
 			"exp":               0,
 			"iss":               "https://agent.buildkite.com",

pkg/identity/buildkite/principal_test.go

@@ -33,13 +33,13 @@ import (
 
 func TestJobPrincipalFromIDToken(t *testing.T) {
 	tests := map[string]struct {
-		Claims          map[string]interface{}
+		Claims          map[string]any
 		ExpectPrincipal jobPrincipal
 		WantErr         bool
 		ErrContains     string
 	}{
 		`Valid token authenticates with correct claims`: {
-			Claims: map[string]interface{}{
+			Claims: map[string]any{
 				"aud":               "sigstore",
 				"exp":               0,
 				"iss":               "https://agent.buildkite.com",
@@ -55,7 +55,7 @@ func TestJobPrincipalFromIDToken(t *testing.T) {
 			WantErr: false,
 		},
 		`Token missing organization_slug claim should be rejected`: {
-			Claims: map[string]interface{}{
+			Claims: map[string]any{
 				"aud":           "sigstore",
 				"exp":           0,
 				"iss":           "https://agent.buildkite.com",
@@ -66,7 +66,7 @@ func TestJobPrincipalFromIDToken(t *testing.T) {
 			ErrContains: "organization_slug",
 		},
 		`Token missing pipeline_slug claim should be rejected`: {
-			Claims: map[string]interface{}{
+			Claims: map[string]any{
 				"aud":               "sigstore",
 				"exp":               0,
 				"iss":               "https://agent.buildkite.com",
@@ -127,11 +127,11 @@ func withClaims(token *oidc.IDToken, data []byte) {
 
 func TestName(t *testing.T) {
 	tests := map[string]struct {
-		Claims     map[string]interface{}
+		Claims     map[string]any
 		ExpectName string
 	}{
 		`Valid token authenticates with correct claims`: {
-			Claims: map[string]interface{}{
+			Claims: map[string]any{
 				"aud":               "sigstore",
 				"exp":               0,
 				"iss":               "https://agent.buildkite.com",

pkg/identity/chainguard/issuer_test.go

@@ -51,7 +51,7 @@ func TestIssuer(t *testing.T) {
 			Issuer:  "https://iss.example.com",
 			Subject: id.String(),
 		}
-		claims, err := json.Marshal(map[string]interface{}{
+		claims, err := json.Marshal(map[string]any{
 			"iss": "https://iss.example.com",
 			"sub": id.String(),
 
@@ -63,7 +63,7 @@ func TestIssuer(t *testing.T) {
 				"sub": fmt.Sprintf("catalog-syncer:%s", group.String()),
 				"aud": "chainguard",
 			},
-			"internal": map[string]interface{}{
+			"internal": map[string]any{
 				"service-principal": "CATALOG_SYNCER",
 			},
 		})