Move the executor and spawn package into driver

2026-01-04 17:35:43 +03:00 · 2015-11-04 16:53:27 -08:00
parent 64be746d9b
commit 0f1050b1bf
13 changed files with 3 additions and 3 deletions
--- a/client/driver/exec.go
+++ b/client/driver/exec.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )

--- a/client/driver/executor/exec.go
+++ b/client/driver/executor/exec.go
--- a/client/driver/executor/exec_basic.go
+++ b/client/driver/executor/exec_basic.go
--- a/client/driver/executor/exec_linux.go
+++ b/client/driver/executor/exec_linux.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/driver/args"
 	"github.com/hashicorp/nomad/client/driver/environment"
-	"github.com/hashicorp/nomad/client/spawn"
+	"github.com/hashicorp/nomad/client/driver/spawn"
 	"github.com/hashicorp/nomad/nomad/structs"

 	"github.com/opencontainers/runc/libcontainer/cgroups"
--- a/client/driver/executor/exec_linux_test.go
+++ b/client/driver/executor/exec_linux_test.go
--- a/client/driver/executor/exec_universal.go
+++ b/client/driver/executor/exec_universal.go
--- a/client/driver/executor/setuid.go
+++ b/client/driver/executor/setuid.go
--- a/client/driver/executor/setuid_windows.go
+++ b/client/driver/executor/setuid_windows.go
--- a/client/driver/java.go
+++ b/client/driver/java.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/go-getter"
 	"github.com/hashicorp/nomad/client/allocdir"
 	"github.com/hashicorp/nomad/client/config"
-	"github.com/hashicorp/nomad/client/executor"
+	"github.com/hashicorp/nomad/client/driver/executor"
 	"github.com/hashicorp/nomad/nomad/structs"
 )

--- a/client/driver/spawn/spawn.go
+++ b/client/driver/spawn/spawn.go
--- a/client/driver/spawn/spawn_posix.go
+++ b/client/driver/spawn/spawn_posix.go
--- a/client/driver/spawn/spawn_test.go
+++ b/client/driver/spawn/spawn_test.go
--- a/client/driver/spawn/spawn_windows.go
+++ b/client/driver/spawn/spawn_windows.go