Skip to content

Commit

Permalink
configs: remove import block duplicate id check (#33434)
Browse files Browse the repository at this point in the history
  • Loading branch information
kmoe committed Jun 27, 2023
1 parent 3732bff commit fbff64a
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 73 deletions.

This file was deleted.

This file was deleted.

12 changes: 0 additions & 12 deletions internal/command/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,6 @@ func TestSameImportTargetMultipleTimesShouldFail(t *testing.T) {
}
}

func TestSameImportIDMultipleTimesShouldFail(t *testing.T) {
output, code := setupTest(t, "validate-invalid/duplicate_import_ids")
if code != 1 {
t.Fatalf("Should have failed: %d\n\n%s", code, output.Stderr())
}
wantError := `Error: Duplicate import for ID "test"`
if !strings.Contains(output.Stderr(), wantError) {
t.Fatalf("Missing error string %q\n\n'%s'", wantError, output.Stderr())
}
}

func TestOutputWithoutValueShouldFail(t *testing.T) {
output, code := setupTest(t, "validate-invalid/outputs")
if code != 1 {
Expand Down Expand Up @@ -241,7 +230,6 @@ func TestValidate_json(t *testing.T) {
{"validate-invalid/multiple_modules", false},
{"validate-invalid/multiple_resources", false},
{"validate-invalid/duplicate_import_targets", false},
{"validate-invalid/duplicate_import_ids", false},
{"validate-invalid/outputs", false},
{"validate-invalid/incorrectmodulename", false},
{"validate-invalid/interpolation", false},
Expand Down
12 changes: 0 additions & 12 deletions internal/configs/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,18 +431,6 @@ func (m *Module) appendFile(file *File) hcl.Diagnostics {
})
continue
}

if i.ID == mi.ID {
if i.To.Resource.Resource.Type == mi.To.Resource.Resource.Type {
diags = append(diags, &hcl.Diagnostic{
Severity: hcl.DiagError,
Summary: fmt.Sprintf("Duplicate import for ID %q", i.ID),
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),
Subject: &i.DeclRange,
})
continue
}
}
}

if i.ProviderConfigRef != nil {
Expand Down

0 comments on commit fbff64a

Please sign in to comment.