Merge pull request #3308 from tonistiigi/ci-fmt-err

ci: unbreak linter

cmd/buildctl/debug/logs.go

@@ -1,7 +1,6 @@
 package debug
 
 import (
-	"fmt"
 	"io"
 	"os"
 
@@ -30,7 +29,7 @@ var LogsCommand = cli.Command{
 func logs(clicontext *cli.Context) error {
 	args := clicontext.Args()
 	if len(args) == 0 {
-		return fmt.Errorf("build ref must be specified")
+		return errors.Errorf("build ref must be specified")
 	}
 	ref := args[0]
 

exporter/containerimage/attestations.go

@@ -41,56 +41,54 @@ func supplementSBOM(ctx context.Context, s session.Group, target cache.Immutable
 	}
 
 	doc, err := decodeSPDX(content)
-	if err != nil {
-		return att, err
-	}
-
-	layers, err := newFileLayerFinder(target, targetRemote)
-	if err != nil {
-		return att, err
-	}
-	modifyFile := func(f *spdx.File2_2) error {
-		if f.FileComment != "" {
-			// Skip over files that already have a comment - since the data is
-			// unstructured, we can't correctly overwrite this field without
-			// possibly breaking some scanner functionality.
-			return nil
+	if err == nil {
+		layers, err := newFileLayerFinder(target, targetRemote)
+		if err != nil {
+			return att, err
 		}
+		modifyFile := func(f *spdx.File2_2) error {
+			if f.FileComment != "" {
+				// Skip over files that already have a comment - since the data is
+				// unstructured, we can't correctly overwrite this field without
+				// possibly breaking some scanner functionality.
+				return nil
+			}
 
-		_, desc, err := layers.find(ctx, s, f.FileName)
-		if err != nil {
-			if !errors.Is(err, fs.ErrNotExist) {
-				return err
+			_, desc, err := layers.find(ctx, s, f.FileName)
+			if err != nil {
+				if !errors.Is(err, fs.ErrNotExist) {
+					return err
+				}
+				return nil
 			}
+			f.FileComment = fmt.Sprintf("layerID: %s", desc.Digest.String())
 			return nil
 		}
-		f.FileComment = fmt.Sprintf("layerID: %s", desc.Digest.String())
-		return nil
-	}
-	for _, f := range doc.UnpackagedFiles {
-		if err := modifyFile(f); err != nil {
-			return att, err
-		}
-	}
-	for _, p := range doc.Packages {
-		for _, f := range p.Files {
+		for _, f := range doc.UnpackagedFiles {
 			if err := modifyFile(f); err != nil {
 				return att, err
 			}
 		}
-	}
+		for _, p := range doc.Packages {
+			for _, f := range p.Files {
+				if err := modifyFile(f); err != nil {
+					return att, err
+				}
+			}
+		}
 
-	doc.CreationInfo.CreatorTools = append(doc.CreationInfo.CreatorTools, "buildkit-"+version.Version)
+		doc.CreationInfo.CreatorTools = append(doc.CreationInfo.CreatorTools, "buildkit-"+version.Version)
 
-	dt, err := encodeSPDX(doc)
-	if err != nil {
-		return att, err
+		content, err = encodeSPDX(doc)
+		if err != nil {
+			return att, err
+		}
 	}
 
 	return result.Attestation{
 		Kind:        att.Kind,
 		Path:        att.Path,
-		ContentFunc: func() ([]byte, error) { return dt, nil },
+		ContentFunc: func() ([]byte, error) { return content, nil },
 		InToto:      att.InToto,
 	}, nil
 }