Skip to content

Commit 76bf60b

Browse files
radeksimkoradeksimko
authored
Merge pull request #659 from hashicorp/fix-license-headers
Fix license headers
2 parents bd58136 + 0f84b52 commit 76bf60b

File tree

11 files changed

+214
-109
lines changed

11 files changed

+214
-109
lines changed

‎ext/dynblock/options.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
14
package dynblock
25

36
import (

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ require (
1717
github.com/zclconf/go-cty v1.13.0
1818
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
1919
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
20+
golang.org/x/tools v0.6.0
2021
)
2122

2223
require (
2324
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
2425
github.com/kr/text v0.1.0 // indirect
2526
github.com/pmezard/go-difflib v1.0.0 // indirect
2627
github.com/stretchr/testify v1.2.2 // indirect
28+
golang.org/x/mod v0.8.0 // indirect
2729
golang.org/x/sys v0.5.0 // indirect
2830
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
2931
golang.org/x/text v0.11.0 // indirect

‎go.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY3
3939
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
4040
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 h1:O8uGbHCqlTp2P6QJSLmCojM4mN6UemYv8K+dCnmHmu0=
4141
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
42+
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
43+
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
4244
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
4345
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
46+
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
4447
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4548
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
4649
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -49,5 +52,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
4952
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5053
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
5154
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
55+
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
56+
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
5257
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
5358
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎hclsyntax/expression_vars_gen.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ func main() {
8787

8888
}
8989

90-
const outputPreamble = `package hclsyntax
90+
const outputPreamble = `// Copyright (c) HashiCorp, Inc.
91+
// SPDX-License-Identifier: MPL-2.0
92+
93+
package hclsyntax
9194
9295
// Generated by expression_vars_get.go. DO NOT EDIT.
9396
// Run 'go generate' on this package to update the set of functions here.

‎hclsyntax/scan_string_lit.go‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1+
//line scan_string_lit.rl:1
12
// Copyright (c) HashiCorp, Inc.
23
// SPDX-License-Identifier: MPL-2.0
34

4-
//line scan_string_lit.rl:1
5-
65
package hclsyntax
76

87
// This file is generated from scan_string_lit.rl. DO NOT EDIT.
98

10-
//line scan_string_lit.go:9
9+
//line scan_string_lit.go:11
1110
var _hclstrtok_actions []byte = []byte{
1211
0, 1, 0, 1, 1, 2, 1, 0,
1312
}
@@ -117,12 +116,12 @@ const hclstrtok_error int = 0
117116
const hclstrtok_en_quoted int = 10
118117
const hclstrtok_en_unquoted int = 4
119118

120-
//line scan_string_lit.rl:10
119+
//line scan_string_lit.rl:12
121120

122121
func scanStringLit(data []byte, quoted bool) [][]byte {
123122
var ret [][]byte
124123

125-
//line scan_string_lit.rl:61
124+
//line scan_string_lit.rl:63
126125

127126
// Ragel state
128127
p := 0 // "Pointer" into data
@@ -147,11 +146,11 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
147146
ret = append(ret, data[ts:te])
148147
}*/
149148

150-
//line scan_string_lit.go:154
149+
//line scan_string_lit.go:156
151150
{
152151
}
153152

154-
//line scan_string_lit.go:158
153+
//line scan_string_lit.go:160
155154
{
156155
var _klen int
157156
var _trans int
@@ -232,7 +231,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
232231
_acts++
233232
switch _hclstrtok_actions[_acts-1] {
234233
case 0:
235-
//line scan_string_lit.rl:40
234+
//line scan_string_lit.rl:42
236235

237236
// If te is behind p then we've skipped over some literal
238237
// characters which we must now return.
@@ -242,12 +241,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
242241
ts = p
243242

244243
case 1:
245-
//line scan_string_lit.rl:48
244+
//line scan_string_lit.rl:50
246245

247246
te = p
248247
ret = append(ret, data[ts:te])
249248

250-
//line scan_string_lit.go:253
249+
//line scan_string_lit.go:255
251250
}
252251
}
253252

@@ -270,12 +269,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
270269
__acts++
271270
switch _hclstrtok_actions[__acts-1] {
272271
case 1:
273-
//line scan_string_lit.rl:48
272+
//line scan_string_lit.rl:50
274273

275274
te = p
276275
ret = append(ret, data[ts:te])
277276

278-
//line scan_string_lit.go:278
277+
//line scan_string_lit.go:280
279278
}
280279
}
281280
}
@@ -285,7 +284,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
285284
}
286285
}
287286

288-
//line scan_string_lit.rl:89
287+
//line scan_string_lit.rl:91
289288

290289
if te < p {
291290
// Collect any leftover literal characters at the end of the input

‎hclsyntax/scan_string_lit.rl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
13

24
package hclsyntax
35

0 commit comments

Comments
 (0)