Merge branch 'release/v11.2.1' of https://github.com/utmstack/UTMStack into release/v11.2.1

Author: JocLRojas

installer/config/const.go

@@ -11,14 +11,15 @@ const (
 	UpdateInstanceDetailsEndpoint = "/api/v1/instances/details"
 	HeartbeatEndpoint             = "/api/v1/instances/heartbeat"
 	GetUpdatesInfoEndpoint        = "/api/v1/updates"
-	SetUpdateSentEndpoint      = "/api/v1/updates/sent"
-	GetLicenseEndpoint         = "/api/v1/licenses"
-	HealthEndpoint             = "/api/v1/health"
-	LogCollectorEndpoint       = "/api/v1/logcollectors/upload"
+	SetUpdateSentEndpoint         = "/api/v1/updates/sent"
+	GetLicenseEndpoint            = "/api/v1/licenses"
+	HealthEndpoint                = "/api/v1/health"
+	LogCollectorEndpoint          = "/api/v1/logcollectors/upload"
 
 	GitHubReleasesURL = "https://github.com/utmstack/UTMStack/releases/download/%s/installer"
 
-	ImagesPath = "/utmstack/images"
+	ImagesPath       = "/utmstack/images"
+	InstallerBinPath = "/usr/local/bin/utmstack_installer"
 
 	RequiredMinCPUCores  = 2
 	RequiredMinDiskSpace = 30
@@ -39,6 +40,7 @@ var (
 	VersionFilePath        = filepath.Join(GetConfig().UpdatesFolder, "version.json")
 	LicenseFilePath        = filepath.Join(GetConfig().UpdatesFolder, "LICENSE")
 	PendingUpdatesPath     = filepath.Join(GetConfig().UpdatesFolder, "pending-updates.json")
+	LastAdminEmailPath     = filepath.Join(GetConfig().UpdatesFolder, "last-admin-email.txt")
 	EventProcessorLogsPath = filepath.Join(GetConfig().DataDir, "events-engine-workdir", "logs")
 	CheckUpdatesEvery      = 5 * time.Minute
 	SyncSystemLogsEvery    = 5 * time.Minute

installer/updater/client.go

@@ -5,8 +5,10 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"mime/multipart"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -170,11 +172,6 @@ func (c *UpdaterClient) CheckUpdate() error {
 }
 
 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)
@@ -208,8 +205,8 @@ func (c *UpdaterClient) UpdateInstaller(version string) error {
 		return fmt.Errorf("error making installer executable: %v", err)
 	}
 
-	// Replace current binary
-	if err := os.Rename(tmpPath, execPath); err != nil {
+	// Replace binary at standard location
+	if err := os.Rename(tmpPath, config.InstallerBinPath); err != nil {
 		os.Remove(tmpPath)
 		return fmt.Errorf("error replacing installer binary: %v", err)
 	}
@@ -236,23 +233,32 @@ func (c *UpdaterClient) UploadLogs(ctx context.Context, path string) error {
 	url := fmt.Sprintf("%s%s", c.Config.Server, config.LogCollectorEndpoint)
 
 	buf := &bytes.Buffer{}
-	writer := io.MultiWriter(buf)
+	writer := multipart.NewWriter(buf)
 
 	zipFile, err := os.Open(path)
 	if err != nil {
 		return err
 	}
 	defer zipFile.Close()
 
-	if _, err = io.Copy(writer, zipFile); err != nil {
+	part, err := writer.CreateFormFile("file", filepath.Base(path))
+	if err != nil {
+		return err
+	}
+
+	if _, err = io.Copy(part, zipFile); err != nil {
+		return err
+	}
+
+	if err = writer.Close(); err != nil {
 		return err
 	}
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, buf)
 	if err != nil {
 		return err
 	}
-	req.Header.Set("Content-Type", "application/zip")
+	req.Header.Set("Content-Type", writer.FormDataContentType())
 	req.Header.Set("id", c.Config.InstanceID)
 	req.Header.Set("key", c.Config.InstanceKey)
 

installer/updater/register.go

@@ -4,7 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/utmstack/UTMStack/installer/config"
@@ -120,6 +122,12 @@ func PollAndUpdateAdminEmail(instanceConf InstanceConfig) {
 			continue
 		}
 
+		// Check if this email was already sent
+		lastEmail, _ := os.ReadFile(config.LastAdminEmailPath)
+		if strings.TrimSpace(string(lastEmail)) == email {
+			return
+		}
+
 		// Email found, update instance details
 		updateReq := InstanceDTOInput{
 			Name:  serverConfig.ServerName,
@@ -146,6 +154,9 @@ func PollAndUpdateAdminEmail(instanceConf InstanceConfig) {
 			continue
 		}
 
+		// Save the email to avoid re-sending
+		_ = os.WriteFile(config.LastAdminEmailPath, []byte(email), 0644)
+
 		config.Logger().Info("Successfully updated instance with admin email: %s", email)
 		return
 	}

installer/updater/service.go

@@ -1,6 +1,9 @@
 package updater
 
 import (
+	"fmt"
+	"io"
+	"os"
 	"time"
 
 	"github.com/kardianos/service"
@@ -14,6 +17,7 @@ func GetConfigServ() *service.Config {
 		Name:        "UTMStackComponentsUpdater",
 		DisplayName: "UTMStack Components Updater",
 		Description: "UTMStack Components Updater",
+		Executable:  config.InstallerBinPath,
 		Arguments:   []string{"--run"},
 	}
 
@@ -32,6 +36,11 @@ func (p *program) Stop(s service.Service) error {
 }
 
 func (p *program) run() {
+	// Migrate service to standard path if needed
+	if migrated := migrateServiceIfNeeded(); migrated {
+		return // Exit, new service will start from standard path
+	}
+
 	go MonitorConnection(config.GetCMServer(), 30*time.Second, 3, &config.ConnectedToInternet)
 	time.Sleep(5 * time.Second)
 
@@ -73,6 +82,11 @@ func (p *program) run() {
 }
 
 func InstallService() {
+	// Copy current binary to standard location
+	if err := copyInstallerToStandardPath(); err != nil {
+		config.Logger().Fatal("error copying installer to standard path: %v", err)
+	}
+
 	svcConfig := GetConfigServ()
 	prg := new(program)
 	newService, err := service.New(prg, svcConfig)
@@ -90,6 +104,90 @@ func InstallService() {
 	}
 }
 
+func copyInstallerToStandardPath() error {
+	currentExec, err := os.Executable()
+	if err != nil {
+		return fmt.Errorf("error getting current executable path: %v", err)
+	}
+
+	// If already at standard path, skip copy
+	if currentExec == config.InstallerBinPath {
+		return nil
+	}
+
+	srcFile, err := os.Open(currentExec)
+	if err != nil {
+		return fmt.Errorf("error opening source binary: %v", err)
+	}
+	defer srcFile.Close()
+
+	dstFile, err := os.Create(config.InstallerBinPath)
+	if err != nil {
+		return fmt.Errorf("error creating destination binary: %v", err)
+	}
+	defer dstFile.Close()
+
+	if _, err = io.Copy(dstFile, srcFile); err != nil {
+		return fmt.Errorf("error copying binary: %v", err)
+	}
+
+	if err = os.Chmod(config.InstallerBinPath, 0755); err != nil {
+		return fmt.Errorf("error setting permissions on binary: %v", err)
+	}
+
+	return nil
+}
+
+func migrateServiceIfNeeded() bool {
+	currentExec, err := os.Executable()
+	if err != nil {
+		config.Logger().ErrorF("error getting current executable path: %v", err)
+		return false
+	}
+
+	// Already running from standard path, no migration needed
+	if currentExec == config.InstallerBinPath {
+		return false
+	}
+
+	config.Logger().Info("Migrating service to standard path: %s", config.InstallerBinPath)
+
+	// Copy current binary to standard location
+	if err := copyInstallerToStandardPath(); err != nil {
+		config.Logger().ErrorF("error copying installer during migration: %v", err)
+		return false
+	}
+
+	// Uninstall old service
+	serviceName := GetConfigServ().Name
+	if err := utils.UninstallService(serviceName); err != nil {
+		config.Logger().ErrorF("error uninstalling old service during migration: %v", err)
+		return false
+	}
+
+	// Install new service pointing to standard path
+	svcConfig := GetConfigServ()
+	prg := new(program)
+	newService, err := service.New(prg, svcConfig)
+	if err != nil {
+		config.Logger().ErrorF("error creating new service during migration: %v", err)
+		return false
+	}
+
+	if err := newService.Install(); err != nil {
+		config.Logger().ErrorF("error installing new service during migration: %v", err)
+		return false
+	}
+
+	if err := newService.Start(); err != nil {
+		config.Logger().ErrorF("error starting new service during migration: %v", err)
+		return false
+	}
+
+	config.Logger().Info("Service migrated successfully to %s", config.InstallerBinPath)
+	return true
+}
+
 func RunService() {
 	svcConfig := GetConfigServ()
 	prg := new(program)