Skip to content

Fix two error handling errors causing existing resources to be removed #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svanharmelen wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix two error handling errors causing existing resources to be removed #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5395c96
Do not silently ignore any errors that might have occurred
svanharmelen May 28, 2025
b03c642
Do not clear resources from the state based on NotFound errors
svanharmelen May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions zitadel/action/funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
}},
},
})
if err != nil && helper.IgnoreIfNotFoundError(err) == nil {
d.SetId("")
return nil
}
if err != nil {
return diag.Errorf("failed to list actions")
}
Expand Down
5 changes: 2 additions & 3 deletions zitadel/project_role/funcs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,8 @@ func read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagn
}},
},
})
if err != nil || resp.Result == nil || len(resp.Result) == 0 {
d.SetId("")
return nil
if err != nil {
return diag.Errorf("failed to list project roles")
}

if len(resp.Result) == 1 {
Expand Down