Merge pull request nutanix#203 from yannickstruyf3/bugfix/issue-201-r…

…ead-error-categories added return nil in read function
yannickstruyf3 · Nov 30, 2020 · 6ce4136 · 6ce4136
2 parents 897edf3 + 0b4228d
commit 6ce4136
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/nutanix/resource_nutanix_category_key.go b/nutanix/resource_nutanix_category_key.go
@@ -89,6 +89,7 @@ func resourceNutanixCategoryKeyRead(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		if strings.Contains(fmt.Sprint(err), "ENTITY_NOT_FOUND") {
 			d.SetId("")
+			return nil
 		}
 		return err
 	}

diff --git a/nutanix/resource_nutanix_category_value.go b/nutanix/resource_nutanix_category_value.go
@@ -97,8 +97,9 @@ func resourceNutanixCategoryValueRead(d *schema.ResourceData, meta interface{})
 	resp, err := conn.V3.GetCategoryValue(name.(string), d.Id())
 
 	if err != nil {
-		if strings.Contains(fmt.Sprint(err), "ENTITY_NOT_FOUND") {
+		if strings.Contains(fmt.Sprint(err), "ENTITY_NOT_FOUND") || strings.Contains(fmt.Sprint(err), "CATEGORY_NAME_VALUE_MISMATCH") {
 			d.SetId("")
+			return nil
 		}
 		return err
 	}