revert lint revert changes

.github/workflows/lint_and_test.yaml

@@ -44,8 +44,7 @@ jobs:
           cache_name: run-tests-go-cache
 
       - name: Test
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make build install-requirements test
+        run: make build install-requirements test
 
   go-lint:
     name: Lint Golang
@@ -79,11 +78,6 @@ jobs:
           cache_name: golint-go-cache
 
       - name: Install goimports
-        run: |
-          go install golang.org/x/tools/cmd/goimports@latest
-      - name: Setup lint
-        run: |
-          make -f hack/Makefile golangci-lint
+        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Lint
-        run: |
-          PATH=$PATH:$(go env GOPATH)/bin make check
+        run: make check

Makefile

@@ -62,8 +62,9 @@ format:
 	@$(REPO_ROOT)/hack/format.sh $(EFFECTIVE_DIRECTORIES)
 
 .PHONY: check
-check:
-	@$(REPO_ROOT)/hack/check.sh --golangci-lint-config=./.golangci.yaml $(EFFECTIVE_DIRECTORIES)
+check: ## Run golangci-lint.
+	make -f hack/Makefile golangci-lint
+	golangci-lint run --timeout 10m --config .github/config/golangci.yaml $(EFFECTIVE_DIRECTORIES)
 
 .PHONY: check-and-fix
 check-and-fix:

api/credentials/utils.go

@@ -109,25 +109,25 @@ func GuessConsumerType(ctxp ContextProvider, spec string) string {
 			}
 		}
 		if fix == "" {
-			min := -1
+			minVal := -1
 			for _, i := range matchers.List() {
 				idx := strings.Index(i.Type, ".")
 				if idx > 0 {
 					d := levenshtein.DistanceForStrings([]rune(lspec), []rune(strings.ToLower(i.Type[:idx])), levenshtein.DefaultOptions)
-					if d < 5 && fix == "" || min > d {
+					if d < 5 && fix == "" || minVal > d {
 						fix = i.Type
-						min = d
+						minVal = d
 					}
 				}
 			}
 		}
 		if fix == "" {
-			min := -1
+			minVal := -1
 			for _, i := range matchers.List() {
 				d := levenshtein.DistanceForStrings([]rune(lspec), []rune(strings.ToLower(i.Type)), levenshtein.DefaultOptions)
-				if d < 5 && fix == "" || min > d {
+				if d < 5 && fix == "" || minVal > d {
 					fix = i.Type
-					min = d
+					minVal = d
 				}
 			}
 		}

api/oci/cpi/support/artifact.go

@@ -145,6 +145,7 @@ func (a *ArtifactAccessImpl) ManifestAccess(v cpi.ArtifactAccess) internal.Manif
 			return nil
 		}
 	}
+
 	return NewManifestForArtifact(v, a)
 }
 
