this is sedia refactor

Author: giulio93

internal/e2e/updatetest/deb_test.go

@@ -0,0 +1,122 @@
+package updatetest
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+var arch = flag.String("arch", "amd64", "target architecture")
+
+const dockerFile = "test.Dockerfile"
+const daemonHost = "127.0.0.1:8800"
+
+func TestUpdatePackage(t *testing.T) {
+	fmt.Printf("***** ARCH %s ***** \n", *arch)
+
+	t.Run("Stable To Current", func(t *testing.T) {
+		t.Cleanup(func() { os.RemoveAll("build") })
+
+		tagAppCli := fetchDebPackageLatest(t, "build/stable", "arduino-app-cli")
+		fetchDebPackageLatest(t, "build/stable", "arduino-router")
+		majorTag := genMajorTag(t, tagAppCli)
+
+		fmt.Printf("Updating from stable version %s to unstable version %s \n", tagAppCli, majorTag)
+		fmt.Printf("Building local deb version %s \n", majorTag)
+		buildDebVersion(t, "build", majorTag, *arch)
+
+		const dockerImageName = "apt-test-update-image"
+		fmt.Println("**** BUILD docker image *****")
+		buildDockerImage(t, dockerFile, dockerImageName, *arch)
+		//TODO: t cleanup remove docker image
+
+		t.Run("CLI Command", func(t *testing.T) {
+			const containerName = "apt-test-update"
+			t.Cleanup(func() { stopDockerContainer(t, containerName) })
+
+			fmt.Println("**** RUN docker image *****")
+			startDockerContainer(t, containerName, dockerImageName)
+			waitForPort(t, daemonHost, 5*time.Second)
+
+			preUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+preUpdateVersion, tagAppCli)
+			runSystemUpdate(t, containerName)
+			postUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+postUpdateVersion, majorTag)
+		})
+
+		t.Run("HTTP Request", func(t *testing.T) {
+			const containerName = "apt-test-update-http"
+			t.Cleanup(func() { stopDockerContainer(t, containerName) })
+
+			startDockerContainer(t, containerName, dockerImageName)
+			waitForPort(t, daemonHost, 5*time.Second)
+
+			preUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+preUpdateVersion, tagAppCli)
+
+			putUpdateRequest(t, daemonHost)
+			waitForUpgrade(t, daemonHost)
+
+			postUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+postUpdateVersion, majorTag)
+		})
+
+	})
+
+	t.Run("CurrentToStable", func(t *testing.T) {
+		t.Cleanup(func() { os.RemoveAll("build") })
+
+		tagAppCli := fetchDebPackageLatest(t, "build", "arduino-app-cli")
+		fetchDebPackageLatest(t, "build/stable", "arduino-router")
+		minorTag := genMinorTag(t, tagAppCli)
+
+		fmt.Printf("Updating from unstable version %s to stable version %s \n", minorTag, tagAppCli)
+		fmt.Printf("Building local deb version %s \n", minorTag)
+		buildDebVersion(t, "build/stable", minorTag, *arch)
+
+		fmt.Println("**** BUILD docker image *****")
+		const dockerImageName = "test-apt-update-unstable-image"
+
+		buildDockerImage(t, dockerFile, dockerImageName, *arch)
+		//TODO: t cleanup remove docker image
+
+		t.Run("CLI Command", func(t *testing.T) {
+			const containerName = "apt-test-update-unstable"
+			t.Cleanup(func() { stopDockerContainer(t, containerName) })
+
+			fmt.Println("**** RUN docker image *****")
+			startDockerContainer(t, containerName, dockerImageName)
+			waitForPort(t, daemonHost, 5*time.Second)
+
+			preUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+preUpdateVersion, minorTag)
+			runSystemUpdate(t, containerName)
+			postUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+postUpdateVersion, tagAppCli)
+		})
+
+		t.Run("HTTP Request", func(t *testing.T) {
+			const containerName = "apt-test-update--unstable-http"
+			t.Cleanup(func() { stopDockerContainer(t, containerName) })
+
+			startDockerContainer(t, containerName, dockerImageName)
+			waitForPort(t, daemonHost, 5*time.Second)
+
+			preUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+preUpdateVersion, minorTag)
+
+			putUpdateRequest(t, daemonHost)
+			waitForUpgrade(t, daemonHost)
+
+			postUpdateVersion := getAppCliVersion(t, containerName)
+			require.Equal(t, "v"+postUpdateVersion, tagAppCli)
+		})
+
+	})
+
+}

