From 54998933f5ae0a60389b32018f9b55b01d2072c1 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 9 Aug 2017 11:14:33 -0400 Subject: [PATCH] load Meta.PluginOverrides in dicovery Make sure the override paths from the legacy rc file are loaded for discovery. --- command/plugins.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/command/plugins.go b/command/plugins.go index ca94f07b93..ce26b0f855 100644 --- a/command/plugins.go +++ b/command/plugins.go @@ -172,6 +172,12 @@ func (m *Meta) pluginDirs(includeAutoInstalled bool) []string { // the defined search paths. func (m *Meta) providerPluginSet() discovery.PluginMetaSet { plugins := discovery.FindPlugins("provider", m.pluginDirs(true)) + + // Add providers defined in the legacy .terraformrc, + if m.PluginOverrides != nil { + plugins = plugins.OverridePaths(m.PluginOverrides.Providers) + } + plugins, _ = plugins.ValidateVersions() for p := range plugins { @@ -198,6 +204,12 @@ func (m *Meta) providerPluginAutoInstalledSet() discovery.PluginMetaSet { // in all locations *except* the auto-install directory. func (m *Meta) providerPluginManuallyInstalledSet() discovery.PluginMetaSet { plugins := discovery.FindPlugins("provider", m.pluginDirs(false)) + + // Add providers defined in the legacy .terraformrc, + if m.PluginOverrides != nil { + plugins = plugins.OverridePaths(m.PluginOverrides.Providers) + } + plugins, _ = plugins.ValidateVersions() for p := range plugins {