@@ -177,7 +178,7 @@ func (a *ArtifactAccessImpl) GetBlob(digest digest.Digest) (cpi.BlobAccess, erro
 	if d != nil {
 		size, data, err := a.container.GetBlobData(digest)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("failed to get blob data for artifact access with digest %s: %w", digest.String(), err)
 		}
 		err = AdjustSize(d, size)
 		if err != nil {

api/oci/extensions/repositories/docker/convert.go

@@ -73,7 +73,7 @@ func (a *artBlobCache) Unref() error {
 func (a *artBlobCache) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
 	blob, err := a.access.GetBlob(digest)
 	if err != nil {
-		return -1, nil, err
+		return -1, nil, fmt.Errorf("error getting blob for docker repo %s: %w", digest, err)
 	}
 	return blob.Size(), blob, err
 }

api/ocm/cpi/repocpi/bridge_cv.go

@@ -326,8 +326,6 @@ func (b *componentVersionAccessBridge) AddBlob(blob cpi.BlobAccess, artType, ref
 	} else {
 		if !optionutils.AsValue(opts.UseNoDefaultIfNotSet) {
 			prov = internal.BlobHandlerProviderForRegistry(ctx.BlobHandlers())
-		} else { //nolint: staticcheck // yes
-			// use no blob uploader
 		}
 	}
 	if prov != nil {

api/ocm/extensions/repositories/genericocireg/componentversion.go

@@ -275,10 +275,10 @@ func (c *ComponentVersionContainer) evalLayer(s compdesc.AccessSpec) (compdesc.A
 	if d != nil {
 		// find layer
 		layers := c.manifest.GetDescriptor().Layers
-		max := len(layers) - 1
+		maxLen := len(layers) - 1
 		for i := range layers {
 			l := layers[len(layers)-1-i]
-			if i < max && l.Digest == d.Digest && (d.Digest == "" || d.Digest == l.Digest) {
+			if i < maxLen && l.Digest == d.Digest && (d.Digest == "" || d.Digest == l.Digest) {
 				return s, len(layers) - 1 - i, nil
 			}
 		}

api/ocm/tools/signing/digest.go

@@ -91,13 +91,13 @@ func VerifyResourceDigest(cv ocm.ComponentVersionAccess, i int, bacc ocm.DataAcc
 	hasher := registry.GetHasher(dtype.HashAlgorithm)
 	digest, err := octx.BlobDigesters().DetermineDigests(raw.Type, hasher, registry, meth, req...)
 	if err != nil {
-		return false, errors.Wrapf(err, resMsg(raw, acc.Describe(octx), "failed determining digest for resource"))
+		return false, errors.Wrap(err, resMsg(raw, acc.Describe(octx), "failed determining digest for resource"))
 	}
 	if len(digest) == 0 {
-		return false, errors.Newf(resMsg(raw, acc.Describe(octx), "no digester accepts resource"))
+		return false, errors.New(resMsg(raw, acc.Describe(octx), "no digester accepts resource"))
 	}
 	if !checkDigest(rdigest, &digest[0]) {
-		return true, errors.Newf(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], rdigest))
+		return true, errors.New(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], rdigest))
 	}
 	return true, nil
 }

api/ocm/tools/signing/handle.go

@@ -562,36 +562,36 @@ func calculateReferenceDigests(state WalkingState, opts *Options, legacy bool) (
 		}
 		nested, err := opts.Resolver.LookupComponentVersion(reference.GetComponentName(), reference.GetVersion())
 		if err != nil {
-			return errors.Wrapf(err, refMsg(reference, "failed resolving component reference"))
+			return errors.Wrap(err, refMsg(reference, "failed resolving component reference"))
 		}
 		loop.Close(nested)
 
 		if nctx == nil || opts.Recursively || opts.Verify {
 			digestOpts := opts.Nested()
 			nctx, err = apply(state, nested, digestOpts, false)
 			if err != nil {
-				return errors.Wrapf(err, refMsg(reference, "failed applying to component reference"))
+				return errors.Wrap(err, refMsg(reference, "failed applying to component reference"))
 			}
 		} else {
 			state.Logger.Debug("accepting digest from context", "reference", reference)
 			opts.Printer.Printf("  accepting digest from context for %s", reference)
 			if err != nil {
-				return errors.Wrapf(err, refMsg(reference, "failed applying to component reference"))
+				return errors.Wrap(err, refMsg(reference, "failed applying to component reference"))
 			}
 		}
 		if reference.Digest != nil {
 			if ctx.IsRoot() {
 				if DigesterType(reference.Digest) == DigesterType(nctx.Digest) {
 					if nctx.Digest != nil && !reflect.DeepEqual(reference.Digest, nctx.Digest) {
-						return errors.Newf(refMsg(reference, "calculated reference digest (%+v) mismatches existing digest (%+v) for", nctx.Digest, reference.Digest))
+						return errors.New(refMsg(reference, "calculated reference digest (%+v) mismatches existing digest (%+v) for", nctx.Digest, reference.Digest))
 					}
 				}
 			}
 			pre := ctx.In[nctx.Key]
 			if pre != nil {
 				if DigesterType(pre.Digest) == DigesterType(nctx.Digest) {
 					if nctx.Digest != nil && !reflect.DeepEqual(pre.Digest, nctx.Digest) {
-						return errors.Newf(refMsg(reference, "calculated reference digest (%+v) mismatches existing digest (%+v) for", nctx.Digest, reference.Digest))
+						return errors.New(refMsg(reference, "calculated reference digest (%+v) mismatches existing digest (%+v) for", nctx.Digest, reference.Digest))
 					}
 				}
 			}
@@ -674,14 +674,14 @@ func calculateResourceDigests(state WalkingState, cv ocm.ComponentVersionAccess,
 			return errors.Wrapf(err, resMsg(raw, acc.Describe(octx), "failed determining digest for resource"))
 		}
 		if len(digest) == 0 {
-			return errors.Newf(resMsg(raw, acc.Describe(octx), "no digester accepts resource"))
+			return errors.New(resMsg(raw, acc.Describe(octx), "no digester accepts resource"))
 		}
 		if !checkDigest(rdigest, &digest[0]) {
-			return errors.Newf(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], rdigest))
+			return errors.New(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], rdigest))
 		}
 		if NormalizedDigesterType(raw.Digest) == NormalizedDigesterType(&digest[0]) {
 			if !checkDigest(raw.Digest, &digest[0]) {
-				return errors.Newf(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], raw.Digest))
+				return errors.New(resMsg(raw, acc.Describe(octx), "calculated resource digest (%+v) mismatches existing digest (%+v) for", &digest[0], raw.Digest))
 			}
 		}
 		cd.Resources[i].Digest = &digest[0]

