From 674c4d86b3bed9c03d43c0b00825dd4508c0f8c5 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 17 Aug 2025 18:08:35 +0800 Subject: [PATCH] Move all config typedefs to config.go --- forged/internal/database/config.go | 5 +++++ forged/internal/database/database.go | 4 ---- forged/internal/incoming/hooks/config.go | 6 ++++++ forged/internal/incoming/hooks/hooks.go | 6 ------ forged/internal/incoming/lmtp/config.go | 9 +++++++++ forged/internal/incoming/lmtp/lmtp.go | 8 -------- forged/internal/incoming/ssh/config.go | 9 +++++++++ forged/internal/incoming/ssh/ssh.go | 8 -------- forged/internal/incoming/web/config.go | 14 ++++++++++++++ forged/internal/incoming/web/server.go | 13 ------------- forged/internal/ipc/irc/bot.go | 12 ------------ forged/internal/ipc/irc/config.go | 13 +++++++++++++ diff --git a/forged/internal/database/config.go b/forged/internal/database/config.go new file mode 100644 index 0000000000000000000000000000000000000000..369769304089bb3b57e64ad8887f628cfa623ab7 --- /dev/null +++ b/forged/internal/database/config.go @@ -0,0 +1,5 @@ +package database + +type Config struct { + Conn string `scfg:"conn"` +} diff --git a/forged/internal/database/database.go b/forged/internal/database/database.go index 92244b743b334a101b8011f546527468bbc8f8c0..093ed8f7dddfc89a1679bf8c2fa104ceae666ed2 100644 --- a/forged/internal/database/database.go +++ b/forged/internal/database/database.go @@ -27,7 +27,3 @@ err = fmt.Errorf("create pgxpool: %w", err) } return Database{db}, err } - -type Config struct { - Conn string `scfg:"conn"` -} diff --git a/forged/internal/incoming/hooks/config.go b/forged/internal/incoming/hooks/config.go new file mode 100644 index 0000000000000000000000000000000000000000..0d23dc007fed2e3b7171dd072c3204babcafe1ce --- /dev/null +++ b/forged/internal/incoming/hooks/config.go @@ -0,0 +1,6 @@ +package hooks + +type Config struct { + Socket string `scfg:"socket"` + Execs string `scfg:"execs"` +} diff --git a/forged/internal/incoming/hooks/hooks.go b/forged/internal/incoming/hooks/hooks.go index 4400b617b452f50225858ace8a055f71dd7f4f7f..d0f57f569a13ea61b8fd90d39f35c2293ac75202 100644 --- a/forged/internal/incoming/hooks/hooks.go +++ b/forged/internal/incoming/hooks/hooks.go @@ -17,12 +17,6 @@ hookMap cmap.Map[string, hookInfo] socketPath string executablesPath string } - -type Config struct { - Socket string `scfg:"socket"` - Execs string `scfg:"execs"` -} - type hookInfo struct { session ssh.Session pubkey string diff --git a/forged/internal/incoming/lmtp/config.go b/forged/internal/incoming/lmtp/config.go new file mode 100644 index 0000000000000000000000000000000000000000..62416084ec1854bdccc0feb96f86d54788b960e4 --- /dev/null +++ b/forged/internal/incoming/lmtp/config.go @@ -0,0 +1,9 @@ +package lmtp + +type Config struct { + Socket string `scfg:"socket"` + Domain string `scfg:"domain"` + MaxSize int64 `scfg:"max_size"` + WriteTimeout uint32 `scfg:"write_timeout"` + ReadTimeout uint32 `scfg:"read_timeout"` +} diff --git a/forged/internal/incoming/lmtp/lmtp.go b/forged/internal/incoming/lmtp/lmtp.go index 429ff20be4c2b8af26583902558e77c4cc46824d..61b1caf1fba9c830cca5e52047e6fc6602b402d2 100644 --- a/forged/internal/incoming/lmtp/lmtp.go +++ b/forged/internal/incoming/lmtp/lmtp.go @@ -18,14 +18,6 @@ writeTimeout uint32 readTimeout uint32 } -type Config struct { - Socket string `scfg:"socket"` - Domain string `scfg:"domain"` - MaxSize int64 `scfg:"max_size"` - WriteTimeout uint32 `scfg:"write_timeout"` - ReadTimeout uint32 `scfg:"read_timeout"` -} - func New(config Config) (server *Server) { return &Server{ socket: config.Socket, diff --git a/forged/internal/incoming/ssh/config.go b/forged/internal/incoming/ssh/config.go new file mode 100644 index 0000000000000000000000000000000000000000..7d22cc1ef57b5c50347e27159077dcc527569fc0 --- /dev/null +++ b/forged/internal/incoming/ssh/config.go @@ -0,0 +1,9 @@ +package ssh + +type Config struct { + Net string `scfg:"net"` + Addr string `scfg:"addr"` + Key string `scfg:"key"` + Root string `scfg:"root"` + ShutdownTimeout uint32 `scfg:"shutdown_timeout"` +} diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go index a0cce5ed66f5bb5f0e5302cddb2ddc9ca85de11c..9338eca47eb2398f7a804e280be6ee235ea0b525 100644 --- a/forged/internal/incoming/ssh/ssh.go +++ b/forged/internal/incoming/ssh/ssh.go @@ -12,14 +12,6 @@ "go.lindenii.runxiyu.org/forge/forged/internal/common/misc" gossh "golang.org/x/crypto/ssh" ) -type Config struct { - Net string `scfg:"net"` - Addr string `scfg:"addr"` - Key string `scfg:"key"` - Root string `scfg:"root"` - ShutdownTimeout uint32 `scfg:"shutdown_timeout"` -} - type Server struct { gliderServer *gliderssh.Server privkey gossh.Signer diff --git a/forged/internal/incoming/web/config.go b/forged/internal/incoming/web/config.go new file mode 100644 index 0000000000000000000000000000000000000000..63a7f37b7aba5cafecf8cb845fdd8f91e3980a8e --- /dev/null +++ b/forged/internal/incoming/web/config.go @@ -0,0 +1,14 @@ +package web + +type Config struct { + Net string `scfg:"net"` + Addr string `scfg:"addr"` + Root string `scfg:"root"` + CookieExpiry int `scfg:"cookie_expiry"` + ReadTimeout uint32 `scfg:"read_timeout"` + WriteTimeout uint32 `scfg:"write_timeout"` + IdleTimeout uint32 `scfg:"idle_timeout"` + MaxHeaderBytes int `scfg:"max_header_bytes"` + ReverseProxy bool `scfg:"reverse_proxy"` + ShutdownTimeout uint32 `scfg:"shutdown_timeout"` +} diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go index a965251560ef59db4b3ab3e2261d25019bee4539..6229bf0a5b23121eb29e8afa2833121056ab7151 100644 --- a/forged/internal/incoming/web/server.go +++ b/forged/internal/incoming/web/server.go @@ -19,19 +19,6 @@ httpServer *http.Server shutdownTimeout uint32 } -type Config struct { - Net string `scfg:"net"` - Addr string `scfg:"addr"` - Root string `scfg:"root"` - CookieExpiry int `scfg:"cookie_expiry"` - ReadTimeout uint32 `scfg:"read_timeout"` - WriteTimeout uint32 `scfg:"write_timeout"` - IdleTimeout uint32 `scfg:"idle_timeout"` - MaxHeaderBytes int `scfg:"max_header_bytes"` - ReverseProxy bool `scfg:"reverse_proxy"` - ShutdownTimeout uint32 `scfg:"shutdown_timeout"` -} - func New(config Config) (server *Server) { httpServer := &http.Server{ Handler: NewHandler(config), diff --git a/forged/internal/ipc/irc/bot.go b/forged/internal/ipc/irc/bot.go index c7a188b65cfc08bb74072d1c067df00e2045645e..07008ae205183b7e5f0dad64182fa6a22b790d79 100644 --- a/forged/internal/ipc/irc/bot.go +++ b/forged/internal/ipc/irc/bot.go @@ -13,18 +13,6 @@ "go.lindenii.runxiyu.org/forge/forged/internal/common/misc" ) -// Config contains IRC connection and identity settings for the bot. -// This should usually be a part of the primary config struct. -type Config struct { - Net string `scfg:"net"` - Addr string `scfg:"addr"` - TLS bool `scfg:"tls"` - SendQ uint `scfg:"sendq"` - Nick string `scfg:"nick"` - User string `scfg:"user"` - Gecos string `scfg:"gecos"` -} - // Bot represents an IRC bot client that handles events and allows for sending messages. type Bot struct { // TODO: Use each config field instead of embedding Config here. diff --git a/forged/internal/ipc/irc/config.go b/forged/internal/ipc/irc/config.go new file mode 100644 index 0000000000000000000000000000000000000000..b1b5703d196813d938e1b10c1f9e58d8e3182c05 --- /dev/null +++ b/forged/internal/ipc/irc/config.go @@ -0,0 +1,13 @@ +package irc + +// Config contains IRC connection and identity settings for the bot. +// This should usually be a part of the primary config struct. +type Config struct { + Net string `scfg:"net"` + Addr string `scfg:"addr"` + TLS bool `scfg:"tls"` + SendQ uint `scfg:"sendq"` + Nick string `scfg:"nick"` + User string `scfg:"user"` + Gecos string `scfg:"gecos"` +} -- 2.48.1