Address review

Author: martacarbone

pkg/board/os_image.go

@@ -67,17 +67,10 @@ func parseOSImageVersion(r io.Reader) (string, bool) {
 	return "", false
 }
 
-type OSImageRelease struct {
-	VersionLabel string
-	ID           string
-	Latest       bool
-}
-
 // Calculates whether user partition preservation is supported,
 // according to the current and target OS image versions.
 //
 // Preservation is supported if both versions are not the R0 image.
-func IsUserPartitionPreservationSupported(conn remote.RemoteConn, targetImageVersion OSImageRelease) bool {
-	currentImageVersion := GetOSImageVersion(conn)
-	return targetImageVersion.ID != R0_IMAGE_VERSION_ID && currentImageVersion != R0_IMAGE_VERSION_ID
+func IsUserPartitionPreservationSupported(currentImageVersion string, targetImageVersion string) bool {
+	return targetImageVersion != R0_IMAGE_VERSION_ID && currentImageVersion != R0_IMAGE_VERSION_ID
 }

pkg/board/os_image_test.go

@@ -112,45 +112,43 @@ func TestGetOSImageVersion(t *testing.T) {
 
 func TestIsUserPartitionPreservationSupported(t *testing.T) {
 	const R0_IMAGE_VERSION_ID = "20250807-136"
-
-	R0Version := createBuildInfoConnection(R0_IMAGE_VERSION_ID)
-	AnotherVersion := createBuildInfoConnection("BUILD_ID=20250101-001")
+	anotherVersionId := "20250101-001"
 
 	tests := []struct {
 		name                    string
-		currentVersion          remote.RemoteConn
+		currentVersion          string
 		targetVersion           string
 		isPreservationSupported bool
 	}{
 		{
 			name:                    "both versions are *not* R0",
-			currentVersion:          AnotherVersion,
+			currentVersion:          anotherVersionId,
 			targetVersion:           "20250101-001",
 			isPreservationSupported: true,
 		},
 		{
 			name:                    "current version is R0",
-			currentVersion:          R0Version,
+			currentVersion:          R0_IMAGE_VERSION_ID,
 			targetVersion:           "20250101-001",
 			isPreservationSupported: false,
 		},
 		{
 			name:                    "target version is R0",
-			currentVersion:          AnotherVersion,
+			currentVersion:          anotherVersionId,
 			targetVersion:           R0_IMAGE_VERSION_ID,
 			isPreservationSupported: false,
 		},
 		{
 			name:                    "both versions are R0",
-			currentVersion:          R0Version,
+			currentVersion:          R0_IMAGE_VERSION_ID,
 			targetVersion:           R0_IMAGE_VERSION_ID,
 			isPreservationSupported: false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			isPreservationSupported := IsUserPartitionPreservationSupported(tt.currentVersion, OSImageRelease{ID: tt.targetVersion})
+			isPreservationSupported := IsUserPartitionPreservationSupported(tt.currentVersion, tt.targetVersion)
 			require.Equal(t, isPreservationSupported, tt.isPreservationSupported)
 		})
 	}