command: rename choosePlugins to chooseProviders to clarify scope of function
This commit is contained in:
parent
67fc4dd5a1
commit
efafadbe5e
|
@ -496,7 +496,7 @@ func (c *InitCommand) getProviders(earlyConfig *earlyconfig.Config, state *state
|
||||||
configReqs := configDeps.AllPluginRequirements()
|
configReqs := configDeps.AllPluginRequirements()
|
||||||
// FIXME: This is weird because ConfigTreeDependencies was written before
|
// FIXME: This is weird because ConfigTreeDependencies was written before
|
||||||
// we switched over to using earlyConfig as the main source of dependencies.
|
// we switched over to using earlyConfig as the main source of dependencies.
|
||||||
// In future we should clean this up to be a more reasoable API.
|
// In future we should clean this up to be a more reasonable API.
|
||||||
stateReqs := terraform.ConfigTreeDependencies(nil, state).AllPluginRequirements()
|
stateReqs := terraform.ConfigTreeDependencies(nil, state).AllPluginRequirements()
|
||||||
|
|
||||||
requirements := configReqs.Merge(stateReqs)
|
requirements := configReqs.Merge(stateReqs)
|
||||||
|
@ -597,7 +597,7 @@ func (c *InitCommand) getProviders(earlyConfig *earlyconfig.Config, state *state
|
||||||
available = c.providerPluginSet() // re-discover to see newly-installed plugins
|
available = c.providerPluginSet() // re-discover to see newly-installed plugins
|
||||||
|
|
||||||
// internal providers were already filtered out, since we don't need to get them.
|
// internal providers were already filtered out, since we don't need to get them.
|
||||||
chosen := choosePlugins(available, nil, requirements)
|
chosen := chooseProviders(available, nil, requirements)
|
||||||
|
|
||||||
digests := map[string][]byte{}
|
digests := map[string][]byte{}
|
||||||
for name, meta := range chosen {
|
for name, meta := range chosen {
|
||||||
|
|
|
@ -39,7 +39,7 @@ type multiVersionProviderResolver struct {
|
||||||
Internal map[addrs.Provider]providers.Factory
|
Internal map[addrs.Provider]providers.Factory
|
||||||
}
|
}
|
||||||
|
|
||||||
func choosePlugins(avail discovery.PluginMetaSet, internal map[addrs.Provider]providers.Factory, reqd discovery.PluginRequirements) map[string]discovery.PluginMeta {
|
func chooseProviders(avail discovery.PluginMetaSet, internal map[addrs.Provider]providers.Factory, reqd discovery.PluginRequirements) map[string]discovery.PluginMeta {
|
||||||
candidates := avail.ConstrainVersions(reqd)
|
candidates := avail.ConstrainVersions(reqd)
|
||||||
ret := map[string]discovery.PluginMeta{}
|
ret := map[string]discovery.PluginMeta{}
|
||||||
for name, metas := range candidates {
|
for name, metas := range candidates {
|
||||||
|
@ -63,7 +63,7 @@ func (r *multiVersionProviderResolver) ResolveProviders(
|
||||||
factories := make(map[addrs.Provider]providers.Factory, len(reqd))
|
factories := make(map[addrs.Provider]providers.Factory, len(reqd))
|
||||||
var errs []error
|
var errs []error
|
||||||
|
|
||||||
chosen := choosePlugins(r.Available, r.Internal, reqd)
|
chosen := chooseProviders(r.Available, r.Internal, reqd)
|
||||||
for name, req := range reqd {
|
for name, req := range reqd {
|
||||||
if factory, isInternal := r.Internal[addrs.NewLegacyProvider(name)]; isInternal {
|
if factory, isInternal := r.Internal[addrs.NewLegacyProvider(name)]; isInternal {
|
||||||
if !req.Versions.Unconstrained() {
|
if !req.Versions.Unconstrained() {
|
||||||
|
|
Loading…
Reference in New Issue