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,10 +27,7 @@ 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:
+  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)

internal/config/config.go

@@ -51,7 +51,6 @@ type Config struct {
 	HTTPServer    HTTPServerConfig       `mapstructure:"http_server"`
 	Modules       Modules                `mapstructure:"modules"`
 	Reporting     reportingclient.Config `mapstructure:"reporting"`
-	RequestIP     requestcontext.WithClientIPConfig `mapstructure:"requestip"`
 }
 
 type BitcoinNodeClient struct {
@@ -68,6 +67,7 @@ type Modules struct {
 type HTTPServerConfig struct {
 	Port      int                               `mapstructure:"port"`
 	Logger    requestlogger.Config              `mapstructure:"logger"`
+	RequestIP requestcontext.WithClientIPConfig `mapstructure:"requestip"`
 }
 
 // Parse parse the configuration from environment variables