From c05f9dffc55efe1e5e6d1eac481e2fa18cbc1c6b Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 28 Sep 2021 16:14:43 +0200 Subject: [PATCH] Update imports Signed-off-by: Evan Lezar --- cmd/nvidia-container-runtime.experimental/main.go | 12 ++++++------ cmd/nvidia-container-runtime/nvcr.go | 2 +- cmd/nvidia-container-runtime/nvcr_test.go | 2 +- cmd/nvidia-container-runtime/runtime_factory.go | 2 +- examples/discover/main.go | 2 +- examples/filter/main.go | 4 ++-- internal/ensure/devices.go | 2 +- internal/ensure/ensure.go | 2 +- internal/filter/all.go | 2 +- internal/filter/all_test.go | 2 +- internal/filter/any.go | 2 +- internal/filter/any_test.go | 2 +- internal/filter/by_id.go | 2 +- internal/filter/by_id_test.go | 2 +- internal/filter/devices.go | 2 +- internal/filter/devices_test.go | 2 +- internal/filter/is_control_device.go | 2 +- internal/filter/is_control_device_test.go | 2 +- internal/filter/is_standard_device.go | 2 +- internal/filter/is_standard_device_test.go | 2 +- internal/filter/selector.go | 2 +- internal/filter/selector_mock.go | 2 +- internal/modify/device.go | 4 ++-- internal/modify/discover.go | 4 ++-- internal/modify/hooks.go | 4 ++-- internal/modify/modify.go | 2 +- internal/modify/modify_mock.go | 2 +- internal/modify/mounts.go | 4 ++-- internal/runtime/runtime_modifier.go | 4 ++-- internal/runtime/runtime_modifier_test.go | 4 ++-- 30 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cmd/nvidia-container-runtime.experimental/main.go b/cmd/nvidia-container-runtime.experimental/main.go index fa6accf7..7452f07d 100644 --- a/cmd/nvidia-container-runtime.experimental/main.go +++ b/cmd/nvidia-container-runtime.experimental/main.go @@ -20,12 +20,12 @@ import ( "fmt" "os" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/ensure" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/filter" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/modify" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/runtime" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/ensure" + "github.com/NVIDIA/nvidia-container-toolkit/internal/filter" + "github.com/NVIDIA/nvidia-container-toolkit/internal/modify" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/runtime" log "github.com/sirupsen/logrus" "github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime.experimental/config" diff --git a/cmd/nvidia-container-runtime/nvcr.go b/cmd/nvidia-container-runtime/nvcr.go index 15822be4..1eb23a26 100644 --- a/cmd/nvidia-container-runtime/nvcr.go +++ b/cmd/nvidia-container-runtime/nvcr.go @@ -22,7 +22,7 @@ import ( "os/exec" "strings" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) diff --git a/cmd/nvidia-container-runtime/nvcr_test.go b/cmd/nvidia-container-runtime/nvcr_test.go index 00963ae9..32abc498 100644 --- a/cmd/nvidia-container-runtime/nvcr_test.go +++ b/cmd/nvidia-container-runtime/nvcr_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/opencontainers/runtime-spec/specs-go" testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" diff --git a/cmd/nvidia-container-runtime/runtime_factory.go b/cmd/nvidia-container-runtime/runtime_factory.go index 8d879182..d93b5044 100644 --- a/cmd/nvidia-container-runtime/runtime_factory.go +++ b/cmd/nvidia-container-runtime/runtime_factory.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" ) const ( diff --git a/examples/discover/main.go b/examples/discover/main.go index fee40a6b..ec6ccae4 100644 --- a/examples/discover/main.go +++ b/examples/discover/main.go @@ -20,7 +20,7 @@ import ( "encoding/json" "os" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" log "github.com/sirupsen/logrus" ) diff --git a/examples/filter/main.go b/examples/filter/main.go index 9871e443..8561128c 100644 --- a/examples/filter/main.go +++ b/examples/filter/main.go @@ -20,8 +20,8 @@ import ( "encoding/json" "os" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/filter" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/filter" log "github.com/sirupsen/logrus" ) diff --git a/internal/ensure/devices.go b/internal/ensure/devices.go index 9f259620..0d71df39 100644 --- a/internal/ensure/devices.go +++ b/internal/ensure/devices.go @@ -23,8 +23,8 @@ import ( "os/exec" "path/filepath" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/NVIDIA/nvidia-container-toolkit/internal/lookup" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" log "github.com/sirupsen/logrus" ) diff --git a/internal/ensure/ensure.go b/internal/ensure/ensure.go index d6485d01..09606876 100644 --- a/internal/ensure/ensure.go +++ b/internal/ensure/ensure.go @@ -16,7 +16,7 @@ package ensure -import "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" +import "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" // Ensure is an alias for Discover type Ensure discover.Discover diff --git a/internal/filter/all.go b/internal/filter/all.go index 339d34e3..8870ea44 100644 --- a/internal/filter/all.go +++ b/internal/filter/all.go @@ -16,7 +16,7 @@ package filter -import "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" +import "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" type all struct { selectors []Selector diff --git a/internal/filter/all_test.go b/internal/filter/all_test.go index f487fa14..f62dc095 100644 --- a/internal/filter/all_test.go +++ b/internal/filter/all_test.go @@ -19,7 +19,7 @@ package filter import ( "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/stretchr/testify/require" ) diff --git a/internal/filter/any.go b/internal/filter/any.go index 51fd4154..ce6db63c 100644 --- a/internal/filter/any.go +++ b/internal/filter/any.go @@ -16,7 +16,7 @@ package filter -import "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" +import "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" type any struct { selectors []Selector diff --git a/internal/filter/any_test.go b/internal/filter/any_test.go index 5ac1f5fa..c8d2eb22 100644 --- a/internal/filter/any_test.go +++ b/internal/filter/any_test.go @@ -19,7 +19,7 @@ package filter import ( "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/stretchr/testify/require" ) diff --git a/internal/filter/by_id.go b/internal/filter/by_id.go index 2a4aea4c..0b5e075f 100644 --- a/internal/filter/by_id.go +++ b/internal/filter/by_id.go @@ -17,7 +17,7 @@ package filter import ( - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" ) type devicesByID map[string]struct{} diff --git a/internal/filter/by_id_test.go b/internal/filter/by_id_test.go index 80a7c66d..7fca5b38 100644 --- a/internal/filter/by_id_test.go +++ b/internal/filter/by_id_test.go @@ -19,7 +19,7 @@ package filter import ( "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/stretchr/testify/require" ) diff --git a/internal/filter/devices.go b/internal/filter/devices.go index 0ba5e0d3..4a27d4d9 100644 --- a/internal/filter/devices.go +++ b/internal/filter/devices.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" log "github.com/sirupsen/logrus" ) diff --git a/internal/filter/devices_test.go b/internal/filter/devices_test.go index 408eddb1..aa83b450 100644 --- a/internal/filter/devices_test.go +++ b/internal/filter/devices_test.go @@ -19,7 +19,7 @@ package filter import ( "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" log "github.com/sirupsen/logrus" testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" diff --git a/internal/filter/is_control_device.go b/internal/filter/is_control_device.go index 359fbee7..f981088a 100644 --- a/internal/filter/is_control_device.go +++ b/internal/filter/is_control_device.go @@ -17,7 +17,7 @@ package filter import ( - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" log "github.com/sirupsen/logrus" ) diff --git a/internal/filter/is_control_device_test.go b/internal/filter/is_control_device_test.go index ebb6634e..94d806d1 100644 --- a/internal/filter/is_control_device_test.go +++ b/internal/filter/is_control_device_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" ) diff --git a/internal/filter/is_standard_device.go b/internal/filter/is_standard_device.go index f5f8d8e6..2384a04e 100644 --- a/internal/filter/is_standard_device.go +++ b/internal/filter/is_standard_device.go @@ -16,7 +16,7 @@ package filter -import "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" +import "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" type standardDevice struct{} diff --git a/internal/filter/is_standard_device_test.go b/internal/filter/is_standard_device_test.go index c1002ca6..9526c8b2 100644 --- a/internal/filter/is_standard_device_test.go +++ b/internal/filter/is_standard_device_test.go @@ -19,7 +19,7 @@ package filter import ( "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "github.com/stretchr/testify/require" ) diff --git a/internal/filter/selector.go b/internal/filter/selector.go index d0cf9642..2075f6f4 100644 --- a/internal/filter/selector.go +++ b/internal/filter/selector.go @@ -16,7 +16,7 @@ package filter -import "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" +import "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" //go:generate moq -stub -out selector_mock.go . Selector diff --git a/internal/filter/selector_mock.go b/internal/filter/selector_mock.go index bc3fdd49..0a3eb2f3 100644 --- a/internal/filter/selector_mock.go +++ b/internal/filter/selector_mock.go @@ -4,7 +4,7 @@ package filter import ( - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" "sync" ) diff --git a/internal/modify/device.go b/internal/modify/device.go index a825e38c..a164f8fa 100644 --- a/internal/modify/device.go +++ b/internal/modify/device.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) diff --git a/internal/modify/discover.go b/internal/modify/discover.go index 89fad3de..f3b52ab3 100644 --- a/internal/modify/discover.go +++ b/internal/modify/discover.go @@ -19,8 +19,8 @@ package modify import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" log "github.com/sirupsen/logrus" ) diff --git a/internal/modify/hooks.go b/internal/modify/hooks.go index 538cae87..73b76d04 100644 --- a/internal/modify/hooks.go +++ b/internal/modify/hooks.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strings" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) diff --git a/internal/modify/modify.go b/internal/modify/modify.go index 12e3775f..5614bb2a 100644 --- a/internal/modify/modify.go +++ b/internal/modify/modify.go @@ -17,7 +17,7 @@ package modify import ( - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" ) //go:generate moq -stub -out modify_mock.go . Modifier diff --git a/internal/modify/modify_mock.go b/internal/modify/modify_mock.go index c9c8a07e..7046efd8 100644 --- a/internal/modify/modify_mock.go +++ b/internal/modify/modify_mock.go @@ -4,7 +4,7 @@ package modify import ( - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "sync" ) diff --git a/internal/modify/mounts.go b/internal/modify/mounts.go index 1f5e7514..75e411a9 100644 --- a/internal/modify/mounts.go +++ b/internal/modify/mounts.go @@ -3,8 +3,8 @@ package modify import ( "strings" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/discover" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/discover" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) diff --git a/internal/runtime/runtime_modifier.go b/internal/runtime/runtime_modifier.go index 55ef4cd3..da6dc488 100644 --- a/internal/runtime/runtime_modifier.go +++ b/internal/runtime/runtime_modifier.go @@ -19,8 +19,8 @@ package runtime import ( "fmt" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/modify" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/modify" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" log "github.com/sirupsen/logrus" ) diff --git a/internal/runtime/runtime_modifier_test.go b/internal/runtime/runtime_modifier_test.go index 9dcd6f27..48e214d5 100644 --- a/internal/runtime/runtime_modifier_test.go +++ b/internal/runtime/runtime_modifier_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/modify" - "github.com/NVIDIA/nvidia-container-toolkit/pkg/oci" + "github.com/NVIDIA/nvidia-container-toolkit/internal/modify" + "github.com/NVIDIA/nvidia-container-toolkit/internal/oci" testlog "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" )