command/0.12upgrade: honor user-supplied plugin-dir

Fixes #21594
hashicorp · Aug 2, 2019 · de42356 · de42356
1 parent 4c63187
commit de42356
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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)