Skip to content

Commit 9e3b8c6

Browse files
authored
required_providers: use required provider entry as range if present (#63)
1 parent df0f6ca commit 9e3b8c6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

rules/terraform_required_providers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ func (r *TerraformRequiredProvidersRule) Check(rr tflint.Runner) error {
129129
continue
130130
}
131131

132-
provider, exists := requiredProviders[name]
132+
requiredProvider, exists := requiredProviders[name]
133133
if !exists {
134134
if err := runner.EmitIssue(r, fmt.Sprintf(`Missing version constraint for provider "%s" in "required_providers"`, name), ref.DefRange); err != nil {
135135
return err
136136
}
137137
continue
138138
}
139139

140-
val, diags := provider.Expr.Value(&hcl.EvalContext{
140+
val, diags := requiredProvider.Expr.Value(&hcl.EvalContext{
141141
Variables: map[string]cty.Value{
142142
// configuration_aliases can declare additional provider instances
143143
// required provider "foo" could have: configuration_aliases = [foo.a, foo.b]
@@ -166,7 +166,7 @@ func (r *TerraformRequiredProvidersRule) Check(rr tflint.Runner) error {
166166
continue
167167
}
168168
}
169-
if err := runner.EmitIssue(r, fmt.Sprintf(`Missing version constraint for provider "%s" in "required_providers"`, name), ref.DefRange); err != nil {
169+
if err := runner.EmitIssue(r, fmt.Sprintf(`Missing version constraint for provider "%s" in "required_providers"`, name), requiredProvider.Expr.Range()); err != nil {
170170
return err
171171
}
172172
}

rules/terraform_required_providers_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ provider "template" {}
133133
Range: hcl.Range{
134134
Filename: "module.tf",
135135
Start: hcl.Pos{
136-
Line: 10,
137-
Column: 1,
136+
Line: 4,
137+
Column: 14,
138138
},
139139
End: hcl.Pos{
140-
Line: 10,
141-
Column: 20,
140+
Line: 6,
141+
Column: 4,
142142
},
143143
},
144144
},

0 commit comments

Comments
 (0)