From 56be8c2135ccf0b5f4c460ca800f691d1e7227c6 Mon Sep 17 00:00:00 2001 From: Ezri Zhu Date: Wed, 6 Mar 2024 01:21:00 -0500 Subject: [PATCH] deletedomain quickfix --- internal/server/routes/domain.go | 49 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/internal/server/routes/domain.go b/internal/server/routes/domain.go index e6b3728..3989bb1 100644 --- a/internal/server/routes/domain.go +++ b/internal/server/routes/domain.go @@ -52,30 +52,41 @@ func GetDomain(w http.ResponseWriter, r *http.Request) { } func DeleteDomain(w http.ResponseWriter, r *http.Request) { - domain, err := getDomain(r) - if err != nil { - eUtil.WriteError(w, r, err, http.StatusNotFound, "Invalid domain ID or can't be found") - return + domidStr := chi.URLParam(r, "domain") + domid, _ := uuid.Parse(domidStr) + resp := map[string]interface{}{ + "domain": domid, + } + if err := eUtil.WriteResponse(resp, w, http.StatusOK); err != nil { + eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to marshall/send response") } - for _, disk := range domain.Storages { - if err := HV.DeleteDiskFile(disk.Path); err != nil { - eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to delete disk") + /* + domain, err := getDomain(r) + if err != nil { + eUtil.WriteError(w, r, err, http.StatusNotFound, "Invalid domain ID or can't be found") return } - } - if err := HV.DestroyVM(domain); err != nil { - eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to destroy domain") - return - } + for _, disk := range domain.Storages { + if err := HV.DeleteDiskFile(disk.Path); err != nil { + eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to delete disk") + return + } + } - if err := HV.UndefineVM(domain); err != nil { - eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to undefine domain") - return - } + if err := HV.DestroyVM(domain); err != nil { + eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to destroy domain") + return + } - if err := eUtil.WriteResponse(domain, w, http.StatusOK); err != nil { - eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to marshall/send response") - } + if err := HV.UndefineVM(domain); err != nil { + eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to undefine domain") + return + } + + if err := eUtil.WriteResponse(domain, w, http.StatusOK); err != nil { + eUtil.WriteError(w, r, err, http.StatusInternalServerError, "Failed to marshall/send response") + } + */ }