Detect variables with dashes and numbers in them

Author: alexrudd

configuration.mock

@@ -8,4 +8,13 @@ resource "aws_nat_gateway" "nat" {
   allocation_id = "${element(aws_eip.nat.*.id, count.index)}"
   subnet_id     = "${element(aws_subnet.public.*.id, count.index)}"
   count         = "${length(var.public_subnets)}"
-}
+}
+
+data "template_file" "template1" {
+  template = "${file("${path.module}/template1.tpl")}"
+  vars {
+    t1_var1 = "${var.t1_var1}"
+    t1-var2 = "${var.t1-var2}"
+    t1-var3 = "${var.t1-Var3}"
+  }
+}

generator_test.go

@@ -41,8 +41,9 @@ func TestMatchVariable(t *testing.T) {
 	for _, text := range messages {
 		ter.matchVarPref(text, varPrefix)
 	}
-	if len(ter.Variables) != 1 {
-		t.Errorf("Should return one variable. but returned %d", len(ter.Variables))
+	if len(ter.Variables) != 4 {
+		t.Errorf("Should return four variable. but returned %d", len(ter.Variables))
+		t.Errorf("Variables found: %s", ter.Variables)
 	}
 
 }

terraform.go

@@ -11,7 +11,7 @@ type terraformVars struct {
 
 func (t *terraformVars) matchVarPref(row, varPrefix string) {
 	if strings.Contains(row, varPrefix) {
-		pattern := regexp.MustCompile(`var.([a-z?_]+)`)
+		pattern := regexp.MustCompile(`var.([a-z?0-9?_][a-z?0-9?_?-]*)`)
 		match := pattern.FindAllStringSubmatch(row, 1)
 		if len(match) != 0 {
 			res := replacer.Replace(match[0][0])