diff --git a/go.mod b/go.mod
index 11ce8bd12..ad13e24cb 100644
--- a/go.mod
+++ b/go.mod
@@ -71,7 +71,7 @@ require (
 	github.com/hashicorp/go-version v1.0.0
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/hashicorp/hcl v1.0.0
-	github.com/hashicorp/hcl2 v0.0.0-20190124230628-a9ca194bcdc3
+	github.com/hashicorp/hcl2 v0.0.0-20190130225218-89dbc5eb3d9e
 	github.com/hashicorp/hil v0.0.0-20170627220502-fa9f258a9250
 	github.com/hashicorp/logutils v0.0.0-20150609070431-0dc08b1671f3
 	github.com/hashicorp/memberlist v0.1.0 // indirect
@@ -128,7 +128,7 @@ require (
 	github.com/xanzy/ssh-agent v0.2.0
 	github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
 	github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557
-	github.com/zclconf/go-cty v0.0.0-20190124225737-a385d646c1e9
+	github.com/zclconf/go-cty v0.0.0-20190130221141-d7fe3fa0020f
 	go.opencensus.io v0.17.0 // indirect
 	go.uber.org/atomic v1.3.2 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
diff --git a/go.sum b/go.sum
index 8870cfaf4..6dffc05e9 100644
--- a/go.sum
+++ b/go.sum
@@ -161,8 +161,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/hcl2 v0.0.0-20181208003705-670926858200/go.mod h1:ShfpTh661oAaxo7VcNxg0zcZW6jvMa7Moy2oFx7e5dE=
-github.com/hashicorp/hcl2 v0.0.0-20190124230628-a9ca194bcdc3 h1:z8jV6t+XwhZ6NR70Fm5Pf2kvDP25b8gFQwJb5ndsnV4=
-github.com/hashicorp/hcl2 v0.0.0-20190124230628-a9ca194bcdc3/go.mod h1:HtEzazM5AZ9fviNEof8QZB4T1Vz9UhHrGhnMPzl//Ek=
+github.com/hashicorp/hcl2 v0.0.0-20190130225218-89dbc5eb3d9e h1:wcDATcjAY0ebgNtuyt00GxJll5fCChrevvrIdguzhQQ=
+github.com/hashicorp/hcl2 v0.0.0-20190130225218-89dbc5eb3d9e/go.mod h1:HtEzazM5AZ9fviNEof8QZB4T1Vz9UhHrGhnMPzl//Ek=
 github.com/hashicorp/hil v0.0.0-20170627220502-fa9f258a9250 h1:fooK5IvDL/KIsi4LxF/JH68nVdrBSiGNPhS2JAQjtjo=
 github.com/hashicorp/hil v0.0.0-20170627220502-fa9f258a9250/go.mod h1:KHvg/R2/dPtaePb16oW4qIyzkMxXOL38xjRN64adsts=
 github.com/hashicorp/logutils v0.0.0-20150609070431-0dc08b1671f3 h1:oD64EFjELI9RY9yoWlfua58r+etdnoIC871z+rr6lkA=
@@ -325,6 +325,8 @@ github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod h1:ce1O1j6Ut
 github.com/zclconf/go-cty v0.0.0-20181129180422-88fbe721e0f8/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v0.0.0-20190124225737-a385d646c1e9 h1:hHCAGde+QfwbqXSAqOmBd4NlOrJ6nmjWp+Nu408ezD4=
 github.com/zclconf/go-cty v0.0.0-20190124225737-a385d646c1e9/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
+github.com/zclconf/go-cty v0.0.0-20190130221141-d7fe3fa0020f h1:QdzpIo5V8FV8SHsXCXpgSXOquZEF7YozbNcYnEnGZvA=
+github.com/zclconf/go-cty v0.0.0-20190130221141-d7fe3fa0020f/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 go.opencensus.io v0.17.0 h1:2Cu88MYg+1LU+WVD+NWwYhyP0kKgRlN9QjWGaX0jKTE=
 go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
 go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_string_lit.go b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_string_lit.go
index de1f524ca..2895ade75 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_string_lit.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_string_lit.go
@@ -1,10 +1,10 @@
-// line 1 "scan_string_lit.rl"
+//line scan_string_lit.rl:1
 
 package hclsyntax
 
 // This file is generated from scan_string_lit.rl. DO NOT EDIT.
 
-// line 9 "scan_string_lit.go"
+//line scan_string_lit.go:9
 var _hclstrtok_actions []byte = []byte{
 	0, 1, 0, 1, 1, 2, 1, 0,
 }
@@ -114,12 +114,12 @@ const hclstrtok_error int = 0
 const hclstrtok_en_quoted int = 10
 const hclstrtok_en_unquoted int = 4
 
-// line 10 "scan_string_lit.rl"
+//line scan_string_lit.rl:10
 
 func scanStringLit(data []byte, quoted bool) [][]byte {
 	var ret [][]byte
 
-	// line 61 "scan_string_lit.rl"
+//line scan_string_lit.rl:61
 
 	// Ragel state
 	p := 0          // "Pointer" into data
@@ -144,11 +144,11 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
 	    ret = append(ret, data[ts:te])
 	}*/
 
-	// line 154 "scan_string_lit.go"
+//line scan_string_lit.go:154
 	{
 	}
 
-	// line 158 "scan_string_lit.go"
+//line scan_string_lit.go:158
 	{
 		var _klen int
 		var _trans int
@@ -229,7 +229,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
 			_acts++
 			switch _hclstrtok_actions[_acts-1] {
 			case 0:
-				// line 40 "scan_string_lit.rl"
+//line scan_string_lit.rl:40
 
 				// If te is behind p then we've skipped over some literal
 				// characters which we must now return.
@@ -239,12 +239,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
 				ts = p
 
 			case 1:
-				// line 48 "scan_string_lit.rl"
+//line scan_string_lit.rl:48
 
 				te = p
 				ret = append(ret, data[ts:te])
 
-				// line 255 "scan_string_lit.go"
+//line scan_string_lit.go:253
 			}
 		}
 
@@ -267,12 +267,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
 				__acts++
 				switch _hclstrtok_actions[__acts-1] {
 				case 1:
-					// line 48 "scan_string_lit.rl"
+//line scan_string_lit.rl:48
 
 					te = p
 					ret = append(ret, data[ts:te])
 
-					// line 281 "scan_string_lit.go"
+//line scan_string_lit.go:278
 				}
 			}
 		}
@@ -282,7 +282,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
 		}
 	}
 
