Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ type Version struct {
Raw string
}

// versionRegex extracts version numbers from strings like "TrueNAS-SCALE-24.10.2.4"
var versionRegex = regexp.MustCompile(`(\d+)\.(\d+)\.(\d+)\.(\d+)`)
// versionRegex extracts version numbers from strings like "TrueNAS-SCALE-24.10.2.4" or "TrueNAS-25.10.1"
var versionRegex = regexp.MustCompile(`(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?`)

// ParseVersion parses a TrueNAS version string.
// Examples: "TrueNAS-SCALE-24.10.2.4", "TrueNAS-25.04.2.4"
// Examples: "TrueNAS-SCALE-24.10.2.4", "TrueNAS-25.04.2.4", "TrueNAS-25.10.1"
func ParseVersion(raw string) (Version, error) {
v := Version{Raw: raw}

Expand Down Expand Up @@ -63,9 +63,11 @@ func ParseVersion(raw string) (Version, error) {
if err != nil {
return v, fmt.Errorf("invalid patch version: %w", err)
}
v.Build, err = strconv.Atoi(match[4])
if err != nil {
return v, fmt.Errorf("invalid build version: %w", err)
if match[4] != "" {
v.Build, err = strconv.Atoi(match[4])
if err != nil {
return v, fmt.Errorf("invalid build version: %w", err)
}
}

return v, nil
Expand Down
12 changes: 12 additions & 0 deletions version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ func TestParseVersion(t *testing.T) {
Raw: "TrueNAS-SCALE-25.10.0.0",
},
},
{
name: "TrueNAS 25.10 three-part version",
raw: "TrueNAS-25.10.1",
want: Version{
Major: 25,
Minor: 10,
Patch: 1,
Build: 0,
Flavor: FlavorUnknown,
Raw: "TrueNAS-25.10.1",
},
},
{
name: "invalid version string",
raw: "not-a-version",
Expand Down