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

config: fix error message in validation

This commit is contained in:
Mitchell Hashimoto 2014-07-22 08:47:10 -07:00
parent f9e6754763
commit b10b678326
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -213,8 +213,8 @@ func (c *Config) Validate() error {
// are valid in the Validate step. // are valid in the Validate step.
func (c *Config) allVariables() map[string][]InterpolatedVariable { func (c *Config) allVariables() map[string][]InterpolatedVariable {
result := make(map[string][]InterpolatedVariable) result := make(map[string][]InterpolatedVariable)
for n, pc := range c.ProviderConfigs { for _, pc := range c.ProviderConfigs {
source := fmt.Sprintf("provider config '%s'", n) source := fmt.Sprintf("provider config '%s'", pc.Name)
for _, v := range pc.RawConfig.Variables { for _, v := range pc.RawConfig.Variables {
result[source] = append(result[source], v) result[source] = append(result[source], v)
} }

8
config/test-fixtures/validate-good/main.tf
View File

@ -3,6 +3,12 @@ variable "foo" {
description = "bar"; description = "bar";
} }
variable "amis" {
default = {
"east": "foo",
}
}
provider "aws" { provider "aws" {
access_key = "foo"; access_key = "foo";
secret_key = "bar"; secret_key = "bar";
@ -16,7 +22,7 @@ resource "aws_security_group" "firewall" {
} }
resource aws_instance "web" { resource aws_instance "web" {
ami = "${var.foo}" ami = "${var.amis.east}"
security_groups = [ security_groups = [
"foo", "foo",
"${aws_security_group.firewall.foo}" "${aws_security_group.firewall.foo}"