ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Context.InitProvider must cache providers using absolute addresses 

Previously InitProvider was incorrectly using only the relative address,
which (due to the ambiguity in the string representation of absolute vs.
relative addresses) caused it to always initialize providers in the root
module.

Now we use the absolute address as the key, which then agrees with the
Provider method and ensures that each module gets its own separate
instance of each provider if explicit configuration is present.
This commit is contained in:
Martin Atkins 2018-05-11 16:53:52 -07:00
parent b8c3b8d45d
commit 0c4c7c5a5f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
terraform/eval_context_builtin.go
View File

@ -105,13 +105,14 @@ func (ctx *BuiltinEvalContext) InitProvider(typeName string, addr addrs.Provider
ctx.ProviderLock.Lock() ctx.ProviderLock.Lock()
defer ctx.ProviderLock.Unlock() defer ctx.ProviderLock.Unlock()
key := addr.String() key := absAddr.String()
p, err := ctx.Components.ResourceProvider(typeName, key) p, err := ctx.Components.ResourceProvider(typeName, key)
if err != nil { if err != nil {
return nil, err return nil, err
} }
log.Printf("[TRACE] BuiltinEvalContext: Initialized %q provider for %s", typeName, absAddr)
ctx.ProviderCache[key] = p ctx.ProviderCache[key] = p
// Also fetch and cache the provider's schema. // Also fetch and cache the provider's schema.