api/utils/accessio/cache.go

@@ -426,7 +426,7 @@ func (c *cached) cleanup() error {
 func (a *cached) GetBlobData(digest digest.Digest) (int64, blobaccess.DataAccess, error) {
 	err := a.Ref()
 	if err != nil {
-		return blobaccess.BLOB_UNKNOWN_SIZE, nil, err
+		return blobaccess.BLOB_UNKNOWN_SIZE, nil, fmt.Errorf("failed to get ref: %w", err)
 	}
 	defer a.Unref()
 

api/utils/runtime/scheme.go

@@ -54,7 +54,7 @@ func MustNewDirectDecoder[T TypedObject](proto T) *DirectDecoder[T] {
 
 func NewDirectDecoder[T TypedObject](proto T) (*DirectDecoder[T], error) {
 	t := MustProtoType(proto)
-	if !reflect.PtrTo(t).Implements(typeTypedObject) {
+	if !reflect.PointerTo(t).Implements(typeTypedObject) {
 		return nil, errors.Newf("object interface %T: must implement TypedObject", proto)
 	}
 	if t.Kind() != reflect.Struct {
@@ -197,10 +197,10 @@ func NewDefaultScheme[T TypedObject, R TypedObjectDecoder[T]](protoUnstr Unstruc
 		if err != nil {
 			return nil, errors.Wrapf(err, "unstructured prototype %T", protoUnstr)
 		}
-		if !reflect.PtrTo(ut).Implements(it) {
+		if !reflect.PointerTo(ut).Implements(it) {
 			return nil, fmt.Errorf("unstructured type %T must implement %T to be acceptale as unknown result", protoUnstr, &protoIfce)
 		}
-		if !reflect.PtrTo(ut).Implements(typeUnknown) {
+		if !reflect.PointerTo(ut).Implements(typeUnknown) {
 			return nil, fmt.Errorf("unstructured type %T must implement Unknown to be acceptable as unknown result", protoUnstr)
 		}
 	}

api/utils/spiff/options.go

@@ -1,8 +1,6 @@
 package spiff
 
 import (
-	"fmt"
-
 	"github.com/mandelsoft/goutils/errors"
 	"github.com/mandelsoft/goutils/sliceutils"
 	"github.com/mandelsoft/spiff/spiffing"
@@ -98,7 +96,7 @@ func StubData(name string, data []byte) OptionFunction {
 func TemplateData(name string, data []byte) OptionFunction {
 	return func(r *Request) error {
 		if len(data) == 0 {
-			return fmt.Errorf("no template data for " + name)
+			return errors.New("no template data for " + name)
 		}
 		r.Template = spiffing.NewSourceData(name, data)
 		return nil

api/version/version.go

@@ -55,24 +55,24 @@ func Current() string {
 	return Get().SemVer()
 }
 
-// GetInterface returns the overall codebase version. It's for detecting
+// Get returns the overall codebase version. It's for detecting
 // what code a binary was built from.
 // These variables typically come from -ldflags settings and in
 // their absence fallback to the settings in pkg/version/base.go.
 func Get() Info {
 	var (
 		gitMajor string
 		gitMinor string
-		gitPatch string = "0"
+		gitPatch = "0"
 		gitPre   string
 		gitMeta  string
 	)
 
 	v, err := semver.NewVersion(gitVersion)
 	if err == nil {
-		gitMajor = strconv.Itoa(int(v.Major()))
-		gitMinor = strconv.Itoa(int(v.Minor()))
-		gitPatch = strconv.Itoa(int(v.Patch()))
+		gitMajor = strconv.FormatUint(v.Major(), 10)
+		gitMinor = strconv.FormatUint(v.Minor(), 10)
+		gitPatch = strconv.FormatUint(v.Patch(), 10)
 		gitPre = v.Prerelease()
 		gitMeta = v.Metadata()
 	} else {

cmds/ocm/commands/controllercmds/common/manifests.go

@@ -98,7 +98,7 @@ func fetchObjects(ctx context.Context, octx clictx.Context, releaseURL, baseURL,
 			return nil, fmt.Errorf("✗ failed to read %s file at location: %w", filename, err)
 		}
 
-		out.Outf(octx, string(content))
+		out.Out(octx, string(content))
 
 		return nil, nil
 	}

cmds/ocm/commands/misccmds/rsakeypair/cmd.go

@@ -155,7 +155,7 @@ func (o *Command) Complete(args []string) error {
 		o.RootCertPool = rootcertsattr.Get(o.Context).GetRootCertPool(true)
 	}
 
-	if o.attrs != nil && len(o.attrs) > 0 {
+	if len(o.attrs) > 0 {
 		var subject pkix.Name
 		for k, v := range o.attrs {
 			switch strings.ToLower(k) {

cmds/ocm/commands/ocmcmds/common/cmds/signing/cmd.go

@@ -132,7 +132,7 @@ func NewAction(desc []string, ctx ocm.Context, p common.Printer, sopts *signing.
 		state:        signing.NewWalkingState(ctx.LoggingContext().WithContext(signing.REALM)),
 		baseresolver: sopts.Resolver,
 		sopts:        sopts,
-		errlist:      errors.ErrListf(desc[1]),
+		errlist:      errors.ErrList(desc[1]),
 	}
 }
 

cmds/ocm/common/output/complexoutput.go

@@ -83,6 +83,6 @@ func (this *ComplexProcessingOutput) out(gap string, m map[string]interface{}) {
 	}
 	s, err := yaml.Marshal(rest)
 	if err == nil {
-		Outf(this.Context, utils.IndentLines(string(s), gap))
+		Out(this.Context, utils.IndentLines(string(s), gap))
 	}
 }

cmds/ocm/common/output/table.go

@@ -9,8 +9,8 @@ import (
 
 func FormatTable(ctx Context, gap string, data [][]string) {
 	columns := []int{}
-	max := 0
-	maxtitle := 0
+	maxValue := 0
+	maxTitle := 0
 
 	formats := []string{}
 	if len(data) > 1 {
@@ -21,8 +21,8 @@ func FormatTable(ctx Context, gap string, data [][]string) {
 			} else {
 				formats = append(formats, "-")
 			}
-			if len(data[0][i]) > maxtitle {
-				maxtitle = len(data[0][i])
+			if len(data[0][i]) > maxTitle {
+				maxTitle = len(data[0][i])
 			}
 		}
 	}
@@ -35,13 +35,13 @@ func FormatTable(ctx Context, gap string, data [][]string) {
 			} else if columns[i] < l {
 				columns[i] = l
 			}
-			if l > max {
-				max = l
+			if l > maxValue {
+				maxValue = l
 			}
 		}
 	}
 
-	if len(columns) > 2 && max > 200 {
+	if len(columns) > 2 && maxValue > 200 {
 		first := []string{}
 		setSep := false
 		for i, row := range data {
@@ -50,7 +50,7 @@ func FormatTable(ctx Context, gap string, data [][]string) {
 			} else {
 				for c, col := range row {
 					if c < len(first) {
-						Outf(ctx, "%s%-*s: %s\n", gap, maxtitle, first[c], col)
+						Outf(ctx, "%s%-*s: %s\n", gap, maxTitle, first[c], col)
 					} else {
 						Outf(ctx, "%s%d: %s\n", gap, c, col)
 					}