Update attest pkg tests

Signed-off-by: Adolfo García Veytia (Puerco) <puerco@carabiner.dev>

Author: puerco

internal/cmd/prov.go

@@ -34,7 +34,6 @@ func (po *provOptions) AddFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVar(&po.prevCommit, "prev_commit", "", "The commit prior to 'commit'.")
 }
 
-//nolint:dupl
 func addProv(parentCmd *cobra.Command) {
 	opts := provOptions{}
 	provCmd := &cobra.Command{

internal/cmd/verifycommit.go

@@ -57,7 +57,6 @@ func (vco *verifyCommitOptions) AddFlags(cmd *cobra.Command) {
 	)
 }
 
-//nolint:dupl
 func addVerifyCommit(cmd *cobra.Command) {
 	opts := verifyCommitOptions{}
 	verifyCommitCmd := &cobra.Command{
@@ -104,11 +103,11 @@ func addVerifyCommit(cmd *cobra.Command) {
 			var refName string
 			switch {
 			case opts.branch != "":
-				//ref = ghcontrol.BranchToFullRef(opts.branch)
+				// ref = ghcontrol.BranchToFullRef(opts.branch)
 				refType = "branch"
 				refName = opts.branch
 			case opts.tag != "":
-				//ref = ghcontrol.TagToFullRef(opts.tag)
+				// ref = ghcontrol.TagToFullRef(opts.tag)
 				refType = "tag"
 				refName = opts.tag
 			default:

pkg/attest/attester.go

@@ -13,13 +13,14 @@ import (
 	"github.com/carabiner-dev/attestation"
 	"github.com/carabiner-dev/collector"
 	intoto "github.com/in-toto/attestation/go/v1"
-	"github.com/slsa-framework/source-tool/pkg/provenance"
-	"github.com/slsa-framework/source-tool/pkg/slsa"
-	"github.com/slsa-framework/source-tool/pkg/sourcetool/models"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
+
+	"github.com/slsa-framework/source-tool/pkg/provenance"
+	"github.com/slsa-framework/source-tool/pkg/slsa"
+	"github.com/slsa-framework/source-tool/pkg/sourcetool/models"
 )
 
 type AttesterOptions struct {
@@ -97,7 +98,7 @@ func WithNotesCollector(yesno bool) optFn {
 
 // Validate checks that the attester configuration is complete
 func (a *Attester) Validate() error {
-	var errs = []error{}
+	errs := []error{}
 	if a.backend == nil {
 		errs = append(errs, errors.New("attester has no backend defined"))
 	}
@@ -147,7 +148,7 @@ func (a *Attester) createCurrentProvenance(ctx context.Context, branch *models.B
 	}
 
 	// Build the provenance predicate
-	var curProvPred = provenance.SourceProvenancePred{
+	curProvPred := provenance.SourceProvenancePred{
 		PrevCommit:   prevCommit.SHA,
 		RepoUri:      branch.Repository.GetHttpURL(),
 		ActivityType: controlStatus.ActivityType,

pkg/attest/log.go

@@ -9,6 +9,5 @@ import (
 )
 
 func Debugf(format string, args ...any) {
-	//nolint:gosec // G706 This is feneral purpose logger
 	slog.Debug(fmt.Sprintf(format, args...))
 }

pkg/attest/provenance.go

@@ -181,7 +181,6 @@ func (a *Attester) GetRevisionVSA(ctx context.Context, branch *models.Branch, co
 
 	// None of the collected attestations are valid
 	return nil, nil, nil
-
 }
 
 // GetRevisionProvenance returns the provenance attestation for a commit by querying
@@ -247,14 +246,14 @@ func (a *Attester) CreateSourceProvenance(ctx context.Context, branch *models.Br
 		return nil, fmt.Errorf("creating provenance predicate: %w", err)
 	}
 
-	//prevProvStmt, prevProvPred, err := a.GetRevisionProvenance(ctx, branch, prevCommit)
+	// prevProvStmt, prevProvPred, err := a.GetRevisionProvenance(ctx, branch, prevCommit)
 	prevProvPred, err := a.GetRevisionProvenance(ctx, branch, prevCommit)
 	if err != nil {
 		return nil, err
 	}
 
 	// No prior provenance found, so we just go with current.
-	//if prevProvStmt == nil || prevProvPred == nil {
+	// if prevProvStmt == nil || prevProvPred == nil {
 	if prevProvPred == nil {
 		Debugf("No previous provenance found, have to bootstrap\n")
 		return curProv, nil