Merge pull request #160 from nicholasSUSE/bug-fixes-1.3.5

fixing latest version
rancher · Jan 16, 2025 · 3d61869 · 3d61869
2 parents f40823c + c29dd5b
commit 3d61869
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/pkg/auto/validate.go b/pkg/auto/validate.go
@@ -125,12 +125,8 @@ func (v *validation) validateReleaseYaml(releaseOpts options.ReleaseOptions) err
 
 // checkMinorPatchVersion will check if the chart version is exactly 1 more patch/minor version than the previous chart version or if the chart is being released. If the chart is being forward-ported, this validation is skipped.
 func (v *validation) checkMinorPatchVersion(version string, releasedVersions []lifecycle.Asset) error {
-	var latestReleasedVersion string
-	if len(releasedVersions) > 1 {
-		latestReleasedVersion = releasedVersions[len(releasedVersions)-1].Version
-	} else {
-		latestReleasedVersion = releasedVersions[0].Version
-	}
+
+	latestReleasedVersion := releasedVersions[0].Version
 
 	// check if the chart version is being released or forward-ported
 	release, err := v.dep.VR.CheckChartVersionToRelease(version)
@@ -154,9 +150,7 @@ func (v *validation) checkMinorPatchVersion(version string, releasedVersions []l
 	}
 
 	if newVer.Minor() < latestVer.Minor() {
-		fmt.Println()
 		// get the latest version that will be the 1 minor version below the new version
-		// var maxPatch int64 = 0
 		for _, releasedVersion := range releasedVersions {
 			releasedSemver, err := semver.NewVersion(releasedVersion.Version)
 			if err != nil {

diff --git a/pkg/auto/validate_test.go b/pkg/auto/validate_test.go
@@ -379,7 +379,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.2.0",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: nil,
@@ -394,7 +394,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.2.1",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: nil,
@@ -409,7 +409,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.1.1",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: nil,
@@ -424,7 +424,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.0.1",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: nil,
@@ -439,7 +439,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.0.2",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: fmt.Errorf("%w: version: %s", errMinorPatchVersion, "104.0.2"),
@@ -454,7 +454,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.1.2",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: fmt.Errorf("%w: version: %s", errMinorPatchVersion, "104.1.2"),
@@ -469,7 +469,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.2.2",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: fmt.Errorf("%w: version: %s", errMinorPatchVersion, "104.2.2"),
@@ -484,7 +484,7 @@ func Test_checkMinorPatchVersion(t *testing.T) {
 					},
 				},
 				version:          "104.3.1",
-				releasedVersions: []lifecycle.Asset{{Version: "104.0.0"}, {Version: "104.1.0"}, {Version: "104.2.0"}},
+				releasedVersions: []lifecycle.Asset{{Version: "104.2.0"}, {Version: "104.1.0"}, {Version: "104.0.0"}},
 			},
 			ex: expected{
 				err: fmt.Errorf("%w: version: %s", errMinorPatchVersion, "104.3.1"),