From 50ef4f2ef1b552e753cd0514acc29c907fdefe9a Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Thu, 18 Dec 2025 14:03:49 +0100 Subject: [PATCH] fix: propagate the current edition channel in the edition validation error --- pkg/version/version.go | 7 +++++-- pkg/version/version_test.go | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/version/version.go b/pkg/version/version.go index d7aed0934a..3bbf55506f 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -79,8 +79,11 @@ func initEdition() error { _, err := semver.NewVersion(editionParts[1]) return err == nil }) { - Edition = Dev - return fmt.Errorf(`unknown edition channel "%s"`, Edition) + defer func() { + Edition = Dev + }() + + return fmt.Errorf(`unknown edition channel '%s'`, Edition) } return nil diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go index 217a5099bf..080021064e 100644 --- a/pkg/version/version_test.go +++ b/pkg/version/version_test.go @@ -2,6 +2,7 @@ package version_test import ( "fmt" + "strings" "testing" "github.com/opencloud-eu/opencloud/pkg/version" @@ -59,6 +60,8 @@ func TestChannel(t *testing.T) { fallthrough case test.valid != (err == nil): t.Fatalf("invalid edition: %s", version.Edition) + case !test.valid && !strings.Contains(err.Error(), "'"+test.got+"'"): + t.Fatalf("no mention of invalid edition '%s' in error: %s", test.got, err.Error()) } }) }