Make terraform configuration compatible with v0.14 (#91)

wata727 · web-flow · commit 47557ad61f7b · 2021-01-02T23:11:45.000+09:00
diff --git a/terraform/addrs/module.go b/terraform/addrs/module.go
@@ -3,19 +3,19 @@ package addrs
 import svchost "github.com/hashicorp/terraform-svchost"
 
 // Module is an alternative representation of addrs.Module.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/addrs/module.go#L17
+// https://github.com/hashicorp/terraform/blob/v0.14.3/addrs/module.go#L17
 type Module []string
 
 // Provider is an alternative representation of addrs.Provider.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/addrs/provider.go#L16-L20
+// https://github.com/hashicorp/terraform/blob/v0.14.3/addrs/provider.go#L16-L20
 type Provider struct {
 	Type      string
 	Namespace string
 	Hostname  svchost.Hostname
 }
 
 // ResourceMode is an alternative representation of addrs.ResourceMode.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/addrs/resource.go#L326-L344
+// https://github.com/hashicorp/terraform/blob/v0.14.3/addrs/resource.go#L326-L344
 type ResourceMode rune
 
 const (
diff --git a/terraform/configs/backend.go b/terraform/configs/backend.go
@@ -3,7 +3,7 @@ package configs
 import "github.com/hashicorp/hcl/v2"
 
 // Backend is an alternative representation of configs.Backend.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/backend.go#L12-L18
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/backend.go#L12-L18
 type Backend struct {
 	Type   string
 	Config hcl.Body
diff --git a/terraform/configs/config.go b/terraform/configs/config.go
@@ -7,7 +7,7 @@ import (
 )
 
 // Config is an alternative representation of configs.Config.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/config.go#L22-L78
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/config.go#L22-L78
 type Config struct {
 	// Root            *Config
 	// Parent          *Config
diff --git a/terraform/configs/module.go b/terraform/configs/module.go
@@ -6,7 +6,7 @@ import (
 )
 
 // Module is an alternative representation of configs.Module.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/module.go#L14-L45
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/module.go#L14-L45
 type Module struct {
 	SourceDir string
 
diff --git a/terraform/configs/module_call.go b/terraform/configs/module_call.go
@@ -3,7 +3,7 @@ package configs
 import "github.com/hashicorp/hcl/v2"
 
 // ModuleCall is an alternative representation of configs.ModuleCall.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/module_call.go#L12-L31
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/module_call.go#L12-L31
 // DependsOn is not supported due to the difficulty of intermediate representation.
 type ModuleCall struct {
 	Name string
@@ -27,7 +27,7 @@ type ModuleCall struct {
 }
 
 // PassedProviderConfig is an alternative representation of configs.PassedProviderConfig.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/module_call.go#L140-L143
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/module_call.go#L148-L151
 type PassedProviderConfig struct {
 	InChild  *ProviderConfigRef
 	InParent *ProviderConfigRef
diff --git a/terraform/configs/named_values.go b/terraform/configs/named_values.go
@@ -6,22 +6,24 @@ import (
 )
 
 // Variable is an alternative representation of configs.Variable.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/named_values.go#L21-L32
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/named_values.go#L21-L34
 type Variable struct {
 	Name        string
 	Description string
 	Default     cty.Value
 	Type        cty.Type
 	ParsingMode VariableParsingMode
 	Validations []*VariableValidation
+	Sensitive   bool
 
 	DescriptionSet bool
+	SensitiveSet   bool
 
 	DeclRange hcl.Range
 }
 
 // VariableParsingMode is an alternative representation of configs.VariableParsingMode.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/named_values.go#L226-L234
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/named_values.go#L234-L242
 type VariableParsingMode rune
 
 // VariableParseLiteral is a variable parsing mode that just takes the given
@@ -33,7 +35,7 @@ const VariableParseLiteral VariableParsingMode = 'L'
 const VariableParseHCL VariableParsingMode = 'H'
 
 // VariableValidation is an alternative representation of configs.VariableValidation.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/named_values.go#L273-L289
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/named_values.go#L281-L297
 type VariableValidation struct {
 	// Condition is an expression that refers to the variable being tested
 	// and contains no other references. The expression must return true
@@ -53,7 +55,7 @@ type VariableValidation struct {
 }
 
 // Local is an alternative representation of configs.Local.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/named_values.go#L485-L490
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/named_values.go#L501-L506
 type Local struct {
 	Name string
 	Expr hcl.Expression
@@ -62,7 +64,7 @@ type Local struct {
 }
 
 // Output is an alternative representation of configs.Output.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/named_values.go#L422-L433
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/named_values.go#L430-L441
 type Output struct {
 	Name        string
 	Description string
diff --git a/terraform/configs/provider.go b/terraform/configs/provider.go
@@ -6,7 +6,7 @@ import (
 )
 
 // Provider is an alternative representation of configs.Provider.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provider.go#L17-L28
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provider.go#L17-L28
 type Provider struct {
 	Name       string
 	NameRange  hcl.Range
@@ -21,7 +21,7 @@ type Provider struct {
 }
 
 // ProviderMeta is an alternative representation of configs.ProviderMeta.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provider_meta.go#L7-L13
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provider_meta.go#L7-L13
 type ProviderMeta struct {
 	Provider string
 	Config   hcl.Body
@@ -31,7 +31,7 @@ type ProviderMeta struct {
 }
 
 // RequiredProvider is an alternative representation of configs.RequiredProvider.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provider_requirements.go#L14-L20
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provider_requirements.go#L14-L20
 type RequiredProvider struct {
 	Name        string
 	Source      string
@@ -41,7 +41,7 @@ type RequiredProvider struct {
 }
 
 // RequiredProviders is an alternative representation of configs.RequiredProviders.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provider_requirements.go#L22-L25
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provider_requirements.go#L22-L25
 type RequiredProviders struct {
 	RequiredProviders map[string]*RequiredProvider
 	DeclRange         hcl.Range
diff --git a/terraform/configs/provisioner.go b/terraform/configs/provisioner.go
@@ -3,7 +3,7 @@ package configs
 import "github.com/hashicorp/hcl/v2"
 
 // Provisioner is an alternative representation of configs.Provisioner.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provisioner.go#L11-L20
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provisioner.go#L11-L20
 type Provisioner struct {
 	Type       string
 	Config     hcl.Body
@@ -16,15 +16,15 @@ type Provisioner struct {
 }
 
 // Connection is an alternative representation of configs.Connection.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provisioner.go#L166-L170
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provisioner.go#L176-L180
 type Connection struct {
 	Config hcl.Body
 
 	DeclRange hcl.Range
 }
 
 // ProvisionerWhen is an alternative representation of configs.ProvisionerWhen.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provisioner.go#L172-L181
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provisioner.go#L182-L191
 type ProvisionerWhen int
 
 const (
@@ -37,7 +37,7 @@ const (
 )
 
 // ProvisionerOnFailure is an alternative representation of configs.ProvisionerOnFailure.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/provisioner.go#L183-L193
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/provisioner.go#L193-L203
 type ProvisionerOnFailure int
 
 const (
diff --git a/terraform/configs/resource.go b/terraform/configs/resource.go
@@ -6,7 +6,7 @@ import (
 )
 
 // Resource is an alternative representation of configs.Resource.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/resource.go#L14-L34
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/resource.go#L14-L34
 // DependsOn is not supported due to the difficulty of intermediate representation.
 type Resource struct {
 	Mode    addrs.ResourceMode
@@ -28,7 +28,7 @@ type Resource struct {
 }
 
 // ManagedResource is an alternative representation of configs.ManagedResource.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/resource.go#L37-L48
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/resource.go#L37-L48
 // IgnoreChanges is not supported due to the difficulty of intermediate representation.
 type ManagedResource struct {
 	Connection   *Connection
@@ -44,7 +44,7 @@ type ManagedResource struct {
 }
 
 // ProviderConfigRef is an alternative representation of configs.ProviderConfigRef.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/resource.go#L373-L378
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/resource.go#L384-L389
 type ProviderConfigRef struct {
 	Name       string
 	NameRange  hcl.Range
diff --git a/terraform/configs/version_constraint.go b/terraform/configs/version_constraint.go
@@ -6,7 +6,7 @@ import (
 )
 
 // VersionConstraint is an alternative representation of configs.VersionConstraint.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/version_constraint.go#L16-L19
+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/version_constraint.go#L16-L19
 type VersionConstraint struct {
 	Required  version.Constraints
 	DeclRange hcl.Range
diff --git a/terraform/experiments/experiment.go b/terraform/experiments/experiment.go
@@ -1,9 +1,9 @@
 package experiments
 
 // Experiment is an alternative representation of experiments.Experiment.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/experiments/experiment.go#L5
+// https://github.com/hashicorp/terraform/blob/v0.14.3/experiments/experiment.go#L5
 type Experiment string
 
 // Set is an alternative representation of experiments.Set.
-// https://github.com/hashicorp/terraform/blob/v0.13.2/experiments/set.go#L5
+// https://github.com/hashicorp/terraform/blob/v0.14.3/experiments/set.go#L5
 type Set map[Experiment]struct{}
diff --git a/tflint/client/decode_named_values.go b/tflint/client/decode_named_values.go
@@ -14,8 +14,10 @@ type Variable struct {
 	Type        cty.Type
 	ParsingMode configs.VariableParsingMode
 	Validations []*VariableValidation
+	Sensitive   bool
 
 	DescriptionSet bool
+	SensitiveSet   bool
 
 	DeclRange hcl.Range
 }
@@ -37,8 +39,10 @@ func decodeVariable(variable *Variable) (*configs.Variable, hcl.Diagnostics) {
 		Type:        variable.Type,
 		ParsingMode: variable.ParsingMode,
 		Validations: ret,
+		Sensitive:   variable.Sensitive,
 
 		DescriptionSet: variable.DescriptionSet,
+		SensitiveSet:   variable.SensitiveSet,
 
 		DeclRange: variable.DeclRange,
 	}, nil

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// Config is an alternative representation of configs.Config.`
`10`		`-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/config.go#L22-L78`
	`10`	`+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/config.go#L22-L78`
`11`	`11`	`type Config struct {`
`12`	`12`	`// Root *Config`
`13`	`13`	`// Parent *Config`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// Module is an alternative representation of configs.Module.`
`9`		`-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/module.go#L14-L45`
	`9`	`+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/module.go#L14-L45`
`10`	`10`	`type Module struct {`
`11`	`11`	`SourceDir string`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// VersionConstraint is an alternative representation of configs.VersionConstraint.`
`9`		`-// https://github.com/hashicorp/terraform/blob/v0.13.2/configs/version_constraint.go#L16-L19`
	`9`	`+// https://github.com/hashicorp/terraform/blob/v0.14.3/configs/version_constraint.go#L16-L19`
`10`	`10`	`type VersionConstraint struct {`
`11`	`11`	`Required version.Constraints`
`12`	`12`	`DeclRange hcl.Range`