From 79c1e474274f3fe4004dbb47f699758ea87805de Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Fri, 2 Aug 2024 22:19:51 +0000 Subject: [PATCH] Rename websocket URLs Given that we now have multiple websocket URLs (logs and events), this change categorizes them under the same prefix. Signed-off-by: Gabriel Adrian Samfira --- apiserver/routers/routers.go | 15 ++++++++++++--- cmd/garm-cli/cmd/events.go | 2 +- cmd/garm-cli/cmd/log.go | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/apiserver/routers/routers.go b/apiserver/routers/routers.go index 36d3a810..8c0434bc 100644 --- a/apiserver/routers/routers.go +++ b/apiserver/routers/routers.go @@ -411,9 +411,18 @@ func NewAPIRouter(han *controllers.APIController, authMiddleware, initMiddleware apiRouter.Handle("/github/credentials/{id}/", http.HandlerFunc(han.UpdateGithubCredential)).Methods("PUT", "OPTIONS") apiRouter.Handle("/github/credentials/{id}", http.HandlerFunc(han.UpdateGithubCredential)).Methods("PUT", "OPTIONS") - // Websocket log writer - apiRouter.Handle("/{ws:ws\\/?}", http.HandlerFunc(han.WSHandler)).Methods("GET") - apiRouter.Handle("/{events:events\\/?}", http.HandlerFunc(han.EventsHandler)).Methods("GET") + ///////////////////////// + // Websocket endpoints // + ///////////////////////// + // Legacy log websocket path + apiRouter.Handle("/ws/", http.HandlerFunc(han.WSHandler)).Methods("GET") + apiRouter.Handle("/ws", http.HandlerFunc(han.WSHandler)).Methods("GET") + // Log websocket endpoint + apiRouter.Handle("/ws/logs/", http.HandlerFunc(han.WSHandler)).Methods("GET") + apiRouter.Handle("/ws/logs", http.HandlerFunc(han.WSHandler)).Methods("GET") + // DB watcher websocket endpoint + apiRouter.Handle("/ws/events/", http.HandlerFunc(han.EventsHandler)).Methods("GET") + apiRouter.Handle("/ws/events", http.HandlerFunc(han.EventsHandler)).Methods("GET") // NotFound handler apiRouter.PathPrefix("/").HandlerFunc(han.NotFoundHandler).Methods("GET", "POST", "PUT", "DELETE", "OPTIONS") diff --git a/cmd/garm-cli/cmd/events.go b/cmd/garm-cli/cmd/events.go index 52a3fe9a..9698f633 100644 --- a/cmd/garm-cli/cmd/events.go +++ b/cmd/garm-cli/cmd/events.go @@ -27,7 +27,7 @@ var eventsCmd = &cobra.Command{ ctx, stop := signal.NotifyContext(context.Background(), signals...) defer stop() - reader, err := garmWs.NewReader(ctx, mgr.BaseURL, "/api/v1/events", mgr.Token, common.PrintWebsocketMessage) + reader, err := garmWs.NewReader(ctx, mgr.BaseURL, "/api/v1/ws/events", mgr.Token, common.PrintWebsocketMessage) if err != nil { return err } diff --git a/cmd/garm-cli/cmd/log.go b/cmd/garm-cli/cmd/log.go index 89f687ef..99a64944 100644 --- a/cmd/garm-cli/cmd/log.go +++ b/cmd/garm-cli/cmd/log.go @@ -21,7 +21,7 @@ var logCmd = &cobra.Command{ ctx, stop := signal.NotifyContext(context.Background(), signals...) defer stop() - reader, err := garmWs.NewReader(ctx, mgr.BaseURL, "/api/v1/ws", mgr.Token, common.PrintWebsocketMessage) + reader, err := garmWs.NewReader(ctx, mgr.BaseURL, "/api/v1/ws/logs", mgr.Token, common.PrintWebsocketMessage) if err != nil { return err }