diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index 644bc4bea..153999069 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -26,12 +26,12 @@ import ( cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/client/taskenv" "github.com/hashicorp/nomad/client/vaultclient" + "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/helper/pluginutils/hclutils" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/helper/pluginutils/hclutils" ) const ( diff --git a/client/client_test.go b/client/client_test.go index 473e0e70c..a2f0b8e6a 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -14,6 +14,7 @@ import ( consulApi "github.com/hashicorp/nomad/client/consul" "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/command/agent/consul" + "github.com/hashicorp/nomad/helper/pluginutils/catalog" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad" @@ -22,7 +23,6 @@ import ( nconfig "github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/plugins/device" psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" "github.com/hashicorp/nomad/testutil" "github.com/stretchr/testify/assert" diff --git a/client/config/config.go b/client/config/config.go index d950d1381..287d8826d 100644 --- a/client/config/config.go +++ b/client/config/config.go @@ -11,10 +11,10 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/client/state" "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/version" ) diff --git a/client/devicemanager/instance.go b/client/devicemanager/instance.go index 92575b9d3..3119f7207 100644 --- a/client/devicemanager/instance.go +++ b/client/devicemanager/instance.go @@ -8,12 +8,12 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" + "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" ) const ( diff --git a/client/devicemanager/manager.go b/client/devicemanager/manager.go index be24c36a4..d2dad3972 100644 --- a/client/devicemanager/manager.go +++ b/client/devicemanager/manager.go @@ -12,11 +12,11 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/devicemanager/state" "github.com/hashicorp/nomad/client/pluginmanager" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // Manager is the interface used to manage device plugins diff --git a/client/devicemanager/manager_test.go b/client/devicemanager/manager_test.go index 39d9c4c7f..044fb6f26 100644 --- a/client/devicemanager/manager_test.go +++ b/client/devicemanager/manager_test.go @@ -11,13 +11,13 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/state" "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/testutil" "github.com/stretchr/testify/require" ) diff --git a/client/fingerprint_manager.go b/client/fingerprint_manager.go index dfd6cde38..84efed5bc 100644 --- a/client/fingerprint_manager.go +++ b/client/fingerprint_manager.go @@ -7,8 +7,8 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/client/config" "github.com/hashicorp/nomad/client/fingerprint" - "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/nomad/structs" ) // FingerprintManager runs a client fingerprinters on a continuous basis, and diff --git a/client/pluginmanager/drivermanager/instance.go b/client/pluginmanager/drivermanager/instance.go index af7d27bae..e04e50b4d 100644 --- a/client/pluginmanager/drivermanager/instance.go +++ b/client/pluginmanager/drivermanager/instance.go @@ -7,12 +7,12 @@ import ( "time" log "github.com/hashicorp/go-hclog" + "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/helper/pluginutils/loader" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" ) const ( diff --git a/client/pluginmanager/drivermanager/manager.go b/client/pluginmanager/drivermanager/manager.go index 4c9cfe09a..ab3722c41 100644 --- a/client/pluginmanager/drivermanager/manager.go +++ b/client/pluginmanager/drivermanager/manager.go @@ -9,11 +9,11 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/pluginmanager" "github.com/hashicorp/nomad/client/pluginmanager/drivermanager/state" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // ErrDriverNotFound is returned during Dispense when the requested driver diff --git a/client/pluginmanager/drivermanager/manager_test.go b/client/pluginmanager/drivermanager/manager_test.go index c0b128164..5b44b9bfe 100644 --- a/client/pluginmanager/drivermanager/manager_test.go +++ b/client/pluginmanager/drivermanager/manager_test.go @@ -11,12 +11,12 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/pluginmanager" "github.com/hashicorp/nomad/client/state" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" dtu "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/client/pluginmanager/drivermanager/testing.go b/client/pluginmanager/drivermanager/testing.go index db017e97f..080bf1c2d 100644 --- a/client/pluginmanager/drivermanager/testing.go +++ b/client/pluginmanager/drivermanager/testing.go @@ -7,12 +7,12 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/helper/pluginutils/catalog" "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/helper/testlog" + "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/plugins/drivers" ) type testManager struct { diff --git a/client/testing.go b/client/testing.go index d292875c1..8b881c0e9 100644 --- a/client/testing.go +++ b/client/testing.go @@ -8,9 +8,9 @@ import ( consulApi "github.com/hashicorp/nomad/client/consul" "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/command/agent/consul" - "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/pluginutils/catalog" "github.com/hashicorp/nomad/helper/pluginutils/singleton" + "github.com/hashicorp/nomad/helper/testlog" testing "github.com/mitchellh/go-testing-interface" ) diff --git a/command/agent/agent.go b/command/agent/agent.go index e323c9754..b9ecbd0f4 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -23,11 +23,11 @@ import ( clientconfig "github.com/hashicorp/nomad/client/config" "github.com/hashicorp/nomad/client/state" "github.com/hashicorp/nomad/command/agent/consul" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/raft" ) diff --git a/drivers/docker/config.go b/drivers/docker/config.go index 6a9fde702..10776eef2 100644 --- a/drivers/docker/config.go +++ b/drivers/docker/config.go @@ -8,10 +8,10 @@ import ( docker "github.com/fsouza/go-dockerclient" hclog "github.com/hashicorp/go-hclog" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 134615e2a..c3b4f9dbf 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -19,13 +19,13 @@ import ( "github.com/hashicorp/nomad/client/taskenv" "github.com/hashicorp/nomad/client/testutil" "github.com/hashicorp/nomad/devices/gpu/nvidia" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/helper/pluginutils/loader" tu "github.com/hashicorp/nomad/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go index 78061c94c..66cef3c0b 100644 --- a/drivers/exec/driver.go +++ b/drivers/exec/driver.go @@ -16,12 +16,12 @@ import ( "github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/java/driver.go b/drivers/java/driver.go index 0c00c6687..7d7f23c78 100644 --- a/drivers/java/driver.go +++ b/drivers/java/driver.go @@ -15,12 +15,12 @@ import ( "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/executor" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/mock/driver.go b/drivers/mock/driver.go index b039adc98..0f63d7302 100644 --- a/drivers/mock/driver.go +++ b/drivers/mock/driver.go @@ -12,12 +12,12 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go index 130644ec1..c606e5832 100644 --- a/drivers/qemu/driver.go +++ b/drivers/qemu/driver.go @@ -17,11 +17,11 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/executor" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index 5be12bdf9..6a3257a6f 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -15,11 +15,11 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/executor" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go index e86b1c98b..6987a5345 100644 --- a/drivers/rkt/driver.go +++ b/drivers/rkt/driver.go @@ -29,11 +29,11 @@ import ( "github.com/hashicorp/nomad/drivers/shared/eventer" "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/helper/pluginutils/loader" rktv1 "github.com/rkt/rkt/api/v1" ) diff --git a/helper/pluginutils/catalog/testing.go b/helper/pluginutils/catalog/testing.go index b94ba5ec8..82dcbe630 100644 --- a/helper/pluginutils/catalog/testing.go +++ b/helper/pluginutils/catalog/testing.go @@ -3,9 +3,9 @@ package catalog import ( testing "github.com/mitchellh/go-testing-interface" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // TestPluginLoader returns a plugin loader populated only with internal plugins diff --git a/helper/pluginutils/loader/init.go b/helper/pluginutils/loader/init.go index afcb51038..774156c8d 100644 --- a/helper/pluginutils/loader/init.go +++ b/helper/pluginutils/loader/init.go @@ -11,10 +11,10 @@ import ( plugin "github.com/hashicorp/go-plugin" version "github.com/hashicorp/go-version" hcl2 "github.com/hashicorp/hcl2/hcl" - "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" "github.com/hashicorp/nomad/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/nomad/structs/config" + "github.com/hashicorp/nomad/plugins/base" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/helper/pluginutils/singleton/future.go b/helper/pluginutils/singleton/future.go index f1b3d95f6..6869f2763 100644 --- a/helper/pluginutils/singleton/future.go +++ b/helper/pluginutils/singleton/future.go @@ -1,8 +1,8 @@ package singleton import ( - "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/helper/uuid" ) // future is a sharable future for retrieving a plugin instance or any error diff --git a/helper/pluginutils/singleton/singleton.go b/helper/pluginutils/singleton/singleton.go index 5b746caf9..2b90f549c 100644 --- a/helper/pluginutils/singleton/singleton.go +++ b/helper/pluginutils/singleton/singleton.go @@ -6,8 +6,8 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/plugins/base" ) var ( diff --git a/helper/pluginutils/singleton/singleton_test.go b/helper/pluginutils/singleton/singleton_test.go index 5c815b33e..cfe067844 100644 --- a/helper/pluginutils/singleton/singleton_test.go +++ b/helper/pluginutils/singleton/singleton_test.go @@ -8,9 +8,9 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/stretchr/testify/require" ) diff --git a/nomad/config.go b/nomad/config.go index 2ef9e3cb5..eab6267ff 100644 --- a/nomad/config.go +++ b/nomad/config.go @@ -11,10 +11,10 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/memberlist" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/nomad/scheduler" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" diff --git a/nomad/testing.go b/nomad/testing.go index c67bd5b1a..248644bc2 100644 --- a/nomad/testing.go +++ b/nomad/testing.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/consul/lib/freeport" "github.com/hashicorp/nomad/command/agent/consul" + "github.com/hashicorp/nomad/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/helper/pluginutils/catalog" - "github.com/hashicorp/nomad/helper/pluginutils/singleton" ) var ( diff --git a/plugins/base/client.go b/plugins/base/client.go index 73e69f702..d7c4e9431 100644 --- a/plugins/base/client.go +++ b/plugins/base/client.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" "github.com/hashicorp/nomad/plugins/base/proto" "github.com/hashicorp/nomad/plugins/shared/hclspec" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" ) // BasePluginClient implements the client side of a remote base plugin, using diff --git a/plugins/device/client.go b/plugins/device/client.go index b94cbc684..9a2dc1cc6 100644 --- a/plugins/device/client.go +++ b/plugins/device/client.go @@ -7,9 +7,9 @@ import ( "github.com/LK4D4/joincontext" "github.com/golang/protobuf/ptypes" + "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device/proto" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" ) // devicePluginClient implements the client side of a remote device plugin, using diff --git a/plugins/drivers/client.go b/plugins/drivers/client.go index 1d7563f7e..e8ce41c40 100644 --- a/plugins/drivers/client.go +++ b/plugins/drivers/client.go @@ -10,13 +10,13 @@ import ( "github.com/golang/protobuf/ptypes" hclog "github.com/hashicorp/go-hclog" cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers/proto" "github.com/hashicorp/nomad/plugins/shared/hclspec" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" sproto "github.com/hashicorp/nomad/plugins/shared/structs/proto" - "github.com/hashicorp/nomad/helper/pluginutils/grpcutils" "google.golang.org/grpc/status" ) diff --git a/plugins/shared/cmd/launcher/command/device.go b/plugins/shared/cmd/launcher/command/device.go index e8c31eca1..5b5d4855c 100644 --- a/plugins/shared/cmd/launcher/command/device.go +++ b/plugins/shared/cmd/launcher/command/device.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/hcl/hcl/ast" hcl2 "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/hcl2/hcldec" - "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/plugins/device" "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" "github.com/hashicorp/nomad/helper/pluginutils/hclutils" + "github.com/hashicorp/nomad/plugins/base" + "github.com/hashicorp/nomad/plugins/device" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty/msgpack"