Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:fix version comparison issue #3328

Merged
merged 3 commits into from Jun 10, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 11 additions & 13 deletions pkg/utils/versionutil/version.go
Expand Up @@ -38,20 +38,18 @@ func Compare(v1, v2 string) bool {
logger.Error("error version format %s %s", v1, v2)
return false
}
if v1List[0] > v2List[0] {
return true
} else if v1List[0] < v2List[0] {
return false
}
if v1List[1] > v2List[1] {
return true
} else if v1List[1] < v2List[1] {
return false
}
if v1List[2] >= v2List[2] {
return true
for i := 0; i < len(v1List); i++ {
v1Num, _ := strconv.Atoi(v1List[i])
v2Num, _ := strconv.Atoi(v2List[i])

if v1Num > v2Num {
return true
} else if v1Num < v2Num {
return false
}
}
return false

return true
}

// assure version format right and new >=
Expand Down
62 changes: 62 additions & 0 deletions pkg/utils/versionutil/version_test.go
@@ -0,0 +1,62 @@
/*
Copyright 2023 cuisongliu@qq.com.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package versionutil

import "testing"

func TestCompare(t *testing.T) {
type args struct {
v1 string
v2 string
}
tests := []struct {
name string
args args
want bool
}{
{
name: "v1 greater than v2",
args: args{
v1: "v1.25.2",
v2: "v1.25.1",
},
want: true,
}, {
name: "v1 less than v2",
args: args{
v1: "v1.25.8",
v2: "v1.25.10",
},
want: false,
},
{
name: "v1 equal v2",
args: args{
v1: "v1.25.8",
v2: "v1.25.8",
},
want: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := Compare(tt.args.v1, tt.args.v2); got != tt.want {
t.Errorf("Compare() = %v, want %v", got, tt.want)
}
})
}
}