all: fix a few staticcheck warnings

Unnecessary fmt.Sprintf calls, better error names, unused code,
and actually use fillManifestDescriptors.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I550563080eac2fae586a4ec1515cae4f35e4165f
Dispatch-Trailer: {"type":"trybot","CL":1199016,"patchset":1,"ref":"refs/changes/16/1199016/1","targetBranch":"main"}

Author: mvdan

ociregistry/ociauth/auth_test.go

@@ -212,7 +212,7 @@ func TestAuthNotAvailableAfterChallenge(t *testing.T) {
 			return &httpError{
 				statusCode: http.StatusUnauthorized,
 				header: http.Header{
-					"Www-Authenticate": []string{fmt.Sprintf("Basic service=someService")},
+					"Www-Authenticate": []string{"Basic service=someService"},
 				},
 			}
 		}
@@ -788,7 +788,7 @@ func (tok token) String() string {
 func runNonFatal(t *testing.T, f func(t testing.TB)) (ok bool) {
 	defer func() {
 		switch e := recover(); e {
-		case failNow, skipNow:
+		case errFailNow, errSkipNow:
 			ok = false
 		case nil:
 		default:
@@ -800,8 +800,8 @@ func runNonFatal(t *testing.T, f func(t testing.TB)) (ok bool) {
 }
 
 var (
-	failNow = errors.New("failing now")
-	skipNow = errors.New("skipping now")
+	errFailNow = errors.New("failing now")
+	errSkipNow = errors.New("skipping now")
 )
 
 type nonFatalT struct {
@@ -811,7 +811,7 @@ type nonFatalT struct {
 func (t nonFatalT) FailNow() {
 	t.Helper()
 	t.Fail()
-	panic(failNow)
+	panic(errFailNow)
 }
 
 func (t nonFatalT) Fatal(args ...any) {
@@ -833,7 +833,7 @@ func (t nonFatalT) Skip(args ...any) {
 }
 
 func (t nonFatalT) SkipNow() {
-	panic(skipNow)
+	panic(errSkipNow)
 }
 
 func (t nonFatalT) Skipf(format string, args ...any) {

ociregistry/ociauth/authfile_test.go

@@ -433,8 +433,8 @@ func helperMain() int {
 		fmt.Printf(`
 {
 	"Username": "someuser",
-	"Secret": ` + fmt.Sprintf("%q", os.Getenv("TEST_SECRET")) + `
-}`)
+	"Secret": %q
+}`, os.Getenv("TEST_SECRET"))
 	case "registry-with-error.com":
 		fmt.Fprintf(os.Stderr, "some error\n")
 		return 1

ociregistry/ocimem/desciter.go

@@ -2,7 +2,6 @@ package ocimem
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	"cuelabs.dev/go/oci/ociregistry"
@@ -31,8 +30,6 @@ var manifestIterators = map[string]func(data []byte) (descIter, error){
 	ocispec.MediaTypeImageIndex:    descIterForType(indexDescIter),
 }
 
-var errUnknownManifestMediaTypeForIteration = errors.New("cannot determine references in unknown media type")
-
 // manifestReferences returns an iterator that iterates over all
 // direct references inside the given manifest described byx the
 // given descriptor that holds the given data.

ociregistry/ocitest/ocitest.go

@@ -208,11 +208,7 @@ func completedManifests(repoc RepoContent, blobs map[string]ociregistry.Descript
 				*m1.Subject = mc.desc
 				madeProgress = true
 			}
-			m1.Config = fillBlobDescriptor(m.Config, blobs)
-			m1.Layers = make([]ociregistry.Descriptor, len(m.Layers))
-			for i, desc := range m.Layers {
-				m1.Layers[i] = fillBlobDescriptor(desc, blobs)
-			}
+			m1 = fillManifestDescriptors(m1, blobs)
 			data, err := json.Marshal(m1)
 			if err != nil {
 				panic(err)