Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Godeps/_workspace/src/github.com/mndrix/tap-go/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Godeps/_workspace/src/github.com/mndrix/tap-go/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions Godeps/_workspace/src/github.com/mndrix/tap-go/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Godeps/_workspace/src/github.com/mndrix/tap-go/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 130 additions & 0 deletions Godeps/_workspace/src/github.com/mndrix/tap-go/tap.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 79 additions & 19 deletions cmd/runtimetest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/Sirupsen/logrus"
"github.com/hashicorp/go-multierror"
"github.com/mndrix/tap-go"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/cmd/runtimetest/mount"
"github.com/syndtr/gocapability/capability"
Expand Down Expand Up @@ -53,7 +54,10 @@ var (
}
)

type validation func(*rspec.Spec) error
type validation struct {
test func(*rspec.Spec) error
description string
}

func loadSpecConfig() (spec *rspec.Spec, err error) {
cf, err := os.Open(specConfig)
Expand Down Expand Up @@ -588,41 +592,97 @@ func validate(context *cli.Context) error {
}

defaultValidations := []validation{
validateRootFS,
validateHostname,
validateMountsExist,
{
test: validateRootFS,
description: "root filesystem",
},
{
test: validateHostname,
description: "hostname",
},
{
test: validateMountsExist,
description: "mounts",
},
}

linuxValidations := []validation{
validateCapabilities,
validateDefaultSymlinks,
validateDefaultFS,
validateDefaultDevices,
validateLinuxDevices,
validateLinuxProcess,
validateMaskedPaths,
validateOOMScoreAdj,
validateROPaths,
validateRlimits,
validateSysctls,
validateUIDMappings,
validateGIDMappings,
{
test: validateCapabilities,
description: "capabilities",
},
{
test: validateDefaultSymlinks,
description: "default symlinks",
},
{
test: validateDefaultFS,
description: "default file system",
},
{
test: validateDefaultDevices,
description: "default devices",
},
{
test: validateLinuxDevices,
description: "linux devices",
},
{
test: validateLinuxProcess,
description: "linux process",
},
{
test: validateMaskedPaths,
description: "masked paths",
},
{
test: validateOOMScoreAdj,
description: "oom score adj",
},
{
test: validateROPaths,
description: "read only paths",
},
{
test: validateRlimits,
description: "rlimits",
},
{
test: validateSysctls,
description: "sysctls",
},
{
test: validateUIDMappings,
description: "uid mappings",
},
{
test: validateGIDMappings,
description: "gid mappings",
},
}

t := tap.New()
t.Header(0)

var validationErrors error
for _, v := range defaultValidations {
if err := v(spec); err != nil {
err := v.test(spec)
t.Ok(err == nil, v.description)
if err != nil {
validationErrors = multierror.Append(validationErrors, err)
}
}

if spec.Platform.OS == "linux" {
for _, v := range linuxValidations {
if err := v(spec); err != nil {
err := v.test(spec)
t.Ok(err == nil, v.description)
if err != nil {
validationErrors = multierror.Append(validationErrors, err)
}
}
}
t.AutoPlan()

return validationErrors
}
Expand Down