diff --git a/cmd/runtimetest/main.go b/cmd/runtimetest/main.go index 3aa3370c6..4684e3277 100644 --- a/cmd/runtimetest/main.go +++ b/cmd/runtimetest/main.go @@ -14,8 +14,8 @@ import ( "strings" "syscall" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/sirupsen/logrus" "github.com/syndtr/gocapability/capability" "github.com/urfave/cli" diff --git a/go.mod b/go.mod index 1368e7c8d..09f3ecada 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/blang/semver/v4 v4.0.0 github.com/google/uuid v1.3.0 github.com/hashicorp/go-multierror v1.1.1 - github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b github.com/mrunalp/fileutils v0.5.0 github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb github.com/opencontainers/selinux v1.9.1 @@ -16,6 +15,7 @@ require ( github.com/urfave/cli v1.19.1 github.com/xeipuuv/gojsonschema v1.2.0 golang.org/x/sys v0.0.0-20191115151921-52ab43148777 + gopkg.in/yaml.v2 v2.4.0 ) require ( @@ -24,5 +24,4 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 37ddcdd4d..d13140d7b 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,6 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b h1:Ga1nclDSe8gOw37MVLMhfu2QKWtD6gvtQ298zsKVh8g= -github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb h1:1xSVPOd7/UA+39/hXEGnBJ13p6JFB0E1EvQFlrRDOXI= diff --git a/vendor/github.com/mndrix/tap-go/LICENSE b/util/tap/LICENSE similarity index 100% rename from vendor/github.com/mndrix/tap-go/LICENSE rename to util/tap/LICENSE diff --git a/vendor/github.com/mndrix/tap-go/Makefile b/util/tap/Makefile similarity index 100% rename from vendor/github.com/mndrix/tap-go/Makefile rename to util/tap/Makefile diff --git a/vendor/github.com/mndrix/tap-go/README.md b/util/tap/README.md similarity index 61% rename from vendor/github.com/mndrix/tap-go/README.md rename to util/tap/README.md index f795022df..9b722bdd3 100644 --- a/vendor/github.com/mndrix/tap-go/README.md +++ b/util/tap/README.md @@ -4,4 +4,7 @@ The [Test Anything Protocol](http://testanything.org/) ("TAP") is a text-based interface between tests and a test harness. This package helps Go to generate TAP output. -Read the [full package documentation](https://godoc.org/github.com/mndrix/tap-go) +Read the [full package documentation](https://godoc.org/github.com/opencontainers/runtime-tools/util/tap) + +NOTE: This code was originally located at https://github.com/mndrix/tap-go and +migrated to here as the project was archieved. \ No newline at end of file diff --git a/vendor/github.com/mndrix/tap-go/tap.go b/util/tap/tap.go similarity index 91% rename from vendor/github.com/mndrix/tap-go/tap.go rename to util/tap/tap.go index 3be970656..b40237bbb 100644 --- a/vendor/github.com/mndrix/tap-go/tap.go +++ b/util/tap/tap.go @@ -1,32 +1,32 @@ // Package tap provides support for automated Test Anything Protocol ("TAP") // tests in Go. For example: // -// package main +// package main // -// import "github.com/mndrix/tap-go" +// import "github.com/opencontainers/runtime-tools/util/tap" // -// func main() { -// t := tap.New() -// t.Header(2) -// t.Ok(true, "first test") -// t.Ok(true, "second test") -// } +// func main() { +// t := tap.New() +// t.Header(2) +// t.Ok(true, "first test") +// t.Ok(true, "second test") +// } // // generates the following output // -// TAP version 13 -// 1..2 -// ok 1 - first test -// ok 2 - second test -package tap // import "github.com/mndrix/tap-go" +// TAP version 13 +// 1..2 +// ok 1 - first test +// ok 2 - second test +package tap import ( "fmt" "io" "os" "strings" + "testing/quick" ) -import "testing/quick" // T is a type to encapsulate test state. Methods on this type generate TAP // output. diff --git a/util/tap/test/auto/main.go b/util/tap/test/auto/main.go new file mode 100644 index 000000000..6c654a675 --- /dev/null +++ b/util/tap/test/auto/main.go @@ -0,0 +1,11 @@ +package main + +import "github.com/opencontainers/runtime-tools/util/tap" + +func main() { + t := tap.New() + t.Header(0) + t.Ok(true, "first test") + t.Ok(true, "second test") + t.AutoPlan() +} diff --git a/util/tap/test/check/main.go b/util/tap/test/check/main.go new file mode 100644 index 000000000..0258f4d4b --- /dev/null +++ b/util/tap/test/check/main.go @@ -0,0 +1,16 @@ +package main + +import "github.com/opencontainers/runtime-tools/util/tap" + +func main() { + add := func(x int) bool { return x+3 > x } + sub := func(x int) bool { return x-3 < x } + one := func(x int) bool { return x*1 == x } + + t := tap.New() + t.Header(0) + t.Check(add, "addition makes numbers larger") + t.Check(sub, "subtraction makes numbers smaller") + t.Check(one, "1 is a multiplicative identity") + t.AutoPlan() +} diff --git a/util/tap/test/diagnostic/main.go b/util/tap/test/diagnostic/main.go new file mode 100644 index 000000000..1cad82f1e --- /dev/null +++ b/util/tap/test/diagnostic/main.go @@ -0,0 +1,37 @@ +package main + +import ( + "bytes" + "io" + "os" + + tap "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + // collect output for comparison later + buf := new(bytes.Buffer) + t := tap.New() + t.Writer = io.MultiWriter(os.Stdout, buf) + + t.Header(1) + t.Diagnostic("expecting all to be well") + t.Diagnosticf("here's some perfectly magical output: %d %s 0x%X.", 6, "abracadabra", 28) + t.Diagnostic("some\nmultiline\ntext\n") + t.Diagnosticf("%d lines\n%s multiline\ntext", 3, "more") + + got := buf.String() + t.Ok(got == expected, "diagnostics gave expected output") +} + +const expected = `TAP version 13 +1..1 +# expecting all to be well +# here's some perfectly magical output: 6 abracadabra 0x1C. +# some +# multiline +# text +# 3 lines +# more multiline +# text +` diff --git a/util/tap/test/failing/main.go b/util/tap/test/failing/main.go new file mode 100644 index 000000000..484a56009 --- /dev/null +++ b/util/tap/test/failing/main.go @@ -0,0 +1,25 @@ +package main + +import ( + "bytes" + + "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + t1 := tap.New() + t1.Header(2) + + buf := new(bytes.Buffer) + t2 := tap.New() + t2.Writer = buf + t2.Header(2) + + buf.Reset() + t2.Ok(false, "first test") + t1.Ok(buf.String() == "not ok 1 - first test\n", "Ok(false, ...) produces appropriate output") + + buf.Reset() + t2.Fail("second test") + t1.Ok(buf.String() == "not ok 2 - second test\n", "Fail(...) produces appropriate output") +} diff --git a/util/tap/test/known/main.go b/util/tap/test/known/main.go new file mode 100644 index 000000000..5969e0998 --- /dev/null +++ b/util/tap/test/known/main.go @@ -0,0 +1,10 @@ +package main + +import "github.com/opencontainers/runtime-tools/util/tap" + +func main() { + t := tap.New() + t.Header(2) + t.Ok(true, "first test") + t.Pass("second test") +} diff --git a/util/tap/test/skip/main.go b/util/tap/test/skip/main.go new file mode 100644 index 000000000..632d293df --- /dev/null +++ b/util/tap/test/skip/main.go @@ -0,0 +1,30 @@ +package main + +import ( + "bytes" + "io" + "os" + + tap "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + // collect output for comparison later + buf := new(bytes.Buffer) + t := tap.New() + t.Writer = io.MultiWriter(os.Stdout, buf) + + t.Header(4) + t.Skip(1, "insufficient flogiston pressure") + t.Skip(2, "no /sys directory") + + got := buf.String() + t.Ok(got == expected, "skip gave expected output") +} + +const expected = `TAP version 13 +1..4 +ok 1 # SKIP insufficient flogiston pressure +ok 2 # SKIP no /sys directory +ok 3 # SKIP no /sys directory +` diff --git a/util/tap/test/todo/main.go b/util/tap/test/todo/main.go new file mode 100644 index 000000000..db67966e8 --- /dev/null +++ b/util/tap/test/todo/main.go @@ -0,0 +1,38 @@ +package main + +import ( + "bytes" + "io" + "os" + + tap "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + // collect output for comparison later + buf := new(bytes.Buffer) + t := tap.New() + t.Writer = io.MultiWriter(os.Stdout, buf) + + t.Header(6) + t.TODO = true + t.Ok(false, "using Ok(false, ...) in TODO mode") + t.Fail("using Fail(...) in TODO mode") + t.TODO = false + t.Ok(true, "using Ok(false, ...) after leaving TODO mode") + + t.Todo().Fail("using Fail(...) in TODO mode with method chaining") + t.Pass("using Pass(...) after Todo method chaining") + + got := buf.String() + t.Ok(got == expected, "TODO gave expected output") +} + +const expected = `TAP version 13 +1..6 +not ok 1 # TODO using Ok(false, ...) in TODO mode +not ok 2 # TODO using Fail(...) in TODO mode +ok 3 - using Ok(false, ...) after leaving TODO mode +not ok 4 # TODO using Fail(...) in TODO mode with method chaining +ok 5 - using Pass(...) after Todo method chaining +` diff --git a/util/tap/test/writer/main.go b/util/tap/test/writer/main.go new file mode 100644 index 000000000..856c58800 --- /dev/null +++ b/util/tap/test/writer/main.go @@ -0,0 +1,19 @@ +package main + +import ( + "bytes" + "os" + + "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + buf := new(bytes.Buffer) + t := tap.New() + t.Writer = buf + t.Header(2) + t.Ok(true, "a test") + t.Ok(buf.Len() > 0, "buffer has content") + + buf.WriteTo(os.Stdout) +} diff --git a/util/tap/test/yaml/json.go b/util/tap/test/yaml/json.go new file mode 100644 index 000000000..09ee91c47 --- /dev/null +++ b/util/tap/test/yaml/json.go @@ -0,0 +1,14 @@ +// +build !yaml + +package main + +const expected = `TAP version 13 +1..2 +ok 1 - test for anchoring the YAML block + --- + { + "code": 3, + "message": "testing YAML blocks" + } + ... +` diff --git a/util/tap/test/yaml/main.go b/util/tap/test/yaml/main.go new file mode 100644 index 000000000..cbd87c459 --- /dev/null +++ b/util/tap/test/yaml/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "bytes" + "io" + "os" + + tap "github.com/opencontainers/runtime-tools/util/tap" +) + +func main() { + // collect output for comparison later + buf := new(bytes.Buffer) + t := tap.New() + t.Writer = io.MultiWriter(os.Stdout, buf) + + t.Header(2) + t.Pass("test for anchoring the YAML block") + message := map[string]interface{}{ + "message": "testing YAML blocks", + "code": 3, + } + t.YAML(message) + got := buf.String() + t.Ok(got == expected, "diagnostics gave expected output") +} diff --git a/util/tap/test/yaml/yaml.go b/util/tap/test/yaml/yaml.go new file mode 100644 index 000000000..d9824dffb --- /dev/null +++ b/util/tap/test/yaml/yaml.go @@ -0,0 +1,12 @@ +// +build yaml + +package main + +const expected = `TAP version 13 +1..2 +ok 1 - test for anchoring the YAML block + --- + code: 3 + message: testing YAML blocks + ... +` diff --git a/vendor/github.com/mndrix/tap-go/yaml_json.go b/util/tap/yaml_json.go similarity index 100% rename from vendor/github.com/mndrix/tap-go/yaml_json.go rename to util/tap/yaml_json.go diff --git a/vendor/github.com/mndrix/tap-go/yaml_yaml.go b/util/tap/yaml_yaml.go similarity index 100% rename from vendor/github.com/mndrix/tap-go/yaml_yaml.go rename to util/tap/yaml_yaml.go diff --git a/validation/config_updates_without_affect/config_updates_without_affect.go b/validation/config_updates_without_affect/config_updates_without_affect.go index d3663c27e..a9f52be71 100644 --- a/validation/config_updates_without_affect/config_updates_without_affect.go +++ b/validation/config_updates_without_affect/config_updates_without_affect.go @@ -7,11 +7,11 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" "github.com/mrunalp/fileutils" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/create/create.go b/validation/create/create.go index 3c0e0d6c8..9438d9d8c 100644 --- a/validation/create/create.go +++ b/validation/create/create.go @@ -6,10 +6,10 @@ import ( "runtime" "github.com/google/uuid" - "github.com/mndrix/tap-go" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/delete/delete.go b/validation/delete/delete.go index 01467d43c..fd1a86bb2 100644 --- a/validation/delete/delete.go +++ b/validation/delete/delete.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/mndrix/tap-go" + "github.com/google/uuid" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/delete_only_create_resources/delete_only_create_resources.go b/validation/delete_only_create_resources/delete_only_create_resources.go index 7f78b638f..91cbb5731 100644 --- a/validation/delete_only_create_resources/delete_only_create_resources.go +++ b/validation/delete_only_create_resources/delete_only_create_resources.go @@ -8,10 +8,10 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" "github.com/mrunalp/fileutils" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/delete_resources/delete_resources.go b/validation/delete_resources/delete_resources.go index b03082750..1f3aabd6f 100644 --- a/validation/delete_resources/delete_resources.go +++ b/validation/delete_resources/delete_resources.go @@ -6,13 +6,13 @@ import ( "path/filepath" "time" - tap "github.com/mndrix/tap-go" + "github.com/google/uuid" "github.com/mrunalp/fileutils" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/hooks/hooks.go b/validation/hooks/hooks.go index f039a073e..1f6d70c80 100644 --- a/validation/hooks/hooks.go +++ b/validation/hooks/hooks.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/hooks_stdin/hooks_stdin.go b/validation/hooks_stdin/hooks_stdin.go index d5a95ff22..492ea04c4 100644 --- a/validation/hooks_stdin/hooks_stdin.go +++ b/validation/hooks_stdin/hooks_stdin.go @@ -11,9 +11,9 @@ import ( "github.com/google/uuid" multierror "github.com/hashicorp/go-multierror" - tap "github.com/mndrix/tap-go" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/hostname/hostname.go b/validation/hostname/hostname.go index 02e01754f..5c9bfaed8 100644 --- a/validation/hostname/hostname.go +++ b/validation/hostname/hostname.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/mndrix/tap-go" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/kill/kill.go b/validation/kill/kill.go index ad5336691..cf945e0ce 100644 --- a/validation/kill/kill.go +++ b/validation/kill/kill.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/mndrix/tap-go" + "github.com/google/uuid" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/kill_no_effect/kill_no_effect.go b/validation/kill_no_effect/kill_no_effect.go index 7d0b35abb..0462dafeb 100644 --- a/validation/kill_no_effect/kill_no_effect.go +++ b/validation/kill_no_effect/kill_no_effect.go @@ -6,11 +6,11 @@ import ( "reflect" "time" - "github.com/mndrix/tap-go" + "github.com/google/uuid" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/killsig/killsig.go b/validation/killsig/killsig.go index a3bd49e36..4c493ccf4 100644 --- a/validation/killsig/killsig.go +++ b/validation/killsig/killsig.go @@ -6,11 +6,11 @@ import ( "path/filepath" "time" - "github.com/mndrix/tap-go" + "github.com/google/uuid" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) var signals = []string{ diff --git a/validation/linux_cgroups_blkio/linux_cgroups_blkio.go b/validation/linux_cgroups_blkio/linux_cgroups_blkio.go index 5b335f509..7535f9f14 100644 --- a/validation/linux_cgroups_blkio/linux_cgroups_blkio.go +++ b/validation/linux_cgroups_blkio/linux_cgroups_blkio.go @@ -4,8 +4,8 @@ import ( "fmt" "runtime" - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_cpus/linux_cgroups_cpus.go b/validation/linux_cgroups_cpus/linux_cgroups_cpus.go index a13707580..a550da640 100644 --- a/validation/linux_cgroups_cpus/linux_cgroups_cpus.go +++ b/validation/linux_cgroups_cpus/linux_cgroups_cpus.go @@ -6,8 +6,8 @@ import ( "path/filepath" "runtime" - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_devices/linux_cgroups_devices.go b/validation/linux_cgroups_devices/linux_cgroups_devices.go index ae947ade2..e3e9047ce 100644 --- a/validation/linux_cgroups_devices/linux_cgroups_devices.go +++ b/validation/linux_cgroups_devices/linux_cgroups_devices.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go index e1db3f1bd..5fb3f2731 100644 --- a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go +++ b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go @@ -4,9 +4,9 @@ import ( "fmt" "runtime" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_memory/linux_cgroups_memory.go b/validation/linux_cgroups_memory/linux_cgroups_memory.go index 89e88bd7f..1649296bd 100644 --- a/validation/linux_cgroups_memory/linux_cgroups_memory.go +++ b/validation/linux_cgroups_memory/linux_cgroups_memory.go @@ -4,8 +4,8 @@ import ( "fmt" "runtime" - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_network/linux_cgroups_network.go b/validation/linux_cgroups_network/linux_cgroups_network.go index f91cf9867..37d750093 100644 --- a/validation/linux_cgroups_network/linux_cgroups_network.go +++ b/validation/linux_cgroups_network/linux_cgroups_network.go @@ -5,8 +5,8 @@ import ( "net" "runtime" - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_pids/linux_cgroups_pids.go b/validation/linux_cgroups_pids/linux_cgroups_pids.go index 5826c6ae2..81492312c 100644 --- a/validation/linux_cgroups_pids/linux_cgroups_pids.go +++ b/validation/linux_cgroups_pids/linux_cgroups_pids.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go b/validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go index 67b0433ea..9c3f11fee 100644 --- a/validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go +++ b/validation/linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go b/validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go index 290860750..afe4b6e5c 100644 --- a/validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go +++ b/validation/linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.go @@ -1,9 +1,9 @@ package main import ( - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go b/validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go index 679a88f21..0134a665e 100644 --- a/validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go +++ b/validation/linux_cgroups_relative_devices/linux_cgroups_relative_devices.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go index 583a9fa83..04002e18b 100644 --- a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go +++ b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go @@ -2,9 +2,9 @@ package main import ( "fmt" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go b/validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go index 7dcdeb272..5562ee57e 100644 --- a/validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go +++ b/validation/linux_cgroups_relative_memory/linux_cgroups_relative_memory.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go b/validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go index da5e9ee25..025b6cf54 100644 --- a/validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go +++ b/validation/linux_cgroups_relative_network/linux_cgroups_relative_network.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go b/validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go index 6a9c90f7b..85e822208 100644 --- a/validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go +++ b/validation/linux_cgroups_relative_pids/linux_cgroups_relative_pids.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_masked_paths/linux_masked_paths.go b/validation/linux_masked_paths/linux_masked_paths.go index 1345a6ad6..69cd17918 100644 --- a/validation/linux_masked_paths/linux_masked_paths.go +++ b/validation/linux_masked_paths/linux_masked_paths.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/mndrix/tap-go" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" "golang.org/x/sys/unix" ) diff --git a/validation/linux_ns_itype/linux_ns_itype.go b/validation/linux_ns_itype/linux_ns_itype.go index 1b08b458b..33828d042 100644 --- a/validation/linux_ns_itype/linux_ns_itype.go +++ b/validation/linux_ns_itype/linux_ns_itype.go @@ -6,9 +6,9 @@ import ( "path/filepath" "runtime" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_ns_nopath/linux_ns_nopath.go b/validation/linux_ns_nopath/linux_ns_nopath.go index 7aea78d01..91053d852 100644 --- a/validation/linux_ns_nopath/linux_ns_nopath.go +++ b/validation/linux_ns_nopath/linux_ns_nopath.go @@ -6,9 +6,9 @@ import ( "path/filepath" "runtime" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_ns_path/linux_ns_path.go b/validation/linux_ns_path/linux_ns_path.go index 8744fb592..bf358c70b 100644 --- a/validation/linux_ns_path/linux_ns_path.go +++ b/validation/linux_ns_path/linux_ns_path.go @@ -8,9 +8,9 @@ import ( "syscall" "time" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_ns_path_type/linux_ns_path_type.go b/validation/linux_ns_path_type/linux_ns_path_type.go index 82846831f..8db0f8b11 100644 --- a/validation/linux_ns_path_type/linux_ns_path_type.go +++ b/validation/linux_ns_path_type/linux_ns_path_type.go @@ -6,9 +6,9 @@ import ( "runtime" "syscall" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_readonly_paths/linux_readonly_paths.go b/validation/linux_readonly_paths/linux_readonly_paths.go index 2427060c4..b0b01afbb 100644 --- a/validation/linux_readonly_paths/linux_readonly_paths.go +++ b/validation/linux_readonly_paths/linux_readonly_paths.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/mndrix/tap-go" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" "golang.org/x/sys/unix" ) diff --git a/validation/linux_rootfs_propagation/linux_rootfs_propagation.go b/validation/linux_rootfs_propagation/linux_rootfs_propagation.go index 5938aea6d..631d99af5 100644 --- a/validation/linux_rootfs_propagation/linux_rootfs_propagation.go +++ b/validation/linux_rootfs_propagation/linux_rootfs_propagation.go @@ -1,7 +1,7 @@ package main import ( - "github.com/mndrix/tap-go" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/linux_seccomp/linux_seccomp.go b/validation/linux_seccomp/linux_seccomp.go index 5bbf716d1..9a96d1c04 100644 --- a/validation/linux_seccomp/linux_seccomp.go +++ b/validation/linux_seccomp/linux_seccomp.go @@ -1,8 +1,8 @@ package main import ( - tap "github.com/mndrix/tap-go" "github.com/opencontainers/runtime-tools/generate/seccomp" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/misc_props/misc_props.go b/validation/misc_props/misc_props.go index bbcfaff51..85e8cf3eb 100644 --- a/validation/misc_props/misc_props.go +++ b/validation/misc_props/misc_props.go @@ -8,9 +8,9 @@ import ( "time" "github.com/google/uuid" - "github.com/mndrix/tap-go" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/pidfile/pidfile.go b/validation/pidfile/pidfile.go index 45adfbca1..a6afa87ab 100644 --- a/validation/pidfile/pidfile.go +++ b/validation/pidfile/pidfile.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/poststart/poststart.go b/validation/poststart/poststart.go index b3d9452a1..aa2bf958c 100644 --- a/validation/poststart/poststart.go +++ b/validation/poststart/poststart.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/poststart_fail/poststart_fail.go b/validation/poststart_fail/poststart_fail.go index 82d922b01..69be4207b 100644 --- a/validation/poststart_fail/poststart_fail.go +++ b/validation/poststart_fail/poststart_fail.go @@ -7,9 +7,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/poststop/poststop.go b/validation/poststop/poststop.go index 87bd565e0..661283a17 100644 --- a/validation/poststop/poststop.go +++ b/validation/poststop/poststop.go @@ -10,9 +10,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/poststop_fail/poststop_fail.go b/validation/poststop_fail/poststop_fail.go index 0d85ab773..31e22af7d 100644 --- a/validation/poststop_fail/poststop_fail.go +++ b/validation/poststop_fail/poststop_fail.go @@ -7,9 +7,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/prestart/prestart.go b/validation/prestart/prestart.go index 92bf2216f..29110685f 100644 --- a/validation/prestart/prestart.go +++ b/validation/prestart/prestart.go @@ -9,9 +9,9 @@ import ( "time" "github.com/google/uuid" - tap "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/prestart_fail/prestart_fail.go b/validation/prestart_fail/prestart_fail.go index d18175ecd..1157e5197 100644 --- a/validation/prestart_fail/prestart_fail.go +++ b/validation/prestart_fail/prestart_fail.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - tap "github.com/mndrix/tap-go" + "github.com/google/uuid" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + tap "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/start/start.go b/validation/start/start.go index 07895d8e9..a9c0fa489 100644 --- a/validation/start/start.go +++ b/validation/start/start.go @@ -7,9 +7,9 @@ import ( "time" "github.com/google/uuid" - "github.com/mndrix/tap-go" rspecs "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" ) diff --git a/validation/state/state.go b/validation/state/state.go index 5d688ff49..f63d3cab2 100644 --- a/validation/state/state.go +++ b/validation/state/state.go @@ -5,12 +5,12 @@ import ( "os/exec" "time" - "github.com/mndrix/tap-go" + "github.com/google/uuid" rspecs "github.com/opencontainers/runtime-spec/specs-go" rfc2119 "github.com/opencontainers/runtime-tools/error" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" "github.com/opencontainers/runtime-tools/validation/util" - "github.com/google/uuid" ) func main() { diff --git a/validation/util/linux_resources_blkio.go b/validation/util/linux_resources_blkio.go index 1d4ac12f5..8eceda677 100644 --- a/validation/util/linux_resources_blkio.go +++ b/validation/util/linux_resources_blkio.go @@ -3,9 +3,9 @@ package util import ( "fmt" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" ) // ValidateLinuxResourcesBlockIO validates linux.resources.blockIO. diff --git a/validation/util/linux_resources_cpus.go b/validation/util/linux_resources_cpus.go index f37efe9ae..c944ca058 100644 --- a/validation/util/linux_resources_cpus.go +++ b/validation/util/linux_resources_cpus.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" ) const ( diff --git a/validation/util/linux_resources_devices.go b/validation/util/linux_resources_devices.go index ed7551688..3489ab80a 100644 --- a/validation/util/linux_resources_devices.go +++ b/validation/util/linux_resources_devices.go @@ -3,10 +3,10 @@ package util import ( "fmt" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" ) // ValidateLinuxResourcesDevices validates linux.resources.devices. diff --git a/validation/util/linux_resources_memory.go b/validation/util/linux_resources_memory.go index 73de149d6..939d7edff 100644 --- a/validation/util/linux_resources_memory.go +++ b/validation/util/linux_resources_memory.go @@ -1,9 +1,9 @@ package util import ( - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" ) // ValidateLinuxResourcesMemory validates linux.resources.memory. diff --git a/validation/util/linux_resources_network.go b/validation/util/linux_resources_network.go index 22682413a..4394e9094 100644 --- a/validation/util/linux_resources_network.go +++ b/validation/util/linux_resources_network.go @@ -3,9 +3,9 @@ package util import ( "fmt" - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" ) // ValidateLinuxResourcesNetwork validates linux.resources.network. diff --git a/validation/util/linux_resources_pids.go b/validation/util/linux_resources_pids.go index 1431efd96..f55dbc26b 100644 --- a/validation/util/linux_resources_pids.go +++ b/validation/util/linux_resources_pids.go @@ -1,9 +1,9 @@ package util import ( - "github.com/mndrix/tap-go" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/cgroups" + "github.com/opencontainers/runtime-tools/util/tap" ) // ValidateLinuxResourcesPids validates linux.resources.pids. diff --git a/validation/util/test.go b/validation/util/test.go index 626499e65..b8537ab24 100644 --- a/validation/util/test.go +++ b/validation/util/test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/google/uuid" - "github.com/mndrix/tap-go" "github.com/mrunalp/fileutils" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/specerror" + "github.com/opencontainers/runtime-tools/util/tap" ) // RuntimeCommand is the default runtime command. diff --git a/vendor/github.com/mndrix/tap-go/.gitignore b/vendor/github.com/mndrix/tap-go/.gitignore deleted file mode 100644 index 9e8d7ca04..000000000 --- a/vendor/github.com/mndrix/tap-go/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -gopath/pkg -test/*/test -/TAGS diff --git a/vendor/modules.txt b/vendor/modules.txt index e367ed9f9..ba291c456 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -13,9 +13,6 @@ github.com/hashicorp/errwrap # github.com/hashicorp/go-multierror v1.1.1 ## explicit; go 1.13 github.com/hashicorp/go-multierror -# github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b -## explicit -github.com/mndrix/tap-go # github.com/mrunalp/fileutils v0.5.0 ## explicit; go 1.13 github.com/mrunalp/fileutils