Use producer.ValidateAnnotations

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

cmd/validate/go.mod

@@ -9,9 +9,10 @@ require (
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
-	tags.cncf.io/container-device-interface v0.0.0 // indirect
+	tags.cncf.io/container-device-interface/api/producer v0.8.0 // indirect
 	tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
 )
 

cmd/validate/go.sum

@@ -19,6 +19,7 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ
 golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
 golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

internal/validation/k8s/objectmeta.go

@@ -7,6 +7,7 @@ require (
 	github.com/xeipuuv/gojsonschema v1.2.0
 	sigs.k8s.io/yaml v1.3.0
 	tags.cncf.io/container-device-interface v0.0.0
+	tags.cncf.io/container-device-interface/api/producer v0.8.0
 	tags.cncf.io/container-device-interface/specs-go v0.8.0
 )
 
@@ -23,7 +24,6 @@ require (
 	golang.org/x/sys v0.19.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	tags.cncf.io/container-device-interface/api/producer v0.8.0 // indirect
 )
 
 replace (

internal/validation/k8s/validation.go

@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	schema "github.com/xeipuuv/gojsonschema"
-	"tags.cncf.io/container-device-interface/internal/validation"
+	"tags.cncf.io/container-device-interface/api/producer"
 	cdi "tags.cncf.io/container-device-interface/specs-go"
 )
 
@@ -315,7 +315,7 @@ func (s *Schema) validateContents(any map[string]interface{}) error {
 	contents := schemaContents(any)
 
 	if specAnnotations, ok := contents.getAnnotations(); ok {
-		if err := validation.ValidateSpecAnnotations("", specAnnotations); err != nil {
+		if err := producer.ValidateSpecAnnotations("", specAnnotations); err != nil {
 			return err
 		}
 	}
@@ -328,7 +328,7 @@ func (s *Schema) validateContents(any map[string]interface{}) error {
 	for _, device := range devices {
 		name, _ := device.getFieldAsString("name")
 		if annotations, ok := device.getAnnotations(); ok {
-			if err := validation.ValidateSpecAnnotations(name, annotations); err != nil {
+			if err := producer.ValidateSpecAnnotations(name, annotations); err != nil {
 				return err
 			}
 		}