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
12 changes: 11 additions & 1 deletion pkg/versioncheck/versioncheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ func (v *VersionCheckHandler) CheckLatestVersion(ctx context.Context, versionDat
LatestReleaseVersion = latestVersion.ClientUpdate

if latestVersion.ClientUpdate != "" {
if BuildNumber != "" && semver.Compare(BuildNumber, LatestReleaseVersion) == -1 {
if BuildNumber != "" && semver.Compare(
normalizeVersion(BuildNumber),
normalizeVersion(LatestReleaseVersion),
) == -1 {
logger.L().Ctx(ctx).Warning(warningMessage(LatestReleaseVersion))
}
}
Expand All @@ -211,6 +214,13 @@ func (v *VersionCheckHandler) CheckLatestVersion(ctx context.Context, versionDat
return nil
}

func normalizeVersion(v string) string {
if v != "" && !strings.HasPrefix(v, "v") {
return "v" + v
}
return v
}

func (v *VersionCheckHandler) getLatestVersion(versionData *VersionCheckRequest) (*VersionCheckResponse, error) {

reqBody, err := json.Marshal(*versionData)
Expand Down
21 changes: 21 additions & 0 deletions pkg/versioncheck/versioncheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,27 @@ func TestCheckLatestVersion_Semver_Compare(t *testing.T) {

}

func TestNormalizeVersion(t *testing.T) {
assert.Equal(t, "v4.0.6", normalizeVersion("4.0.6"))
assert.Equal(t, "v3.0.15", normalizeVersion("v3.0.15"))
assert.Equal(t, "", normalizeVersion(""))
}

func TestSemverCompare_WithNormalization(t *testing.T) {
result := semver.Compare(
normalizeVersion("4.0.6"),
normalizeVersion("v3.0.15"),
)

assert.Equal(t, 1, result)
}

func TestSemverCompare_WithoutNormalization(t *testing.T) {
result := semver.Compare("4.0.6", "v3.0.15")

assert.Equal(t, -1, result)
}

func TestCheckLatestVersion(t *testing.T) {
type args struct {
ctx context.Context
Expand Down
Loading