diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index 3a53b0056..644bc4bea 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -30,8 +30,8 @@ import ( "github.com/hashicorp/nomad/nomad/structs" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/pluginutils/hclutils" + "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 e622005f6..473e0e70c 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -22,7 +22,7 @@ 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/pluginutils/catalog" + "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 7ec223030..d950d1381 100644 --- a/client/config/config.go +++ b/client/config/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 532d3e2a8..92575b9d3 100644 --- a/client/devicemanager/instance.go +++ b/client/devicemanager/instance.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/nomad/plugins/base" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/pluginutils/loader" - "github.com/hashicorp/nomad/pluginutils/singleton" + "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 43bf2ca2b..be24c36a4 100644 --- a/client/devicemanager/manager.go +++ b/client/devicemanager/manager.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 a72fdb882..39d9c4c7f 100644 --- a/client/devicemanager/manager_test.go +++ b/client/devicemanager/manager_test.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" psstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 58e76262b..dfd6cde38 100644 --- a/client/fingerprint_manager.go +++ b/client/fingerprint_manager.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/nomad/client/config" "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // 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 f0c0b08e5..af7d27bae 100644 --- a/client/pluginmanager/drivermanager/instance.go +++ b/client/pluginmanager/drivermanager/instance.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/nomad/plugins/base" bstructs "github.com/hashicorp/nomad/plugins/base/structs" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/pluginutils/loader" - "github.com/hashicorp/nomad/pluginutils/singleton" + "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 39cd4fb7b..4c9cfe09a 100644 --- a/client/pluginmanager/drivermanager/manager.go +++ b/client/pluginmanager/drivermanager/manager.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" pstructs "github.com/hashicorp/nomad/plugins/shared/structs" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 af88fbc7e..c0b128164 100644 --- a/client/pluginmanager/drivermanager/manager_test.go +++ b/client/pluginmanager/drivermanager/manager_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" dtu "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 03b372130..db017e97f 100644 --- a/client/pluginmanager/drivermanager/testing.go +++ b/client/pluginmanager/drivermanager/testing.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" - "github.com/hashicorp/nomad/pluginutils/catalog" - "github.com/hashicorp/nomad/pluginutils/loader" - "github.com/hashicorp/nomad/pluginutils/singleton" + "github.com/hashicorp/nomad/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" ) type testManager struct { diff --git a/client/testing.go b/client/testing.go index 0b48ec646..d292875c1 100644 --- a/client/testing.go +++ b/client/testing.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/nomad/client/fingerprint" "github.com/hashicorp/nomad/command/agent/consul" "github.com/hashicorp/nomad/helper/testlog" - "github.com/hashicorp/nomad/pluginutils/catalog" - "github.com/hashicorp/nomad/pluginutils/singleton" + "github.com/hashicorp/nomad/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" testing "github.com/mitchellh/go-testing-interface" ) diff --git a/command/agent/agent.go b/command/agent/agent.go index 095b38848..e323c9754 100644 --- a/command/agent/agent.go +++ b/command/agent/agent.go @@ -27,7 +27,7 @@ import ( "github.com/hashicorp/nomad/nomad" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/hashicorp/raft" ) diff --git a/command/agent/plugins.go b/command/agent/plugins.go index a7339de5a..8f96d471d 100644 --- a/command/agent/plugins.go +++ b/command/agent/plugins.go @@ -3,9 +3,9 @@ package agent import ( "fmt" - "github.com/hashicorp/nomad/pluginutils/catalog" - "github.com/hashicorp/nomad/pluginutils/loader" - "github.com/hashicorp/nomad/pluginutils/singleton" + "github.com/hashicorp/nomad/helper/pluginutils/catalog" + "github.com/hashicorp/nomad/helper/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/singleton" ) // setupPlugins is used to setup the plugin loaders. diff --git a/drivers/docker/config.go b/drivers/docker/config.go index 6447b6aac..6a9fde702 100644 --- a/drivers/docker/config.go +++ b/drivers/docker/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/shared/hclspec" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go index 330e2c3f6..134615e2a 100644 --- a/drivers/docker/driver_test.go +++ b/drivers/docker/driver_test.go @@ -25,7 +25,7 @@ import ( "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" dtestutil "github.com/hashicorp/nomad/plugins/drivers/testutils" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 e5ac3d706..78061c94c 100644 --- a/drivers/exec/driver.go +++ b/drivers/exec/driver.go @@ -21,7 +21,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/java/driver.go b/drivers/java/driver.go index 3284a5e64..0c00c6687 100644 --- a/drivers/java/driver.go +++ b/drivers/java/driver.go @@ -20,7 +20,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/mock/driver.go b/drivers/mock/driver.go index e5053b394..b039adc98 100644 --- a/drivers/mock/driver.go +++ b/drivers/mock/driver.go @@ -17,7 +17,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go index bc37a8961..130644ec1 100644 --- a/drivers/qemu/driver.go +++ b/drivers/qemu/driver.go @@ -21,7 +21,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index dc0273701..5be12bdf9 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -19,7 +19,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) const ( diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go index 2217ba628..e86b1c98b 100644 --- a/drivers/rkt/driver.go +++ b/drivers/rkt/driver.go @@ -33,7 +33,7 @@ import ( "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/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" rktv1 "github.com/rkt/rkt/api/v1" ) diff --git a/pluginutils/catalog/catalog.go b/helper/pluginutils/catalog/catalog.go similarity index 96% rename from pluginutils/catalog/catalog.go rename to helper/pluginutils/catalog/catalog.go index c86f94113..6d12de4a3 100644 --- a/pluginutils/catalog/catalog.go +++ b/helper/pluginutils/catalog/catalog.go @@ -5,7 +5,7 @@ package catalog import ( "sync" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) var ( diff --git a/pluginutils/catalog/register.go b/helper/pluginutils/catalog/register.go similarity index 100% rename from pluginutils/catalog/register.go rename to helper/pluginutils/catalog/register.go diff --git a/pluginutils/catalog/register_linux.go b/helper/pluginutils/catalog/register_linux.go similarity index 100% rename from pluginutils/catalog/register_linux.go rename to helper/pluginutils/catalog/register_linux.go diff --git a/pluginutils/catalog/register_testing.go b/helper/pluginutils/catalog/register_testing.go similarity index 100% rename from pluginutils/catalog/register_testing.go rename to helper/pluginutils/catalog/register_testing.go diff --git a/pluginutils/catalog/testing.go b/helper/pluginutils/catalog/testing.go similarity index 96% rename from pluginutils/catalog/testing.go rename to helper/pluginutils/catalog/testing.go index 0c98d301e..b94ba5ec8 100644 --- a/pluginutils/catalog/testing.go +++ b/helper/pluginutils/catalog/testing.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // TestPluginLoader returns a plugin loader populated only with internal plugins diff --git a/pluginutils/grpcutils/utils.go b/helper/pluginutils/grpcutils/utils.go similarity index 100% rename from pluginutils/grpcutils/utils.go rename to helper/pluginutils/grpcutils/utils.go diff --git a/pluginutils/hclspecutils/dec.go b/helper/pluginutils/hclspecutils/dec.go similarity index 100% rename from pluginutils/hclspecutils/dec.go rename to helper/pluginutils/hclspecutils/dec.go diff --git a/pluginutils/hclspecutils/dec_test.go b/helper/pluginutils/hclspecutils/dec_test.go similarity index 100% rename from pluginutils/hclspecutils/dec_test.go rename to helper/pluginutils/hclspecutils/dec_test.go diff --git a/pluginutils/hclspecutils/spec_funcs.go b/helper/pluginutils/hclspecutils/spec_funcs.go similarity index 100% rename from pluginutils/hclspecutils/spec_funcs.go rename to helper/pluginutils/hclspecutils/spec_funcs.go diff --git a/pluginutils/hclspecutils/type_expr.go b/helper/pluginutils/hclspecutils/type_expr.go similarity index 100% rename from pluginutils/hclspecutils/type_expr.go rename to helper/pluginutils/hclspecutils/type_expr.go diff --git a/pluginutils/hclutils/util.go b/helper/pluginutils/hclutils/util.go similarity index 100% rename from pluginutils/hclutils/util.go rename to helper/pluginutils/hclutils/util.go diff --git a/pluginutils/hclutils/util_test.go b/helper/pluginutils/hclutils/util_test.go similarity index 100% rename from pluginutils/hclutils/util_test.go rename to helper/pluginutils/hclutils/util_test.go diff --git a/pluginutils/loader/api_versions.go b/helper/pluginutils/loader/api_versions.go similarity index 100% rename from pluginutils/loader/api_versions.go rename to helper/pluginutils/loader/api_versions.go diff --git a/pluginutils/loader/filter_unix.go b/helper/pluginutils/loader/filter_unix.go similarity index 100% rename from pluginutils/loader/filter_unix.go rename to helper/pluginutils/loader/filter_unix.go diff --git a/pluginutils/loader/filter_windows.go b/helper/pluginutils/loader/filter_windows.go similarity index 100% rename from pluginutils/loader/filter_windows.go rename to helper/pluginutils/loader/filter_windows.go diff --git a/pluginutils/loader/init.go b/helper/pluginutils/loader/init.go similarity index 99% rename from pluginutils/loader/init.go rename to helper/pluginutils/loader/init.go index fbe4615e9..afcb51038 100644 --- a/pluginutils/loader/init.go +++ b/helper/pluginutils/loader/init.go @@ -13,8 +13,8 @@ import ( hcl2 "github.com/hashicorp/hcl2/hcl" "github.com/hashicorp/nomad/nomad/structs/config" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/pluginutils/hclutils" + "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/helper/pluginutils/hclutils" "github.com/zclconf/go-cty/cty/msgpack" ) diff --git a/pluginutils/loader/instance.go b/helper/pluginutils/loader/instance.go similarity index 100% rename from pluginutils/loader/instance.go rename to helper/pluginutils/loader/instance.go diff --git a/pluginutils/loader/loader.go b/helper/pluginutils/loader/loader.go similarity index 100% rename from pluginutils/loader/loader.go rename to helper/pluginutils/loader/loader.go diff --git a/pluginutils/loader/loader_test.go b/helper/pluginutils/loader/loader_test.go similarity index 100% rename from pluginutils/loader/loader_test.go rename to helper/pluginutils/loader/loader_test.go diff --git a/pluginutils/loader/plugin_test.go b/helper/pluginutils/loader/plugin_test.go similarity index 100% rename from pluginutils/loader/plugin_test.go rename to helper/pluginutils/loader/plugin_test.go diff --git a/pluginutils/loader/testing.go b/helper/pluginutils/loader/testing.go similarity index 100% rename from pluginutils/loader/testing.go rename to helper/pluginutils/loader/testing.go diff --git a/pluginutils/loader/util.go b/helper/pluginutils/loader/util.go similarity index 100% rename from pluginutils/loader/util.go rename to helper/pluginutils/loader/util.go diff --git a/pluginutils/singleton/future.go b/helper/pluginutils/singleton/future.go similarity index 95% rename from pluginutils/singleton/future.go rename to helper/pluginutils/singleton/future.go index 3b55bc358..f1b3d95f6 100644 --- a/pluginutils/singleton/future.go +++ b/helper/pluginutils/singleton/future.go @@ -2,7 +2,7 @@ package singleton import ( "github.com/hashicorp/nomad/helper/uuid" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) // future is a sharable future for retrieving a plugin instance or any error diff --git a/pluginutils/singleton/singleton.go b/helper/pluginutils/singleton/singleton.go similarity index 98% rename from pluginutils/singleton/singleton.go rename to helper/pluginutils/singleton/singleton.go index 4145d0869..5b746caf9 100644 --- a/pluginutils/singleton/singleton.go +++ b/helper/pluginutils/singleton/singleton.go @@ -7,7 +7,7 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" ) var ( diff --git a/pluginutils/singleton/singleton_test.go b/helper/pluginutils/singleton/singleton_test.go similarity index 99% rename from pluginutils/singleton/singleton_test.go rename to helper/pluginutils/singleton/singleton_test.go index 57e69b19c..5c815b33e 100644 --- a/pluginutils/singleton/singleton_test.go +++ b/helper/pluginutils/singleton/singleton_test.go @@ -10,7 +10,7 @@ import ( plugin "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/plugins/base" - "github.com/hashicorp/nomad/pluginutils/loader" + "github.com/hashicorp/nomad/helper/pluginutils/loader" "github.com/stretchr/testify/require" ) diff --git a/nomad/config.go b/nomad/config.go index 929ba2948..2ef9e3cb5 100644 --- a/nomad/config.go +++ b/nomad/config.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/nomad/helper/uuid" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/nomad/structs/config" - "github.com/hashicorp/nomad/pluginutils/loader" + "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 374fc4790..c67bd5b1a 100644 --- a/nomad/testing.go +++ b/nomad/testing.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" - "github.com/hashicorp/nomad/pluginutils/catalog" - "github.com/hashicorp/nomad/pluginutils/singleton" + "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 dd0f728d7..73e69f702 100644 --- a/plugins/base/client.go +++ b/plugins/base/client.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/nomad/plugins/base/proto" "github.com/hashicorp/nomad/plugins/shared/hclspec" - "github.com/hashicorp/nomad/pluginutils/grpcutils" + "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 b602d3127..b94cbc684 100644 --- a/plugins/device/client.go +++ b/plugins/device/client.go @@ -9,7 +9,7 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device/proto" - "github.com/hashicorp/nomad/pluginutils/grpcutils" + "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 899c2f85f..1d7563f7e 100644 --- a/plugins/drivers/client.go +++ b/plugins/drivers/client.go @@ -16,7 +16,7 @@ import ( "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/pluginutils/grpcutils" + "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 7ad69f7f7..e8c31eca1 100644 --- a/plugins/shared/cmd/launcher/command/device.go +++ b/plugins/shared/cmd/launcher/command/device.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/hcl2/hcldec" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/device" - "github.com/hashicorp/nomad/pluginutils/hclspecutils" - "github.com/hashicorp/nomad/pluginutils/hclutils" + "github.com/hashicorp/nomad/helper/pluginutils/hclspecutils" + "github.com/hashicorp/nomad/helper/pluginutils/hclutils" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/zclconf/go-cty/cty/msgpack"