Handle multiple variables per line and match capitals

Author: alexrudd

configuration.mock

@@ -15,6 +15,6 @@ data "template_file" "template1" {
   vars {
     t1_var1 = "${var.t1_var1}"
     t1-var2 = "${var.t1-var2}"
-    t1-var3 = "${var.t1-Var3}"
+    t1-var3 = "${var.t1-Var3}-${var.t1-inline}"
   }
 }

generator_test.go

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

terraform.go

@@ -12,10 +12,10 @@ type terraformVars struct {
 
 func (t *terraformVars) matchVarPref(row, varPrefix string) {
 	if strings.Contains(row, varPrefix) {
-		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])
+		pattern := regexp.MustCompile(`var.([a-z?A-Z?0-9?_][a-z?A-Z?0-9?_?-]*)`)
+		match := pattern.FindAllStringSubmatch(row, -1)
+		for _, m := range match {
+			res := replacer.Replace(m[0])
 			if !containsElement(t.Variables, res) {
 				t.Variables = append(t.Variables, res)
 			}