Skip to content

Commit 9afda0e

Browse files
The Terraform Teamkmoe
andauthored
backport of commit 1075303 (#33435)
Co-authored-by: Katy Moe <katy@katy.moe>
1 parent 9ab661b commit 9afda0e

File tree

4 files changed

+0
-73
lines changed

4 files changed

+0
-73
lines changed

internal/command/testdata/validate-invalid/duplicate_import_ids/main.tf

Lines changed: 0 additions & 15 deletions
This file was deleted.

internal/command/testdata/validate-invalid/duplicate_import_ids/output.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

internal/command/validate_test.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,6 @@ func TestSameImportTargetMultipleTimesShouldFail(t *testing.T) {
161161
}
162162
}
163163

164-
func TestSameImportIDMultipleTimesShouldFail(t *testing.T) {
165-
output, code := setupTest(t, "validate-invalid/duplicate_import_ids")
166-
if code != 1 {
167-
t.Fatalf("Should have failed: %d\n\n%s", code, output.Stderr())
168-
}
169-
wantError := `Error: Duplicate import for ID "test"`
170-
if !strings.Contains(output.Stderr(), wantError) {
171-
t.Fatalf("Missing error string %q\n\n'%s'", wantError, output.Stderr())
172-
}
173-
}
174-
175164
func TestOutputWithoutValueShouldFail(t *testing.T) {
176165
output, code := setupTest(t, "validate-invalid/outputs")
177166
if code != 1 {
@@ -241,7 +230,6 @@ func TestValidate_json(t *testing.T) {
241230
{"validate-invalid/multiple_modules", false},
242231
{"validate-invalid/multiple_resources", false},
243232
{"validate-invalid/duplicate_import_targets", false},
244-
{"validate-invalid/duplicate_import_ids", false},
245233
{"validate-invalid/outputs", false},
246234
{"validate-invalid/incorrectmodulename", false},
247235
{"validate-invalid/interpolation", false},

internal/configs/module.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -418,18 +418,6 @@ func (m *Module) appendFile(file *File) hcl.Diagnostics {
418418
})
419419
continue
420420
}
421-
422-
if i.ID == mi.ID {
423-
if i.To.Resource.Resource.Type == mi.To.Resource.Resource.Type {
424-
diags = append(diags, &hcl.Diagnostic{
425-
Severity: hcl.DiagError,
426-
Summary: fmt.Sprintf("Duplicate import for ID %q", i.ID),
427-
Detail: fmt.Sprintf("An import block for the ID %q and a resource of type %q was already declared at %s. The same resource cannot be imported twice.", i.ID, i.To.Resource.Resource.Type, mi.DeclRange),
428-
Subject: &i.DeclRange,
429-
})
430-
continue
431-
}
432-
}
433421
}
434422

435423
if i.ProviderConfigRef != nil {

0 commit comments

Comments
 (0)