Merge remote-tracking branch 'origin/v11' into release/v11.1.4

Author: mjabascal10

installer/config/const.go

@@ -15,6 +15,8 @@ const (
 	LogCollectorEndpoint       = "/api/v1/logcollectors/upload"
 	GetLatestVersionEndpoint   = "/api/v1/versions/latest"
 
+	GitHubReleasesURL = "https://github.com/utmstack/UTMStack/releases/download/%s/installer"
+
 	ImagesPath = "/utmstack/images"
 
 	RequiredMinCPUCores  = 2

installer/install.go

@@ -30,6 +30,9 @@ func Install(specificVersion string) error {
 
 	if isInstalledAlready {
 		fmt.Println("UTMStack is already installed. If you want to re-install it, please remove the service UTMStackComponentsUpdater first.")
+		if err := utils.RestartService("UTMStackComponentsUpdater"); err != nil {
+			return fmt.Errorf("error restarting service: %v", err)
+		}
 		return nil
 	}
 

installer/updater/client.go

@@ -140,6 +140,14 @@ func (c *UpdaterClient) UpdateToNewVersion(version, edition, changelog string) e
 	config.Logger().Info("Updating UTMStack to version %s-%s...", version, edition)
 	config.Updating = true
 
+	// Update installer binary first (only in prod branch)
+	cnf := config.GetConfig()
+	if cnf.Branch == "prod" || cnf.Branch == "" {
+		if err := c.UpdateInstaller(version); err != nil {
+			config.Logger().ErrorF("error updating installer: %v", err)
+		}
+	}
+
 	err := docker.StackUP(version + "-" + edition)
 	if err != nil {
 		return fmt.Errorf("error updating UTMStack: %v", err)
@@ -153,9 +161,67 @@ func (c *UpdaterClient) UpdateToNewVersion(version, edition, changelog string) e
 	config.Logger().Info("UTMStack updated to version %s-%s", version, edition)
 	config.Updating = false
 
-	err = utils.RunCmd("docker", "system", "prune", "-f")
+	time.Sleep(3 * time.Minute)
+
+	err = utils.RunCmd("docker", "image", "prune", "-a", "-f")
+	if err != nil {
+		config.Logger().ErrorF("error cleaning up old Docker images after update: %v", err)
+	}
+
+	// Restart service to load new installer binary
+	if cnf.Branch == "prod" || cnf.Branch == "" {
+		go func() {
+			time.Sleep(5 * time.Second)
+			utils.RestartService("UTMStackComponentsUpdater")
+		}()
+	}
+
+	return nil
+}
+
+func (c *UpdaterClient) UpdateInstaller(version string) error {
+	execPath, err := os.Executable()
+	if err != nil {
+		return fmt.Errorf("error getting executable path: %v", err)
+	}
+
+	// Download new installer from GitHub
+	url := fmt.Sprintf(config.GitHubReleasesURL, version)
+	resp, err := http.Get(url)
+	if err != nil {
+		return fmt.Errorf("error downloading installer from %s: %v", url, err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("error downloading installer: status %d", resp.StatusCode)
+	}
+
+	// Create temp file
+	tmpFile, err := os.CreateTemp("", "installer-*")
 	if err != nil {
-		config.Logger().ErrorF("error cleaning up Docker system after update: %v", err)
+		return fmt.Errorf("error creating temp file: %v", err)
+	}
+	tmpPath := tmpFile.Name()
+
+	// Download to temp file
+	_, err = io.Copy(tmpFile, resp.Body)
+	tmpFile.Close()
+	if err != nil {
+		os.Remove(tmpPath)
+		return fmt.Errorf("error writing installer to temp file: %v", err)
+	}
+
+	// Make executable
+	if err := os.Chmod(tmpPath, 0755); err != nil {
+		os.Remove(tmpPath)
+		return fmt.Errorf("error making installer executable: %v", err)
+	}
+
+	// Replace current binary
+	if err := os.Rename(tmpPath, execPath); err != nil {
+		os.Remove(tmpPath)
+		return fmt.Errorf("error replacing installer binary: %v", err)
 	}
 
 	return nil

installer/updater/window.go

@@ -1,58 +1,91 @@
 package updater
 
 import (
+	"encoding/json"
 	"time"
 
-	"github.com/robfig/cron/v3"
 	"github.com/utmstack/UTMStack/installer/config"
 )
 
-var windowConfig string
+type MaintenanceWindow struct {
+	Days      []int  `json:"days"`      // 0=Sunday, 1=Monday, ..., 6=Saturday
+	StartTime string `json:"startTime"` // Format: "HH:MM"
+	EndTime   string `json:"endTime"`   // Format: "HH:MM"
+}
+
+var windowConfig *MaintenanceWindow
 
 func UpdateWindowConfig() {
 	for {
-		window, err := getWindowMaintaince()
-		if err != nil {
-			// Only log error if it's not a maintenance error
-			if !IsBackendMaintenanceError(err) {
-				config.Logger().ErrorF("Error getting maintenance window config: %v", err)
-			}
-			// If backend is in maintenance, just skip this iteration silently
-		}
-
-		if window != "" {
+		window, _ := getWindowMaintaince()
+		if window != nil {
 			windowConfig = window
-			config.Logger().Info("Updated maintenance window config: %s", windowConfig)
 		}
 
 		time.Sleep(config.CheckUpdatesEvery)
 	}
 }
 
 func IsInMaintenanceWindow() bool {
-	if windowConfig == "" {
+	if windowConfig == nil {
+		return true
+	}
+
+	if len(windowConfig.Days) == 0 {
 		return true
 	}
 
-	parser := cron.NewParser(cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow)
+	if windowConfig.StartTime == "" || windowConfig.EndTime == "" {
+		return true
+	}
+
+	startTime, err := time.Parse("15:04", windowConfig.StartTime)
+	if err != nil {
+		config.Logger().ErrorF("Error parsing start time %s: %v", windowConfig.StartTime, err)
+		return true
+	}
 
-	schedule, err := parser.Parse(windowConfig)
+	endTime, err := time.Parse("15:04", windowConfig.EndTime)
 	if err != nil {
-		config.Logger().ErrorF("Error parsing cron expression %s: %v", windowConfig, err)
+		config.Logger().ErrorF("Error parsing end time %s: %v", windowConfig.EndTime, err)
+		return true
+	}
+
+	now := time.Now()
+
+	currentDay := int(now.Weekday())
+	dayAllowed := false
+	for _, day := range windowConfig.Days {
+		if day == currentDay {
+			dayAllowed = true
+			break
+		}
+	}
+
+	if !dayAllowed {
 		return false
 	}
 
-	now := time.Now().Truncate(time.Minute)
-	prev := schedule.Next(now.Add(-1 * time.Minute))
+	currentTime, _ := time.Parse("15:04", now.Format("15:04"))
+
+	if startTime.Before(endTime) || startTime.Equal(endTime) {
+		return !currentTime.Before(startTime) && !currentTime.After(endTime)
+	}
 
-	return prev.Equal(now)
+	return !currentTime.Before(startTime) || !currentTime.After(endTime)
 }
 
-func getWindowMaintaince() (string, error) {
+func getWindowMaintaince() (*MaintenanceWindow, error) {
 	backConf, err := getConfigFromBackend(8)
 	if err != nil {
-		return "", err
+		return nil, err
+	}
+
+	var window MaintenanceWindow
+	err = json.Unmarshal([]byte(backConf[0].ConfParamValue), &window)
+	if err != nil {
+		return nil, err
 	}
 
-	return backConf[0].ConfParamValue, nil
+	return &window, nil
 }

installer/utils/services.go

@@ -8,6 +8,10 @@ func StopService(name string) error {
 	return RunCmd("systemctl", "stop", name)
 }
 
+func RestartService(name string) error {
+	return RunCmd("systemctl", "restart", name)
+}
+
 func UninstallService(name string) error {
 	err := RunCmd("systemctl", "disable", name)
 	if err != nil {