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

loader and singleton

This commit is contained in:
Alex Dadgar 2019-01-14 16:50:05 -08:00 committed by Michael Schurter
parent 6c2782f037
commit cdcd3c929c
35 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/plugins/shared/loader"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/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"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
)
// Manager is the interface used to manage device plugins

2
client/devicemanager/manager_test.go
View File

@ -16,7 +16,7 @@ import (
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/plugins/base"
"github.com/hashicorp/nomad/plugins/device"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
psstructs "github.com/hashicorp/nomad/plugins/shared/structs"
"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/plugins/shared/loader"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/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"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

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

@ -11,8 +11,8 @@ import (
"github.com/hashicorp/nomad/plugins/base"
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/pluginutils/catalog"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/pluginutils/singleton"
)
type testManager struct {

2
client/testing.go
View File

@ -10,7 +10,7 @@ import (
"github.com/hashicorp/nomad/command/agent/consul"
"github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/pluginutils/catalog"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/raft"
)

4
command/agent/plugins.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"github.com/hashicorp/nomad/pluginutils/catalog"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/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/plugins/shared/loader"
"github.com/hashicorp/nomad/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"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)

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"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)

2
drivers/mock/driver.go
View File

@ -16,7 +16,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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)

2
drivers/qemu/driver.go
View File

@ -21,7 +21,7 @@ import (
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)

2
drivers/rawexec/driver.go
View File

@ -19,7 +19,7 @@ import (
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)

2
drivers/rkt/driver.go
View File

@ -33,7 +33,7 @@ import (
"github.com/hashicorp/nomad/plugins/drivers"
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
rktv1 "github.com/rkt/rkt/api/v1"
)

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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/hashicorp/nomad/scheduler"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/serf"

2
nomad/testing.go
View File

@ -13,7 +13,7 @@ import (
"github.com/hashicorp/nomad/nomad/mock"
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/pluginutils/catalog"
"github.com/hashicorp/nomad/plugins/shared/singleton"
"github.com/hashicorp/nomad/pluginutils/singleton"
"github.com/mitchellh/go-testing-interface"
)

2
pluginutils/catalog/catalog.go
View File

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

2
pluginutils/catalog/testing.go
View File

@ -3,7 +3,7 @@ package catalog
import (
"github.com/hashicorp/nomad/helper/testlog"
"github.com/hashicorp/nomad/nomad/structs/config"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/mitchellh/go-testing-interface"
)

0
plugins/shared/loader/api_versions.go → pluginutils/loader/api_versions.go
View File

0
plugins/shared/loader/init.go → pluginutils/loader/init.go
View File

0
plugins/shared/loader/instance.go → pluginutils/loader/instance.go
View File

0
plugins/shared/loader/loader.go → pluginutils/loader/loader.go
View File

0
plugins/shared/loader/loader_test.go → pluginutils/loader/loader_test.go
View File

0
plugins/shared/loader/plugin_test.go → pluginutils/loader/plugin_test.go
View File

0
plugins/shared/loader/testing.go → pluginutils/loader/testing.go
View File

0
plugins/shared/loader/util.go → pluginutils/loader/util.go
View File

2
plugins/shared/singleton/future.go → pluginutils/singleton/future.go
View File

@ -2,7 +2,7 @@ package singleton
import (
"github.com/hashicorp/nomad/helper/uuid"
"github.com/hashicorp/nomad/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
)
// future is a sharable future for retrieving a plugin instance or any error

2
plugins/shared/singleton/singleton.go → 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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
)
var (

2
plugins/shared/singleton/singleton_test.go → 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/plugins/shared/loader"
"github.com/hashicorp/nomad/pluginutils/loader"
"github.com/stretchr/testify/require"
)