Skip to content

Commit

Permalink
driver uncomment and general cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
philrenaud committed Dec 10, 2024
1 parent f7ca7d5 commit f251fd3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
1 change: 0 additions & 1 deletion command/deployment_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ func (c *DeploymentStatusCommand) Run(args []string) int {
formatTime(time.Now()), limit(deploy.ID, length)))
c.monitor(client, deploy.ID, meta.LastIndex, wait, verbose)

// Hint here
hint, _ := c.Meta.showUIPath(UIHintContext{
Command: "deployment status",
PathParams: map[string]string{
Expand Down
1 change: 0 additions & 1 deletion command/job_run.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ func (c *JobRunCommand) Run(args []string) int {
}

// Detach was not specified, so start monitoring
// Set hint to open the browser
hint, _ := c.Meta.showUIPath(UIHintContext{
Command: "job run",
PathParams: map[string]string{
Expand Down
14 changes: 6 additions & 8 deletions helper/pluginutils/catalog/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@

package catalog

// TODO: changes made to get mac buildin' again.

import (
"github.com/hashicorp/nomad/drivers/docker"
// "github.com/hashicorp/nomad/drivers/exec"
// "github.com/hashicorp/nomad/drivers/java"
// "github.com/hashicorp/nomad/drivers/qemu"
"github.com/hashicorp/nomad/drivers/exec"
"github.com/hashicorp/nomad/drivers/java"
"github.com/hashicorp/nomad/drivers/qemu"
"github.com/hashicorp/nomad/drivers/rawexec"
)

Expand All @@ -18,8 +16,8 @@ import (
// register_XXX.go file.
func init() {
RegisterDeferredConfig(rawexec.PluginID, rawexec.PluginConfig, rawexec.PluginLoader)
// Register(exec.PluginID, exec.PluginConfig)
// Register(qemu.PluginID, qemu.PluginConfig)
// Register(java.PluginID, java.PluginConfig)
Register(exec.PluginID, exec.PluginConfig)
Register(qemu.PluginID, qemu.PluginConfig)
Register(java.PluginID, java.PluginConfig)
RegisterDeferredConfig(docker.PluginID, docker.PluginConfig, docker.PluginLoader)
}

0 comments on commit f251fd3

Please sign in to comment.