WIP

handlers/delete_instance.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/play-with-docker/play-with-docker/services"
 )
 
 func DeleteInstance(rw http.ResponseWriter, req *http.Request) {
@@ -12,11 +11,9 @@ func DeleteInstance(rw http.ResponseWriter, req *http.Request) {
 	sessionId := vars["sessionId"]
 	instanceName := vars["instanceName"]
 
-	s := services.GetSession(sessionId)
-	s.Lock()
-	defer s.Unlock()
-	i := services.GetInstance(s, instanceName)
-	err := services.DeleteInstance(s, i)
+	s := core.SessionGet(sessionId)
+	i := core.InstanceGet(s, instanceName)
+	err := core.InstanceDelete(s, i)
 	if err != nil {
 		rw.WriteHeader(http.StatusInternalServerError)
 		return