Merge pull request #1016 from hashicorp/b-splat-validate

config: provisioner splat vars can only reference other resources
This commit is contained in:
Mitchell Hashimoto 2015-02-23 13:48:40 -08:00
commit 87ecf4f40d
6 changed files with 92 additions and 0 deletions

View File

@ -385,6 +385,40 @@ func (c *Config) Validate() error {
n, d)) n, d))
} }
} }
// Verify provisioners don't contain any splats
for _, p := range r.Provisioners {
// This validation checks that there are now splat variables
// referencing ourself. This currently is not allowed.
for _, v := range p.ConnInfo.Variables {
rv, ok := v.(*ResourceVariable)
if !ok {
continue
}
if rv.Multi && rv.Index == -1 && rv.Type == r.Type && rv.Name == r.Name {
errs = append(errs, fmt.Errorf(
"%s: connection info cannot contain splat variable "+
"referencing itself", n))
break
}
}
for _, v := range p.RawConfig.Variables {
rv, ok := v.(*ResourceVariable)
if !ok {
continue
}
if rv.Multi && rv.Index == -1 && rv.Type == r.Type && rv.Name == r.Name {
errs = append(errs, fmt.Errorf(
"%s: connection info cannot contain splat variable "+
"referencing itself", n))
break
}
}
}
} }
for source, vs := range vars { for source, vs := range vars {

View File

@ -179,6 +179,34 @@ func TestConfigValidate_pathVarInvalid(t *testing.T) {
} }
} }
func TestConfigValidate_provConnSplatOther(t *testing.T) {
c := testConfig(t, "validate-prov-conn-splat-other")
if err := c.Validate(); err != nil {
t.Fatalf("should be valid: %s", err)
}
}
func TestConfigValidate_provConnSplatSelf(t *testing.T) {
c := testConfig(t, "validate-prov-conn-splat-self")
if err := c.Validate(); err == nil {
t.Fatal("should not be valid")
}
}
func TestConfigValidate_provSplatOther(t *testing.T) {
c := testConfig(t, "validate-prov-splat-other")
if err := c.Validate(); err != nil {
t.Fatalf("should be valid: %s", err)
}
}
func TestConfigValidate_provSplatSelf(t *testing.T) {
c := testConfig(t, "validate-prov-splat-self")
if err := c.Validate(); err == nil {
t.Fatal("should not be valid")
}
}
func TestConfigValidate_unknownThing(t *testing.T) { func TestConfigValidate_unknownThing(t *testing.T) {
c := testConfig(t, "validate-unknownthing") c := testConfig(t, "validate-unknownthing")
if err := c.Validate(); err == nil { if err := c.Validate(); err == nil {

View File

@ -0,0 +1,9 @@
resource "aws_instance" "foo" {}
resource "aws_instance" "bar" {
connection {
host = "${element(aws_instance.foo.*.private_ip, 0)}"
}
provisioner "local-exec" {}
}

View File

@ -0,0 +1,7 @@
resource "aws_instance" "bar" {
connection {
host = "${element(aws_instance.bar.*.private_ip, 0)}"
}
provisioner "local-exec" {}
}

View File

@ -0,0 +1,7 @@
resource "aws_instance" "foo" {}
resource "aws_instance" "bar" {
provisioner "local-exec" {
command = "${element(aws_instance.foo.*.private_ip, 0)}"
}
}

View File

@ -0,0 +1,7 @@
resource "aws_instance" "foo" {}
resource "aws_instance" "bar" {
provisioner "local-exec" {
command = "${element(aws_instance.bar.*.private_ip, 0)}"
}
}