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

robustness: do not panic when parsing unknown versions. #19226

Merged
merged 1 commit into from
Jan 17, 2025
Merged
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
44 changes: 34 additions & 10 deletions tests/framework/e2e/downgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,47 @@ func offsetMinor(v *semver.Version, offset int) *semver.Version {
return &semver.Version{Major: v.Major, Minor: minor}
}

func majorMinorVersionsEqual(v1, v2 string) bool {
ver1 := semver.New(v1)
ver2 := semver.New(v2)
return ver1.Major == ver2.Major && ver1.Minor == ver2.Minor
func majorMinorVersionsEqual(v1, v2 string) (bool, error) {
ver1, err := semver.NewVersion(v1)
if err != nil {
return false, err
}
ver2, err := semver.NewVersion(v2)
if err != nil {
return false, err
}
return ver1.Major == ver2.Major && ver1.Minor == ver2.Minor, nil
}

func compareMemberVersion(expect version.Versions, target version.Versions) error {
if expect.Server != "" && !majorMinorVersionsEqual(expect.Server, target.Server) {
return fmt.Errorf("expect etcdserver version %v, but got %v", expect.Server, target.Server)
if expect.Server != "" {
result, err := majorMinorVersionsEqual(expect.Server, target.Server)
if err != nil {
return err
}
if !result {
return fmt.Errorf("expect etcdserver version %v, but got %v", expect.Server, target.Server)
}
}

if expect.Cluster != "" && !majorMinorVersionsEqual(expect.Cluster, target.Cluster) {
return fmt.Errorf("expect etcdcluster version %v, but got %v", expect.Cluster, target.Cluster)
if expect.Cluster != "" {
result, err := majorMinorVersionsEqual(expect.Cluster, target.Cluster)
if err != nil {
return err
}
if !result {
return fmt.Errorf("expect etcdcluster version %v, but got %v", expect.Cluster, target.Cluster)
}
}

if expect.Storage != "" && !majorMinorVersionsEqual(expect.Storage, target.Storage) {
return fmt.Errorf("expect storage version %v, but got %v", expect.Storage, target.Storage)
if expect.Storage != "" {
result, err := majorMinorVersionsEqual(expect.Storage, target.Storage)
if err != nil {
return err
}
if !result {
return fmt.Errorf("expect storage version %v, but got %v", expect.Storage, target.Storage)
}
}
return nil
}
Expand Down
Loading