-	// line 89 "scan_string_lit.rl"
+//line scan_string_lit.rl:89
 
 	if te < p {
 		// Collect any leftover literal characters at the end of the input
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.go b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.go
index 2ed038de7..30a08363c 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.go
@@ -1,4 +1,4 @@
-// line 1 "scan_tokens.rl"
+//line scan_tokens.rl:1
 
 package hclsyntax
 
@@ -10,7 +10,7 @@ import (
 
 // This file is generated from scan_tokens.rl. DO NOT EDIT.
 
-// line 15 "scan_tokens.go"
+//line scan_tokens.go:15
 var _hcltok_actions []byte = []byte{
 	0, 1, 0, 1, 1, 1, 2, 1, 3,
 	1, 4, 1, 6, 1, 7, 1, 8,
@@ -225,23 +225,23 @@ var _hcltok_key_offsets []int16 = []int16{
 	9172, 9173, 9182, 9190, 9192, 9195, 9197, 9199,
 	9201, 9206, 9219, 9223, 9238, 9267, 9278, 9280,
 	9284, 9288, 9293, 9297, 9299, 9306, 9310, 9318,
-	9322, 9398, 9400, 9401, 9402, 9403, 9404, 9405,
-	9407, 9412, 9414, 9416, 9417, 9461, 9462, 9463,
-	9465, 9470, 9474, 9474, 9476, 9478, 9489, 9499,
-	9507, 9508, 9510, 9511, 9515, 9519, 9529, 9533,
-	9540, 9551, 9558, 9562, 9568, 9579, 9611, 9660,
-	9675, 9690, 9695, 9697, 9702, 9734, 9742, 9744,
-	9766, 9788, 9790, 9806, 9822, 9838, 9854, 9869,
-	9879, 9896, 9913, 9930, 9946, 9956, 9973, 9989,
-	10005, 10021, 10037, 10053, 10069, 10085, 10086, 10087,
-	10088, 10089, 10091, 10093, 10095, 10109, 10123, 10137,
-	10151, 10152, 10153, 10155, 10157, 10159, 10173, 10187,
-	10188, 10189, 10191, 10193, 10195, 10244, 10288, 10290,
-	10295, 10299, 10299, 10301, 10303, 10314, 10324, 10332,
-	10333, 10335, 10336, 10340, 10344, 10354, 10358, 10365,
-	10376, 10383, 10387, 10393, 10404, 10436, 10485, 10500,
-	10515, 10520, 10522, 10527, 10559, 10567, 10569, 10591,
-	10613,
+	9322, 9397, 9399, 9400, 9401, 9402, 9403, 9404,
+	9406, 9411, 9413, 9415, 9416, 9460, 9461, 9462,
+	9464, 9469, 9473, 9473, 9475, 9477, 9488, 9498,
+	9506, 9507, 9509, 9510, 9514, 9518, 9528, 9532,
+	9539, 9550, 9557, 9561, 9567, 9578, 9610, 9659,
+	9674, 9689, 9694, 9696, 9701, 9733, 9741, 9743,
+	9765, 9787, 9789, 9805, 9821, 9837, 9853, 9868,
+	9878, 9895, 9912, 9929, 9945, 9955, 9972, 9988,
+	10004, 10020, 10036, 10052, 10068, 10084, 10085, 10086,
+	10087, 10088, 10090, 10092, 10094, 10108, 10122, 10136,
+	10150, 10151, 10152, 10154, 10156, 10158, 10172, 10186,
+	10187, 10188, 10190, 10192, 10194, 10243, 10287, 10289,
+	10294, 10298, 10298, 10300, 10302, 10313, 10323, 10331,
+	10332, 10334, 10335, 10339, 10343, 10353, 10357, 10364,
+	10375, 10382, 10386, 10392, 10403, 10435, 10484, 10499,
+	10514, 10519, 10521, 10526, 10558, 10566, 10568, 10590,
+	10612,
 }
 
 var _hcltok_trans_keys []byte = []byte{
@@ -847,7 +847,7 @@ var _hcltok_trans_keys []byte = []byte{
 	140, 141, 143, 144, 153, 154, 189, 190,
 	191, 128, 136, 137, 191, 173, 128, 168,
 	169, 177, 178, 180, 181, 182, 183, 191,
-	0, 127, 192, 255, 150, 151, 158, 159,
+	128, 255, 192, 255, 150, 151, 158, 159,
 	152, 154, 156, 158, 134, 135, 142, 143,
 	190, 191, 192, 255, 181, 189, 191, 128,
 	190, 133, 181, 128, 129, 130, 140, 141,
@@ -1268,7 +1268,7 @@ var _hcltok_trans_keys []byte = []byte{
 	128, 140, 141, 143, 144, 153, 154, 189,
 	190, 191, 128, 136, 137, 191, 173, 128,
 	168, 169, 177, 178, 180, 181, 182, 183,
-	191, 0, 127, 192, 255, 150, 151, 158,
+	191, 128, 255, 192, 255, 150, 151, 158,
 	159, 152, 154, 156, 158, 134, 135, 142,
 	143, 190, 191, 192, 255, 181, 189, 191,
 	128, 190, 133, 181, 128, 129, 130, 140,
@@ -1411,23 +1411,126 @@ var _hcltok_trans_keys []byte = []byte{
 	192, 255, 162, 191, 192, 255, 160, 168,
 	128, 159, 161, 167, 169, 191, 158, 191,
 	192, 255, 9, 10, 13, 32, 33, 34,
-	35, 37, 38, 46, 47, 60, 61, 62,
-	64, 92, 95, 123, 124, 125, 126, 127,
-	194, 195, 198, 199, 203, 204, 205, 206,
-	207, 210, 212, 213, 214, 215, 216, 217,
-	219, 220, 221, 222, 223, 224, 225, 226,
-	227, 228, 233, 234, 237, 238, 239, 240,
-	0, 39, 40, 45, 48, 57, 58, 63,
-	65, 90, 91, 96, 97, 122, 192, 193,
-	196, 218, 229, 236, 241, 247, 9, 32,
-	10, 61, 10, 38, 46, 42, 47, 46,
-	69, 101, 48, 57, 60, 61, 61, 62,
-	61, 45, 95, 194, 195, 198, 199, 203,
+	35, 38, 46, 47, 60, 61, 62, 64,
+	92, 95, 123, 124, 125, 126, 127, 194,
+	195, 198, 199, 203, 204, 205, 206, 207,
+	210, 212, 213, 214, 215, 216, 217, 219,
+	220, 221, 222, 223, 224, 225, 226, 227,
+	228, 233, 234, 237, 238, 239, 240, 0,
+	36, 37, 45, 48, 57, 58, 63, 65,
+	90, 91, 96, 97, 122, 192, 193, 196,
+	218, 229, 236, 241, 247, 9, 32, 10,
+	61, 10, 38, 46, 42, 47, 46, 69,
+	101, 48, 57, 60, 61, 61, 62, 61,
+	45, 95, 194, 195, 198, 199, 203, 204,
+	205, 206, 207, 210, 212, 213, 214, 215,
+	216, 217, 219, 220, 221, 222, 223, 224,
+	225, 226, 227, 228, 233, 234, 237, 239,
+	240, 243, 48, 57, 65, 90, 97, 122,
+	196, 218, 229, 236, 124, 125, 128, 191,
+	170, 181, 186, 128, 191, 151, 183, 128,
+	255, 192, 255, 0, 127, 173, 130, 133,
+	146, 159, 165, 171, 175, 191, 192, 255,
+	181, 190, 128, 175, 176, 183, 184, 185,
+	186, 191, 134, 139, 141, 162, 128, 135,
+	136, 255, 182, 130, 137, 176, 151, 152,
+	154, 160, 136, 191, 192, 255, 128, 143,
+	144, 170, 171, 175, 176, 178, 179, 191,
+	128, 159, 160, 191, 176, 128, 138, 139,
+	173, 174, 255, 148, 150, 164, 167, 173,
+	176, 185, 189, 190, 192, 255, 144, 128,
+	145, 146, 175, 176, 191, 128, 140, 141,
+	255, 166, 176, 178, 191, 192, 255, 186,
+	128, 137, 138, 170, 171, 179, 180, 181,
+	182, 191, 160, 161, 162, 164, 165, 166,
+	167, 168, 169, 170, 171, 172, 173, 174,
+	175, 176, 177, 178, 179, 180, 181, 182,
+	183, 184, 185, 186, 187, 188, 189, 190,
+	128, 191, 128, 129, 130, 131, 137, 138,
+	139, 140, 141, 142, 143, 144, 153, 154,
+	155, 156, 157, 158, 159, 160, 161, 162,
+	163, 164, 165, 166, 167, 168, 169, 170,
+	171, 172, 173, 174, 175, 176, 177, 178,
+	179, 180, 182, 183, 184, 188, 189, 190,
+	191, 132, 187, 129, 130, 132, 133, 134,
+	176, 177, 178, 179, 180, 181, 182, 183,
+	128, 191, 128, 129, 130, 131, 132, 133,
+	134, 135, 144, 136, 143, 145, 191, 192,
+	255, 182, 183, 184, 128, 191, 128, 191,
+	191, 128, 190, 192, 255, 128, 146, 147,
+	148, 152, 153, 154, 155, 156, 158, 159,
+	160, 161, 162, 163, 164, 165, 166, 167,
+	168, 169, 170, 171, 172, 173, 174, 175,
+	176, 129, 191, 192, 255, 158, 159, 128,
+	157, 160, 191, 192, 255, 128, 191, 164,
+	169, 171, 172, 173, 174, 175, 180, 181,
+	182, 183, 184, 185, 187, 188, 189, 190,
+	191, 128, 163, 165, 186, 144, 145, 146,
+	147, 148, 150, 151, 152, 155, 157, 158,
+	160, 170, 171, 172, 175, 128, 159, 161,
+	169, 173, 191, 128, 191, 10, 13, 34,
+	36, 37, 92, 128, 191, 192, 223, 224,
+	239, 240, 247, 248, 255, 10, 13, 34,
+	36, 37, 92, 128, 191, 192, 223, 224,
+	239, 240, 247, 248, 255, 10, 13, 34,
+	36, 37, 92, 128, 191, 192, 223, 224,
+	239, 240, 247, 248, 255, 10, 13, 34,
+	36, 37, 92, 128, 191, 192, 223, 224,
+	239, 240, 247, 248, 255, 10, 13, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 36, 37, 92, 123,
+	192, 223, 224, 239, 240, 247, 10, 13,
+	34, 36, 37, 92, 123, 128, 191, 192,
+	223, 224, 239, 240, 247, 248, 255, 10,
+	13, 34, 36, 37, 92, 123, 128, 191,
+	192, 223, 224, 239, 240, 247, 248, 255,
+	10, 13, 34, 36, 37, 92, 123, 128,
+	191, 192, 223, 224, 239, 240, 247, 248,
+	255, 10, 13, 34, 36, 37, 92, 128,
+	191, 192, 223, 224, 239, 240, 247, 248,
+	255, 36, 37, 92, 123, 192, 223, 224,
+	239, 240, 247, 10, 13, 34, 36, 37,
+	92, 123, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 34, 36,
+	37, 92, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 123, 126, 123, 126,
+	128, 191, 128, 191, 128, 191, 10, 13,
+	36, 37, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 36, 37,
+	128, 191, 192, 223, 224, 239, 240, 247,
+	248, 255, 10, 13, 36, 37, 128, 191,
+	192, 223, 224, 239, 240, 247, 248, 255,
+	10, 13, 36, 37, 128, 191, 192, 223,
+	224, 239, 240, 247, 248, 255, 126, 126,
+	128, 191, 128, 191, 128, 191, 10, 13,
+	36, 37, 128, 191, 192, 223, 224, 239,
+	240, 247, 248, 255, 10, 13, 36, 37,
+	128, 191, 192, 223, 224, 239, 240, 247,
+	248, 255, 126, 126, 128, 191, 128, 191,
+	128, 191, 95, 194, 195, 198, 199, 203,
 	204, 205, 206, 207, 210, 212, 213, 214,
 	215, 216, 217, 219, 220, 221, 222, 223,
 	224, 225, 226, 227, 228, 233, 234, 237,
-	239, 240, 243, 48, 57, 65, 90, 97,
-	122, 196, 218, 229, 236, 124, 125, 128,
+	238, 239, 240, 65, 90, 97, 122, 128,
+	191, 192, 193, 196, 218, 229, 236, 241,
+	247, 248, 255, 45, 95, 194, 195, 198,
+	199, 203, 204, 205, 206, 207, 210, 212,
+	213, 214, 215, 216, 217, 219, 220, 221,
+	222, 223, 224, 225, 226, 227, 228, 233,
+	234, 237, 239, 240, 243, 48, 57, 65,
+	90, 97, 122, 196, 218, 229, 236, 128,
 	191, 170, 181, 186, 128, 191, 151, 183,
 	128, 255, 192, 255, 0, 127, 173, 130,
 	133, 146, 159, 165, 171, 175, 191, 192,
@@ -1468,110 +1571,7 @@ var _hcltok_trans_keys []byte = []byte{
 	190, 191, 128, 163, 165, 186, 144, 145,
 	146, 147, 148, 150, 151, 152, 155, 157,
 	158, 160, 170, 171, 172, 175, 128, 159,
-	161, 169, 173, 191, 128, 191, 10, 13,
-	34, 36, 37, 92, 128, 191, 192, 223,
-	224, 239, 240, 247, 248, 255, 10, 13,
-	34, 36, 37, 92, 128, 191, 192, 223,
-	224, 239, 240, 247, 248, 255, 10, 13,
-	34, 36, 37, 92, 128, 191, 192, 223,
-	224, 239, 240, 247, 248, 255, 10, 13,
-	34, 36, 37, 92, 128, 191, 192, 223,
-	224, 239, 240, 247, 248, 255, 10, 13,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 36, 37, 92,
-	123, 192, 223, 224, 239, 240, 247, 10,
-	13, 34, 36, 37, 92, 123, 128, 191,
-	192, 223, 224, 239, 240, 247, 248, 255,
-	10, 13, 34, 36, 37, 92, 123, 128,
-	191, 192, 223, 224, 239, 240, 247, 248,
-	255, 10, 13, 34, 36, 37, 92, 123,
-	128, 191, 192, 223, 224, 239, 240, 247,
-	248, 255, 10, 13, 34, 36, 37, 92,
-	128, 191, 192, 223, 224, 239, 240, 247,
-	248, 255, 36, 37, 92, 123, 192, 223,
-	224, 239, 240, 247, 10, 13, 34, 36,
-	37, 92, 123, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 34,
-	36, 37, 92, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 123, 126, 123,
-	126, 128, 191, 128, 191, 128, 191, 10,
-	13, 36, 37, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 36,
-	37, 128, 191, 192, 223, 224, 239, 240,
-	247, 248, 255, 10, 13, 36, 37, 128,
-	191, 192, 223, 224, 239, 240, 247, 248,
-	255, 10, 13, 36, 37, 128, 191, 192,
-	223, 224, 239, 240, 247, 248, 255, 126,
-	126, 128, 191, 128, 191, 128, 191, 10,
-	13, 36, 37, 128, 191, 192, 223, 224,
-	239, 240, 247, 248, 255, 10, 13, 36,
-	37, 128, 191, 192, 223, 224, 239, 240,
-	247, 248, 255, 126, 126, 128, 191, 128,
-	191, 128, 191, 95, 194, 195, 198, 199,
-	203, 204, 205, 206, 207, 210, 212, 213,
-	214, 215, 216, 217, 219, 220, 221, 222,
-	223, 224, 225, 226, 227, 228, 233, 234,
-	237, 238, 239, 240, 65, 90, 97, 122,
-	128, 191, 192, 193, 196, 218, 229, 236,
-	241, 247, 248, 255, 45, 95, 194, 195,
-	198, 199, 203, 204, 205, 206, 207, 210,
-	212, 213, 214, 215, 216, 217, 219, 220,
-	221, 222, 223, 224, 225, 226, 227, 228,
-	233, 234, 237, 239, 240, 243, 48, 57,
-	65, 90, 97, 122, 196, 218, 229, 236,
-	128, 191, 170, 181, 186, 128, 191, 151,
-	183, 128, 255, 192, 255, 0, 127, 173,
-	130, 133, 146, 159, 165, 171, 175, 191,
-	192, 255, 181, 190, 128, 175, 176, 183,
-	184, 185, 186, 191, 134, 139, 141, 162,
-	128, 135, 136, 255, 182, 130, 137, 176,
-	151, 152, 154, 160, 136, 191, 192, 255,
-	128, 143, 144, 170, 171, 175, 176, 178,
-	179, 191, 128, 159, 160, 191, 176, 128,
-	138, 139, 173, 174, 255, 148, 150, 164,
-	167, 173, 176, 185, 189, 190, 192, 255,
-	144, 128, 145, 146, 175, 176, 191, 128,
-	140, 141, 255, 166, 176, 178, 191, 192,
-	255, 186, 128, 137, 138, 170, 171, 179,
-	180, 181, 182, 191, 160, 161, 162, 164,
-	165, 166, 167, 168, 169, 170, 171, 172,
-	173, 174, 175, 176, 177, 178, 179, 180,
-	181, 182, 183, 184, 185, 186, 187, 188,
-	189, 190, 128, 191, 128, 129, 130, 131,
-	137, 138, 139, 140, 141, 142, 143, 144,
-	153, 154, 155, 156, 157, 158, 159, 160,
-	161, 162, 163, 164, 165, 166, 167, 168,
-	169, 170, 171, 172, 173, 174, 175, 176,
-	177, 178, 179, 180, 182, 183, 184, 188,
-	189, 190, 191, 132, 187, 129, 130, 132,
-	133, 134, 176, 177, 178, 179, 180, 181,
-	182, 183, 128, 191, 128, 129, 130, 131,
-	132, 133, 134, 135, 144, 136, 143, 145,
-	191, 192, 255, 182, 183, 184, 128, 191,
-	128, 191, 191, 128, 190, 192, 255, 128,
-	146, 147, 148, 152, 153, 154, 155, 156,
-	158, 159, 160, 161, 162, 163, 164, 165,
-	166, 167, 168, 169, 170, 171, 172, 173,
-	174, 175, 176, 129, 191, 192, 255, 158,
-	159, 128, 157, 160, 191, 192, 255, 128,
-	191, 164, 169, 171, 172, 173, 174, 175,
-	180, 181, 182, 183, 184, 185, 187, 188,
-	189, 190, 191, 128, 163, 165, 186, 144,
-	145, 146, 147, 148, 150, 151, 152, 155,
-	157, 158, 160, 170, 171, 172, 175, 128,
-	159, 161, 169, 173, 191, 128, 191,
+	161, 169, 173, 191, 128, 191,
 }
 
 var _hcltok_single_lengths []byte = []byte{
@@ -1758,7 +1758,7 @@ var _hcltok_single_lengths []byte = []byte{
 	1, 5, 2, 0, 3, 2, 2, 2,
 	1, 7, 0, 7, 17, 3, 0, 2,
 	0, 3, 0, 0, 1, 0, 2, 0,
-	54, 2, 1, 1, 1, 1, 1, 2,
+	53, 2, 1, 1, 1, 1, 1, 2,
 	3, 2, 2, 1, 34, 1, 1, 0,
 	3, 2, 0, 0, 0, 1, 2, 4,
 	1, 0, 1, 0, 0, 0, 0, 1,
@@ -2164,23 +2164,23 @@ var _hcltok_index_offsets []int16 = []int16{
 	7213, 7215, 7223, 7229, 7231, 7235, 7238, 7241,
 	7244, 7248, 7259, 7262, 7274, 7298, 7306, 7308,
 	7312, 7315, 7320, 7323, 7325, 7330, 7333, 7339,
-	7342, 7408, 7411, 7413, 7415, 7417, 7419, 7421,
-	7424, 7429, 7432, 7435, 7437, 7477, 7479, 7481,
-	7483, 7488, 7492, 7493, 7495, 7497, 7504, 7511,
-	7518, 7520, 7522, 7524, 7527, 7530, 7536, 7539,
-	7544, 7551, 7556, 7559, 7563, 7570, 7602, 7651,
-	7666, 7679, 7684, 7686, 7690, 7721, 7727, 7729,
-	7750, 7770, 7772, 7784, 7796, 7808, 7820, 7831,
-	7839, 7852, 7865, 7878, 7890, 7898, 7911, 7923,
-	7935, 7947, 7959, 7971, 7983, 7995, 7997, 7999,
-	8001, 8003, 8005, 8007, 8009, 8019, 8029, 8039,
-	8049, 8051, 8053, 8055, 8057, 8059, 8069, 8078,
-	8080, 8082, 8084, 8086, 8088, 8130, 8170, 8172,
-	8177, 8181, 8182, 8184, 8186, 8193, 8200, 8207,
-	8209, 8211, 8213, 8216, 8219, 8225, 8228, 8233,
-	8240, 8245, 8248, 8252, 8259, 8291, 8340, 8355,
-	8368, 8373, 8375, 8379, 8410, 8416, 8418, 8439,
-	8459,
+	7342, 7407, 7410, 7412, 7414, 7416, 7418, 7420,
+	7423, 7428, 7431, 7434, 7436, 7476, 7478, 7480,
+	7482, 7487, 7491, 7492, 7494, 7496, 7503, 7510,
+	7517, 7519, 7521, 7523, 7526, 7529, 7535, 7538,
+	7543, 7550, 7555, 7558, 7562, 7569, 7601, 7650,
+	7665, 7678, 7683, 7685, 7689, 7720, 7726, 7728,
+	7749, 7769, 7771, 7783, 7795, 7807, 7819, 7830,
+	7838, 7851, 7864, 7877, 7889, 7897, 7910, 7922,
+	7934, 7946, 7958, 7970, 7982, 7994, 7996, 7998,
+	8000, 8002, 8004, 8006, 8008, 8018, 8028, 8038,
+	8048, 8050, 8052, 8054, 8056, 8058, 8068, 8077,
+	8079, 8081, 8083, 8085, 8087, 8129, 8169, 8171,
+	8176, 8180, 8181, 8183, 8185, 8192, 8199, 8206,
+	8208, 8210, 8212, 8215, 8218, 8224, 8227, 8232,
+	8239, 8244, 8247, 8251, 8258, 8290, 8339, 8354,
+	8367, 8372, 8374, 8378, 8409, 8415, 8417, 8438,
+	8458,
 }
 
 var _hcltok_indicies []int16 = []int16{
@@ -2666,7 +2666,7 @@ var _hcltok_indicies []int16 = []int16{
 	670, 671, 421, 671, 421, 671, 421, 670,
 	671, 670, 421, 421, 671, 670, 671, 421,
 	671, 421, 671, 670, 421, 671, 670, 671,
-	671, 421, 671, 421, 671, 670, 670, 421,
+	671, 421, 671, 421, 671, 670, 421, 670,
 	670, 421, 671, 671, 421, 671, 671, 671,
 	671, 671, 671, 671, 670, 421, 671, 671,
 	671, 421, 670, 671, 671, 671, 421, 671,
@@ -2993,7 +2993,7 @@ var _hcltok_indicies []int16 = []int16{
 	794, 1045, 794, 1045, 794, 1044, 1045, 1044,
 	794, 794, 1045, 1044, 1045, 794, 1045, 794,
 	1045, 1044, 794, 1045, 1044, 1045, 1045, 794,
-	1045, 794, 1045, 1044, 1044, 794, 1044, 794,
+	1045, 794, 1045, 1044, 794, 1044, 1044, 794,
 	1045, 1045, 794, 1045, 1045, 1045, 1045, 1045,
 	1045, 1045, 1044, 794, 1045, 1045, 1045, 794,
 	1044, 1045, 1045, 1045, 794, 1045, 794, 1045,
@@ -3102,146 +3102,146 @@ var _hcltok_indicies []int16 = []int16{
 	1045, 1044, 794, 1045, 794, 1139, 1058, 1046,
 	1044, 800, 1045, 1044, 794, 1049, 1140, 1046,
 	1058, 1046, 1044, 1045, 1044, 794, 1141, 1142,
-	1143, 1141, 1144, 1145, 1146, 1147, 1148, 1149,
-	1150, 1151, 1152, 1153, 671, 671, 421, 1154,
-	1155, 1156, 1157, 671, 1160, 1161, 1163, 1164,
-	1165, 1159, 1166, 1167, 1168, 1169, 1170, 1171,
-	1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179,
-	1180, 1181, 1182, 1183, 1184, 1185, 1187, 1188,
-	1189, 1190, 1191, 1192, 671, 1147, 9, 1147,
-	421, 1147, 421, 1159, 1162, 1186, 1193, 1158,
-	1141, 1141, 1194, 1142, 1195, 1197, 1196, 2,
-	1, 1198, 1196, 1199, 1196, 5, 1, 1196,
-	8, 10, 10, 9, 1200, 1201, 1202, 1196,
-	1203, 1204, 1196, 1205, 1196, 421, 421, 1207,
-	1208, 490, 471, 1209, 471, 1210, 1211, 1212,
-	1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220,
-	545, 1221, 521, 1222, 1223, 1224, 1225, 1226,
-	1227, 1228, 1229, 1230, 1231, 1232, 1233, 421,
-	421, 421, 426, 566, 1206, 1234, 1196, 1235,
-	1196, 671, 1236, 421, 421, 421, 671, 1236,
-	671, 671, 421, 1236, 421, 1236, 421, 1236,
-	421, 671, 671, 671, 671, 671, 1236, 421,
-	671, 671, 671, 421, 671, 421, 1236, 421,
-	671, 671, 671, 671, 421, 1236, 671, 421,
-	671, 421, 671, 421, 671, 671, 421, 671,
-	1236, 421, 671, 421, 671, 421, 671, 1236,
-	671, 421, 1236, 671, 421, 671, 421, 1236,
-	671, 671, 671, 671, 671, 1236, 421, 421,
-	671, 421, 671, 1236, 671, 421, 1236, 671,
-	671, 1236, 421, 421, 671, 421, 671, 421,
-	671, 1236, 1237, 1238, 1239, 1240, 1241, 1242,
-	1243, 1244, 1245, 1246, 1247, 716, 1248, 1249,
-	1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257,
-	1258, 1259, 1258, 1260, 1261, 1262, 1263, 1264,
-	672, 1236, 1265, 1266, 1267, 1268, 1269, 1270,
-	1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278,
-	1279, 1280, 1281, 1282, 1283, 726, 1284, 1285,
-	1286, 693, 1287, 1288, 1289, 1290, 1291, 1292,
-	672, 1293, 1294, 1295, 1296, 1297, 1298, 1299,
-	1300, 675, 1301, 672, 675, 1302, 1303, 1304,
-	1305, 684, 1236, 1306, 1307, 1308, 1309, 704,
-	1310, 1311, 684, 1312, 1313, 1314, 1315, 1316,
-	672, 1236, 1317, 1276, 1318, 1319, 1320, 684,
-	1321, 1322, 675, 672, 684, 426, 1236, 1286,
-	672, 675, 684, 426, 684, 426, 1323, 684,
-	1236, 426, 675, 1324, 1325, 675, 1326, 1327,
-	682, 1328, 1329, 1330, 1331, 1332, 1282, 1333,
-	1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341,
-	1342, 1343, 1344, 1301, 1345, 675, 684, 426,
-	1236, 1346, 1347, 684, 672, 1236, 426, 672,
-	1236, 675, 1348, 732, 1349, 1350, 1351, 1352,
-	1353, 1354, 1355, 1356, 672, 1357, 1358, 1359,
-	1360, 1361, 1362, 672, 684, 1236, 1364, 1365,
-	1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373,
-	1374, 1370, 1376, 1377, 1378, 1379, 1363, 1375,
-	1363, 1236, 1363, 1236, 1380, 1380, 1381, 1382,
-	1383, 1384, 1385, 1386, 1387, 1388, 1385, 770,
-	1389, 1389, 1389, 1390, 1391, 1384, 1389, 771,
-	772, 1392, 1389, 770, 1393, 1393, 1393, 1395,
-	1396, 1397, 1393, 1398, 1399, 1400, 1393, 1394,
-	1401, 1401, 1401, 1403, 1404, 1405, 1401, 1406,
-	1407, 1408, 1401, 1402, 1389, 1389, 1409, 1410,
-	1384, 1389, 771, 772, 1392, 1389, 770, 1411,
-	1412, 1413, 770, 1414, 1415, 1416, 768, 768,
-	768, 768, 1418, 1419, 1420, 1394, 768, 1421,
-	1422, 1423, 768, 1417, 769, 769, 769, 1425,
-	1426, 1427, 1394, 769, 1428, 1429, 1430, 769,
-	1424, 768, 768, 768, 1432, 1433, 1434, 1402,
-	768, 1435, 1436, 1437, 768, 1431, 1393, 1393,
-	770, 1438, 1439, 1397, 1393, 1398, 1399, 1400,
-	1393, 1394, 1440, 1441, 1442, 770, 1443, 1444,
-	1445, 769, 769, 769, 769, 1447, 1448, 1449,
-	1402, 769, 1450, 1451, 1452, 769, 1446, 1401,
-	1401, 770, 1453, 1454, 1405, 1401, 1406, 1407,
-	1408, 1401, 1402, 1401, 1401, 1401, 1403, 1404,
-	1405, 770, 1406, 1407, 1408, 1401, 1402, 1401,
-	1401, 1401, 1403, 1404, 1405, 771, 1406, 1407,
-	1408, 1401, 1402, 1401, 1401, 1401, 1403, 1404,
-	1405, 772, 1406, 1407, 1408, 1401, 1402, 1393,
-	1393, 1393, 1395, 1396, 1397, 770, 1398, 1399,
-	1400, 1393, 1394, 1393, 1393, 1393, 1395, 1396,
-	1397, 771, 1398, 1399, 1400, 1393, 1394, 1393,
-	1393, 1393, 1395, 1396, 1397, 772, 1398, 1399,
-	1400, 1393, 1394, 1456, 768, 1458, 1457, 1459,
-	769, 1461, 1460, 770, 1462, 774, 1462, 1463,
-	1462, 776, 1464, 1465, 1466, 1467, 1468, 1469,
-	1470, 1467, 780, 776, 1464, 1472, 1473, 1471,
-	781, 782, 1474, 1471, 780, 1477, 1478, 1479,
-	1480, 1475, 1481, 1482, 1483, 1475, 1476, 1486,
-	1487, 1488, 1489, 1484, 1490, 1491, 1492, 1484,
-	1485, 1494, 1493, 1496, 1495, 780, 1497, 781,
-	1497, 782, 1497, 786, 1498, 1499, 1500, 1501,
-	1502, 1503, 1504, 1501, 788, 786, 1498, 1506,
-	1505, 789, 790, 1507, 1505, 788, 1509, 1508,
-	1511, 1510, 788, 1512, 789, 1512, 790, 1512,
-	794, 1515, 1516, 1518, 1519, 1520, 1514, 1521,
-	1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529,
-	1530, 1531, 1532, 1533, 1534, 1535, 1536, 1537,
-	1538, 1539, 1540, 1542, 1543, 1544, 1545, 1546,
-	1547, 794, 794, 1513, 1514, 1517, 1541, 1548,
-	1513, 1045, 794, 794, 1550, 1551, 864, 845,
-	1552, 845, 1553, 1554, 1555, 1556, 1557, 1558,
-	1559, 1560, 1561, 1562, 1563, 919, 1564, 895,
-	1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572,
-	1573, 1574, 1575, 1576, 794, 794, 794, 800,
-	940, 1549, 1045, 1577, 794, 794, 794, 1045,
-	1577, 1045, 1045, 794, 1577, 794, 1577, 794,
-	1577, 794, 1045, 1045, 1045, 1045, 1045, 1577,
-	794, 1045, 1045, 1045, 794, 1045, 794, 1577,
-	794, 1045, 1045, 1045, 1045, 794, 1577, 1045,
-	794, 1045, 794, 1045, 794, 1045, 1045, 794,
-	1045, 1577, 794, 1045, 794, 1045, 794, 1045,
-	1577, 1045, 794, 1577, 1045, 794, 1045, 794,
-	1577, 1045, 1045, 1045, 1045, 1045, 1577, 794,
-	794, 1045, 794, 1045, 1577, 1045, 794, 1577,
-	1045, 1045, 1577, 794, 794, 1045, 794, 1045,
-	794, 1045, 1577, 1578, 1579, 1580, 1581, 1582,
-	1583, 1584, 1585, 1586, 1587, 1588, 1090, 1589,
-	1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597,
-	1598, 1599, 1600, 1599, 1601, 1602, 1603, 1604,
-	1605, 1046, 1577, 1606, 1607, 1608, 1609, 1610,
-	1611, 1612, 1613, 1614, 1615, 1616, 1617, 1618,
-	1619, 1620, 1621, 1622, 1623, 1624, 1100, 1625,
-	1626, 1627, 1067, 1628, 1629, 1630, 1631, 1632,
-	1633, 1046, 1634, 1635, 1636, 1637, 1638, 1639,
-	1640, 1641, 1049, 1642, 1046, 1049, 1643, 1644,
-	1645, 1646, 1058, 1577, 1647, 1648, 1649, 1650,
-	1078, 1651, 1652, 1058, 1653, 1654, 1655, 1656,
-	1657, 1046, 1577, 1658, 1617, 1659, 1660, 1661,
-	1058, 1662, 1663, 1049, 1046, 1058, 800, 1577,
-	1627, 1046, 1049, 1058, 800, 1058, 800, 1664,
-	1058, 1577, 800, 1049, 1665, 1666, 1049, 1667,
-	1668, 1056, 1669, 1670, 1671, 1672, 1673, 1623,
-	1674, 1675, 1676, 1677, 1678, 1679, 1680, 1681,
-	1682, 1683, 1684, 1685, 1642, 1686, 1049, 1058,
-	800, 1577, 1687, 1688, 1058, 1046, 1577, 800,
-	1046, 1577, 1049, 1689, 1106, 1690, 1691, 1692,
-	1693, 1694, 1695, 1696, 1697, 1046, 1698, 1699,
-	1700, 1701, 1702, 1703, 1046, 1058, 1577, 1705,
-	1706, 1707, 1708, 1709, 1710, 1711, 1712, 1713,
-	1714, 1715, 1711, 1717, 1718, 1719, 1720, 1704,
-	1716, 1704, 1577, 1704, 1577,
+	1143, 1141, 1144, 1145, 1146, 1148, 1149, 1150,
+	1151, 1152, 1153, 671, 671, 421, 1154, 1155,
+	1156, 1157, 671, 1160, 1161, 1163, 1164, 1165,
+	1159, 1166, 1167, 1168, 1169, 1170, 1171, 1172,
+	1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180,
+	1181, 1182, 1183, 1184, 1185, 1187, 1188, 1189,
+	1190, 1191, 1192, 671, 1147, 9, 1147, 421,
+	1147, 421, 1159, 1162, 1186, 1193, 1158, 1141,
+	1141, 1194, 1142, 1195, 1197, 1196, 2, 1,
+	1198, 1196, 1199, 1196, 5, 1, 1196, 8,
+	10, 10, 9, 1200, 1201, 1202, 1196, 1203,
+	1204, 1196, 1205, 1196, 421, 421, 1207, 1208,
+	490, 471, 1209, 471, 1210, 1211, 1212, 1213,
+	1214, 1215, 1216, 1217, 1218, 1219, 1220, 545,
+	1221, 521, 1222, 1223, 1224, 1225, 1226, 1227,
+	1228, 1229, 1230, 1231, 1232, 1233, 421, 421,
+	421, 426, 566, 1206, 1234, 1196, 1235, 1196,
+	671, 1236, 421, 421, 421, 671, 1236, 671,
+	671, 421, 1236, 421, 1236, 421, 1236, 421,
+	671, 671, 671, 671, 671, 1236, 421, 671,
+	671, 671, 421, 671, 421, 1236, 421, 671,
+	671, 671, 671, 421, 1236, 671, 421, 671,
+	421, 671, 421, 671, 671, 421, 671, 1236,
+	421, 671, 421, 671, 421, 671, 1236, 671,
+	421, 1236, 671, 421, 671, 421, 1236, 671,
+	671, 671, 671, 671, 1236, 421, 421, 671,
+	421, 671, 1236, 671, 421, 1236, 671, 671,
+	1236, 421, 421, 671, 421, 671, 421, 671,
+	1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243,
+	1244, 1245, 1246, 1247, 716, 1248, 1249, 1250,
+	1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258,
+	1259, 1258, 1260, 1261, 1262, 1263, 1264, 672,
+	1236, 1265, 1266, 1267, 1268, 1269, 1270, 1271,
+	1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279,
+	1280, 1281, 1282, 1283, 726, 1284, 1285, 1286,
+	693, 1287, 1288, 1289, 1290, 1291, 1292, 672,
+	1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300,
+	675, 1301, 672, 675, 1302, 1303, 1304, 1305,
+	684, 1236, 1306, 1307, 1308, 1309, 704, 1310,
+	1311, 684, 1312, 1313, 1314, 1315, 1316, 672,
+	1236, 1317, 1276, 1318, 1319, 1320, 684, 1321,
+	1322, 675, 672, 684, 426, 1236, 1286, 672,
+	675, 684, 426, 684, 426, 1323, 684, 1236,
+	426, 675, 1324, 1325, 675, 1326, 1327, 682,
+	1328, 1329, 1330, 1331, 1332, 1282, 1333, 1334,
+	1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342,
+	1343, 1344, 1301, 1345, 675, 684, 426, 1236,
+	1346, 1347, 684, 672, 1236, 426, 672, 1236,
+	675, 1348, 732, 1349, 1350, 1351, 1352, 1353,
+	1354, 1355, 1356, 672, 1357, 1358, 1359, 1360,
+	1361, 1362, 672, 684, 1236, 1364, 1365, 1366,
+	1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374,
+	1370, 1376, 1377, 1378, 1379, 1363, 1375, 1363,
+	1236, 1363, 1236, 1380, 1380, 1381, 1382, 1383,
+	1384, 1385, 1386, 1387, 1388, 1385, 770, 1389,
+	1389, 1389, 1390, 1391, 1384, 1389, 771, 772,
+	1392, 1389, 770, 1393, 1393, 1393, 1395, 1396,
+	1397, 1393, 1398, 1399, 1400, 1393, 1394, 1401,
+	1401, 1401, 1403, 1404, 1405, 1401, 1406, 1407,
+	1408, 1401, 1402, 1389, 1389, 1409, 1410, 1384,
+	1389, 771, 772, 1392, 1389, 770, 1411, 1412,
+	1413, 770, 1414, 1415, 1416, 768, 768, 768,
+	768, 1418, 1419, 1420, 1394, 768, 1421, 1422,
+	1423, 768, 1417, 769, 769, 769, 1425, 1426,
+	1427, 1394, 769, 1428, 1429, 1430, 769, 1424,
+	768, 768, 768, 1432, 1433, 1434, 1402, 768,
+	1435, 1436, 1437, 768, 1431, 1393, 1393, 770,
+	1438, 1439, 1397, 1393, 1398, 1399, 1400, 1393,
+	1394, 1440, 1441, 1442, 770, 1443, 1444, 1445,
+	769, 769, 769, 769, 1447, 1448, 1449, 1402,
+	769, 1450, 1451, 1452, 769, 1446, 1401, 1401,
+	770, 1453, 1454, 1405, 1401, 1406, 1407, 1408,
+	1401, 1402, 1401, 1401, 1401, 1403, 1404, 1405,
+	770, 1406, 1407, 1408, 1401, 1402, 1401, 1401,
+	1401, 1403, 1404, 1405, 771, 1406, 1407, 1408,
+	1401, 1402, 1401, 1401, 1401, 1403, 1404, 1405,
+	772, 1406, 1407, 1408, 1401, 1402, 1393, 1393,
+	1393, 1395, 1396, 1397, 770, 1398, 1399, 1400,
+	1393, 1394, 1393, 1393, 1393, 1395, 1396, 1397,
+	771, 1398, 1399, 1400, 1393, 1394, 1393, 1393,
+	1393, 1395, 1396, 1397, 772, 1398, 1399, 1400,
+	1393, 1394, 1456, 768, 1458, 1457, 1459, 769,
+	1461, 1460, 770, 1462, 774, 1462, 1463, 1462,
+	776, 1464, 1465, 1466, 1467, 1468, 1469, 1470,
+	1467, 780, 776, 1464, 1472, 1473, 1471, 781,
+	782, 1474, 1471, 780, 1477, 1478, 1479, 1480,
+	1475, 1481, 1482, 1483, 1475, 1476, 1486, 1487,
+	1488, 1489, 1484, 1490, 1491, 1492, 1484, 1485,
+	1494, 1493, 1496, 1495, 780, 1497, 781, 1497,
+	782, 1497, 786, 1498, 1499, 1500, 1501, 1502,
+	1503, 1504, 1501, 788, 786, 1498, 1506, 1505,
+	789, 790, 1507, 1505, 788, 1509, 1508, 1511,
+	1510, 788, 1512, 789, 1512, 790, 1512, 794,
+	1515, 1516, 1518, 1519, 1520, 1514, 1521, 1522,
+	1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530,
+	1531, 1532, 1533, 1534, 1535, 1536, 1537, 1538,
+	1539, 1540, 1542, 1543, 1544, 1545, 1546, 1547,
+	794, 794, 1513, 1514, 1517, 1541, 1548, 1513,
+	1045, 794, 794, 1550, 1551, 864, 845, 1552,
+	845, 1553, 1554, 1555, 1556, 1557, 1558, 1559,
+	1560, 1561, 1562, 1563, 919, 1564, 895, 1565,
+	1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573,
+	1574, 1575, 1576, 794, 794, 794, 800, 940,
+	1549, 1045, 1577, 794, 794, 794, 1045, 1577,
+	1045, 1045, 794, 1577, 794, 1577, 794, 1577,
+	794, 1045, 1045, 1045, 1045, 1045, 1577, 794,
+	1045, 1045, 1045, 794, 1045, 794, 1577, 794,
+	1045, 1045, 1045, 1045, 794, 1577, 1045, 794,
+	1045, 794, 1045, 794, 1045, 1045, 794, 1045,
+	1577, 794, 1045, 794, 1045, 794, 1045, 1577,
+	1045, 794, 1577, 1045, 794, 1045, 794, 1577,
+	1045, 1045, 1045, 1045, 1045, 1577, 794, 794,
+	1045, 794, 1045, 1577, 1045, 794, 1577, 1045,
+	1045, 1577, 794, 794, 1045, 794, 1045, 794,
+	1045, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
+	1584, 1585, 1586, 1587, 1588, 1090, 1589, 1590,
+	1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598,
+	1599, 1600, 1599, 1601, 1602, 1603, 1604, 1605,
+	1046, 1577, 1606, 1607, 1608, 1609, 1610, 1611,
+	1612, 1613, 1614, 1615, 1616, 1617, 1618, 1619,
+	1620, 1621, 1622, 1623, 1624, 1100, 1625, 1626,
+	1627, 1067, 1628, 1629, 1630, 1631, 1632, 1633,
+	1046, 1634, 1635, 1636, 1637, 1638, 1639, 1640,
+	1641, 1049, 1642, 1046, 1049, 1643, 1644, 1645,
+	1646, 1058, 1577, 1647, 1648, 1649, 1650, 1078,
+	1651, 1652, 1058, 1653, 1654, 1655, 1656, 1657,
+	1046, 1577, 1658, 1617, 1659, 1660, 1661, 1058,
+	1662, 1663, 1049, 1046, 1058, 800, 1577, 1627,
+	1046, 1049, 1058, 800, 1058, 800, 1664, 1058,
+	1577, 800, 1049, 1665, 1666, 1049, 1667, 1668,
+	1056, 1669, 1670, 1671, 1672, 1673, 1623, 1674,
+	1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682,
+	1683, 1684, 1685, 1642, 1686, 1049, 1058, 800,
+	1577, 1687, 1688, 1058, 1046, 1577, 800, 1046,
+	1577, 1049, 1689, 1106, 1690, 1691, 1692, 1693,
+	1694, 1695, 1696, 1697, 1046, 1698, 1699, 1700,
+	1701, 1702, 1703, 1046, 1058, 1577, 1705, 1706,
+	1707, 1708, 1709, 1710, 1711, 1712, 1713, 1714,
+	1715, 1711, 1717, 1718, 1719, 1720, 1704, 1716,
+	1704, 1577, 1704, 1577,
 }
 
 var _hcltok_trans_targs []int16 = []int16{
@@ -4301,7 +4301,7 @@ const hcltok_en_bareTemplate int = 1549
 const hcltok_en_identOnly int = 1556
 const hcltok_en_main int = 1464
 
-// line 16 "scan_tokens.rl"
+//line scan_tokens.rl:16
 
 func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []Token {
 	stripData := stripUTF8BOM(data)
@@ -4315,7 +4315,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 		StartByte: start.Byte,
 	}
 
-	// line 299 "scan_tokens.rl"
+//line scan_tokens.rl:299
 
 	// Ragel state
 	p := 0          // "Pointer" into data
@@ -4343,7 +4343,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 	var retBraces []int              // stack of brace levels that cause us to use fret
 	var heredocs []heredocInProgress // stack of heredocs we're currently processing
 
-	// line 334 "scan_tokens.rl"
+//line scan_tokens.rl:334
 
 	// Make Go compiler happy
 	_ = ts
@@ -4363,7 +4363,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 		f.emitToken(TokenType(b[0]), ts, te)
 	}
 
-	// line 4375 "scan_tokens.go"
+//line scan_tokens.go:4375
 	{
 		top = 0
 		ts = 0
@@ -4371,7 +4371,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 		act = 0
 	}
 
-	// line 4383 "scan_tokens.go"
+//line scan_tokens.go:4383
 	{
 		var _klen int
 		var _trans int
@@ -4392,11 +4392,10 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 			_acts++
 			switch _hcltok_actions[_acts-1] {
 			case 6:
-				// line 1 "NONE"
-
+//line NONE:1
 				ts = p
 
-				// line 4407 "scan_tokens.go"
+//line scan_tokens.go:4406
 			}
 		}
 
@@ -4468,33 +4467,27 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 			_acts++
 			switch _hcltok_actions[_acts-1] {
 			case 0:
-				// line 223 "scan_tokens.rl"
-
+//line scan_tokens.rl:223
 				p--
 
 			case 1:
-				// line 224 "scan_tokens.rl"
-
+//line scan_tokens.rl:224
 				p--
 
 			case 2:
-				// line 229 "scan_tokens.rl"
-
+//line scan_tokens.rl:229
 				p--
 
 			case 3:
-				// line 230 "scan_tokens.rl"
-
+//line scan_tokens.rl:230
 				p--
 
 			case 7:
-				// line 1 "NONE"
-
+//line NONE:1
 				te = p + 1
 
 			case 8:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p + 1
 				{
 					token(TokenTemplateInterp)
@@ -4512,8 +4505,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 9:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p + 1
 				{
 					token(TokenTemplateControl)
@@ -4531,8 +4523,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 10:
-				// line 84 "scan_tokens.rl"
-
+//line scan_tokens.rl:84
 				te = p + 1
 				{
 					token(TokenCQuote)
@@ -4545,22 +4536,19 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 
 				}
 			case 11:
-				// line 244 "scan_tokens.rl"
-
+//line scan_tokens.rl:244
 				te = p + 1
 				{
 					token(TokenInvalid)
 				}
 			case 12:
-				// line 245 "scan_tokens.rl"
-
+//line scan_tokens.rl:245
 				te = p + 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 13:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p
 				p--
 				{
@@ -4579,8 +4567,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 14:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p
 				p--
 				{
@@ -4599,54 +4586,46 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 15:
-				// line 243 "scan_tokens.rl"
-
+//line scan_tokens.rl:243
 				te = p
 				p--
 				{
 					token(TokenQuotedLit)
 				}
 			case 16:
-				// line 244 "scan_tokens.rl"
-
+//line scan_tokens.rl:244
 				te = p
 				p--
 				{
 					token(TokenInvalid)
 				}
 			case 17:
-				// line 245 "scan_tokens.rl"
-
+//line scan_tokens.rl:245
 				te = p
 				p--
 				{
 					token(TokenBadUTF8)
 				}
 			case 18:
-				// line 243 "scan_tokens.rl"
-
+//line scan_tokens.rl:243
 				p = (te) - 1
 				{
 					token(TokenQuotedLit)
 				}
 			case 19:
-				// line 245 "scan_tokens.rl"
-
+//line scan_tokens.rl:245
 				p = (te) - 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 20:
-				// line 148 "scan_tokens.rl"
-
+//line scan_tokens.rl:148
 				act = 10
 			case 21:
-				// line 253 "scan_tokens.rl"
-
+//line scan_tokens.rl:253
 				act = 11
 			case 22:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p + 1
 				{
 					token(TokenTemplateInterp)
@@ -4664,8 +4643,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 23:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p + 1
 				{
 					token(TokenTemplateControl)
@@ -4683,8 +4661,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 24:
-				// line 111 "scan_tokens.rl"
-
+//line scan_tokens.rl:111
 				te = p + 1
 				{
 					// This action is called specificially when a heredoc literal
@@ -4729,15 +4706,13 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					token(TokenStringLit)
 				}
 			case 25:
-				// line 253 "scan_tokens.rl"
-
+//line scan_tokens.rl:253
 				te = p + 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 26:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p
 				p--
 				{
@@ -4756,8 +4731,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 27:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p
 				p--
 				{
@@ -4776,8 +4750,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 28:
-				// line 148 "scan_tokens.rl"
-
+//line scan_tokens.rl:148
 				te = p
 				p--
 				{
@@ -4788,16 +4761,14 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					token(TokenStringLit)
 				}
 			case 29:
-				// line 253 "scan_tokens.rl"
-
+//line scan_tokens.rl:253
 				te = p
 				p--
 				{
 					token(TokenBadUTF8)
 				}
 			case 30:
-				// line 148 "scan_tokens.rl"
-
+//line scan_tokens.rl:148
 				p = (te) - 1
 				{
 					// This action is called when a heredoc literal _doesn't_ end
@@ -4807,8 +4778,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					token(TokenStringLit)
 				}
 			case 31:
-				// line 1 "NONE"
-
+//line NONE:1
 				switch act {
 				case 0:
 					{
@@ -4833,16 +4803,13 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 				}
 
 			case 32:
-				// line 156 "scan_tokens.rl"
-
+//line scan_tokens.rl:156
 				act = 14
 			case 33:
-				// line 260 "scan_tokens.rl"
-
+//line scan_tokens.rl:260
 				act = 15
 			case 34:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p + 1
 				{
 					token(TokenTemplateInterp)
@@ -4860,8 +4827,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 35:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p + 1
 				{
 					token(TokenTemplateControl)
@@ -4879,22 +4845,19 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 36:
-				// line 156 "scan_tokens.rl"
-
+//line scan_tokens.rl:156
 				te = p + 1
 				{
 					token(TokenStringLit)
 				}
 			case 37:
-				// line 260 "scan_tokens.rl"
-
+//line scan_tokens.rl:260
 				te = p + 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 38:
-				// line 160 "scan_tokens.rl"
-
+//line scan_tokens.rl:160
 				te = p
 				p--
 				{
@@ -4913,8 +4876,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 39:
-				// line 170 "scan_tokens.rl"
-
+//line scan_tokens.rl:170
 				te = p
 				p--
 				{
@@ -4933,31 +4895,27 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 40:
-				// line 156 "scan_tokens.rl"
-
+//line scan_tokens.rl:156
 				te = p
 				p--
 				{
 					token(TokenStringLit)
 				}
 			case 41:
-				// line 260 "scan_tokens.rl"
-
+//line scan_tokens.rl:260
 				te = p
 				p--
 				{
 					token(TokenBadUTF8)
 				}
 			case 42:
-				// line 156 "scan_tokens.rl"
-
+//line scan_tokens.rl:156
 				p = (te) - 1
 				{
 					token(TokenStringLit)
 				}
 			case 43:
-				// line 1 "NONE"
-
+//line NONE:1
 				switch act {
 				case 0:
 					{
@@ -4978,60 +4936,51 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 				}
 
 			case 44:
-				// line 264 "scan_tokens.rl"
-
+//line scan_tokens.rl:264
 				act = 16
 			case 45:
-				// line 265 "scan_tokens.rl"
-
+//line scan_tokens.rl:265
 				act = 17
 			case 46:
-				// line 265 "scan_tokens.rl"
-
+//line scan_tokens.rl:265
 				te = p + 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 47:
-				// line 266 "scan_tokens.rl"
-
+//line scan_tokens.rl:266
 				te = p + 1
 				{
 					token(TokenInvalid)
 				}
 			case 48:
-				// line 264 "scan_tokens.rl"
-
+//line scan_tokens.rl:264
 				te = p
 				p--
 				{
 					token(TokenIdent)
 				}
 			case 49:
-				// line 265 "scan_tokens.rl"
-
+//line scan_tokens.rl:265
 				te = p
 				p--
 				{
 					token(TokenBadUTF8)
 				}
 			case 50:
-				// line 264 "scan_tokens.rl"
-
+//line scan_tokens.rl:264
 				p = (te) - 1
 				{
 					token(TokenIdent)
 				}
 			case 51:
-				// line 265 "scan_tokens.rl"
-
+//line scan_tokens.rl:265
 				p = (te) - 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 52:
-				// line 1 "NONE"
-
+//line NONE:1
 				switch act {
 				case 16:
 					{
@@ -5046,109 +4995,92 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 				}
 
 			case 53:
-				// line 272 "scan_tokens.rl"
-
+//line scan_tokens.rl:272
 				act = 21
 			case 54:
-				// line 285 "scan_tokens.rl"
-
+//line scan_tokens.rl:285
 				act = 32
 			case 55:
-				// line 295 "scan_tokens.rl"
-
+//line scan_tokens.rl:295
 				act = 38
 			case 56:
-				// line 296 "scan_tokens.rl"
-
+//line scan_tokens.rl:296
 				act = 39
 			case 57:
-				// line 274 "scan_tokens.rl"
-
+//line scan_tokens.rl:274
 				te = p + 1
 				{
 					token(TokenComment)
 				}
 			case 58:
-				// line 275 "scan_tokens.rl"
-
+//line scan_tokens.rl:275
 				te = p + 1
 				{
 					token(TokenNewline)
 				}
 			case 59:
-				// line 277 "scan_tokens.rl"
-
+//line scan_tokens.rl:277
 				te = p + 1
 				{
 					token(TokenEqualOp)
 				}
 			case 60:
-				// line 278 "scan_tokens.rl"
-
+//line scan_tokens.rl:278
 				te = p + 1
 				{
 					token(TokenNotEqual)
 				}
 			case 61:
-				// line 279 "scan_tokens.rl"
-
+//line scan_tokens.rl:279
 				te = p + 1
 				{
 					token(TokenGreaterThanEq)
 				}
 			case 62:
-				// line 280 "scan_tokens.rl"
-
+//line scan_tokens.rl:280
 				te = p + 1
 				{
 					token(TokenLessThanEq)
 				}
 			case 63:
-				// line 281 "scan_tokens.rl"
-
+//line scan_tokens.rl:281
 				te = p + 1
 				{
 					token(TokenAnd)
 				}
 			case 64:
-				// line 282 "scan_tokens.rl"
-
+//line scan_tokens.rl:282
 				te = p + 1
 				{
 					token(TokenOr)
 				}
 			case 65:
-				// line 283 "scan_tokens.rl"
-
+//line scan_tokens.rl:283
 				te = p + 1
 				{
 					token(TokenEllipsis)
 				}
 			case 66:
-				// line 284 "scan_tokens.rl"
-
+//line scan_tokens.rl:284
 				te = p + 1
 				{
 					token(TokenFatArrow)
 				}
 			case 67:
-				// line 285 "scan_tokens.rl"
-
+//line scan_tokens.rl:285
 				te = p + 1
 				{
 					selfToken()
 				}
 			case 68:
-				// line 180 "scan_tokens.rl"
-
+//line scan_tokens.rl:180
 				te = p + 1
 				{
 					token(TokenOBrace)
 					braces++
 				}
 			case 69:
-				// line 185 "scan_tokens.rl"
-
+//line scan_tokens.rl:185
 				te = p + 1
 				{
 					if len(retBraces) > 0 && retBraces[len(retBraces)-1] == braces {
@@ -5168,8 +5100,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 70:
-				// line 197 "scan_tokens.rl"
-
+//line scan_tokens.rl:197
 				te = p + 1
 				{
 					// Only consume from the retBraces stack and return if we are at
@@ -5198,8 +5129,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 71:
-				// line 79 "scan_tokens.rl"
-
+//line scan_tokens.rl:79
 				te = p + 1
 				{
 					token(TokenOQuote)
@@ -5212,8 +5142,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 72:
-				// line 89 "scan_tokens.rl"
-
+//line scan_tokens.rl:89
 				te = p + 1
 				{
 					token(TokenOHeredoc)
@@ -5243,96 +5172,83 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 			case 73:
-				// line 295 "scan_tokens.rl"
-
+//line scan_tokens.rl:295
 				te = p + 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 74:
-				// line 296 "scan_tokens.rl"
-
+//line scan_tokens.rl:296
 				te = p + 1
 				{
 					token(TokenInvalid)
 				}
 			case 75:
-				// line 270 "scan_tokens.rl"
-
+//line scan_tokens.rl:270
 				te = p
 				p--
 
 			case 76:
-				// line 271 "scan_tokens.rl"
-
+//line scan_tokens.rl:271
 				te = p
 				p--
 				{
 					token(TokenNumberLit)
 				}
 			case 77:
-				// line 272 "scan_tokens.rl"
-
+//line scan_tokens.rl:272
 				te = p
 				p--
 				{
 					token(TokenIdent)
 				}
 			case 78:
-				// line 285 "scan_tokens.rl"
-
+//line scan_tokens.rl:285
 				te = p
 				p--
 				{
 					selfToken()
 				}
 			case 79:
-				// line 295 "scan_tokens.rl"
-
+//line scan_tokens.rl:295
 				te = p
 				p--
 				{
 					token(TokenBadUTF8)
 				}
 			case 80:
-				// line 296 "scan_tokens.rl"
-
+//line scan_tokens.rl:296
 				te = p
 				p--
 				{
 					token(TokenInvalid)
 				}
 			case 81:
-				// line 271 "scan_tokens.rl"
-
+//line scan_tokens.rl:271
 				p = (te) - 1
 				{
 					token(TokenNumberLit)
 				}
 			case 82:
-				// line 272 "scan_tokens.rl"
-
+//line scan_tokens.rl:272
 				p = (te) - 1
 				{
 					token(TokenIdent)
 				}
 			case 83:
-				// line 285 "scan_tokens.rl"
-
+//line scan_tokens.rl:285
 				p = (te) - 1
 				{
 					selfToken()
 				}
 			case 84:
-				// line 295 "scan_tokens.rl"
-
+//line scan_tokens.rl:295
 				p = (te) - 1
 				{
 					token(TokenBadUTF8)
 				}
 			case 85:
-				// line 1 "NONE"
-
+//line NONE:1
 				switch act {
 				case 21:
 					{
@@ -5356,7 +5272,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 					}
 				}
 
-				// line 5222 "scan_tokens.go"
+//line scan_tokens.go:5138
 			}
 		}
 
@@ -5368,16 +5284,14 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 			_acts++
 			switch _hcltok_actions[_acts-1] {
 			case 4:
-				// line 1 "NONE"
-
+//line NONE:1
 				ts = 0
 
 			case 5:
-				// line 1 "NONE"
-
+//line NONE:1
 				act = 0
 
-				// line 5242 "scan_tokens.go"
+//line scan_tokens.go:5156
 			}
 		}
 
@@ -5403,7 +5317,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
 		}
 	}
 
-	// line 357 "scan_tokens.rl"
+//line scan_tokens.rl:357
 
 	// If we fall out here without being in a final state then we've
 	// encountered something that the scanner can't match, which we'll
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.rl b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.rl
index a7ae54fcc..1f37b88ba 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.rl
+++ b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/scan_tokens.rl
@@ -9,7 +9,7 @@ import (
 
 // This file is generated from scan_tokens.rl. DO NOT EDIT.
 %%{
-  # (except you are actually in scan_tokens.rl here, so edit away!)
+  # (except when you are actually in scan_tokens.rl here, so edit away!)
 
   machine hcltok;
   write data;
@@ -44,7 +44,7 @@ func scanTokens(data []byte, filename string, start hcl.Pos, mode scanMode) []To
         Ident = (ID_Start | '_') (ID_Continue | '-')*;
 
         # Symbols that just represent themselves are handled as a single rule.
-        SelfToken = "[" | "]" | "(" | ")" | "." | "," | "*" | "/" | "%" | "+" | "-" | "=" | "<" | ">" | "!" | "?" | ":" | "\n" | "&" | "|" | "~" | "^" | ";" | "`";
+        SelfToken = "[" | "]" | "(" | ")" | "." | "," | "*" | "/" | "%" | "+" | "-" | "=" | "<" | ">" | "!" | "?" | ":" | "\n" | "&" | "|" | "~" | "^" | ";" | "`" | "'";
 
         EqualOp = "==";
         NotEqual = "!=";
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token.go b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token.go
index 1967c2252..67be099c1 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token.go
@@ -90,6 +90,7 @@ const (
 	TokenBitwiseNot TokenType = '~'
 	TokenBitwiseXor TokenType = '^'
 	TokenStarStar   TokenType = '➚'
+	TokenApostrophe TokenType = '\''
 	TokenBacktick   TokenType = '`'
 	TokenSemicolon  TokenType = ';'
 	TokenTabs       TokenType = '␉'
@@ -183,11 +184,15 @@ func checkInvalidTokens(tokens Tokens) hcl.Diagnostics {
 	toldBitwise := 0
 	toldExponent := 0
 	toldBacktick := 0
+	toldApostrophe := 0
 	toldSemicolon := 0
 	toldTabs := 0
 	toldBadUTF8 := 0
 
 	for _, tok := range tokens {
+		// copy token so it's safe to point to it
+		tok := tok
+
 		switch tok.Type {
 		case TokenBitwiseAnd, TokenBitwiseOr, TokenBitwiseXor, TokenBitwiseNot:
 			if toldBitwise < 4 {
@@ -223,16 +228,30 @@ func checkInvalidTokens(tokens Tokens) hcl.Diagnostics {
 		case TokenBacktick:
 			// Only report for alternating (even) backticks, so we won't report both start and ends of the same
 			// backtick-quoted string.
-			if toldExponent < 4 && (toldExponent%2) == 0 {
+			if (toldBacktick % 2) == 0 {
 				diags = append(diags, &hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Invalid character",
 					Detail:   "The \"`\" character is not valid. To create a multi-line string, use the \"heredoc\" syntax, like \"<<EOT\".",
 					Subject:  &tok.Range,
 				})
-
+			}
+			if toldBacktick <= 2 {
 				toldBacktick++
 			}
+		case TokenApostrophe:
+			if (toldApostrophe % 2) == 0 {
+				newDiag := &hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  "Invalid character",
+					Detail:   "Single quotes are not valid. Use double quotes (\") to enclose strings.",
+					Subject:  &tok.Range,
+				}
+				diags = append(diags, newDiag)
+			}
+			if toldApostrophe <= 2 {
+				toldApostrophe++
+			}
 		case TokenSemicolon:
 			if toldSemicolon < 1 {
 				diags = append(diags, &hcl.Diagnostic{
@@ -273,8 +292,6 @@ func checkInvalidTokens(tokens Tokens) hcl.Diagnostics {
 				Detail:   "This character is not used within the language.",
 				Subject:  &tok.Range,
 			})
-
-			toldTabs++
 		}
 	}
 	return diags
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token_type_string.go b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token_type_string.go
index 93de7ee9d..a14066efc 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token_type_string.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/hclsyntax/token_type_string.go
@@ -4,7 +4,7 @@ package hclsyntax
 
 import "strconv"
 
-const _TokenType_name = "TokenNilTokenNewlineTokenBangTokenPercentTokenBitwiseAndTokenOParenTokenCParenTokenStarTokenPlusTokenCommaTokenMinusTokenDotTokenSlashTokenColonTokenSemicolonTokenLessThanTokenEqualTokenGreaterThanTokenQuestionTokenCommentTokenOHeredocTokenIdentTokenNumberLitTokenQuotedLitTokenStringLitTokenOBrackTokenCBrackTokenBitwiseXorTokenBacktickTokenCHeredocTokenOBraceTokenBitwiseOrTokenCBraceTokenBitwiseNotTokenOQuoteTokenCQuoteTokenTemplateControlTokenEllipsisTokenFatArrowTokenTemplateSeqEndTokenAndTokenOrTokenTemplateInterpTokenEqualOpTokenNotEqualTokenLessThanEqTokenGreaterThanEqTokenEOFTokenTabsTokenStarStarTokenInvalidTokenBadUTF8"
+const _TokenType_name = "TokenNilTokenNewlineTokenBangTokenPercentTokenBitwiseAndTokenApostropheTokenOParenTokenCParenTokenStarTokenPlusTokenCommaTokenMinusTokenDotTokenSlashTokenColonTokenSemicolonTokenLessThanTokenEqualTokenGreaterThanTokenQuestionTokenCommentTokenOHeredocTokenIdentTokenNumberLitTokenQuotedLitTokenStringLitTokenOBrackTokenCBrackTokenBitwiseXorTokenBacktickTokenCHeredocTokenOBraceTokenBitwiseOrTokenCBraceTokenBitwiseNotTokenOQuoteTokenCQuoteTokenTemplateControlTokenEllipsisTokenFatArrowTokenTemplateSeqEndTokenAndTokenOrTokenTemplateInterpTokenEqualOpTokenNotEqualTokenLessThanEqTokenGreaterThanEqTokenEOFTokenTabsTokenStarStarTokenInvalidTokenBadUTF8"
 
 var _TokenType_map = map[TokenType]string{
 	0:      _TokenType_name[0:8],
@@ -12,53 +12,54 @@ var _TokenType_map = map[TokenType]string{
 	33:     _TokenType_name[20:29],
 	37:     _TokenType_name[29:41],
 	38:     _TokenType_name[41:56],
-	40:     _TokenType_name[56:67],
-	41:     _TokenType_name[67:78],
-	42:     _TokenType_name[78:87],
-	43:     _TokenType_name[87:96],
-	44:     _TokenType_name[96:106],
-	45:     _TokenType_name[106:116],
-	46:     _TokenType_name[116:124],
-	47:     _TokenType_name[124:134],
-	58:     _TokenType_name[134:144],
-	59:     _TokenType_name[144:158],
-	60:     _TokenType_name[158:171],
-	61:     _TokenType_name[171:181],
-	62:     _TokenType_name[181:197],
-	63:     _TokenType_name[197:210],
-	67:     _TokenType_name[210:222],
-	72:     _TokenType_name[222:235],
-	73:     _TokenType_name[235:245],
-	78:     _TokenType_name[245:259],
-	81:     _TokenType_name[259:273],
-	83:     _TokenType_name[273:287],
-	91:     _TokenType_name[287:298],
-	93:     _TokenType_name[298:309],
-	94:     _TokenType_name[309:324],
-	96:     _TokenType_name[324:337],
-	104:    _TokenType_name[337:350],
-	123:    _TokenType_name[350:361],
-	124:    _TokenType_name[361:375],
-	125:    _TokenType_name[375:386],
-	126:    _TokenType_name[386:401],
-	171:    _TokenType_name[401:412],
-	187:    _TokenType_name[412:423],
-	955:    _TokenType_name[423:443],
-	8230:   _TokenType_name[443:456],
-	8658:   _TokenType_name[456:469],
-	8718:   _TokenType_name[469:488],
-	8743:   _TokenType_name[488:496],
-	8744:   _TokenType_name[496:503],
-	8747:   _TokenType_name[503:522],
-	8788:   _TokenType_name[522:534],
-	8800:   _TokenType_name[534:547],
-	8804:   _TokenType_name[547:562],
-	8805:   _TokenType_name[562:580],
-	9220:   _TokenType_name[580:588],
-	9225:   _TokenType_name[588:597],
-	10138:  _TokenType_name[597:610],
-	65533:  _TokenType_name[610:622],
-	128169: _TokenType_name[622:634],
+	39:     _TokenType_name[56:71],
+	40:     _TokenType_name[71:82],
+	41:     _TokenType_name[82:93],
+	42:     _TokenType_name[93:102],
+	43:     _TokenType_name[102:111],
+	44:     _TokenType_name[111:121],
+	45:     _TokenType_name[121:131],
+	46:     _TokenType_name[131:139],
+	47:     _TokenType_name[139:149],
+	58:     _TokenType_name[149:159],
+	59:     _TokenType_name[159:173],
+	60:     _TokenType_name[173:186],
+	61:     _TokenType_name[186:196],
+	62:     _TokenType_name[196:212],
+	63:     _TokenType_name[212:225],
+	67:     _TokenType_name[225:237],
+	72:     _TokenType_name[237:250],
+	73:     _TokenType_name[250:260],
+	78:     _TokenType_name[260:274],
+	81:     _TokenType_name[274:288],
+	83:     _TokenType_name[288:302],
+	91:     _TokenType_name[302:313],
+	93:     _TokenType_name[313:324],
+	94:     _TokenType_name[324:339],
+	96:     _TokenType_name[339:352],
+	104:    _TokenType_name[352:365],
+	123:    _TokenType_name[365:376],
+	124:    _TokenType_name[376:390],
+	125:    _TokenType_name[390:401],
+	126:    _TokenType_name[401:416],
+	171:    _TokenType_name[416:427],
+	187:    _TokenType_name[427:438],
+	955:    _TokenType_name[438:458],
+	8230:   _TokenType_name[458:471],
+	8658:   _TokenType_name[471:484],
+	8718:   _TokenType_name[484:503],
+	8743:   _TokenType_name[503:511],
+	8744:   _TokenType_name[511:518],
+	8747:   _TokenType_name[518:537],
+	8788:   _TokenType_name[537:549],
+	8800:   _TokenType_name[549:562],
+	8804:   _TokenType_name[562:577],
+	8805:   _TokenType_name[577:595],
+	9220:   _TokenType_name[595:603],
+	9225:   _TokenType_name[603:612],
+	10138:  _TokenType_name[612:625],
+	65533:  _TokenType_name[625:637],
+	128169: _TokenType_name[637:649],
 }
 
 func (i TokenType) String() string {
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/ops.go b/vendor/github.com/hashicorp/hcl2/hcl/ops.go
index f4e30b09c..3aa0bdf04 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/ops.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/ops.go
@@ -145,3 +145,122 @@ func Index(collection, key cty.Value, srcRange *Range) (cty.Value, Diagnostics)
 	}
 
 }
+
+// GetAttr is a helper function that performs the same operation as the
+// attribute access in the HCL expression language. That is, the result is the
+// same as it would be for obj.attr in a configuration expression.
+//
+// This is exported so that applications can access attributes in a manner
+// consistent with how the language does it, including handling of null and
+// unknown values, etc.
+//
+// Diagnostics are produced if the given combination of values is not valid.
+// Therefore a pointer to a source range must be provided to use in diagnostics,
+// though nil can be provided if the calling application is going to
+// ignore the subject of the returned diagnostics anyway.
+func GetAttr(obj cty.Value, attrName string, srcRange *Range) (cty.Value, Diagnostics) {
+	if obj.IsNull() {
+		return cty.DynamicVal, Diagnostics{
+			{
+				Severity: DiagError,
+				Summary:  "Attempt to get attribute from null value",
+				Detail:   "This value is null, so it does not have any attributes.",
+				Subject:  srcRange,
+			},
+		}
+	}
+
+	ty := obj.Type()
+	switch {
+	case ty.IsObjectType():
+		if !ty.HasAttribute(attrName) {
+			return cty.DynamicVal, Diagnostics{
+				{
+					Severity: DiagError,
+					Summary:  "Unsupported attribute",
+					Detail:   fmt.Sprintf("This object does not have an attribute named %q.", attrName),
+					Subject:  srcRange,
+				},
+			}
+		}
+
+		if !obj.IsKnown() {
+			return cty.UnknownVal(ty.AttributeType(attrName)), nil
+		}
+
+		return obj.GetAttr(attrName), nil
+	case ty.IsMapType():
+		if !obj.IsKnown() {
+			return cty.UnknownVal(ty.ElementType()), nil
+		}
+
+		idx := cty.StringVal(attrName)
+		if obj.HasIndex(idx).False() {
+			return cty.DynamicVal, Diagnostics{
+				{
+					Severity: DiagError,
+					Summary:  "Missing map element",
+					Detail:   fmt.Sprintf("This map does not have an element with the key %q.", attrName),
+					Subject:  srcRange,
+				},
+			}
+		}
+
+		return obj.Index(idx), nil
+	case ty == cty.DynamicPseudoType:
+		return cty.DynamicVal, nil
+	default:
+		return cty.DynamicVal, Diagnostics{
+			{
+				Severity: DiagError,
+				Summary:  "Unsupported attribute",
+				Detail:   "This value does not have any attributes.",
+				Subject:  srcRange,
+			},
+		}
+	}
+
+}
+
+// ApplyPath is a helper function that applies a cty.Path to a value using the
+// indexing and attribute access operations from HCL.
+//
+// This is similar to calling the path's own Apply method, but ApplyPath uses
+// the more relaxed typing rules that apply to these operations in HCL, rather
+// than cty's relatively-strict rules. ApplyPath is implemented in terms of
+// Index and GetAttr, and so it has the same behavior for individual steps
+// but will stop and return any errors returned by intermediate steps.
+//
+// Diagnostics are produced if the given path cannot be applied to the given
+// value. Therefore a pointer to a source range must be provided to use in
+// diagnostics, though nil can be provided if the calling application is going
+// to ignore the subject of the returned diagnostics anyway.
+func ApplyPath(val cty.Value, path cty.Path, srcRange *Range) (cty.Value, Diagnostics) {
+	var diags Diagnostics
+
+	for _, step := range path {
+		var stepDiags Diagnostics
+		switch ts := step.(type) {
+		case cty.IndexStep:
+			val, stepDiags = Index(val, ts.Key, srcRange)
+		case cty.GetAttrStep:
+			val, stepDiags = GetAttr(val, ts.Name, srcRange)
+		default:
+			// Should never happen because the above are all of the step types.
+			diags = diags.Append(&Diagnostic{
+				Severity: DiagError,
+				Summary:  "Invalid path step",
+				Detail:   fmt.Sprintf("Go type %T is not a valid path step. This is a bug in this program.", step),
+				Subject:  srcRange,
+			})
+			return cty.DynamicVal, diags
+		}
+
+		diags = append(diags, stepDiags...)
+		if stepDiags.HasErrors() {
+			return cty.DynamicVal, diags
+		}
+	}
+
+	return val, diags
+}
diff --git a/vendor/github.com/hashicorp/hcl2/hcl/traversal.go b/vendor/github.com/hashicorp/hcl2/hcl/traversal.go
index 24f4c91b7..d71019700 100644
--- a/vendor/github.com/hashicorp/hcl2/hcl/traversal.go
+++ b/vendor/github.com/hashicorp/hcl2/hcl/traversal.go
@@ -255,66 +255,7 @@ type TraverseAttr struct {
 }
 
 func (tn TraverseAttr) TraversalStep(val cty.Value) (cty.Value, Diagnostics) {
-	if val.IsNull() {
-		return cty.DynamicVal, Diagnostics{
-			{
-				Severity: DiagError,
-				Summary:  "Attempt to get attribute from null value",
-				Detail:   "This value is null, so it does not have any attributes.",
-				Subject:  &tn.SrcRange,
-			},
-		}
-	}
-
-	ty := val.Type()
-	switch {
-	case ty.IsObjectType():
-		if !ty.HasAttribute(tn.Name) {
-			return cty.DynamicVal, Diagnostics{
-				{
-					Severity: DiagError,
-					Summary:  "Unsupported attribute",
-					Detail:   fmt.Sprintf("This object does not have an attribute named %q.", tn.Name),
-					Subject:  &tn.SrcRange,
-				},
-			}
-		}
-
-		if !val.IsKnown() {
-			return cty.UnknownVal(ty.AttributeType(tn.Name)), nil
-		}
-
-		return val.GetAttr(tn.Name), nil
-	case ty.IsMapType():
-		if !val.IsKnown() {
-			return cty.UnknownVal(ty.ElementType()), nil
-		}
-
-		idx := cty.StringVal(tn.Name)
-		if val.HasIndex(idx).False() {
-			return cty.DynamicVal, Diagnostics{
-				{
-					Severity: DiagError,
-					Summary:  "Missing map element",
-					Detail:   fmt.Sprintf("This map does not have an element with the key %q.", tn.Name),
-					Subject:  &tn.SrcRange,
-				},
-			}
-		}
-
-		return val.Index(idx), nil
-	case ty == cty.DynamicPseudoType:
-		return cty.DynamicVal, nil
-	default:
-		return cty.DynamicVal, Diagnostics{
-			{
-				Severity: DiagError,
-				Summary:  "Unsupported attribute",
-				Detail:   "This value does not have any attributes.",
-				Subject:  &tn.SrcRange,
-			},
-		}
-	}
+	return GetAttr(val, tn.Name, &tn.SrcRange)
 }
 
 func (tn TraverseAttr) SourceRange() Range {
diff --git a/vendor/github.com/zclconf/go-cty/cty/path.go b/vendor/github.com/zclconf/go-cty/cty/path.go
index 69bc4819d..625bfdf85 100644
--- a/vendor/github.com/zclconf/go-cty/cty/path.go
+++ b/vendor/github.com/zclconf/go-cty/cty/path.go
@@ -136,9 +136,13 @@ type IndexStep struct {
 // Apply returns the value resulting from indexing the given value with
 // our key value.
 func (s IndexStep) Apply(val Value) (Value, error) {
+	if val == NilVal || val.IsNull() {
+		return NilVal, errors.New("cannot index a null value")
+	}
+
 	switch s.Key.Type() {
 	case Number:
-		if !val.Type().IsListType() {
+		if !(val.Type().IsListType() || val.Type().IsTupleType()) {
 			return NilVal, errors.New("not a list type")
 		}
 	case String:
@@ -174,6 +178,10 @@ type GetAttrStep struct {
 // Apply returns the value of our named attribute from the given value, which
 // must be of an object type that has a value of that name.
 func (s GetAttrStep) Apply(val Value) (Value, error) {
+	if val == NilVal || val.IsNull() {
+		return NilVal, errors.New("cannot access attributes on a null value")
+	}
+
 	if !val.Type().IsObjectType() {
 		return NilVal, errors.New("not an object type")
 	}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index dc5fb4a1b..d2f77591f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -351,7 +351,7 @@ github.com/hashicorp/hcl/hcl/scanner
 github.com/hashicorp/hcl/hcl/strconv
 github.com/hashicorp/hcl/json/scanner
 github.com/hashicorp/hcl/json/token
-# github.com/hashicorp/hcl2 v0.0.0-20190124230628-a9ca194bcdc3
+# github.com/hashicorp/hcl2 v0.0.0-20190130225218-89dbc5eb3d9e
 github.com/hashicorp/hcl2/hcl
 github.com/hashicorp/hcl2/hcl/hclsyntax
 github.com/hashicorp/hcl2/hcldec
@@ -482,7 +482,7 @@ github.com/vmihailenco/msgpack/codes
 github.com/xanzy/ssh-agent
 # github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557
 github.com/xlab/treeprint
-# github.com/zclconf/go-cty v0.0.0-20190124225737-a385d646c1e9
+# github.com/zclconf/go-cty v0.0.0-20190130221141-d7fe3fa0020f
 github.com/zclconf/go-cty/cty
 github.com/zclconf/go-cty/cty/gocty
 github.com/zclconf/go-cty/cty/convert