Stop throwing an error if host or group is not found when trying to remove a host or group. We still achieve the goal and can continue.

Author: habakke

internal/ansible/resource_ansible_group.go

@@ -177,11 +177,12 @@ func ansibleGroupResourceQueryDelete(d *schema.ResourceData, meta interface{}) e
 	id := d.Id()
 	g := db.Group(id)
 	if g == nil {
-		return fmt.Errorf("unable to find group with id '%s'", d.Id())
-	}
-
-	if err := db.RemoveGroup(*g); err != nil {
-		return fmt.Errorf("unable to delete group '%s': %e", g.GetName(), err)
+		logger.Error().Err(err).Msg("cannot find group so unable to remove, but continuing anyway")
+	} else {
+		// if we find the group we remove it, if we can't find it we can skip removing it
+		if err := db.RemoveGroup(*g); err != nil {
+			return fmt.Errorf("unable to delete group '%s': %e", g.GetName(), err)
+		}
 	}
 
 	// Save and export database

internal/ansible/resource_ansible_host.go

@@ -211,16 +211,19 @@ func ansibleHostResourceQueryDelete(d *schema.ResourceData, meta interface{}) er
 	id := d.Id()
 	g, entry, err := db.FindEntryById(id)
 	if err != nil {
-		return fmt.Errorf("unable to find entry with id '%s': %e", id, err)
-	}
+		logger.Error().Err(err).Msg("cannot find host so unable to remove, but continuing anyway")
+	} else {
+		// only remove host from group if we actually find it there. if we dont find it, then everything is ok and we
+		// can skip the removing it.
 
-	// remove entry from group
-	if err := g.RemoveEntity(*entry); err != nil {
-		return fmt.Errorf("unable to remove entry from group with id: %e", err)
-	}
+		// remove entry from group
+		if err := g.RemoveEntity(*entry); err != nil {
+			return fmt.Errorf("unable to remove entry from group with id: %e", err)
+		}
 
-	// update group
-	db.UpdateGroup(*g)
+		// update group
+		db.UpdateGroup(*g)
+	}
 
 	// Save and export database
 	if err := commitAndExport(db, i.GetDatabasePath()); err != nil {