Cope with an object that was deleted server-side

Author: DRuggeri

restapi/api_object.go

@@ -231,6 +231,11 @@ func (obj *api_object) read_object() error {
 
 	res_str, err := obj.api_client.send_request(obj.api_client.read_method, strings.Replace(obj.get_path, "{id}", obj.id, -1), "")
 	if err != nil {
+		if strings.Contains(err.Error(), "Unexpected response code '404'") {
+			log.Printf("api_object.go: 404 error while refreshing state for '%s' at path '%s'. Removing from state.", obj.id, obj.get_path)
+			obj.id = ""
+			return nil
+		}
 		return err
 	}
 

restapi/api_object_test.go

@@ -218,8 +218,8 @@ func TestAPIObject(t *testing.T) {
 		}
 		testing_objects["pet"].delete_object()
 		err = testing_objects["pet"].read_object()
-		if err == nil {
-			t.Fatalf("api_object_test.go: 'pet' object deleted, but 404 not returned when getting it.\n")
+		if err != nil {
+			t.Fatalf("api_object_test.go: 'pet' object deleted, but an error was returned when reading the object (expected the provider to cope with this!\n")
 		}
 	})