Nil check error in diag.FromErr

This allows following use cases: ```go func foo() error { //... } func bar() diag.diagnostics { //... return diag.FromErr(foo()) } ```
hashicorp · Jul 7, 2020 · 42455a8 · 42455a8
1 parent b35892a
commit 42455a8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 0 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/terraform-plugin-sdk.iml b/.idea/terraform-plugin-sdk.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/diag/helpers.go b/diag/helpers.go
@@ -10,6 +10,9 @@ import "fmt"
 //     return diag.FromErr(err)
 //   }
 func FromErr(err error) Diagnostics {
+	if err == nil {
+		return nil
+	}
 	return Diagnostics{
 		Diagnostic{
 			Severity: Error,