Fix: Remove resource from statefile for pending_reclamation state

IBM-Cloud · May 20, 2021 · eb1807e · eb1807e
1 parent 60f65da
commit eb1807e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ibm/resource_ibm_cis.go b/ibm/resource_ibm_cis.go
@@ -437,8 +437,8 @@ func resourceIBMCISInstanceExists(d *schema.ResourceData, meta interface{}) (boo
 		}
 		return false, fmt.Errorf("Error communicating with the API: %s %s", err, response)
 	}
-	if strings.Contains(*instance.State, "removed") {
-		log.Printf("[WARN] Removing instance from state because it's in removed state")
+	if instance != nil && (strings.Contains(*instance.State, "removed") || strings.Contains(*instance.State, cisInstanceReclamation)) {
+		log.Printf("[WARN] Removing instance from state because it's in removed or pending_reclamation state")
 		d.SetId("")
 		return false, nil
 	}

diff --git a/ibm/resource_ibm_database.go b/ibm/resource_ibm_database.go
@@ -1818,8 +1818,8 @@ func resourceIBMDatabaseInstanceExists(d *schema.ResourceData, meta interface{})
 		}
 		return false, fmt.Errorf("Error communicating with the API: %s %s", err, response)
 	}
-	if strings.Contains(*instance.State, "removed") {
-		log.Printf("[WARN] Removing instance from state because it's in removed state")
+	if instance != nil && (strings.Contains(*instance.State, "removed") || strings.Contains(*instance.State, databaseInstanceReclamation)) {
+		log.Printf("[WARN] Removing instance from state because it's in removed or pending_reclamation state")
 		d.SetId("")
 		return false, nil
 	}

diff --git a/ibm/resource_ibm_resource_instance.go b/ibm/resource_ibm_resource_instance.go
@@ -758,6 +758,11 @@ func resourceIBMResourceInstanceExists(d *schema.ResourceData, meta interface{})
 		}
 		return false, fmt.Errorf("Error communicating with the API: %s with resp code: %s", err, resp)
 	}
+	if instance != nil && (strings.Contains(*instance.State, "removed") || strings.Contains(*instance.State, rsInstanceReclamation)) {
+		log.Printf("[WARN] Removing instance from state because it's in removed or pending_reclamation state")
+		d.SetId("")
+		return false, nil
+	}
 
 	return *instance.ID == instanceID, nil
 }