Move to new github.com/sirupsen/logrus.

Need to mv to latest released and supported version of logrus
switch github.com/Sirupsen/logrus github.com/sirupsen/logrus

Also vendor in latest containers/storage and containers/image

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

vendor/github.com/opencontainers/runtime-tools/validate/error.go

@@ -0,0 +1,110 @@
+package validate
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	rspec "github.com/opencontainers/runtime-spec/specs-go"
+)
+
+// ComplianceLevel represents the OCI compliance levels
+type ComplianceLevel int
+
+const (
+	// MAY-level
+
+	// ComplianceMay represents 'MAY' in RFC2119
+	ComplianceMay ComplianceLevel = iota
+	// ComplianceOptional represents 'OPTIONAL' in RFC2119
+	ComplianceOptional
+
+	// SHOULD-level
+
+	// ComplianceShould represents 'SHOULD' in RFC2119
+	ComplianceShould
+	// ComplianceShouldNot represents 'SHOULD NOT' in RFC2119
+	ComplianceShouldNot
+	// ComplianceRecommended represents 'RECOMMENDED' in RFC2119
+	ComplianceRecommended
+	// ComplianceNotRecommended represents 'NOT RECOMMENDED' in RFC2119
+	ComplianceNotRecommended
+
+	// MUST-level
+
+	// ComplianceMust represents 'MUST' in RFC2119
+	ComplianceMust
+	// ComplianceMustNot represents 'MUST NOT' in RFC2119
+	ComplianceMustNot
+	// ComplianceShall represents 'SHALL' in RFC2119
+	ComplianceShall
+	// ComplianceShallNot represents 'SHALL NOT' in RFC2119
+	ComplianceShallNot
+	// ComplianceRequired represents 'REQUIRED' in RFC2119
+	ComplianceRequired
+)
+
+// ErrorCode represents the compliance content
+type ErrorCode int
+
+const (
+	// DefaultFilesystems represents the error code of default filesystems test
+	DefaultFilesystems ErrorCode = iota
+)
+
+// Error represents an error with compliance level and OCI reference
+type Error struct {
+	Level     ComplianceLevel
+	Reference string
+	Err       error
+}
+
+const referencePrefix = "https://github.com/opencontainers/runtime-spec/blob"
+
+var ociErrors = map[ErrorCode]Error{
+	DefaultFilesystems: Error{Level: ComplianceShould, Reference: "config-linux.md#default-filesystems"},
+}
+
+// ParseLevel takes a string level and returns the OCI compliance level constant
+func ParseLevel(level string) (ComplianceLevel, error) {
+	switch strings.ToUpper(level) {
+	case "MAY":
+		fallthrough
+	case "OPTIONAL":
+		return ComplianceMay, nil
+	case "SHOULD":
+		fallthrough
+	case "SHOULDNOT":
+		fallthrough
+	case "RECOMMENDED":
+		fallthrough
+	case "NOTRECOMMENDED":
+		return ComplianceShould, nil
+	case "MUST":
+		fallthrough
+	case "MUSTNOT":
+		fallthrough
+	case "SHALL":
+		fallthrough
+	case "SHALLNOT":
+		fallthrough
+	case "REQUIRED":
+		return ComplianceMust, nil
+	}
+
+	var l ComplianceLevel
+	return l, fmt.Errorf("%q is not a valid compliance level", level)
+}
+
+// NewError creates an Error by ErrorCode and message
+func NewError(code ErrorCode, msg string) error {
+	err := ociErrors[code]
+	err.Err = errors.New(msg)
+
+	return &err
+}
+
+// Error returns the error message with OCI reference
+func (oci *Error) Error() string {
+	return fmt.Sprintf("%s\nRefer to: %s/v%s/%s", oci.Err.Error(), referencePrefix, rspec.Version, oci.Reference)
+}

vendor/github.com/opencontainers/runtime-tools/validate/validate.go

@@ -14,9 +14,9 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/blang/semver"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 )
 
@@ -96,22 +96,31 @@ func NewValidatorFromPath(bundlePath string, hostSpecific bool, platform string)
 // CheckAll checks all parts of runtime bundle
 func (v *Validator) CheckAll() (msgs []string) {
 	msgs = append(msgs, v.CheckPlatform()...)
-	msgs = append(msgs, v.CheckRootfsPath()...)
+	msgs = append(msgs, v.CheckRoot()...)
 	msgs = append(msgs, v.CheckMandatoryFields()...)
 	msgs = append(msgs, v.CheckSemVer()...)
 	msgs = append(msgs, v.CheckMounts()...)
 	msgs = append(msgs, v.CheckProcess()...)
 	msgs = append(msgs, v.CheckHooks()...)
-	if v.spec.Linux != nil {
-		msgs = append(msgs, v.CheckLinux()...)
-	}
+	msgs = append(msgs, v.CheckLinux()...)
 
 	return
 }
 
-// CheckRootfsPath checks status of v.spec.Root.Path
-func (v *Validator) CheckRootfsPath() (msgs []string) {
-	logrus.Debugf("check rootfs path")
+// CheckRoot checks status of v.spec.Root
+func (v *Validator) CheckRoot() (msgs []string) {
+	logrus.Debugf("check root")
+
+	if v.platform == "windows" && v.spec.Windows.HyperV != nil {
+		if v.spec.Root != nil {
+			msgs = append(msgs, fmt.Sprintf("for Hyper-V containers, Root must not be set"))
+			return
+		}
+		return
+	} else if v.spec.Root == nil {
+		msgs = append(msgs, fmt.Sprintf("for non-Hyper-V containers, Root must be set"))
+		return
+	}
 
 	absBundlePath, err := filepath.Abs(v.bundlePath)
 	if err != nil {
@@ -211,6 +220,10 @@ func checkEventHooks(hookType string, hooks []rspec.Hook, hostSpecific bool) (ms
 func (v *Validator) CheckProcess() (msgs []string) {
 	logrus.Debugf("check process")
 
+	if v.spec.Process == nil {
+		return
+	}
+
 	process := v.spec.Process
 	if !filepath.IsAbs(process.Cwd) {
 		msgs = append(msgs, fmt.Sprintf("cwd %q is not an absolute path", process.Cwd))
@@ -425,6 +438,10 @@ func (v *Validator) CheckPlatform() (msgs []string) {
 func (v *Validator) CheckLinux() (msgs []string) {
 	logrus.Debugf("check linux")
 
+	if v.spec.Linux == nil {
+		return
+	}
+
 	var typeList = map[rspec.LinuxNamespaceType]struct {
 		num      int
 		newExist bool