Merge pull request hashicorp#659 from hashicorp/fix-license-headers

Fix license headers
sunnybana · Feb 26, 2024 · 76bf60b · 76bf60b
2 parents bd58136 + 0f84b52
commit 76bf60b
Show file tree

Hide file tree

Showing 11 changed files with 214 additions and 109 deletions.
diff --git a/ext/dynblock/options.go b/ext/dynblock/options.go
@@ -1,3 +1,6 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
 package dynblock
 
 import (

diff --git a/go.mod b/go.mod
@@ -17,13 +17,15 @@ require (
  github.com/zclconf/go-cty v1.13.0
  github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
  golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
+ golang.org/x/tools v0.6.0
 )
 
 require (
  github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
  github.com/kr/text v0.1.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/stretchr/testify v1.2.2 // indirect
+ golang.org/x/mod v0.8.0 // indirect
  golang.org/x/sys v0.5.0 // indirect
  golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
  golang.org/x/text v0.11.0 // indirect

diff --git a/go.sum b/go.sum
@@ -39,8 +39,11 @@ github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b h1:FosyBZYxY3
 github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8=
 golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 h1:O8uGbHCqlTp2P6QJSLmCojM4mN6UemYv8K+dCnmHmu0=
 golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 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
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/hclsyntax/expression_vars_gen.go b/hclsyntax/expression_vars_gen.go
@@ -87,7 +87,10 @@ func main() {
 
 }
 
-const outputPreamble = `package hclsyntax
+const outputPreamble = `// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package hclsyntax
 
 // Generated by expression_vars_get.go. DO NOT EDIT.
 // Run 'go generate' on this package to update the set of functions here.

diff --git a/hclsyntax/scan_string_lit.go b/hclsyntax/scan_string_lit.go
@@ -1,13 +1,12 @@
+//line scan_string_lit.rl:1
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-//line scan_string_lit.rl:1
-
 package hclsyntax
 
 // This file is generated from scan_string_lit.rl. DO NOT EDIT.
 
-//line scan_string_lit.go:9
+//line scan_string_lit.go:11
 var _hclstrtok_actions []byte = []byte{
  0, 1, 0, 1, 1, 2, 1, 0,
 }
@@ -117,12 +116,12 @@ const hclstrtok_error int = 0
 const hclstrtok_en_quoted int = 10
 const hclstrtok_en_unquoted int = 4
 
-//line scan_string_lit.rl:10
+//line scan_string_lit.rl:12
 
 func scanStringLit(data []byte, quoted bool) [][]byte {
  var ret [][]byte
 
-//line scan_string_lit.rl:61
+//line scan_string_lit.rl:63
 
  // Ragel state
  p := 0 // "Pointer" into data
@@ -147,11 +146,11 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
  ret = append(ret, data[ts:te])
  }*/
 
-//line scan_string_lit.go:154
+//line scan_string_lit.go:156
  {
  }
 
-//line scan_string_lit.go:158
+//line scan_string_lit.go:160
  {
  var _klen int
  var _trans int
@@ -232,7 +231,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
  _acts++
  switch _hclstrtok_actions[_acts-1] {
  case 0:
-//line scan_string_lit.rl:40
+//line scan_string_lit.rl:42
 
  // If te is behind p then we've skipped over some literal
  // characters which we must now return.
@@ -242,12 +241,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
  ts = p
 
  case 1:
-//line scan_string_lit.rl:48
+//line scan_string_lit.rl:50
 
  te = p
  ret = append(ret, data[ts:te])
 
-//line scan_string_lit.go:253
+//line scan_string_lit.go:255
  }
  }
 
@@ -270,12 +269,12 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
  __acts++
  switch _hclstrtok_actions[__acts-1] {
  case 1:
-//line scan_string_lit.rl:48
+//line scan_string_lit.rl:50
 
  te = p
  ret = append(ret, data[ts:te])
 
-//line scan_string_lit.go:278
+//line scan_string_lit.go:280
  }
  }
  }
@@ -285,7 +284,7 @@ func scanStringLit(data []byte, quoted bool) [][]byte {
  }
  }
 
-//line scan_string_lit.rl:89
+//line scan_string_lit.rl:91
 
  if te < p {
  // Collect any leftover literal characters at the end of the input

diff --git a/hclsyntax/scan_string_lit.rl b/hclsyntax/scan_string_lit.rl
@@ -1,3 +1,5 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
 
 package hclsyntax