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

Updated via: go get github.com/hashicorp/terraform@sdk-v0.11-with-go-modules and go mod tidy

1 files changed, 11 insertions, 0 deletions

diff --git a/vendor/github.com/hashicorp/terraform/config/merge.go b/vendor/github.com/hashicorp/terraform/config/merge.go
index db214be..55fc864 100644
--- a/vendor/github.com/hashicorp/terraform/config/merge.go
+++ b/vendor/github.com/hashicorp/terraform/config/merge.go
@@ -137,6 +137,17 @@ func Merge(c1, c2 *Config) (*Config, error) {
                 }
         }
 
+        // Local Values
+        // These are simpler than the other config elements because they are just
+        // flat values and so no deep merging is required.
+        if localsCount := len(c1.Locals) + len(c2.Locals); localsCount != 0 {
+                // Explicit length check above because we want c.Locals to remain
+                // nil if the result would be empty.
+                c.Locals = make([]*Local, 0, len(c1.Locals)+len(c2.Locals))
+                c.Locals = append(c.Locals, c1.Locals...)
+                c.Locals = append(c.Locals, c2.Locals...)
+        }
+
         return c, nil
 }