feat: enhance configuration management with main and route configs

- Added `main_config` and `route_config` fields to ActiveConfigResponse and AgentConfigResponse for better configuration handling.
- Updated NginxManager interface to accept separate main and route configurations.
- Modified sync service to apply main and route configurations correctly.
- Enhanced tests to validate new configuration fields and their application.
- Updated ConfigVersion model to include main configuration.
- Improved rendering logic for main and route configurations in the service layer.
- Added UI components to display main configuration changes and OpenResty parameter changes.

atsf_agent/internal/config/config.go

@@ -12,6 +12,7 @@ import (
 )
 
 const (
+	defaultDockerMainConfigRelativePath  = "etc/nginx/nginx.conf"
 	defaultDockerRouteConfigRelativePath = "etc/nginx/conf.d/atsflare_routes.conf"
 	defaultCertDirRelativePath           = "etc/nginx/certs"
 	defaultDockerStateRelativePath       = "var/lib/atsflare/agent-state.json"
@@ -19,26 +20,27 @@ const (
 )
 
 type Config struct {
-	ServerURL          string              `json:"server_url"`
-	AgentToken         string              `json:"agent_token"`
-	DiscoveryToken     string              `json:"discovery_token"`
-	NodeName           string              `json:"node_name"`
-	NodeIP             string              `json:"node_ip"`
-	AgentVersion       string              `json:"-"`
-	NginxVersion       string              `json:"-"`
-	OpenrestyPath      string              `json:"openresty_path"`
-	OpenrestyContainerName string          `json:"openresty_container_name"`
-	OpenrestyDockerImage   string          `json:"openresty_docker_image"`
-	DockerBinary       string              `json:"docker_binary"`
-	DataDir            string              `json:"data_dir"`
-	RouteConfigPath    string              `json:"route_config_path"`
-	CertDir            string              `json:"cert_dir"`
-	OpenrestyCertDir   string              `json:"openresty_cert_dir"`
-	StatePath          string              `json:"state_path"`
-	HeartbeatInterval  MillisecondDuration `json:"heartbeat_interval"`
-	SyncInterval       MillisecondDuration `json:"sync_interval"`
-	RequestTimeout     MillisecondDuration `json:"request_timeout"`
-	configPath         string
+	ServerURL              string              `json:"server_url"`
+	AgentToken             string              `json:"agent_token"`
+	DiscoveryToken         string              `json:"discovery_token"`
+	NodeName               string              `json:"node_name"`
+	NodeIP                 string              `json:"node_ip"`
+	AgentVersion           string              `json:"-"`
+	NginxVersion           string              `json:"-"`
+	OpenrestyPath          string              `json:"openresty_path"`
+	OpenrestyContainerName string              `json:"openresty_container_name"`
+	OpenrestyDockerImage   string              `json:"openresty_docker_image"`
+	DockerBinary           string              `json:"docker_binary"`
+	DataDir                string              `json:"data_dir"`
+	MainConfigPath         string              `json:"main_config_path"`
+	RouteConfigPath        string              `json:"route_config_path"`
+	CertDir                string              `json:"cert_dir"`
+	OpenrestyCertDir       string              `json:"openresty_cert_dir"`
+	StatePath              string              `json:"state_path"`
+	HeartbeatInterval      MillisecondDuration `json:"heartbeat_interval"`
+	SyncInterval           MillisecondDuration `json:"sync_interval"`
+	RequestTimeout         MillisecondDuration `json:"request_timeout"`
+	configPath             string
 }
 
 type configFile struct {
@@ -52,6 +54,7 @@ type configFile struct {
 	OpenrestyDockerImage   string              `json:"openresty_docker_image"`
 	DockerBinary           string              `json:"docker_binary"`
 	DataDir                string              `json:"data_dir"`
+	MainConfigPath         string              `json:"main_config_path"`
 	RouteConfigPath        string              `json:"route_config_path"`
 	CertDir                string              `json:"cert_dir"`
 	OpenrestyCertDir       string              `json:"openresty_cert_dir"`
@@ -81,6 +84,7 @@ func Load(path string) (*Config, error) {
 		OpenrestyDockerImage:   file.OpenrestyDockerImage,
 		DockerBinary:           file.DockerBinary,
 		DataDir:                file.DataDir,
+		MainConfigPath:         file.MainConfigPath,
 		RouteConfigPath:        file.RouteConfigPath,
 		CertDir:                file.CertDir,
 		OpenrestyCertDir:       file.OpenrestyCertDir,
@@ -119,9 +123,13 @@ func applyDefaults(cfg *Config, baseDir string) {
 		cfg.NodeIP = detectNodeIP()
 	}
 	if cfg.OpenrestyPath == "" {
+		cfg.MainConfigPath = joinManagedPath(cfg.DataDir, defaultDockerMainConfigRelativePath)
 		cfg.RouteConfigPath = joinManagedPath(cfg.DataDir, defaultDockerRouteConfigRelativePath)
 		cfg.StatePath = joinManagedPath(cfg.DataDir, defaultDockerStateRelativePath)
 	} else {
+		if cfg.MainConfigPath == "" {
+			cfg.MainConfigPath = joinManagedPath(cfg.DataDir, defaultDockerMainConfigRelativePath)
+		}
 		if cfg.RouteConfigPath == "" {
 			cfg.RouteConfigPath = joinManagedPath(cfg.DataDir, defaultDockerRouteConfigRelativePath)
 		}
@@ -158,6 +166,9 @@ func normalizeManagedPaths(cfg *Config) {
 	if usesSlashPath(cfg.DataDir) {
 		cfg.DataDir = filepath.ToSlash(cfg.DataDir)
 	}
+	if usesSlashPath(cfg.MainConfigPath) {
+		cfg.MainConfigPath = filepath.ToSlash(cfg.MainConfigPath)
+	}
 	if usesSlashPath(cfg.RouteConfigPath) {
 		cfg.RouteConfigPath = filepath.ToSlash(cfg.RouteConfigPath)
 	}

atsf_agent/internal/config/config_test.go

@@ -33,6 +33,9 @@ func TestLoadDockerModeUsesManagedPaths(t *testing.T) {
 	if cfg.DataDir != filepath.Join(dir, "data") {
 		t.Fatalf("unexpected data dir: %s", cfg.DataDir)
 	}
+	if cfg.MainConfigPath != filepath.Join(dir, "data", defaultDockerMainConfigRelativePath) {
+		t.Fatalf("unexpected main config path: %s", cfg.MainConfigPath)
+	}
 	if cfg.RouteConfigPath != filepath.Join(dir, "data", defaultDockerRouteConfigRelativePath) {
 		t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
 	}
@@ -62,6 +65,7 @@ func TestLoadPathModeKeepsExplicitPaths(t *testing.T) {
 		"node_name":         "edge-01",
 		"node_ip":           "10.0.0.8",
 		"openresty_path":    "/usr/local/openresty/nginx/sbin/openresty",
+		"main_config_path":  "/tmp/nginx.conf",
 		"route_config_path": "/tmp/routes.conf",
 		"state_path":        "/tmp/agent-state.json",
 	}
@@ -78,6 +82,9 @@ func TestLoadPathModeKeepsExplicitPaths(t *testing.T) {
 		t.Fatalf("Load failed: %v", err)
 	}
 
+	if cfg.MainConfigPath != "/tmp/nginx.conf" {
+		t.Fatalf("unexpected main config path: %s", cfg.MainConfigPath)
+	}
 	if cfg.RouteConfigPath != "/tmp/routes.conf" {
 		t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
 	}
@@ -115,6 +122,9 @@ func TestLoadUsesCustomDataDirForGeneratedFiles(t *testing.T) {
 	if cfg.RouteConfigPath != "/srv/atsflare/"+defaultDockerRouteConfigRelativePath {
 		t.Fatalf("unexpected route config path: %s", cfg.RouteConfigPath)
 	}
+	if cfg.MainConfigPath != "/srv/atsflare/"+defaultDockerMainConfigRelativePath {
+		t.Fatalf("unexpected main config path: %s", cfg.MainConfigPath)
+	}
 	if cfg.StatePath != "/srv/atsflare/"+defaultDockerStateRelativePath {
 		t.Fatalf("unexpected state path: %s", cfg.StatePath)
 	}