refactor: adjust terraform v1.5.7

Signed-off-by: thxCode <thxcode0824@gmail.com>

Author: thxCode

staging/terraform/configs/module_merge_body.go

@@ -16,13 +16,13 @@ import (
 // replace _all_ of the blocks of the same type in "base" in the new
 // body.
 func MergeBodies(base, override hcl.Body) hcl.Body {
-	return mergeBody{
+	return MergeBody{
 		Base:     base,
 		Override: override,
 	}
 }
 
-// mergeBody is a hcl.Body implementation that wraps a pair of other bodies
+// MergeBody is a hcl.Body implementation that wraps a pair of other bodies
 // and allows attributes and blocks within the override to take precedence
 // over those defined in the base body.
 //
@@ -34,14 +34,14 @@ func MergeBodies(base, override hcl.Body) hcl.Body {
 // This cannot possibly "do the right thing" in all cases, because we don't
 // have enough information about user intent. However, this behavior is intended
 // to be reasonable for simple overriding use-cases.
-type mergeBody struct {
+type MergeBody struct {
 	Base     hcl.Body
 	Override hcl.Body
 }
 
-var _ hcl.Body = mergeBody{}
+var _ hcl.Body = MergeBody{}
 
-func (b mergeBody) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
+func (b MergeBody) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagnostics) {
 	var diags hcl.Diagnostics
 	baseSchema := schemaWithDynamic(schema)
 	overrideSchema := schemaWithDynamic(schemaForOverrides(schema))
@@ -56,7 +56,7 @@ func (b mergeBody) Content(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Diagno
 	return content, diags
 }
 
-func (b mergeBody) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
+func (b MergeBody) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl.Body, hcl.Diagnostics) {
 	var diags hcl.Diagnostics
 	baseSchema := schemaWithDynamic(schema)
 	overrideSchema := schemaWithDynamic(schemaForOverrides(schema))
@@ -73,7 +73,7 @@ func (b mergeBody) PartialContent(schema *hcl.BodySchema) (*hcl.BodyContent, hcl
 	return content, remain, diags
 }
 
-func (b mergeBody) prepareContent(base *hcl.BodyContent, override *hcl.BodyContent) *hcl.BodyContent {
+func (b MergeBody) prepareContent(base *hcl.BodyContent, override *hcl.BodyContent) *hcl.BodyContent {
 	content := &hcl.BodyContent{
 		Attributes: make(hcl.Attributes),
 	}
@@ -120,7 +120,7 @@ func (b mergeBody) prepareContent(base *hcl.BodyContent, override *hcl.BodyConte
 	return content
 }
 
-func (b mergeBody) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
+func (b MergeBody) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
 	var diags hcl.Diagnostics
 	ret := make(hcl.Attributes)
 
@@ -139,6 +139,6 @@ func (b mergeBody) JustAttributes() (hcl.Attributes, hcl.Diagnostics) {
 	return ret, diags
 }
 
-func (b mergeBody) MissingItemRange() hcl.Range {
+func (b MergeBody) MissingItemRange() hcl.Range {
 	return b.Base.MissingItemRange()
 }

staging/terraform/configs/named_values.go

@@ -6,12 +6,13 @@ package configs
 import (
 	"fmt"
 
+	"github.com/zclconf/go-cty/cty"
+	"github.com/zclconf/go-cty/cty/convert"
+
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/ext/typeexpr"
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
-	"github.com/zclconf/go-cty/cty"
-	"github.com/zclconf/go-cty/cty/convert"
 
 	"github.com/hashicorp/terraform/addrs"
 )
@@ -46,12 +47,14 @@ type Variable struct {
 	NullableSet bool
 
 	DeclRange hcl.Range
+	Tokens    hcl.Tokens
 }
 
 func decodeVariableBlock(block *hcl.Block, override bool) (*Variable, hcl.Diagnostics) {
 	v := &Variable{
 		Name:      block.Labels[0],
 		DeclRange: block.DefRange,
+		Tokens:    block.Tokens,
 	}
 
 	// Unless we're building an override, we'll set some defaults
@@ -404,6 +407,7 @@ type Output struct {
 	SensitiveSet   bool
 
 	DeclRange hcl.Range
+	Tokens    hcl.Tokens
 }
 
 func decodeOutputBlock(block *hcl.Block, override bool) (*Output, hcl.Diagnostics) {
@@ -412,6 +416,7 @@ func decodeOutputBlock(block *hcl.Block, override bool) (*Output, hcl.Diagnostic
 	o := &Output{
 		Name:      block.Labels[0],
 		DeclRange: block.DefRange,
+		Tokens:    block.Tokens,
 	}
 
 	schema := outputBlockSchema
@@ -488,6 +493,7 @@ type Local struct {
 	Expr hcl.Expression
 
 	DeclRange hcl.Range
+	Tokens    hcl.Tokens
 }
 
 func decodeLocalsBlock(block *hcl.Block) ([]*Local, hcl.Diagnostics) {
@@ -511,6 +517,7 @@ func decodeLocalsBlock(block *hcl.Block) ([]*Local, hcl.Diagnostics) {
 			Name:      name,
 			Expr:      attr.Expr,
 			DeclRange: attr.Range,
+			Tokens:    attr.Tokens,
 		})
 	}
 	return locals, diags

staging/terraform/doc.go

@@ -5,9 +5,11 @@
 // Package terraform borrows from the https://github.com/hashicorp/terraform/tree/v1.5.7.
 //
 // Since the default Terraform hasn't exposed its internal packages,
-// this package shifts up the internal packages to be public,
-// and exposes the configs.MergeBody type,
-// which is used to merge the HCL bodies in the Terraform module.
+// this package shifts up the internal packages to be public.
+//
+// Secondary, this package exposes the configs.MergeBody type,
+// which is used to merge the HCL bodies in the Terraform module,
+// and exposes the AST tokens of some Terraform blocks.
 //
 // This package is not exactly the same with the original implementation but works well for us.
 package terraform