core: error instead of panic on self var in wrong scope

Fixes hashicorp#4808 Fixes hashicorp#5174
bigkraig · Mar 1, 2016 · 624e08a · 624e08a
1 parent 337aad0
commit 624e08a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/terraform/interpolate.go b/terraform/interpolate.go
@@ -238,6 +238,10 @@ func (i *Interpolater) valueSelfVar(
 	n string,
 	v *config.SelfVariable,
 	result map[string]ast.Variable) error {
+	if scope == nil || scope.Resource == nil {
+		return fmt.Errorf(
+			"%s: invalid scope, self variables are only valid on resources", n)
+	}
 	rv, err := config.NewResourceVariable(fmt.Sprintf(
 		"%s.%s.%d.%s",
 		scope.Resource.Type,

diff --git a/terraform/interpolate_test.go b/terraform/interpolate_test.go
@@ -386,6 +386,24 @@ func TestInterpolator_resourceMultiAttributesComputed(t *testing.T) {
 	})
 }
 
+func TestInterpolater_selfVarWithoutResource(t *testing.T) {
+	i := &Interpolater{}
+
+	scope := &InterpolationScope{
+		Path: rootModulePath,
+	}
+
+	v, err := config.NewInterpolatedVariable("self.name")
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	_, err = i.Values(scope, map[string]config.InterpolatedVariable{"foo": v})
+	if err == nil {
+		t.Fatalf("expected err, got none")
+	}
+}
+
 func getInterpolaterFixture(t *testing.T) *Interpolater {
 	lock := new(sync.RWMutex)
 	state := &State{