Merge pull request #865 from vaikas/lints

Fix lints, or ignore safe ones. No functional changes.

pkg/build/cache.go

@@ -35,11 +35,7 @@ func loadConfig(configFile string, rootNode *yaml.Node) error {
 		return err
 	}
 
-	if err := yaml.Unmarshal(configData, rootNode); err != nil {
-		return err
-	}
-
-	return nil
+	return yaml.Unmarshal(configData, rootNode)
 }
 
 // visitFetch processes a fetch node, updating the cache membership map.

pkg/build/package.go

@@ -499,7 +499,7 @@ func (pc *PackageBuild) EmitPackage(ctx context.Context) error {
 	if pc.wantSignature() {
 		signatureData, err := EmitSignature(ctx, pc.Signer(), controlSectionData, pc.Build.SourceDateEpoch)
 		if err != nil {
-			return fmt.Errorf("emitting signature: %v", err)
+			return fmt.Errorf("emitting signature: %w", err)
 		}
 
 		combinedParts = append([]io.Reader{bytes.NewReader(signatureData)}, combinedParts...)

pkg/build/runner.go

@@ -2,20 +2,20 @@ package build
 
 import "runtime"
 
-type runner string
+type Runner string
 
 const (
-	runnerBubblewrap runner = "bubblewrap"
-	runnerDocker     runner = "docker"
-	runnerLima       runner = "lima"
-	runnerKubernetes runner = "kubernetes"
+	runnerBubblewrap Runner = "bubblewrap"
+	runnerDocker     Runner = "docker"
+	runnerLima       Runner = "lima"
+	runnerKubernetes Runner = "kubernetes"
 	// more to come
 )
 
 // GetDefaultRunner returns the default runner to use.
 // Currently, this is bubblewrap, but will be replaced with determining by platform.
-func GetDefaultRunner() runner {
-	var r runner
+func GetDefaultRunner() Runner {
+	var r Runner
 	switch runtime.GOOS {
 	case "linux":
 		r = runnerBubblewrap
@@ -29,8 +29,8 @@ func GetDefaultRunner() runner {
 }
 
 // GetAllRunners returns a list of all valid runners.
-func GetAllRunners() []runner {
-	return []runner{
+func GetAllRunners() []Runner {
+	return []Runner{
 		runnerBubblewrap,
 		runnerDocker,
 		runnerLima,

pkg/build/sca_interface.go

@@ -31,25 +31,25 @@ type SCABuildInterface struct {
 }
 
 // PackageName returns the currently built package name.
-func (sca *SCABuildInterface) PackageName() string {
-	return sca.PackageBuild.PackageName
+func (scabi *SCABuildInterface) PackageName() string {
+	return scabi.PackageBuild.PackageName
 }
 
 // RelativeNames returns all the package names relating to the package being
 // built.
-func (sca *SCABuildInterface) RelativeNames() []string {
-	targets := []string{sca.PackageBuild.Origin.Name}
+func (scabi *SCABuildInterface) RelativeNames() []string {
+	targets := []string{scabi.PackageBuild.Origin.Name}
 
-	for _, target := range sca.PackageBuild.Build.Configuration.Subpackages {
+	for _, target := range scabi.PackageBuild.Build.Configuration.Subpackages {
 		targets = append(targets, target.Name)
 	}
 
 	return targets
 }
 
 // Version returns the version of the package being built including epoch.
-func (sca *SCABuildInterface) Version() string {
-	return fmt.Sprintf("%s-r%d", sca.PackageBuild.Origin.Version, sca.PackageBuild.Origin.Epoch)
+func (scabi *SCABuildInterface) Version() string {
+	return fmt.Sprintf("%s-r%d", scabi.PackageBuild.Origin.Version, scabi.PackageBuild.Origin.Epoch)
 }
 
 // FilesystemForRelative implements an abstract filesystem for any of the packages being
@@ -66,21 +66,21 @@ func (scabi *SCABuildInterface) FilesystemForRelative(pkgName string) (sca.SCAFS
 }
 
 // Filesystem implements an abstract filesystem providing access to a package filesystem.
-func (sca *SCABuildInterface) Filesystem() (sca.SCAFS, error) {
-	return sca.FilesystemForRelative(sca.PackageName())
+func (scabi *SCABuildInterface) Filesystem() (sca.SCAFS, error) {
+	return scabi.FilesystemForRelative(scabi.PackageName())
 }
 
 // Logger returns a logger for use by the SCA engine.
-func (sca *SCABuildInterface) Logger() log.Logger {
-	return sca.PackageBuild.Logger
+func (scabi *SCABuildInterface) Logger() log.Logger {
+	return scabi.PackageBuild.Logger
 }
 
 // Options returns the configured SCA engine options for the package being built.
-func (sca *SCABuildInterface) Options() config.PackageOption {
-	return sca.PackageBuild.Options
+func (scabi *SCABuildInterface) Options() config.PackageOption {
+	return scabi.PackageBuild.Options
 }
 
 // BaseDependencies returns the base dependencies for the package being built.
-func (sca *SCABuildInterface) BaseDependencies() config.Dependencies {
-	return sca.PackageBuild.Dependencies
+func (scabi *SCABuildInterface) BaseDependencies() config.Dependencies {
+	return scabi.PackageBuild.Dependencies
 }

pkg/build/sign.go

@@ -4,6 +4,8 @@ import (
 	"archive/tar"
 	"bytes"
 	"context"
+
+	//nolint:gosec
 	"crypto/sha1"
 	"fmt"
 	"os"
@@ -73,6 +75,7 @@ type KeyApkSigner struct {
 }
 
 func (s KeyApkSigner) Sign(control []byte) ([]byte, error) {
+	//nolint:gosec
 	digest := sha1.New()
 
 	_, err := digest.Write(control)

pkg/build/sign_test.go

@@ -84,6 +84,7 @@ func TestEmitSignature(t *testing.T) {
 	}
 
 	_, err = tr.Next()
+	//nolint:errorlint
 	if err != io.EOF {
 		t.Fatalf("Expected tar EOF")
 	}