diff options
| -rw-r--r-- | cmd/gosd/main.go | 8 | ||||
| -rw-r--r-- | internal/server/handler/handler.go (renamed from internal/server/handle/handle.go) | 18 |
2 files changed, 14 insertions, 12 deletions
diff --git a/cmd/gosd/main.go b/cmd/gosd/main.go index 1e97798..b35f806 100644 --- a/cmd/gosd/main.go +++ b/cmd/gosd/main.go @@ -8,7 +8,7 @@ import ( config "codeberg.org/snonux/gos/internal/config/server" "codeberg.org/snonux/gos/internal/server" - "codeberg.org/snonux/gos/internal/server/handle" + "codeberg.org/snonux/gos/internal/server/handler" ) func main() { @@ -19,8 +19,10 @@ func main() { log.Fatal("error building config:", err) } - serv := server.New(conf) - hand := handle.New(conf) + var ( + serv = server.New(conf) + hand = handler.New(conf) + ) serv.Handle("health", func(w http.ResponseWriter, r *http.Request) error { fmt.Fprint(w, serv.Status.String()) diff --git a/internal/server/handle/handle.go b/internal/server/handler/handler.go index ba6bee8..bc751dd 100644 --- a/internal/server/handle/handle.go +++ b/internal/server/handler/handler.go @@ -1,4 +1,4 @@ -package handle +package handler import ( "errors" @@ -16,20 +16,20 @@ import ( "codeberg.org/snonux/gos/internal/types" ) -type Handle struct { +type Handler struct { conf server.ServerConfig getIdRe *regexp.Regexp } -func New(conf server.ServerConfig) Handle { - return Handle{ +func New(conf server.ServerConfig) Handler { + return Handler{ conf: conf, getIdRe: regexp.MustCompile(`^/[0-9]{4}/[a-z0-9]{64}\.json$`), } } // TODO: Use repository.Repository to store the file to the file system -func (h Handle) Submit(w http.ResponseWriter, r *http.Request) error { +func (h Handler) Submit(w http.ResponseWriter, r *http.Request) error { if r.Method != "POST" { return fmt.Errorf("expexted POST request") } @@ -57,7 +57,7 @@ func (h Handle) Submit(w http.ResponseWriter, r *http.Request) error { return nil } -func (h Handle) List(w http.ResponseWriter, r *http.Request) error { +func (h Handler) List(w http.ResponseWriter, r *http.Request) error { if r.Method != "GET" { return fmt.Errorf("expexted GET request") } @@ -71,7 +71,7 @@ func (h Handle) List(w http.ResponseWriter, r *http.Request) error { return err } -func (h Handle) Get(w http.ResponseWriter, r *http.Request) error { +func (h Handler) Get(w http.ResponseWriter, r *http.Request) error { id := r.URL.Query().Get("id") if !h.getIdRe.MatchString(id) { return fmt.Errorf("invalid id %s", id) @@ -86,7 +86,7 @@ func (h Handle) Get(w http.ResponseWriter, r *http.Request) error { return nil } -func (h Handle) Merge(w http.ResponseWriter, r *http.Request) error { +func (h Handler) Merge(w http.ResponseWriter, r *http.Request) error { var errs []error for _, partner := range h.conf.Partners() { @@ -103,7 +103,7 @@ func (h Handle) Merge(w http.ResponseWriter, r *http.Request) error { return nil } -func (h Handle) mergeFromPartner(partner string) error { +func (h Handler) mergeFromPartner(partner string) error { var ( errs []error uri = fmt.Sprintf("%s/list", partner) |