From d2136e0aa7c5a0df57b9877c7db29923156a397d Mon Sep 17 00:00:00 2001 From: Danielle Tomlinson Date: Wed, 28 Nov 2018 17:05:10 +0100 Subject: [PATCH] drivers: Move client/drivers/executor to drivers/shared/executor --- client/driver/exec.go | 2 +- client/driver/executor_plugin.go | 2 +- client/driver/executor_plugin_pre_0_9_0.go | 2 +- client/driver/java.go | 2 +- client/driver/qemu.go | 2 +- client/driver/raw_exec.go | 2 +- client/driver/rkt.go | 2 +- client/driver/utils.go | 2 +- drivers/exec/driver.go | 2 +- drivers/exec/handle.go | 2 +- drivers/java/driver.go | 2 +- drivers/java/handle.go | 2 +- drivers/qemu/driver.go | 2 +- drivers/qemu/handle.go | 2 +- drivers/rawexec/driver.go | 2 +- drivers/rawexec/handle.go | 2 +- drivers/rkt/driver.go | 2 +- drivers/rkt/handle.go | 2 +- {client/driver => drivers/shared}/executor/executor.go | 0 {client/driver => drivers/shared}/executor/executor_basic.go | 0 {client/driver => drivers/shared}/executor/executor_linux.go | 0 .../driver => drivers/shared}/executor/executor_linux_test.go | 0 {client/driver => drivers/shared}/executor/executor_test.go | 0 .../shared}/executor/executor_universal_linux.go | 0 {client/driver => drivers/shared}/executor/executor_unix.go | 0 {client/driver => drivers/shared}/executor/executor_windows.go | 0 {client/driver => drivers/shared}/executor/pid_collector.go | 0 .../driver => drivers/shared}/executor/pid_collector_test.go | 0 .../shared}/executor/resource_container_default.go | 0 .../shared}/executor/resource_container_linux.go | 0 plugins/drivers/utils/utils.go | 2 +- 31 files changed, 19 insertions(+), 19 deletions(-) rename {client/driver => drivers/shared}/executor/executor.go (100%) rename {client/driver => drivers/shared}/executor/executor_basic.go (100%) rename {client/driver => drivers/shared}/executor/executor_linux.go (100%) rename {client/driver => drivers/shared}/executor/executor_linux_test.go (100%) rename {client/driver => drivers/shared}/executor/executor_test.go (100%) rename {client/driver => drivers/shared}/executor/executor_universal_linux.go (100%) rename {client/driver => drivers/shared}/executor/executor_unix.go (100%) rename {client/driver => drivers/shared}/executor/executor_windows.go (100%) rename {client/driver => drivers/shared}/executor/pid_collector.go (100%) rename {client/driver => drivers/shared}/executor/pid_collector_test.go (100%) rename {client/driver => drivers/shared}/executor/resource_container_default.go (100%) rename {client/driver => drivers/shared}/executor/resource_container_linux.go (100%) diff --git a/client/driver/exec.go b/client/driver/exec.go index e7e0afe78..6ab770b3c 100644 --- a/client/driver/exec.go +++ b/client/driver/exec.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper/fields" "github.com/hashicorp/nomad/nomad/structs" "github.com/mitchellh/mapstructure" diff --git a/client/driver/executor_plugin.go b/client/driver/executor_plugin.go index b2e30491d..cb0fca7ca 100644 --- a/client/driver/executor_plugin.go +++ b/client/driver/executor_plugin.go @@ -9,8 +9,8 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/drivers/shared/executor" ) // Registering these types since we have to serialize and de-serialize the Task diff --git a/client/driver/executor_plugin_pre_0_9_0.go b/client/driver/executor_plugin_pre_0_9_0.go index eceea403d..9692adc54 100644 --- a/client/driver/executor_plugin_pre_0_9_0.go +++ b/client/driver/executor_plugin_pre_0_9_0.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/go-plugin" - executorv0 "github.com/hashicorp/nomad/client/driver/executorv0" + executorv0 "github.com/hashicorp/nomad/drivers/shared/executorv0" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/client/driver/java.go b/client/driver/java.go index d7a086a56..f2c769c0e 100644 --- a/client/driver/java.go +++ b/client/driver/java.go @@ -18,11 +18,11 @@ import ( "github.com/hashicorp/go-plugin" "github.com/mitchellh/mapstructure" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/fields" "github.com/hashicorp/nomad/nomad/structs" diff --git a/client/driver/qemu.go b/client/driver/qemu.go index e325235b2..e77f4209c 100644 --- a/client/driver/qemu.go +++ b/client/driver/qemu.go @@ -17,10 +17,10 @@ import ( "github.com/coreos/go-semver/semver" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" cstructs "github.com/hashicorp/nomad/client/structs" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper/fields" "github.com/hashicorp/nomad/nomad/structs" "github.com/mitchellh/mapstructure" diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index da1e18e9e..426507e2e 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -14,11 +14,11 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/allocdir" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper/fields" "github.com/hashicorp/nomad/nomad/structs" "github.com/mitchellh/mapstructure" diff --git a/client/driver/rkt.go b/client/driver/rkt.go index 8edb2a5dd..fb26b0ad9 100644 --- a/client/driver/rkt.go +++ b/client/driver/rkt.go @@ -28,10 +28,10 @@ import ( "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper" "github.com/hashicorp/nomad/helper/fields" "github.com/hashicorp/nomad/nomad/structs" diff --git a/client/driver/utils.go b/client/driver/utils.go index 6958fb40d..b1aeb79e8 100644 --- a/client/driver/utils.go +++ b/client/driver/utils.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/go-plugin" "github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper/discover" "github.com/hashicorp/nomad/nomad/structs" ) diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go index ae5bd2626..97b1d6ad7 100644 --- a/drivers/exec/driver.go +++ b/drivers/exec/driver.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" diff --git a/drivers/exec/handle.go b/drivers/exec/handle.go index dbb6c8712..3feb158dc 100644 --- a/drivers/exec/handle.go +++ b/drivers/exec/handle.go @@ -7,7 +7,7 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/drivers" ) diff --git a/drivers/java/driver.go b/drivers/java/driver.go index 7a0d5b2d1..a0beee822 100644 --- a/drivers/java/driver.go +++ b/drivers/java/driver.go @@ -13,11 +13,11 @@ import ( "github.com/hashicorp/consul-template/signals" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" "github.com/hashicorp/nomad/client/fingerprint" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" diff --git a/drivers/java/handle.go b/drivers/java/handle.go index 98586708d..7d493a4a4 100644 --- a/drivers/java/handle.go +++ b/drivers/java/handle.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/drivers" ) diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go index 20cd50436..77274d964 100644 --- a/drivers/qemu/driver.go +++ b/drivers/qemu/driver.go @@ -16,10 +16,10 @@ import ( "github.com/coreos/go-semver/semver" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" diff --git a/drivers/qemu/handle.go b/drivers/qemu/handle.go index 0e8cc73ca..b7aca3614 100644 --- a/drivers/qemu/handle.go +++ b/drivers/qemu/handle.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/drivers" ) diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index 3ae4091be..3163ec1de 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/consul-template/signals" hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" diff --git a/drivers/rawexec/handle.go b/drivers/rawexec/handle.go index 453d707c7..28d9129db 100644 --- a/drivers/rawexec/handle.go +++ b/drivers/rawexec/handle.go @@ -7,7 +7,7 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/drivers" ) diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go index 2c3e48482..6411c0b99 100644 --- a/drivers/rkt/driver.go +++ b/drivers/rkt/driver.go @@ -25,11 +25,11 @@ import ( "github.com/hashicorp/go-plugin" "github.com/hashicorp/go-version" "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" "github.com/hashicorp/nomad/drivers/shared/eventer" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/base" "github.com/hashicorp/nomad/plugins/drivers" "github.com/hashicorp/nomad/plugins/drivers/utils" diff --git a/drivers/rkt/handle.go b/drivers/rkt/handle.go index 754704160..4f3f52983 100644 --- a/drivers/rkt/handle.go +++ b/drivers/rkt/handle.go @@ -9,8 +9,8 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/nomad/client/driver/executor" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/plugins/drivers" ) diff --git a/client/driver/executor/executor.go b/drivers/shared/executor/executor.go similarity index 100% rename from client/driver/executor/executor.go rename to drivers/shared/executor/executor.go diff --git a/client/driver/executor/executor_basic.go b/drivers/shared/executor/executor_basic.go similarity index 100% rename from client/driver/executor/executor_basic.go rename to drivers/shared/executor/executor_basic.go diff --git a/client/driver/executor/executor_linux.go b/drivers/shared/executor/executor_linux.go similarity index 100% rename from client/driver/executor/executor_linux.go rename to drivers/shared/executor/executor_linux.go diff --git a/client/driver/executor/executor_linux_test.go b/drivers/shared/executor/executor_linux_test.go similarity index 100% rename from client/driver/executor/executor_linux_test.go rename to drivers/shared/executor/executor_linux_test.go diff --git a/client/driver/executor/executor_test.go b/drivers/shared/executor/executor_test.go similarity index 100% rename from client/driver/executor/executor_test.go rename to drivers/shared/executor/executor_test.go diff --git a/client/driver/executor/executor_universal_linux.go b/drivers/shared/executor/executor_universal_linux.go similarity index 100% rename from client/driver/executor/executor_universal_linux.go rename to drivers/shared/executor/executor_universal_linux.go diff --git a/client/driver/executor/executor_unix.go b/drivers/shared/executor/executor_unix.go similarity index 100% rename from client/driver/executor/executor_unix.go rename to drivers/shared/executor/executor_unix.go diff --git a/client/driver/executor/executor_windows.go b/drivers/shared/executor/executor_windows.go similarity index 100% rename from client/driver/executor/executor_windows.go rename to drivers/shared/executor/executor_windows.go diff --git a/client/driver/executor/pid_collector.go b/drivers/shared/executor/pid_collector.go similarity index 100% rename from client/driver/executor/pid_collector.go rename to drivers/shared/executor/pid_collector.go diff --git a/client/driver/executor/pid_collector_test.go b/drivers/shared/executor/pid_collector_test.go similarity index 100% rename from client/driver/executor/pid_collector_test.go rename to drivers/shared/executor/pid_collector_test.go diff --git a/client/driver/executor/resource_container_default.go b/drivers/shared/executor/resource_container_default.go similarity index 100% rename from client/driver/executor/resource_container_default.go rename to drivers/shared/executor/resource_container_default.go diff --git a/client/driver/executor/resource_container_linux.go b/drivers/shared/executor/resource_container_linux.go similarity index 100% rename from client/driver/executor/resource_container_linux.go rename to drivers/shared/executor/resource_container_linux.go diff --git a/plugins/drivers/utils/utils.go b/plugins/drivers/utils/utils.go index b690ebce1..68f62c814 100644 --- a/plugins/drivers/utils/utils.go +++ b/plugins/drivers/utils/utils.go @@ -13,10 +13,10 @@ import ( "github.com/hashicorp/nomad/client/allocdir" "github.com/hashicorp/nomad/client/config" "github.com/hashicorp/nomad/client/driver" - "github.com/hashicorp/nomad/client/driver/executor" dstructs "github.com/hashicorp/nomad/client/driver/structs" cstructs "github.com/hashicorp/nomad/client/structs" "github.com/hashicorp/nomad/drivers/shared/env" + "github.com/hashicorp/nomad/drivers/shared/executor" "github.com/hashicorp/nomad/helper/discover" "github.com/hashicorp/nomad/nomad/structs" "github.com/hashicorp/nomad/plugins/base"