internal/testtools/test_deb_update/helpers.go renamed to internal/e2e/updatetest/helpers.go

@@ -1,11 +1,11 @@
-package testtools
+package updatetest
 
 import (
 	"bufio"
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
-	"io"
 	"iter"
 	"log"
 	"net"
@@ -17,9 +17,11 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
-func FetchDebPackage(t *testing.T, path, repo, version, arch string) string {
+func fetchDebPackageLatest(t *testing.T, path, repo string) string {
 	t.Helper()
 
 	cmd := exec.Command(
@@ -41,20 +43,13 @@ func FetchDebPackage(t *testing.T, path, repo, version, arch string) string {
 		log.Fatal("could not parse tag from gh release list output")
 	}
 	tag := fields[0]
-	tagPath := strings.TrimPrefix(tag, "v")
 
-	debFile := fmt.Sprintf("%s/%s_%s-1_%s.deb", path, repo, tagPath, arch)
-	fmt.Println(debFile)
-	if _, err := os.Stat(debFile); err == nil {
-		fmt.Printf("✅ %s already exists, skipping download.\n", debFile)
-		return tag
-	}
 	fmt.Println("Detected tag:", tag)
 	cmd2 := exec.Command(
 		"gh", "release", "download",
 		tag,
 		"--repo", "github.com/arduino/"+repo,
-		"--pattern", "*",
+		"--pattern", "*.deb",
 		"--dir", path,
 	)
 
@@ -87,7 +82,7 @@ func buildDebVersion(t *testing.T, storePath, tagVersion, arch string) {
 	}
 }
 
-func majorTag(t *testing.T, tag string) string {
+func genMajorTag(t *testing.T, tag string) string {
 	t.Helper()
 
 	parts := strings.Split(tag, ".")
@@ -102,7 +97,7 @@ func majorTag(t *testing.T, tag string) string {
 	return newTag
 }
 
-func minorTag(t *testing.T, tag string) string {
+func genMinorTag(t *testing.T, tag string) string {
 	t.Helper()
 
 	parts := strings.Split(tag, ".")
@@ -133,7 +128,6 @@ func buildDockerImage(t *testing.T, dockerfile, name, arch string) {
 	cmd.Stderr = &stderr
 
 	err := cmd.Run()
-
 	if err != nil {
 		fmt.Printf("❌ Docker build failed: %v\n", err)
 		fmt.Printf("---- STDERR ----\n%s\n", stderr.String())
@@ -142,11 +136,9 @@ func buildDockerImage(t *testing.T, dockerfile, name, arch string) {
 	}
 
 	fmt.Println("✅ Docker build succeeded!")
-	fmt.Println(out.String())
-
 }
 
-func runDockerContainer(t *testing.T, containerName string, containerImageName string) {
+func startDockerContainer(t *testing.T, containerName string, containerImageName string) {
 	t.Helper()
 
 	cmd := exec.Command(
@@ -168,64 +160,66 @@ func runDockerContainer(t *testing.T, containerName string, containerImageName s
 
 }
 
-func runDockerSystemVersion(t *testing.T, containerName string) string {
+func getAppCliVersion(t *testing.T, containerName string) string {
 	t.Helper()
 
 	cmd := exec.Command(
 		"docker", "exec",
 		"--user", "arduino",
 		containerName,
-		"arduino-app-cli", "version",
+		"arduino-app-cli", "version", "--format", "json",
 	)
-
 	output, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Fatalf("command failed: %v\nOutput: %s", err, output)
 	}
 
-	return string(output)
-
-}
-
-func runDockerSystemUpdate(t *testing.T, containerName string) {
-	t.Helper()
-	var buf bytes.Buffer
-
-	cmd := exec.Command(
-		"docker", "exec",
-		containerName,
-		"sh", "-lc",
-		`su - arduino -c "yes | arduino-app-cli system update"`,
-	)
-
-	cmd.Stdout = io.MultiWriter(os.Stdout, &buf)
-
-	if err := cmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running system update: %v\n", err)
-		os.Exit(1)
+	var version struct {
+		Version       string `json:"version"`
+		DaemonVersion string `json:"daemon_version"`
 	}
+	err = json.Unmarshal(output, &version)
+	require.NoError(t, err)
+	//TODO to enable after 0.6.7
+	//require.Equal(t, version.Version, version.DaemonVersion, "client and daemon versions should match")
+	require.NotEmpty(t, version.Version)
+	return version.Version
 
 }
 
-func runDockerDaemon(t *testing.T, containerName string) string {
+func runSystemUpdate(t *testing.T, containerName string) {
 	t.Helper()
 
 	cmd := exec.Command(
 		"docker", "exec",
-		"-d",
 		"--user", "arduino",
 		containerName,
-		"systemctl", "start", "arduino-app-cli",
+		"arduino-app-cli", "system", "update", "--yes",
 	)
 	output, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Fatalf("command failed: %v\n Output: %s", err, output)
-	}
-
-	return string(output)
+	require.NoError(t, err, "system update failed: %s", output)
+	t.Logf("system update output: %s", output)
 }
 
-func runDockerCleanUp(t *testing.T, containerName string) {
+// func runDockerDaemon(t *testing.T, containerName string) string {
+// 	t.Helper()
+
+// 	cmd := exec.Command(
+// 		"docker", "exec",
+// 		"-d",
+// 		"--user", "arduino",
+// 		containerName,
+// 		"systemctl", "start", "arduino-app-cli",
+// 	)
+// 	output, err := cmd.CombinedOutput()
+// 	if err != nil {
+// 		log.Fatalf("command failed: %v\n Output: %s", err, output)
+// 	}
+
+// 	return string(output)
+// }
+
+func stopDockerContainer(t *testing.T, containerName string) {
 	t.Helper()
 
 	cleanupCmd := exec.Command("docker", "rm", "-f", containerName)
@@ -288,10 +282,12 @@ func rm(t *testing.T, pathFile string) {
 
 }
 
-func putUpdateRequest(t *testing.T, url string) string {
+func putUpdateRequest(t *testing.T, host string) {
 
 	t.Helper()
 
+	url := fmt.Sprintf("http://%s/v1/system/update/apply", host)
+
 	req, err := http.NewRequest(http.MethodPut, url, nil)
 	if err != nil {
 		log.Fatalf("Error creating request: %v", err)
@@ -306,30 +302,8 @@ func putUpdateRequest(t *testing.T, url string) string {
 	}
 	defer resp.Body.Close()
 
-	return resp.Status
-}
-
-func rmrf(t *testing.T, pathFile string) {
-	t.Helper()
-	// Check if the folder exists
-	if _, err := os.Stat(pathFile); os.IsNotExist(err) {
-		fmt.Println("No build directory found.")
-		return
-	}
-
-	// Run the Linux command to remove it
-	cmd := exec.Command("rm", "-rf", pathFile)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-
-	fmt.Println("Removing build directory...")
+	require.Equal(t, 202, resp.StatusCode)
 
-	if err := cmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error removing build folder: %v\n", err)
-		os.Exit(1)
-	}
-
-	fmt.Println("Build directory removed successfully.")
 }
 
 func NewSSEClient(ctx context.Context, method, url string) iter.Seq2[Event, error] {
@@ -387,20 +361,35 @@ type Event struct {
 	Data  []byte // json
 }
 
-// WaitForPort waits until a TCP port is open or fails after timeout.
-func WaitForPort(t *testing.T, host string, port string, timeout time.Duration) {
+// waitForPort waits until a TCP port is open or fails after timeout.
+func waitForPort(t *testing.T, host string, timeout time.Duration) {
 	t.Helper()
-	addr := fmt.Sprintf("%s:%s", host, port)
 
 	deadline := time.Now().Add(timeout)
 	for time.Now().Before(deadline) {
-		conn, err := net.DialTimeout("tcp", addr, 500*time.Millisecond)
+		conn, err := net.DialTimeout("tcp", host, 500*time.Millisecond)
 		if err == nil {
 			_ = conn.Close()
-			t.Logf("Server is up on %s", addr)
+			t.Logf("Server is up on %s", host)
 			return
 		}
 		time.Sleep(200 * time.Millisecond)
 	}
-	t.Fatalf("Server at %s did not start within %v", addr, timeout)
+	t.Fatalf("Server at %s did not start within %v", host, timeout)
+}
+
+func waitForUpgrade(t *testing.T, host string) {
+	t.Helper()
+
+	url := fmt.Sprintf("http://%s/v1/system/update/events", host)
+
+	itr := NewSSEClient(t.Context(), "GET", url)
+	for event, err := range itr {
+		require.NoError(t, err)
+		t.Logf("Received event: ID=%s, Event=%s, Data=%s\n", event.ID, event.Event, string(event.Data))
+		if event.Event == "restarting" {
+			break
+		}
+	}
+
 }