luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

move pluginutils -> helper/pluginutils 

I wanted a different color bikeshed, so I get to paint it
This commit is contained in:
Michael Schurter 2019-01-22 14:42:49 -08:00
parent 80c6eb1bc5
commit be0bab7c3f
53 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/allocrunner/taskrunner/task_runner.go
View File

@ -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 (

2
client/client_test.go
View File

@ -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"

2
client/config/config.go
View File

@ -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"
)

4
client/devicemanager/instance.go
View File

@ -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 (

2
client/devicemanager/manager.go
View File

@ -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

2
client/devicemanager/manager_test.go
View File

@ -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"
)

2
client/fingerprint_manager.go
View File

@ -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

4
client/pluginmanager/drivermanager/instance.go
View File

@ -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 (

2
client/pluginmanager/drivermanager/manager.go
View File

@ -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

2
client/pluginmanager/drivermanager/manager_test.go
View File

@ -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"

6
client/pluginmanager/drivermanager/testing.go
View File

@ -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 {

4
client/testing.go
View File

@ -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"
)

2
command/agent/agent.go
View File

@ -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"
)

6
command/agent/plugins.go
View File

@ -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.

2
drivers/docker/config.go
View File

@ -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 (

2
drivers/docker/driver_test.go
View File

@ -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"

2
drivers/exec/driver.go
View File

@ -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 (

2
drivers/java/driver.go
View File

@ -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 (

2
drivers/mock/driver.go
View File

@ -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 (

2
drivers/qemu/driver.go
View File

@ -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 (

2
drivers/rawexec/driver.go
View File

@ -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 (

2
drivers/rkt/driver.go
View File

@ -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"
)

2
pluginutils/catalog/catalog.go → helper/pluginutils/catalog/catalog.go
View File

@ -5,7 +5,7 @@ package catalog
import (
"sync"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/helper/pluginutils/loader"
)
var (

0
pluginutils/catalog/register.go → helper/pluginutils/catalog/register.go
View File

0
pluginutils/catalog/register_linux.go → helper/pluginutils/catalog/register_linux.go
View File

0
pluginutils/catalog/register_testing.go → helper/pluginutils/catalog/register_testing.go
View File

2
pluginutils/catalog/testing.go → helper/pluginutils/catalog/testing.go
View File

@ -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

0
pluginutils/grpcutils/utils.go → helper/pluginutils/grpcutils/utils.go
View File

0
pluginutils/hclspecutils/dec.go → helper/pluginutils/hclspecutils/dec.go
View File

0
pluginutils/hclspecutils/dec_test.go → helper/pluginutils/hclspecutils/dec_test.go
View File

0
pluginutils/hclspecutils/spec_funcs.go → helper/pluginutils/hclspecutils/spec_funcs.go
View File

0
pluginutils/hclspecutils/type_expr.go → helper/pluginutils/hclspecutils/type_expr.go
View File

0
pluginutils/hclutils/util.go → helper/pluginutils/hclutils/util.go
View File

0
pluginutils/hclutils/util_test.go → helper/pluginutils/hclutils/util_test.go
View File

0
pluginutils/loader/api_versions.go → helper/pluginutils/loader/api_versions.go
View File

0
pluginutils/loader/filter_unix.go → helper/pluginutils/loader/filter_unix.go
View File

0
pluginutils/loader/filter_windows.go → helper/pluginutils/loader/filter_windows.go
View File

4
pluginutils/loader/init.go → helper/pluginutils/loader/init.go
View File

@ -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"
)

0
pluginutils/loader/instance.go → helper/pluginutils/loader/instance.go
View File

0
pluginutils/loader/loader.go → helper/pluginutils/loader/loader.go
View File

0
pluginutils/loader/loader_test.go → helper/pluginutils/loader/loader_test.go
View File

0
pluginutils/loader/plugin_test.go → helper/pluginutils/loader/plugin_test.go
View File

0
pluginutils/loader/testing.go → helper/pluginutils/loader/testing.go
View File

0
pluginutils/loader/util.go → helper/pluginutils/loader/util.go
View File

2
pluginutils/singleton/future.go → helper/pluginutils/singleton/future.go
View File

@ -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

2
pluginutils/singleton/singleton.go → helper/pluginutils/singleton/singleton.go
View File

@ -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 (

2
pluginutils/singleton/singleton_test.go → helper/pluginutils/singleton/singleton_test.go
View File

@ -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"
)

2
nomad/config.go
View File

@ -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"

4
nomad/testing.go
View File

@ -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 (

2
plugins/base/client.go
View File

@ -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

2
plugins/device/client.go
View File

@ -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

2
plugins/drivers/client.go
View File

@ -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"
)

4
plugins/shared/cmd/launcher/command/device.go
View File

@ -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"