From de4235698b8ac40a902473a6987592c41674e4ca Mon Sep 17 00:00:00 2001 From: hiroqn Date: Fri, 2 Aug 2019 21:58:21 +0900 Subject: [PATCH] command/0.12upgrade: honor user-supplied plugin-dir Fixes #21594 --- command/012_config_upgrade.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/command/012_config_upgrade.go b/command/012_config_upgrade.go index 4f0dc7c4a2..5ea7c8f4e9 100644 --- a/command/012_config_upgrade.go +++ b/command/012_config_upgrade.go @@ -56,6 +56,12 @@ func (c *ZeroTwelveUpgradeCommand) Run(args []string) int { return 1 } + // Check for user-supplied plugin path + if c.pluginPath, err = c.loadPluginPath(); err != nil { + c.Ui.Error(fmt.Sprintf("Error loading plugin path: %s", err)) + return 1 + } + dir = c.normalizePath(dir) sources, err := configupgrade.LoadModule(dir)