Merge pull request #5581 from mikebrow/cherrypick-#5565-release-1.5

fuweid · web-flow · commit bf16e9e92254 · 2021-06-09T09:25:28.000+08:00
[release/1.5] cherry pick #5565 to release 1.5 - fix invalid validation error checking
diff --git a/metadata/containers.go b/metadata/containers.go
@@ -290,7 +290,7 @@ func validateContainer(container *containers.Container) error {
 
 	// image has no validation
 	for k, v := range container.Labels {
-		if err := labels.Validate(k, v); err == nil {
+		if err := labels.Validate(k, v); err != nil {
 			return errors.Wrapf(err, "containers.Labels")
 		}
 	}
diff --git a/metadata/content.go b/metadata/content.go
@@ -708,7 +708,7 @@ func (cs *contentStore) checkAccess(ctx context.Context, dgst digest.Digest) err
 
 func validateInfo(info *content.Info) error {
 	for k, v := range info.Labels {
-		if err := labels.Validate(k, v); err == nil {
+		if err := labels.Validate(k, v); err != nil {
 			return errors.Wrapf(err, "info.Labels")
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ func validateContainer(container *containers.Container) error {`
`290`	`290`
`291`	`291`	`// image has no validation`
`292`	`292`	`for k, v := range container.Labels {`
`293`		`- if err := labels.Validate(k, v); err == nil {`
	`293`	`+ if err := labels.Validate(k, v); err != nil {`
`294`	`294`	`return errors.Wrapf(err, "containers.Labels")`
`295`	`295`	`}`
`296`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -708,7 +708,7 @@ func (cs *contentStore) checkAccess(ctx context.Context, dgst digest.Digest) err`
`708`	`708`
`709`	`709`	`func validateInfo(info *content.Info) error {`
`710`	`710`	`for k, v := range info.Labels {`
`711`		`- if err := labels.Validate(k, v); err == nil {`
	`711`	`+ if err := labels.Validate(k, v); err != nil {`
`712`	`712`	`return errors.Wrapf(err, "info.Labels")`
`713`	`713`	`}`
`714`	`714`	`}`