From 234dacec3eaabf3e99ee6179255378988665199c Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 18 Aug 2025 03:14:57 +0800 Subject: [PATCH] Rename globalData to global --- forged/internal/global/global.go | 2 +- forged/internal/incoming/hooks/hooks.go | 6 +++--- forged/internal/incoming/lmtp/lmtp.go | 6 +++--- forged/internal/incoming/ssh/ssh.go | 10 +++++----- forged/internal/incoming/web/handler.go | 4 ++-- forged/internal/incoming/web/router.go | 4 ++-- forged/internal/incoming/web/server.go | 8 ++++---- forged/internal/incoming/web/types/types.go | 2 +- forged/internal/server/server.go | 14 +++++++------- diff --git a/forged/internal/global/global.go b/forged/internal/global/global.go index 7d2f03ff4d7ce3b4ec7c15aa1df2eb0943d5bd04..2aa80498ef47a6236974e0bf89eec574e15d3705 100644 --- a/forged/internal/global/global.go +++ b/forged/internal/global/global.go @@ -1,6 +1,6 @@ package global -type GlobalData struct { +type Global struct { ForgeTitle string ForgeVersion string SSHPubkey string diff --git a/forged/internal/incoming/hooks/hooks.go b/forged/internal/incoming/hooks/hooks.go index 941b03fa7ce05ceeb2818ee462267a106eea327f..dfdf17241e3333d3c4523547f35b482e895799b5 100644 --- a/forged/internal/incoming/hooks/hooks.go +++ b/forged/internal/incoming/hooks/hooks.go @@ -17,7 +17,7 @@ type Server struct { hookMap cmap.Map[string, hookInfo] socketPath string executablesPath string - globalData *global.GlobalData + global *global.Global } type hookInfo struct { session ssh.Session @@ -32,12 +32,12 @@ repoName string contribReq string } -func New(config Config, globalData *global.GlobalData) (server *Server) { +func New(config Config, global *global.Global) (server *Server) { return &Server{ socketPath: config.Socket, executablesPath: config.Execs, hookMap: cmap.Map[string, hookInfo]{}, - globalData: globalData, + global: global, } } diff --git a/forged/internal/incoming/lmtp/lmtp.go b/forged/internal/incoming/lmtp/lmtp.go index d7e5ef47c86860d703e676e179c3f75e96b7187d..a7782a2d9ffe43efba58c88e168a2c47b13134f4 100644 --- a/forged/internal/incoming/lmtp/lmtp.go +++ b/forged/internal/incoming/lmtp/lmtp.go @@ -17,17 +17,17 @@ domain string maxSize int64 writeTimeout uint32 readTimeout uint32 - globalData *global.GlobalData + global *global.Global } -func New(config Config, globalData *global.GlobalData) (server *Server) { +func New(config Config, global *global.Global) (server *Server) { return &Server{ socket: config.Socket, domain: config.Domain, maxSize: config.MaxSize, writeTimeout: config.WriteTimeout, readTimeout: config.ReadTimeout, - globalData: globalData, + global: global, } } diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go index dc03501d60d98314ff178b7805bb40eeaf0c8bde..527cd2891b96d166bef3d08838de6275814195f5 100644 --- a/forged/internal/incoming/ssh/ssh.go +++ b/forged/internal/incoming/ssh/ssh.go @@ -20,16 +20,16 @@ net string addr string root string shutdownTimeout uint32 - globalData *global.GlobalData + global *global.Global } -func New(config Config, globalData *global.GlobalData) (server *Server, err error) { +func New(config Config, global *global.Global) (server *Server, err error) { server = &Server{ net: config.Net, addr: config.Addr, root: config.Root, shutdownTimeout: config.ShutdownTimeout, - globalData: globalData, + global: global, } //exhaustruct:ignore var privkeyBytes []byte @@ -44,8 +44,8 @@ if err != nil { return server, fmt.Errorf("parse SSH private key: %w", err) } - server.globalData.SSHPubkey = misc.BytesToString(gossh.MarshalAuthorizedKey(server.privkey.PublicKey())) - server.globalData.SSHFingerprint = gossh.FingerprintSHA256(server.privkey.PublicKey()) + server.global.SSHPubkey = misc.BytesToString(gossh.MarshalAuthorizedKey(server.privkey.PublicKey())) + server.global.SSHFingerprint = gossh.FingerprintSHA256(server.privkey.PublicKey()) server.gliderServer = &gliderssh.Server{ Handler: handle, diff --git a/forged/internal/incoming/web/handler.go b/forged/internal/incoming/web/handler.go index bc50b332482f35df70741b8754dd1c41dad6651a..63019b4e497a5a9d13e605503db447953971f222 100644 --- a/forged/internal/incoming/web/handler.go +++ b/forged/internal/incoming/web/handler.go @@ -16,8 +16,8 @@ type handler struct { r *Router } -func NewHandler(cfg Config, globalData *global.GlobalData, queries *queries.Queries) *handler { - h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(globalData).Queries(queries)} +func NewHandler(cfg Config, global *global.Global, queries *queries.Queries) *handler { + h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(global).Queries(queries)} staticFS := http.FileServer(http.Dir(cfg.StaticPath)) h.r.ANYHTTP("-/static/*rest", diff --git a/forged/internal/incoming/web/router.go b/forged/internal/incoming/web/router.go index 7c2717db17744e80abd9427c76762f37abf7f748..c1a0bc0efcec30dff19180f7ebc13bd9e9c8ad5f 100644 --- a/forged/internal/incoming/web/router.go +++ b/forged/internal/incoming/web/router.go @@ -60,14 +60,14 @@ type Router struct { routes []route errors ErrorRenderers user UserResolver - global *global.GlobalData + global *global.Global reverseProxy bool queries *queries.Queries } func NewRouter() *Router { return &Router{} } -func (r *Router) Global(g *global.GlobalData) *Router { +func (r *Router) Global(g *global.Global) *Router { r.global = g return r } diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go index f81886f2d6ec53c5ab158af5e8e59b836cb848aa..465657ce3f11c5812319234cb0fd8b0945d2f898 100644 --- a/forged/internal/incoming/web/server.go +++ b/forged/internal/incoming/web/server.go @@ -19,12 +19,12 @@ addr string root string httpServer *http.Server shutdownTimeout uint32 - globalData *global.GlobalData + global *global.Global } -func New(config Config, globalData *global.GlobalData, queries *queries.Queries) *Server { +func New(config Config, global *global.Global, queries *queries.Queries) *Server { httpServer := &http.Server{ - Handler: NewHandler(config, globalData, queries), + Handler: NewHandler(config, global, queries), ReadTimeout: time.Duration(config.ReadTimeout) * time.Second, WriteTimeout: time.Duration(config.WriteTimeout) * time.Second, IdleTimeout: time.Duration(config.IdleTimeout) * time.Second, @@ -36,7 +36,7 @@ addr: config.Addr, root: config.Root, shutdownTimeout: config.ShutdownTimeout, httpServer: httpServer, - globalData: globalData, + global: global, } } diff --git a/forged/internal/incoming/web/types/types.go b/forged/internal/incoming/web/types/types.go index 1301fe930a33060422630d59e1aa9a536df1761e..bacce24eaa858ee911dedee9ef231d0650ad777a 100644 --- a/forged/internal/incoming/web/types/types.go +++ b/forged/internal/incoming/web/types/types.go @@ -19,7 +19,7 @@ GroupPath []string SeparatorIndex int RefType string RefName string - Global *global.GlobalData + Global *global.Global Queries *queries.Queries } diff --git a/forged/internal/server/server.go b/forged/internal/server/server.go index ecd5fe1ee2ecc1631580a6f56a737c416c71a774..62a944212523045d83b95608fcc6e4b01840fc0b 100644 --- a/forged/internal/server/server.go +++ b/forged/internal/server/server.go @@ -24,7 +24,7 @@ lmtpServer *lmtp.Server webServer *web.Server sshServer *ssh.Server - globalData global.GlobalData + global global.Global } func New(configPath string) (server *Server, err error) { @@ -37,13 +37,13 @@ } queries := queries.New(&server.database) - server.globalData.ForgeVersion = "unknown" // TODO - server.globalData.ForgeTitle = server.config.General.Title + server.global.ForgeVersion = "unknown" // TODO + server.global.ForgeTitle = server.config.General.Title - server.hookServer = hooks.New(server.config.Hooks, &server.globalData) - server.lmtpServer = lmtp.New(server.config.LMTP, &server.globalData) - server.webServer = web.New(server.config.Web, &server.globalData, queries) - server.sshServer, err = ssh.New(server.config.SSH, &server.globalData) + server.hookServer = hooks.New(server.config.Hooks, &server.global) + server.lmtpServer = lmtp.New(server.config.LMTP, &server.global) + server.webServer = web.New(server.config.Web, &server.global, queries) + server.sshServer, err = ssh.New(server.config.SSH, &server.global) if err != nil { return server, fmt.Errorf("create SSH server: %w", err) } -- 2.48.1