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

call configBody.Content

This commit is contained in:
Ben Drucker 2020-12-06 09:38:43 -08:00
parent 186eff96b8
commit a2c31088f4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
terraform/node_provider.go
View File

@ -51,9 +51,8 @@ func (n *NodeApplyableProvider) ValidateProvider(ctx EvalContext, provider provi
// if a provider config is empty (only an alias), return early and don't continue // if a provider config is empty (only an alias), return early and don't continue
// validation. validate doesn't need to fully configure the provider itself, so // validation. validate doesn't need to fully configure the provider itself, so
// skipping a provider with an implied configuration won't prevent other validation from completing. // skipping a provider with an implied configuration won't prevent other validation from completing.
emptySchema := &configschema.Block{} _, noConfigDiags := configBody.Content(&hcl.BodySchema{})
_, _, evalDiags := ctx.EvaluateBlock(configBody, emptySchema, nil, EvalDataForNoInstanceKey) if !noConfigDiags.HasErrors() {
if !evalDiags.HasErrors() {
return nil return nil
} }
@ -68,7 +67,7 @@ func (n *NodeApplyableProvider) ValidateProvider(ctx EvalContext, provider provi
// Should never happen in real code, but often comes up in tests where // Should never happen in real code, but often comes up in tests where
// mock schemas are being used that tend to be incomplete. // mock schemas are being used that tend to be incomplete.
log.Printf("[WARN] ValidateProvider: no config schema is available for %s, so using empty schema", n.Addr) log.Printf("[WARN] ValidateProvider: no config schema is available for %s, so using empty schema", n.Addr)
configSchema = emptySchema configSchema = &configschema.Block{}
} }
configVal, configBody, evalDiags := ctx.EvaluateBlock(configBody, configSchema, nil, EvalDataForNoInstanceKey) configVal, configBody, evalDiags := ctx.EvaluateBlock(configBody, configSchema, nil, EvalDataForNoInstanceKey)