From 54063a19c4584afea88f9e1f2e3b17ea9190070d Mon Sep 17 00:00:00 2001 From: mountain Date: Tue, 23 May 2023 10:58:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?web=20api=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/http_api.go | 94 ++++++++++++++++++++++++++++++++++++------ server/http_handler.go | 50 +++++++++++++++++++++- 2 files changed, 130 insertions(+), 14 deletions(-) diff --git a/server/http_api.go b/server/http_api.go index c6508f2..7a767ea 100644 --- a/server/http_api.go +++ b/server/http_api.go @@ -49,7 +49,7 @@ func (h *houstonHandler) GetDeploySources(w http.ResponseWriter, r *http.Request enc.Encode(out) } -func (h *houstonHandler) Upload(w http.ResponseWriter, r *http.Request) { +func (h *houstonHandler) UploadDeploySource(w http.ResponseWriter, r *http.Request) { //
// // @@ -104,10 +104,12 @@ func (h *houstonHandler) Deploy(w http.ResponseWriter, r *http.Request) { traws := r.FormValue("targets") var targets []string - if err := json.Unmarshal([]byte(traws), &targets); err != nil { - logger.Error(err) - w.WriteHeader(http.StatusBadRequest) - return + if len(traws) > 0 { + if err := json.Unmarshal([]byte(traws), &targets); err != nil { + logger.Error(err) + w.WriteHeader(http.StatusBadRequest) + return + } } if len(name) == 0 || len(version) == 0 || len(targets) == 0 { @@ -165,10 +167,12 @@ func (h *houstonHandler) StartProcess(w http.ResponseWriter, r *http.Request) { traws := r.FormValue("targets") var targets []string - if err := json.Unmarshal([]byte(traws), &targets); err != nil { - logger.Error(err) - w.WriteHeader(http.StatusBadRequest) - return + if len(traws) > 0 { + if err := json.Unmarshal([]byte(traws), &targets); err != nil { + logger.Error(err) + w.WriteHeader(http.StatusBadRequest) + return + } } if len(name) == 0 || len(version) == 0 || len(targets) == 0 { @@ -202,10 +206,12 @@ func (h *houstonHandler) StopProcess(w http.ResponseWriter, r *http.Request) { traws := r.FormValue("targets") var targets []string - if err := json.Unmarshal([]byte(traws), &targets); err != nil { - logger.Error(err) - w.WriteHeader(http.StatusBadRequest) - return + if len(traws) > 0 { + if err := json.Unmarshal([]byte(traws), &targets); err != nil { + logger.Error(err) + w.WriteHeader(http.StatusBadRequest) + return + } } pid, _ := strconv.Atoi(pidstr) @@ -216,3 +222,65 @@ func (h *houstonHandler) StopProcess(w http.ResponseWriter, r *http.Request) { Pid: int32(pid), }, targets)) } + +func (h *houstonHandler) UploadLogs(w http.ResponseWriter, r *http.Request) { + // + // + // + // + // + // + //
+ name := r.FormValue("name") + if len(name) == 0 { + w.WriteHeader(http.StatusBadRequest) + return + } + version := r.FormValue("version") // option + traws := r.FormValue("targets") + filter := r.FormValue("filter") + + if len(filter) == 0 { + filter = "logs/*" + } + var targets []string + if err := json.Unmarshal([]byte(traws), &targets); err != nil { + logger.Error(err) + w.WriteHeader(http.StatusBadRequest) + return + } + + h.Operation().Upload(MakeUploadRequest(shared.UploadRequest{ + Name: name, + Version: version, + Url: "upload", + Filter: filter, + }, targets)) +} + +func (h *houstonHandler) GetLogFileLinks(w http.ResponseWriter, r *http.Request) { + //
+ // + // + //
+ name := r.FormValue("name") + version := r.FormValue("version") + if len(name) == 0 || len(version) == 0 { + w.WriteHeader(http.StatusBadRequest) + return + } + + logfiles, err := os.ReadDir(path.Join("downloads", name, version)) + if err != nil { + w.WriteHeader(http.StatusInternalServerError) + return + } + + var out []string + for _, lf := range logfiles { + out = append(out, lf.Name()) + } + + enc := json.NewEncoder(w) + enc.Encode(out) +} diff --git a/server/http_handler.go b/server/http_handler.go index 01990fb..005cbca 100644 --- a/server/http_handler.go +++ b/server/http_handler.go @@ -1,8 +1,10 @@ package server import ( + "fmt" "io" "net/http" + "os" "path" "reflect" "runtime/debug" @@ -43,6 +45,46 @@ func NewHoustonHandler() HoustonServerWithHandler { func (h *houstonHandler) RegisterHandlers(serveMux *http.ServeMux, prefix string) error { serveMux.Handle("/"+path.Join(prefix, "houston"), h) + dfsx := http.FileServer(http.Dir("./deploys")) + serveMux.Handle( + "/"+path.Join(prefix, "deploys", "/"), + http.StripPrefix(fmt.Sprintf("/%s/deploys", prefix), dfsx)) + + ufsx := http.FileServer(http.Dir("./downloads")) + serveMux.Handle( + "/"+path.Join(prefix, "downloads", "/"), + http.StripPrefix(fmt.Sprintf("/%s/downloads", prefix), ufsx)) + + serveMux.HandleFunc("/"+path.Join(prefix, "upload"), func(w http.ResponseWriter, r *http.Request) { + defer func() { + s := recover() + if s != nil { + logger.Println(s) + debug.PrintStack() + } + io.Copy(io.Discard, r.Body) + r.Body.Close() + }() + + name := r.Header.Get("Houston-Service-Name") + version := r.Header.Get("Houston-Service-Version") + filename := r.Header.Get("Houston-Service-Filename") + dir := fmt.Sprintf("./downloads/%s/%s", name, version) + if err := os.MkdirAll(dir, os.ModePerm); err == nil { + file, _ := os.Create(path.Join(dir, filename)) + if file != nil { + defer file.Close() + if _, err = io.Copy(file, r.Body); err != nil { + w.WriteHeader(http.StatusInternalServerError) + } + } else { + w.WriteHeader(http.StatusInternalServerError) + } + } else { + w.WriteHeader(http.StatusInternalServerError) + } + }) + return nil } @@ -60,7 +102,13 @@ func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { r.Body.Close() }() - operation := r.FormValue("operation") + var operation string + if r.Method == "POST" { + operation = r.FormValue("operation") + } else { + operation = r.URL.Query().Get("operation") + } + if len(operation) == 0 { w.WriteHeader(http.StatusBadRequest) return From d1efb92f527f44f39f8da1200109d1a9fbfc9d68 Mon Sep 17 00:00:00 2001 From: mountain Date: Tue, 23 May 2023 11:11:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/http_api.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/http_api.go b/server/http_api.go index 7a767ea..2791412 100644 --- a/server/http_api.go +++ b/server/http_api.go @@ -10,7 +10,6 @@ import ( "time" "repositories.action2quare.com/ayo/go-ayo/logger" - "repositories.action2quare.com/ayo/houston/shared" ) @@ -270,7 +269,12 @@ func (h *houstonHandler) GetLogFileLinks(w http.ResponseWriter, r *http.Request) return } - logfiles, err := os.ReadDir(path.Join("downloads", name, version)) + if version == "latest" { + version, _ = shared.FindLastestVersion(path.Join("downloads", name)) + } + + root := path.Join("downloads", name, version) + logfiles, err := os.ReadDir(root) if err != nil { w.WriteHeader(http.StatusInternalServerError) return @@ -278,7 +282,7 @@ func (h *houstonHandler) GetLogFileLinks(w http.ResponseWriter, r *http.Request) var out []string for _, lf := range logfiles { - out = append(out, lf.Name()) + out = append(out, path.Join(root, lf.Name())) } enc := json.NewEncoder(w)