Skip to content

Commit a2e8d25

Browse files
committed
previously defined -> first defined
1 parent 775aaca commit a2e8d25

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

rules/terraform_map_duplicate_keys.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ func (r *TerraformMapDuplicateKeysRule) checkObjectConsExpr(e hcl.Expression, ru
9090
continue
9191
}
9292

93-
if previous, exists := keys[val.AsString()]; exists {
93+
if declRange, exists := keys[val.AsString()]; exists {
9494
if err := runner.EmitIssue(
9595
r,
96-
fmt.Sprintf("Duplicate key: %q, previously defined at %s", val.AsString(), previous),
96+
fmt.Sprintf("Duplicate key: %q, first defined at %s", val.AsString(), declRange),
9797
expr.Range(),
9898
); err != nil {
9999
diags = append(diags, &hcl.Diagnostic{

rules/terraform_map_duplicate_keys_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ resource "null_resource" "test" {
3838
Expected: helper.Issues{
3939
{
4040
Rule: NewTerraformMapDuplicateKeysRule(),
41-
Message: `Duplicate key: "a", previously defined at module.tf:4,9-10`,
41+
Message: `Duplicate key: "a", first defined at module.tf:4,9-10`,
4242
Range: hcl.Range{
4343
Filename: "module.tf",
4444
Start: hcl.Pos{Line: 5, Column: 9},
@@ -64,7 +64,7 @@ resource "null_resource" "test" {
6464
Expected: helper.Issues{
6565
{
6666
Rule: NewTerraformMapDuplicateKeysRule(),
67-
Message: `Duplicate key: "b", previously defined at module.tf:9,4-11`,
67+
Message: `Duplicate key: "b", first defined at module.tf:9,4-11`,
6868
Range: hcl.Range{
6969
Filename: "module.tf",
7070
Start: hcl.Pos{Line: 10, Column: 4},
@@ -101,7 +101,7 @@ resource "null_resource" "test" {
101101
Expected: helper.Issues{
102102
{
103103
Rule: NewTerraformMapDuplicateKeysRule(),
104-
Message: `Duplicate key: "a", previously defined at module.tf:4,4-5`,
104+
Message: `Duplicate key: "a", first defined at module.tf:4,4-5`,
105105
Range: hcl.Range{
106106
Filename: "module.tf",
107107
Start: hcl.Pos{Line: 5, Column: 4},
@@ -110,7 +110,7 @@ resource "null_resource" "test" {
110110
},
111111
{
112112
Rule: NewTerraformMapDuplicateKeysRule(),
113-
Message: `Duplicate key: "a", previously defined at module.tf:4,4-5`,
113+
Message: `Duplicate key: "a", first defined at module.tf:4,4-5`,
114114
Range: hcl.Range{
115115
Filename: "module.tf",
116116
Start: hcl.Pos{Line: 6, Column: 4},

0 commit comments

Comments
 (0)