feat: move requestip config to http config (#25)

cmd/cmd_run.go

@@ -145,7 +145,7 @@ func runHandler(cmd *cobra.Command, _ []string) error {
 			Use(requestid.New()).
 			Use(requestcontext.New(
 				requestcontext.WithRequestId(),
-				requestcontext.WithClientIP(conf.RequestIP),
+				requestcontext.WithClientIP(conf.HTTPServer.RequestIP),
 			)).
 			Use(requestlogger.New(conf.HTTPServer.Logger)).
 			Use(fiberrecover.New(fiberrecover.Config{

config.example.yaml

@@ -27,13 +27,10 @@ http_server:
     disable: false # disable logger if logger level is `INFO`
     request_header: false
     request_query: false
-
-# Client IP extraction configuration options.
-# This is unnecessary if you don't care about the real client IP or if you're not using a reverse proxy.
-requestip:
-  trusted_proxies_ip: # Cloudflare, GCP Public LB. See: server/internal/middleware/requestcontext/PROXY-IP.md
-  trusted_proxies_header: # X-Real-IP, CF-Connecting-IP
-  enable_reject_malformed_request: false # return 403 if request is malformed (invalid IP)
+  requestip: # Client IP extraction configuration options. This is unnecessary if you don't care about the real client IP or if you're not using a reverse proxy.
+    trusted_proxies_ip: # Cloudflare, GCP Public LB. See: server/internal/middleware/requestcontext/PROXY-IP.md
+    trusted_proxies_header: # X-Real-IP, CF-Connecting-IP
+    enable_reject_malformed_request: false # return 403 if request is malformed (invalid IP)
 
 # Meta-protocol modules configuration options.
 modules:

internal/config/config.go

@@ -43,15 +43,14 @@ var (
 )
 
 type Config struct {
-	EnableModules []string                          `mapstructure:"enable_modules"`
-	APIOnly       bool                              `mapstructure:"api_only"`
-	Logger        logger.Config                     `mapstructure:"logger"`
-	BitcoinNode   BitcoinNodeClient                 `mapstructure:"bitcoin_node"`
-	Network       common.Network                    `mapstructure:"network"`
-	HTTPServer    HTTPServerConfig                  `mapstructure:"http_server"`
-	Modules       Modules                           `mapstructure:"modules"`
-	Reporting     reportingclient.Config            `mapstructure:"reporting"`
-	RequestIP     requestcontext.WithClientIPConfig `mapstructure:"requestip"`
+	EnableModules []string               `mapstructure:"enable_modules"`
+	APIOnly       bool                   `mapstructure:"api_only"`
+	Logger        logger.Config          `mapstructure:"logger"`
+	BitcoinNode   BitcoinNodeClient      `mapstructure:"bitcoin_node"`
+	Network       common.Network         `mapstructure:"network"`
+	HTTPServer    HTTPServerConfig       `mapstructure:"http_server"`
+	Modules       Modules                `mapstructure:"modules"`
+	Reporting     reportingclient.Config `mapstructure:"reporting"`
 }
 
 type BitcoinNodeClient struct {
@@ -66,8 +65,9 @@ type Modules struct {
 }
 
 type HTTPServerConfig struct {
-	Port   int                  `mapstructure:"port"`
-	Logger requestlogger.Config `mapstructure:"logger"`
+	Port      int                               `mapstructure:"port"`
+	Logger    requestlogger.Config              `mapstructure:"logger"`
+	RequestIP requestcontext.WithClientIPConfig `mapstructure:"requestip"`
 }
 
 // Parse parse the configuration from environment variables