diff options
| author | Alex Pilon <apilon@hashicorp.com> | 2019-02-22 18:24:37 -0500 |
|---|---|---|
| committer | Alex Pilon <apilon@hashicorp.com> | 2019-02-22 18:24:37 -0500 |
| commit | 15c0b25d011f37e7c20aeca9eaf461f78285b8d9 (patch) | |
| tree | 255c250a5c9d4801c74092d33b7337d8c14438ff /vendor/github.com/hashicorp/terraform/config/append.go | |
| parent | 07971ca38143c5faf951d152fba370ddcbe26ad5 (diff) | |
| download | terraform-provider-statuscake-15c0b25d011f37e7c20aeca9eaf461f78285b8d9.tar.gz terraform-provider-statuscake-15c0b25d011f37e7c20aeca9eaf461f78285b8d9.tar.zst terraform-provider-statuscake-15c0b25d011f37e7c20aeca9eaf461f78285b8d9.zip | |
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
Diffstat (limited to 'vendor/github.com/hashicorp/terraform/config/append.go')
| -rw-r--r-- | vendor/github.com/hashicorp/terraform/config/append.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vendor/github.com/hashicorp/terraform/config/append.go b/vendor/github.com/hashicorp/terraform/config/append.go index 5f4e89e..9d80c42 100644 --- a/vendor/github.com/hashicorp/terraform/config/append.go +++ b/vendor/github.com/hashicorp/terraform/config/append.go | |||
| @@ -82,5 +82,11 @@ func Append(c1, c2 *Config) (*Config, error) { | |||
| 82 | c.Variables = append(c.Variables, c2.Variables...) | 82 | c.Variables = append(c.Variables, c2.Variables...) |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | if len(c1.Locals) > 0 || len(c2.Locals) > 0 { | ||
| 86 | c.Locals = make([]*Local, 0, len(c1.Locals)+len(c2.Locals)) | ||
| 87 | c.Locals = append(c.Locals, c1.Locals...) | ||
| 88 | c.Locals = append(c.Locals, c2.Locals...) | ||
| 89 | } | ||
| 90 | |||
| 85 | return c, nil | 91 | return c, nil |
| 86 | } | 92 | } |