Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

fix: Classify db execution errors #342

Merged
merged 1 commit into from
Jun 20, 2022
+2 −2
Merged

fix: Classify db execution errors #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions provider/execution/execution.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func (e TableExecutor) callTableResolve(ctx context.Context, client schema.Clien
}

if err := e.cleanupStaleData(ctx, client, parent); err != nil {
return nc, diags.Add(fromError(err, diag.WithType(diag.DATABASE), diag.WithSummary("failed to cleanup stale data on table %q", e.Table.Name)))
return nc, diags.Add(ClassifyError(err, diag.WithType(diag.DATABASE), diag.WithSummary("failed to cleanup stale data on table %q", e.Table.Name)))
}

return nc, diags
Expand Down Expand Up @@ -340,7 +340,7 @@ func (e TableExecutor) saveToStorage(ctx context.Context, resources schema.Resou
}
e.Logger.Error("failed insert to db", "error", err)
// Setup diags, adding first diagnostic that bulk insert failed
diags := diag.Diagnostics{}.Add(fromError(err, diag.WithType(diag.DATABASE), diag.WithSummary("failed bulk insert on table %q", e.Table.Name)))
diags := diag.Diagnostics{}.Add(ClassifyError(err, diag.WithType(diag.DATABASE), diag.WithSummary("failed bulk insert on table %q", e.Table.Name)))
// Try to insert resource by resource if partial fetch is enabled and an error occurred
partialFetchResources := make(schema.Resources, 0)
for id := range resources {
Expand Down