From: Aditya Sharoff <aditya.sharoff@intel.com>
Date: Thu, 24 Sep 2020 22:45:15 +0000 (-0700)
Subject: delete should return 404 error for invalid name
X-Git-Tag: 0.8.0~31^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0c527d07b604fc9ecad713732c3d9bb5d5ace31e;p=multicloud%2Fk8s.git

delete should return 404 error for invalid name

Issue-ID: MULTICLOUD-1150

Change-Id: I04c9584e35672b6b40047a67be4d2026002204e1
Signed-off-by: Aditya Sharoff <aditya.sharoff@intel.com>
---

diff --git a/src/orchestrator/api/composite_app_handler.go b/src/orchestrator/api/composite_app_handler.go
index d531b28d..761d60b9 100644
--- a/src/orchestrator/api/composite_app_handler.go
+++ b/src/orchestrator/api/composite_app_handler.go
@@ -130,7 +130,12 @@ func (h compositeAppHandler) deleteHandler(w http.ResponseWriter, r *http.Reques
 	version := vars["version"]
 	projectName := vars["project-name"]
 
-	err := h.client.DeleteCompositeApp(name, version, projectName)
+	_, err := h.client.GetCompositeApp(name, version, projectName)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusNotFound)
+		return
+	}
+	err = h.client.DeleteCompositeApp(name, version, projectName)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return