deps: github.com/hashicorp/terraform@sdk-v0.11-with-go-modules

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / hashicorp / terraform / terraform / eval_provider.go

diff --git a/vendor/github.com/hashicorp/terraform/terraform/eval_provider.go b/vendor/github.com/hashicorp/terraform/terraform/eval_provider.go
index 092fd18d838579a97ce377a40a0d7d8c8826feba..61f6ff941bf099d4529511e4903abcf316f129c4 100644 (file)
--- a/vendor/github.com/hashicorp/terraform/terraform/eval_provider.go
+++ b/vendor/github.com/hashicorp/terraform/terraform/eval_provider.go
@@ -6,17 +6,6 @@ import (
        "github.com/hashicorp/terraform/config"
 )
 
-// EvalSetProviderConfig sets the parent configuration for a provider
-// without configuring that provider, validating it, etc.
-type EvalSetProviderConfig struct {
-       Provider string
-       Config   **ResourceConfig
-}
-
-func (n *EvalSetProviderConfig) Eval(ctx EvalContext) (interface{}, error) {
-       return nil, ctx.SetProviderConfig(n.Provider, *n.Config)
-}
-
 // EvalBuildProviderConfig outputs a *ResourceConfig that is properly
 // merged with parents and inputs on top of what is configured in the file.
 type EvalBuildProviderConfig struct {
@@ -28,7 +17,7 @@ type EvalBuildProviderConfig struct {
 func (n *EvalBuildProviderConfig) Eval(ctx EvalContext) (interface{}, error) {
        cfg := *n.Config
 
-       // If we have a configuration set, then merge that in
+       // If we have an Input configuration set, then merge that in
        if input := ctx.ProviderInput(n.Provider); input != nil {
                // "input" is a map of the subset of config values that were known
                // during the input walk, set by EvalInputProvider. Note that
@@ -40,13 +29,7 @@ func (n *EvalBuildProviderConfig) Eval(ctx EvalContext) (interface{}, error) {
                        return nil, err
                }
 
-               merged := cfg.raw.Merge(rc)
-               cfg = NewResourceConfig(merged)
-       }
-
-       // Get the parent configuration if there is one
-       if parent := ctx.ParentProviderConfig(n.Provider); parent != nil {
-               merged := cfg.raw.Merge(parent.raw)
+               merged := rc.Merge(cfg.raw)
                cfg = NewResourceConfig(merged)
        }
 
@@ -69,11 +52,12 @@ func (n *EvalConfigProvider) Eval(ctx EvalContext) (interface{}, error) {
 // and returns nothing. The provider can be retrieved again with the
 // EvalGetProvider node.
 type EvalInitProvider struct {
-       Name string
+       TypeName string
+       Name     string
 }
 
 func (n *EvalInitProvider) Eval(ctx EvalContext) (interface{}, error) {
-       return ctx.InitProvider(n.Name)
+       return ctx.InitProvider(n.TypeName, n.Name)
 }
 
 // EvalCloseProvider is an EvalNode implementation that closes provider
@@ -116,12 +100,8 @@ type EvalInputProvider struct {
 }
 
 func (n *EvalInputProvider) Eval(ctx EvalContext) (interface{}, error) {
-       // If we already configured this provider, then don't do this again
-       if v := ctx.ProviderInput(n.Name); v != nil {
-               return nil, nil
-       }
-
        rc := *n.Config
+       orig := rc.DeepCopy()
 
        // Wrap the input into a namespace
        input := &PrefixUIInput{
@@ -138,27 +118,20 @@ func (n *EvalInputProvider) Eval(ctx EvalContext) (interface{}, error) {
                        "Error configuring %s: %s", n.Name, err)
        }
 
-       // Set the input that we received so that child modules don't attempt
-       // to ask for input again.
+       // We only store values that have changed through Input.
+       // The goal is to cache cache input responses, not to provide a complete
+       // config for other providers.
+       confMap := make(map[string]interface{})
        if config != nil && len(config.Config) > 0 {
-               // This repository of provider input results on the context doesn't
-               // retain config.ComputedKeys, so we need to filter those out here
-               // in order that later users of this data won't try to use the unknown
-               // value placeholder as if it were a literal value. This map is just
-               // of known values we've been able to complete so far; dynamic stuff
-               // will be merged in by EvalBuildProviderConfig on subsequent
-               // (post-input) walks.
-               confMap := config.Config
-               if config.ComputedKeys != nil {
-                       for _, key := range config.ComputedKeys {
-                               delete(confMap, key)
+               // any values that weren't in the original ResourcConfig will be cached
+               for k, v := range config.Config {
+                       if _, ok := orig.Config[k]; !ok {
+                               confMap[k] = v
                        }
                }
-
-               ctx.SetProviderInput(n.Name, confMap)
-       } else {
-               ctx.SetProviderInput(n.Name, map[string]interface{}{})
        }
 
+       ctx.SetProviderInput(n.Name, confMap)
+
        return nil, nil
 }