CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(plugins): Refactor host plugins to boundary plugins (#3262)

Browse Source
This commit is contained in:
Louis Ruch authored and GitHub committed 2023-06-02 08:04:50 -07:00
1 parent 97977f1995
commit 281f217dcc
16 files changed
+37 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/daemon/controller/controller.go
+3 -3
View File
@@ -44,7 +44,7 @@ import (
pluginstorage "github.com/hashicorp/boundary/internal/storage/plugin"
"github.com/hashicorp/boundary/internal/target"
"github.com/hashicorp/boundary/internal/types/scope"
host_plugin_assets "github.com/hashicorp/boundary/plugins/host"
boundary_plugin_assets "github.com/hashicorp/boundary/plugins/boundary"
plgpb "github.com/hashicorp/boundary/sdk/pbs/plugin"
external_plugins "github.com/hashicorp/boundary/sdk/plugins"
"github.com/hashicorp/boundary/version"
@@ -273,7 +273,7 @@ func New(ctx context.Context, conf *Config) (*Controller, error) {
pluginType,
external_plugins.WithPluginOptions(
pluginutil.WithPluginExecutionDirectory(conf.RawConfig.Plugins.ExecutionDir),
pluginutil.WithPluginsFilesystem(host_plugin_assets.HostPluginPrefix, host_plugin_assets.FileSystem()),
pluginutil.WithPluginsFilesystem(boundary_plugin_assets.PluginPrefix, boundary_plugin_assets.FileSystem()),
),
external_plugins.WithLogger(pluginLogger.Named(pluginType)),
)
@@ -291,7 +291,7 @@ func New(ctx context.Context, conf *Config) (*Controller, error) {
pluginType,
external_plugins.WithPluginOptions(
pluginutil.WithPluginExecutionDirectory(conf.RawConfig.Plugins.ExecutionDir),
pluginutil.WithPluginsFilesystem(host_plugin_assets.HostPluginPrefix, host_plugin_assets.FileSystem()),
pluginutil.WithPluginsFilesystem(boundary_plugin_assets.PluginPrefix, boundary_plugin_assets.FileSystem()),
),
external_plugins.WithLogger(pluginLogger.Named(pluginType)),
)
internal/daemon/controller/controller_test.go
+3 -3
View File
@@ -15,7 +15,7 @@ import (
"github.com/hashicorp/boundary/internal/iam"
"github.com/hashicorp/boundary/internal/kms"
"github.com/hashicorp/boundary/internal/types/scope"
host_plugin_assets "github.com/hashicorp/boundary/plugins/host"
boundary_plugin_assets "github.com/hashicorp/boundary/plugins/boundary"
"github.com/hashicorp/go-secure-stdlib/listenerutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -271,8 +271,8 @@ func TestController_NewPluginsConfig(t *testing.T) {
// Remove random chars and hyphen
name = name[0 : len(name)-6]
switch name {
case host_plugin_assets.HostPluginPrefix + "aws",
host_plugin_assets.HostPluginPrefix + "azure":
case boundary_plugin_assets.PluginPrefix + "aws",
boundary_plugin_assets.PluginPrefix + "azure":
default:
require.Fail("unexpected name", name)
}