all: run staticcheck and fix results

Change/remove some deprecated useages.

Wire up `cmdGetBlob` in `cmd/ocisrv` - although it's currently
unused, it might be useful in the future.

Signed-off-by: Roger Peppe <rogpeppe@gmail.com>
Change-Id: Ic77ed6a48599d8fbe8d1b6a32386ccf12ec1e9ea
Reviewed-on: https://review.gerrithub.io/c/cue-labs/oci/+/1218351
TryBot-Result: CUE porcuepine <cue.porcuepine@gmail.com>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>

Author: rogpeppe

cmd/ocisrv/main_test.go

@@ -48,12 +48,9 @@ func init() {
 }
 
 func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
-		"ocisrv": func() int {
-			main()
-			return 0
-		},
-	}))
+	testscript.Main(m, map[string]func(){
+		"ocisrv": main,
+	})
 }
 
 func TestScript(t *testing.T) {
@@ -65,6 +62,7 @@ func TestScript(t *testing.T) {
 		},
 		Cmds: map[string]func(ts *testscript.TestScript, neg bool, args []string){
 			"pushblob": cmdPushBlob,
+			"getblob":  cmdGetBlob,
 		},
 	})
 }

ociregistry/ociauth/authfile_test.go

@@ -16,9 +16,9 @@ import (
 func TestMain(m *testing.M) {
 	// We're using testscript, not for txtar tests,
 	// but to access the test executable functionality.
-	os.Exit(testscript.RunMain(m, map[string]func() int{
+	testscript.Main(m, map[string]func(){
 		"docker-credential-test": helperMain,
-	}))
+	})
 }
 
 func TestLoadWithNoConfig(t *testing.T) {
@@ -406,7 +406,7 @@ func noRunner(helperName string, serverURL string) (ConfigEntry, error) {
 }
 
 // helperMain implements a docker credential command main function.
-func helperMain() int {
+func helperMain() {
 	flag.Parse()
 	if flag.NArg() != 1 || flag.Arg(0) != "get" {
 		log.Fatal("usage: docker-credential-test get")
@@ -437,10 +437,9 @@ func helperMain() int {
 }`, os.Getenv("TEST_SECRET"))
 	case "registry-with-error.com":
 		fmt.Fprintf(os.Stderr, "some error\n")
-		return 1
+		os.Exit(1)
 	default:
 		fmt.Printf("credentials not found in native keychain\n")
-		return 1
+		os.Exit(1)
 	}
-	return 0
 }

ociregistry/ociserver/mediatype.go

@@ -19,11 +19,9 @@ import (
 )
 
 const (
-	mediaTypeOCIImageIndex                  = ocispec.MediaTypeImageIndex
-	mediaTypeOCIRestrictedLayer             = ocispec.MediaTypeImageLayerNonDistributableGzip
-	mediaTypeOCIUncompressedRestrictedLayer = ocispec.MediaTypeImageLayerNonDistributable
-	mediaTypeOCIManifestSchema1             = ocispec.MediaTypeImageManifest
-	mediaTypeOCIConfigJSON                  = ocispec.MediaTypeImageConfig
-	mediaTypeDockerConfigJSON               = "application/vnd.docker.container.image.v1+json"
-	mediaTypeOctetStream                    = "application/octet-stream"
+	mediaTypeOCIImageIndex      = ocispec.MediaTypeImageIndex
+	mediaTypeOCIManifestSchema1 = ocispec.MediaTypeImageManifest
+	mediaTypeOCIConfigJSON      = ocispec.MediaTypeImageConfig
+	mediaTypeDockerConfigJSON   = "application/vnd.docker.container.image.v1+json"
+	mediaTypeOctetStream        = "application/octet-stream"
 )