Skip to content

Commit

Permalink
fix(webhook): fix version comparison of webhook resources (#342)
Browse files Browse the repository at this point in the history
Signed-off-by: shubham <[email protected]>
  • Loading branch information
shubham14bajpai authored Jun 14, 2021
1 parent a03d481 commit 2816999
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/webhook/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ func IsCurrentLessThanNewVersion(old, new string) bool {
for i := 0; i < len(oldVersions); i++ {
oldVersion, _ := strconv.Atoi(oldVersions[i])
newVersion, _ := strconv.Atoi(newVersions[i])
if oldVersion > newVersion {
return false
if oldVersion == newVersion {
continue
}
return oldVersion < newVersion
}
return true
return false
}
61 changes: 61 additions & 0 deletions pkg/webhook/util_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2020 The OpenEBS Authors
//
// 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 webhook

import "testing"

func TestIsCurrentLessThanNewVersion(t *testing.T) {
type args struct {
old string
new string
}
tests := []struct {
name string
args args
want bool
}{
{
name: "old is less than new",
args: args{
old: "1.12.0",
new: "2.8.0",
},
want: true,
},
{
name: "old is greater than new",
args: args{
old: "2.10.0-RC2",
new: "2.8.0",
},
want: false,
},
{
name: "old is same as new",
args: args{
old: "2.8.0",
new: "2.8.0",
},
want: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := IsCurrentLessThanNewVersion(tt.args.old, tt.args.new); got != tt.want {
t.Errorf("IsCurrentLessThanNewVersion() = %v, want %v", got, tt.want)
}
})
}
}

0 comments on commit 2816999

Please sign in to comment.