refactor: apply gopls modernize improvements

verifiers/internal/gcb/provenance.go

@@ -149,7 +149,7 @@ func (p *Provenance) VerifyTextProvenance() error {
 		return err
 	}
 
-	var unverifiedTextIntotoStatement interface{}
+	var unverifiedTextIntotoStatement any
 	switch predicateType {
 	case v10.PredicateSLSAProvenance:
 		unverifiedTextIntotoStatement = &v10.Provenance{
@@ -193,10 +193,8 @@ func (p *Provenance) validateBuilderID(id string) error {
 	default:
 		return fmt.Errorf("%w: unknown predicate type: %v", serrors.ErrorInvalidDssePayload, predicateType)
 	}
-	for _, b := range builders {
-		if id == b {
-			return nil
-		}
+	if slices.Contains(builders, id) {
+		return nil
 	}
 	return serrors.ErrorInvalidBuilderID
 }
@@ -329,7 +327,7 @@ func (p *Provenance) VerifyBuilder(builderOpts *options.BuilderOpts) (*utils.Tru
 			return nil, fmt.Errorf("%w: expected %q, got %q", serrors.ErrorInvalidFormat, v01.PredicateSLSAProvenance, predicateType)
 		}
 		expectedType := "type.googleapis.com/google.devtools.cloudbuild.v1.Build"
-		args, ok := v.Recipe.Arguments.(map[string]interface{})
+		args, ok := v.Recipe.Arguments.(map[string]any)
 		if !ok {
 			return nil, fmt.Errorf("%w: recipe arguments is not a map", serrors.ErrorInvalidDssePayload)
 		}
@@ -348,7 +346,7 @@ func (p *Provenance) VerifyBuilder(builderOpts *options.BuilderOpts) (*utils.Tru
 	return provBuilderID, nil
 }
 
-func getAsString(m map[string]interface{}, key string) (string, error) {
+func getAsString(m map[string]any, key string) (string, error) {
 	t, ok := m["@type"]
 	if !ok {
 		return "", fmt.Errorf("%w: '%s' field is absent", serrors.ErrorInvalidDssePayload, key)

verifiers/internal/gcb/slsaprovenance/iface/provenance.go

@@ -7,7 +7,7 @@ import (
 // Provenance represents provenance for a predicate type and build type.
 type Provenance interface {
 	// Predicate returns the predicate.
-	Predicate() (interface{}, error)
+	Predicate() (any, error)
 
 	// PredicateType returns the predicate type.
 	PredicateType() (string, error)

verifiers/internal/gcb/slsaprovenance/v0.1/provenance.go

@@ -57,9 +57,9 @@ type ProvenanceRecipe struct {
 	// DefinedInMaterial can be sent as the null pointer to indicate that
 	// the value is not present.
 	// DefinedInMaterial *int        `json:"definedInMaterial,omitempty"`
-	EntryPoint  string      `json:"entryPoint"`
-	Arguments   interface{} `json:"arguments,omitempty"`
-	Environment interface{} `json:"environment,omitempty"`
+	EntryPoint  string `json:"entryPoint"`
+	Arguments   any    `json:"arguments,omitempty"`
+	Environment any    `json:"environment,omitempty"`
 }
 
 // ProvenanceMetadata contains metadata for the built artifact.
@@ -145,7 +145,7 @@ func (p *Provenance) SourceBranch() (string, error) {
 	return "", fmt.Errorf("%w: branch verification", serrors.ErrorNotSupported)
 }
 
-func (p *Provenance) Predicate() (interface{}, error) {
+func (p *Provenance) Predicate() (any, error) {
 	return p.Pred, nil
 }
 
@@ -170,7 +170,7 @@ func (p *Provenance) BuildType() (string, error) {
 // BuildType implements Statement.GetSystemParameters.
 func (p *Provenance) GetSystemParameters() (map[string]any, error) {
 	arguments := p.Pred.Recipe.Arguments
-	argsMap, ok := arguments.(map[string]interface{})
+	argsMap, ok := arguments.(map[string]any)
 	if !ok {
 		return nil, fmt.Errorf("%w: cannot cast arguments as map", common.ErrSubstitution)
 	}
@@ -180,7 +180,7 @@ func (p *Provenance) GetSystemParameters() (map[string]any, error) {
 		return nil, fmt.Errorf("%w: no 'substitutions' field", common.ErrSubstitution)
 	}
 
-	m, ok := substitutions.(map[string]interface{})
+	m, ok := substitutions.(map[string]any)
 	if !ok {
 		return nil, fmt.Errorf("%w: cannot convert substitutions to a map", common.ErrSubstitution)
 	}

verifiers/internal/gcb/slsaprovenance/v1.0/provenance.go

@@ -58,7 +58,7 @@ func New(payload []byte) (iface.Provenance, error) {
 	return &provenance, nil
 }
 
-func (p *Provenance) Predicate() (interface{}, error) {
+func (p *Provenance) Predicate() (any, error) {
 	return p.Pred, nil
 }
 
@@ -82,7 +82,7 @@ func (p *Provenance) BuildType() (string, error) {
 
 // GetSystemParameters implements Provenance.GetSystemParameters.
 func (p *Provenance) GetSystemParameters() (map[string]any, error) {
-	sysParams, ok := p.Pred.BuildDefinition.InternalParameters.(map[string]interface{})
+	sysParams, ok := p.Pred.BuildDefinition.InternalParameters.(map[string]any)
 	if !ok {
 		return nil, fmt.Errorf("%w: system parameters type", serrors.ErrorInvalidDssePayload)
 	}
@@ -122,7 +122,7 @@ func getSubstitutionsField(sysParams map[string]any, name string) (string, error
 	if !ok {
 		return "", fmt.Errorf("%w: substitution entry %q not found", common.ErrSubstitution, "systemSubstitutions")
 	}
-	substitutionsMap, ok := substitutions.(map[string]interface{})
+	substitutionsMap, ok := substitutions.(map[string]any)
 	if !ok {
 		return "", fmt.Errorf("%w: no entry '%v' in substitution map", common.ErrSubstitution, "systemSubstitutions")
 	}
@@ -145,7 +145,7 @@ func (p *Provenance) SourceBranch() (string, error) {
 }
 
 func (p *Provenance) externalParameters() (map[string]any, error) {
-	extParams, ok := p.Pred.BuildDefinition.ExternalParameters.(map[string]interface{})
+	extParams, ok := p.Pred.BuildDefinition.ExternalParameters.(map[string]any)
 	if !ok {
 		return nil, fmt.Errorf("%w: system parameters type", serrors.ErrorInvalidDssePayload)
 	}

verifiers/internal/gha/provenance_forgeable.go

@@ -280,7 +280,7 @@ func verifyNpmCLIGithubActionsV1SystemParameters(prov *slsav1.NpmCLIGithubAction
 	if err != nil {
 		return err
 	}
-	githubParams, ok := sysParams["github"].(map[string]interface{})
+	githubParams, ok := sysParams["github"].(map[string]any)
 	if !ok {
 		return fmt.Errorf("%w: %s", serrors.ErrorInvalidFormat, "github parameters")
 	}