Resolve conflicts with mereg issue_41_flasher_api

Author: martacarbone

pkg/flasherapi/flasherapi.go

@@ -17,15 +17,45 @@ package flasherapi
 
 import (
 	"context"
+	"log/slog"
+	"strings"
 
 	"github.com/arduino/arduino-app-cli/pkg/board/remote"
 )
 
 // GetOSImageVersion returns the version of the OS image used in the board.
 // It is used by the AppLab to enforce image version compatibility.
-func GetOSImageVersion(ctx context.Context, conn remote.RemoteConn) string {
-	// if no version is set, return a default value
-	return "20251123-159"
+func GetOSImageVersion(ctx context.Context, conn remote.RemoteConn) (string, error) {
+	const defaultVersion = "20250807-136"
+
+	output, err := conn.GetCmd("cat /etc/buildinfo").Output(ctx)
+	if err != nil {
+		return defaultVersion, err
+	}
+
+	if version, ok := ParseOSImageVersion(string(output)); ok {
+		slog.Info("find OS Image version", "version", version)
+		return version, nil
+	}
+	slog.Info("Unable to find OS Image version", "using default version", defaultVersion)
+	return defaultVersion, nil
+}
+
+func ParseOSImageVersion(buildInfo string) (string, bool) {
+	for _, line := range strings.Split(buildInfo, "\n") {
+		line = strings.TrimSpace(line)
+
+		key, value, ok := strings.Cut(line, "=")
+		if !ok || key != "BUILD_ID" {
+			continue
+		}
+
+		version := strings.Trim(value, "\"' ")
+		if version != "" {
+			return version, true
+		}
+	}
+	return "", false
 }
 
 type OSImageRelease struct {
@@ -50,9 +80,12 @@ const R0_IMAGE_VERSION_ID = "20250807-136"
 // according to the current and target OS image versions.
 //
 // Preservation is supported if both versions are not the R0 image.
-func IsUserPartitionPreservationSupported(ctx context.Context, conn remote.RemoteConn, targetImageVersion OSImageRelease) bool {
-	currentImageVersion := GetOSImageVersion(ctx, conn)
-	return !(targetImageVersion.ID == R0_IMAGE_VERSION_ID || currentImageVersion == R0_IMAGE_VERSION_ID)
+func IsUserPartitionPreservationSupported(ctx context.Context, conn remote.RemoteConn, targetImageVersion OSImageRelease) (bool, error) {
+	currentImageVersion, err := GetOSImageVersion(ctx, conn)
+	if err != nil {
+		return false, err
+	}
+	return !(targetImageVersion.ID == R0_IMAGE_VERSION_ID || currentImageVersion == R0_IMAGE_VERSION_ID), err
 }
 
 type FlashStep string

pkg/flasherapi/flasherapi_test.go

@@ -0,0 +1,38 @@
+package flasherapi
+
+import "testing"
+
+func TestParseOSImageVersion(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+		found    bool
+	}{
+		{
+			name:     "valid build id",
+			input:    "BUILD_ID=\"20251006-395\"\nVARIANT_ID=xfce",
+			expected: "20251006-395",
+			found:    true,
+		},
+		{
+			name:  "missing build id",
+			input: "VARIANT_ID=xfce\n",
+			found: false,
+		},
+		{
+			name:  "empty build id",
+			input: "BUILD_ID=\n",
+			found: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, ok := ParseOSImageVersion(tt.input)
+			if ok != tt.found || got != tt.expected {
+				t.Fatalf("got (%q, %v), expected (%q, %v)", got, ok, tt.expected, tt.found)
+			}
+		})
+	}
+}