Merge pull request #5 from hsafra/main

Add check on empty result in user & role resource read.
headyj · May 29, 2024 · 3f4c1cd · 3f4c1cd
2 parents aba8061 + 5c28f4c
commit 3f4c1cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/neo4j/resource_role.go b/neo4j/resource_role.go
@@ -62,6 +62,10 @@ func resourceRoleRead(ctx context.Context, d *schema.ResourceData, m interface{}
 	defer session.Close()
 	result, err := neo4j.Single(session.Run("SHOW ROLES WHERE role = $role", map[string]interface{}{"role": d.Id()}))
 	if err != nil {
+		if err.Error() == "Result contains no more records" {
+			d.SetId("")
+			return diags
+		}
 		return diag.FromErr(err)
 	}
 	name, _ := result.Get("role")

diff --git a/neo4j/resource_user.go b/neo4j/resource_user.go
@@ -96,6 +96,10 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}
 	defer session.Close()
 	result, err := neo4j.Single(session.Run("SHOW USERS YIELD user WHERE user = $username", map[string]interface{}{"username": d.Id()}))
 	if err != nil {
+		if err.Error() == "Result contains no more records" {
+			d.SetId("")
+			return diags
+		}
 		return diag.FromErr(err)
 	}
 	name, _ := result.Get("user")