diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go index 070acc6f2..91e3f548b 100644 --- a/drivers/exec/driver.go +++ b/drivers/exec/driver.go @@ -271,7 +271,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { if err != nil { return err } - return d.recoverPre09task(handle.Config, reattachConfig) + return d.recoverPre09Task(handle.Config, reattachConfig) } // If already attached to handle there's nothing to recover. diff --git a/drivers/exec/driver_pre09.go b/drivers/exec/driver_pre09.go index e475f73d0..982123845 100644 --- a/drivers/exec/driver_pre09.go +++ b/drivers/exec/driver_pre09.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" ) -func (d *Driver) recoverPre09task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { +func (d *Driver) recoverPre09Task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { config.ID = fmt.Sprintf("pre09-%s", uuid.Generate()) exec, pluginClient, err := executor.ReattachToPre09Executor(reattach, d.logger.With("task_name", config.Name, "alloc_id", config.AllocID)) diff --git a/drivers/java/driver.go b/drivers/java/driver.go index e64069ed3..433539e9d 100644 --- a/drivers/java/driver.go +++ b/drivers/java/driver.go @@ -259,7 +259,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { if err != nil { return err } - return d.recoverPre09task(handle.Config, reattachConfig) + return d.recoverPre09Task(handle.Config, reattachConfig) } // If already attached to handle there's nothing to recover. diff --git a/drivers/java/driver_pre09.go b/drivers/java/driver_pre09.go index 6186be233..58ba66493 100644 --- a/drivers/java/driver_pre09.go +++ b/drivers/java/driver_pre09.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" ) -func (d *Driver) recoverPre09task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { +func (d *Driver) recoverPre09Task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { config.ID = fmt.Sprintf("pre09-%s", uuid.Generate()) exec, pluginClient, err := executor.ReattachToPre09Executor(reattach, d.logger.With("task_name", config.Name, "alloc_id", config.AllocID)) diff --git a/drivers/qemu/driver.go b/drivers/qemu/driver.go index 37b8727aa..7d2420400 100644 --- a/drivers/qemu/driver.go +++ b/drivers/qemu/driver.go @@ -257,7 +257,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { if err != nil { return err } - return d.recoverPre09task(handle.Config, reattachConfig) + return d.recoverPre09Task(handle.Config, reattachConfig) } // If already attached to handle there's nothing to recover. diff --git a/drivers/qemu/driver_pre09.go b/drivers/qemu/driver_pre09.go index 605c8c23c..152b3f59a 100644 --- a/drivers/qemu/driver_pre09.go +++ b/drivers/qemu/driver_pre09.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" ) -func (d *Driver) recoverPre09task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { +func (d *Driver) recoverPre09Task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { config.ID = fmt.Sprintf("pre09-%s", uuid.Generate()) exec, pluginClient, err := executor.ReattachToPre09Executor(reattach, d.logger.With("task_name", config.Name, "alloc_id", config.AllocID)) diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go index aa5523a63..9a3aec507 100644 --- a/drivers/rawexec/driver.go +++ b/drivers/rawexec/driver.go @@ -263,7 +263,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { if err != nil { return err } - return d.recoverPre0_9Task(handle.Config, reattachConfig) + return d.recoverPre09Task(handle.Config, reattachConfig) } // If already attached to handle there's nothing to recover. diff --git a/drivers/rawexec/driver_pre09.go b/drivers/rawexec/driver_pre09.go index c2201ca0e..9a60842de 100644 --- a/drivers/rawexec/driver_pre09.go +++ b/drivers/rawexec/driver_pre09.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" ) -func (d *Driver) recoverPre09task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { +func (d *Driver) recoverPre09Task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { config.ID = fmt.Sprintf("pre09-%s", uuid.Generate()) exec, pluginClient, err := executor.ReattachToPre09Executor(reattach, d.logger.With("task_name", config.Name, "alloc_id", config.AllocID)) diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go index 155af21bf..e6c1a2225 100644 --- a/drivers/rkt/driver.go +++ b/drivers/rkt/driver.go @@ -370,7 +370,7 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error { if err != nil { return err } - return d.recoverPre09task(handle.Config, reattachConfig) + return d.recoverPre09Task(handle.Config, reattachConfig) } // If already attached to handle there's nothing to recover. diff --git a/drivers/rkt/driver_pre09.go b/drivers/rkt/driver_pre09.go index c23b4c737..6695f6e38 100644 --- a/drivers/rkt/driver_pre09.go +++ b/drivers/rkt/driver_pre09.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/nomad/plugins/drivers" ) -func (d *Driver) recoverPre09task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { +func (d *Driver) recoverPre09Task(config *drivers.TaskConfig, reattach *plugin.ReattachConfig) error { config.ID = fmt.Sprintf("pre09-%s", uuid.Generate()) exec, pluginClient, err := executor.ReattachToPre09Executor(reattach, d.logger.With("task_name", config.Name, "alloc_id", config.AllocID))