schema, specs-go: fix lint errors

Signed-off-by: Stephen Day <stephen.day@getcruise.com>
opencontainers · Dec 2, 2021 · 0e094f3 · 0e094f3
1 parent d3cd202
commit 0e094f3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/schema/backwards_compatibility_test.go b/schema/backwards_compatibility_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/schema"
-	"github.com/opencontainers/image-spec/specs-go/v1"
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 var compatMap = map[string]string{

diff --git a/schema/loader.go b/schema/loader.go
@@ -78,7 +78,7 @@ type fsLoader struct {
 }
 
 // JsonSource implements gojsonschema.JSONLoader.JsonSource. The "Json" capitalization needs to be maintained to conform to the interface.
-func (l *fsLoader) JsonSource() interface{} { // nolint: golint
+func (l *fsLoader) JsonSource() interface{} { // revive:disable-line:var-naming
 	return l.source
 }
 
@@ -117,7 +117,7 @@ func decodeJSONUsingNumber(r io.Reader) (interface{}, error) {
 }
 
 // JsonReference implements gojsonschema.JSONLoader.JsonReference. The "Json" capitalization needs to be maintained to conform to the interface.
-func (l *fsLoader) JsonReference() (gojsonreference.JsonReference, error) { // nolint: golint
+func (l *fsLoader) JsonReference() (gojsonreference.JsonReference, error) { // revive:disable-line:var-naming
 	return gojsonreference.NewJsonReference(l.JsonSource().(string))
 }
 

diff --git a/schema/schema.go b/schema/schema.go
@@ -17,7 +17,7 @@ package schema
 import (
 	"net/http"
 
-	"github.com/opencontainers/image-spec/specs-go/v1"
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // Media types for the OCI image formats

diff --git a/schema/spec_test.go b/schema/spec_test.go
@@ -95,7 +95,6 @@ func validate(t *testing.T, name string) {
 		}
 
 		for _, err := range errs {
-			// TOOD(stevvooe): This is nearly useless without file, line no.
 			printFields(t, "invalid", example.Mediatype, example.Title)
 			t.Error(err)
 			fmt.Println(example.Body, "---")

diff --git a/specs-go/v1/index.go b/specs-go/v1/index.go
@@ -21,7 +21,7 @@ import "github.com/opencontainers/image-spec/specs-go"
 type Index struct {
 	specs.Versioned
 
-	// MediaType specificies the type of this document data structure e.g. `application/vnd.oci.image.index.v1+json`
+	// MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.index.v1+json`
 	MediaType string `json:"mediaType,omitempty"`
 
 	// Manifests references platform specific manifests.

diff --git a/specs-go/v1/manifest.go b/specs-go/v1/manifest.go
@@ -20,7 +20,7 @@ import "github.com/opencontainers/image-spec/specs-go"
 type Manifest struct {
 	specs.Versioned
 
-	// MediaType specificies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json`
+	// MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json`
 	MediaType string `json:"mediaType,omitempty"`
 
 	// Config references a configuration object for a container, by digest.