Skip to content

Commit 42455a8

Browse files
committed
Nil check error in diag.FromErr
This allows following use cases: ```go func foo() error { //... } func bar() diag.diagnostics { //... return diag.FromErr(foo()) } ```
1 parent b35892a commit 42455a8

File tree

6 files changed

+34
-0
lines changed

6 files changed

+34
-0
lines changed

.idea/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/terraform-plugin-sdk.iml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

diag/helpers.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import "fmt"
1010
// return diag.FromErr(err)
1111
// }
1212
func FromErr(err error) Diagnostics {
13+
if err == nil {
14+
return nil
15+
}
1316
return Diagnostics{
1417
Diagnostic{
1518
Severity: Error,

0 commit comments

Comments
 (0)