return ErrorOrNil in bundle validate

Signed-off-by: Liang Chenye <[email protected]>

Author: liangchenye

cmd/oci-runtime-tool/validate.go

@@ -44,7 +44,8 @@ var bundleValidateCommand = cli.Command{
 			for _, e := range levelErrors.Warnings {
 				logrus.Warn(e)
 			}
-			return levelErrors.Error
+
+			return levelErrors.Error.ErrorOrNil()
 		}
 		fmt.Println("Bundle validation succeeded.")
 		return nil

validate/validate.go

@@ -666,15 +666,15 @@ func (v *Validator) CheckAnnotations() (errs error) {
 			errs = multierror.Append(errs,
 				specerror.NewError(
 					specerror.AnnotationsKeyReservedNS,
-					fmt.Errorf("key %s is reserved", key),
+					fmt.Errorf("key %q is reserved", key),
 					rspec.Version))
 		}
 
 		if !reversedDomain.MatchString(key) {
 			errs = multierror.Append(errs,
 				specerror.NewError(
 					specerror.AnnotationsKeyReversedDomain,
-					fmt.Errorf("key %s SHOULD be named using a reverse domain notation", key),
+					fmt.Errorf("key %q SHOULD be named using a reverse domain notation", key),
 					rspec.Version))
 		}
 	}

validation/misc_props.go

@@ -64,8 +64,7 @@ func main() {
 			Actions:   c.action,
 			PreCreate: func(r *util.Runtime) error {
 				r.SetID(containerID)
-				saveConfig(configFile, c.eSpec)
-				return nil
+				return saveConfig(configFile, c.eSpec)
 			},
 			PreDelete: func(r *util.Runtime) error {
 				util.WaitingForStatus(*r, util.LifecycleStatusCreated|util.LifecycleStatusStopped, time.Second*10, time.Second*1)