Merge pull request #215 from nicholasSUSE/multiRCs-fix-override-version

multi RC's for auto-chart-bumps - patch/minor force bump for auto-chart-bumps

Author: nicholasSUSE

main.go

@@ -64,6 +64,8 @@ const (
 	defaultLogLevelEnvironmentVariable = "LOG"
 	// defaultOverrideVersionEnvironmentVariable is the default environment variable that indicates the version to override
 	defaultOverrideVersionEnvironmentVariable = "OVERRIDE_VERSION"
+	// defaultMultiRCEnvironmentVariable is the default environment variable that indicates if the auto-bump should not remove previous RC versions
+	defaultMultiRCEnvironmentVariable = "MULTI_RC"
 )
 
 var (
@@ -103,8 +105,10 @@ var (
 	SoftErrorMode = false
 	// RepoRoot represents the root path of the repository
 	RepoRoot string
-	// OverrideVersion
+	// OverrideVersion is the type of version override (patch, minor, auto)
 	OverrideVersion string
+	// MultiRC indicates if the auto-bump should not remove previous RC versions
+	MultiRC bool
 )
 
 func init() {
@@ -251,6 +255,13 @@ func main() {
 		Required:    false,
 		Destination: &RemoteMode,
 	}
+	multiRCFlag := cli.BoolFlag{
+		Name:        "multi-rc",
+		Usage:       "default is false, if passed, auto-bump will not remove previous RC versions",
+		Required:    false,
+		EnvVar:      defaultMultiRCEnvironmentVariable,
+		Destination: &MultiRC,
+	}
 	ghTokenFlag := cli.StringFlag{
 		Name: "gh_token",
 		Usage: `Usage:
@@ -458,7 +469,7 @@ func main() {
 			`,
 			Action: chartBump,
 			Before: setupCache,
-			Flags:  []cli.Flag{packageFlag, branchFlag, overrideVersionFlag},
+			Flags:  []cli.Flag{packageFlag, branchFlag, overrideVersionFlag, multiRCFlag},
 		},
 	}
 
@@ -1009,7 +1020,7 @@ func chartBump(c *cli.Context) {
 	}
 
 	logger.Log(ctx, slog.LevelInfo, "start auto-chart-bump")
-	if err := bump.BumpChart(ctx, OverrideVersion); err != nil {
+	if err := bump.BumpChart(ctx, OverrideVersion, MultiRC); err != nil {
 		logger.Fatal(ctx, fmt.Errorf("failed to bump: %w", err).Error())
 	}
 }

pkg/auto/chart_bump.go

@@ -218,7 +218,7 @@ func checkUpstreamOptions(options *options.UpstreamOptions) error {
 
 // BumpChart will execute a similar approach as the defined development workflow for chartowners.
 // The main difference is that between the steps: (make prepare and make patch) we will calculate the next version to release.
-func (b *Bump) BumpChart(ctx context.Context, versionOverride string) error {
+func (b *Bump) BumpChart(ctx context.Context, versionOverride string, multiRCs bool) error {
 	// List the possible target charts
 	targetCharts, err := chartsTargets(b.targetChart)
 	if err != nil {
@@ -335,14 +335,24 @@ func (b *Bump) BumpChart(ctx context.Context, versionOverride string) error {
 		return err
 	}
 
-	bumpVersion := b.Pkg.AutoGeneratedBumpVersion.String()
+	if !multiRCs {
+		if strings.Contains(b.versions.toRelease.txt, "-rc") {
 
-	// TODO: Create option to skip removal of -RC (rancher-webhook for example)
-	if strings.Contains(b.versions.latest.txt, "-rc") {
-		logger.Log(ctx, slog.LevelInfo, "removing last -RC version", slog.String("latestVersion", b.versions.latest.txt))
-		if err := b.makeRemove(targetCharts, git); err != nil {
-			logger.Log(ctx, slog.LevelError, "error while removing -RC version", logger.Err(err))
-			return err
+			listRCVersions, err := listRCVersions(b.versions.toRelease.txt, b.assetsVersionsMap[b.targetChart])
+			if err != nil {
+				logger.Log(ctx, slog.LevelError, "error while listing RC versions", logger.Err(err))
+				return err
+			}
+
+			if len(listRCVersions) > 0 {
+				for _, rcVersion := range listRCVersions {
+					logger.Log(ctx, slog.LevelInfo, "removing RC version", slog.String("rcVersion", rcVersion))
+					if err := makeRemove(rcVersion, targetCharts, git); err != nil {
+						logger.Log(ctx, slog.LevelError, "error while removing -RC version", logger.Err(err))
+						return err
+					}
+				}
+			}
 		}
 	}
 
@@ -371,6 +381,7 @@ func (b *Bump) BumpChart(ctx context.Context, versionOverride string) error {
 		return err
 	}
 
+	bumpVersion := b.Pkg.AutoGeneratedBumpVersion.String()
 	logger.Log(ctx, slog.LevelInfo, "bump version", slog.String("bumpVersion", bumpVersion))
 	return writeBumpJSON(targetCharts, bumpVersion)
 }
@@ -481,11 +492,9 @@ func chartsTargets(targetChart string) ([]string, error) {
 	return nil, fmt.Errorf("chart %s not listed", targetChart)
 }
 
-func (b *Bump) makeRemove(targetCharts []string, g *git.Git) error {
-	version := b.versions.latestRepoPrefix.txt + "+up" + b.versions.latest.txt
-
+func makeRemove(targetVersion string, targetCharts []string, g *git.Git) error {
 	for _, chart := range targetCharts {
-		cmd := exec.Command("make", "remove", fmt.Sprintf("CHART=%s", chart), fmt.Sprintf("VERSION=%s", version))
+		cmd := exec.Command("make", "remove", fmt.Sprintf("CHART=%s", chart), fmt.Sprintf("VERSION=%s", targetVersion))
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		if err := cmd.Run(); err != nil {
@@ -537,3 +546,20 @@ func checkBumpAppVersion(ctx context.Context, bumpAppVersion *string, versions [
 
 	return false, nil
 }
+
+func listRCVersions(rcVersion string, assets []lifecycle.Asset) ([]string, error) {
+	idx := strings.Index(rcVersion, "-rc")
+	if idx == -1 {
+		return nil, fmt.Errorf("invalid rcVersion format: %s", rcVersion)
+	}
+	rcVersionCheckStr := rcVersion[:idx+len("-rc")]
+
+	var rcVersions []string
+	for _, asset := range assets {
+		if strings.Contains(asset.Version, rcVersionCheckStr) {
+			rcVersions = append(rcVersions, asset.Version)
+		}
+	}
+
+	return rcVersions, nil
+}

pkg/auto/chart_bump_versions.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/blang/semver"
+	"github.com/rancher/charts-build-scripts/pkg/lifecycle"
 	"github.com/rancher/charts-build-scripts/pkg/logger"
 )
 
@@ -77,21 +78,18 @@ func (b *Bump) loadVersions() error {
 		toReleaseRepoPrefix: &version{},
 	}
 
-	// latestVersion and latestRepoPrefixVersion are the latest versions from the index.yaml
-	// get the latest released version from the index.yaml (the first version is the latest; already sorted)
-	latestUnparsedVersion := b.assetsVersionsMap[b.targetChart][0].Version
-	if latestUnparsedVersion == "" {
-		return errChartLatestVersion
-	}
-
 	// Latest version may/may not contain a repoPrefixVersion
-	latestRepoPrefix, latestVersion, found := parseRepoPrefixVersionIfAny(latestUnparsedVersion)
+	latestRepoPrefix, latestVersion, found, err := getLatestVersionFromIndex(b.assetsVersionsMap[b.targetChart])
+	if err != nil {
+		return err
+	}
 	if found {
 		b.versions.latestRepoPrefix.txt = latestRepoPrefix
 		if err := b.versions.latestRepoPrefix.updateSemver(); err != nil {
 			return err
 		}
 	}
+
 	b.versions.latest.txt = latestVersion
 	if err := b.versions.latest.updateSemver(); err != nil {
 		return err
@@ -120,6 +118,27 @@ func (b *Bump) loadVersions() error {
 	return nil
 }
 
+func getLatestVersionFromIndex(versions []lifecycle.Asset) (string, string, bool, error) {
+	// latestVersion and latestRepoPrefixVersion are the latest versions from the index.yaml
+	// get the latest released version from the index.yaml (the first version is the latest; already sorted)
+	latestUnparsedVersion := getLatestVersionRecursively(versions)
+	if latestUnparsedVersion == "" {
+		return "", "", false, errChartLatestVersion
+	}
+
+	latestRepoPrefix, latestVersion, found := parseRepoPrefixVersionIfAny(latestUnparsedVersion)
+	return latestRepoPrefix, latestVersion, found, nil
+}
+
+func getLatestVersionRecursively(versions []lifecycle.Asset) string {
+	latestVersion := versions[0].Version
+	if strings.Contains(latestVersion, "-rc") {
+		return getLatestVersionRecursively(versions[1:])
+	}
+
+	return latestVersion
+}
+
 // parseRepoPrefixVersionIfAny will parse the repository prefix version if it exists
 func parseRepoPrefixVersionIfAny(unparsedVersion string) (repoPrefix, version string, found bool) {
 	found = strings.Contains(unparsedVersion, "+up")
@@ -177,12 +196,14 @@ func (b *Bump) applyVersionRules(versionOverride string) error {
 		}
 
 	} else if versionOverride == "patch" {
-		b.versions.toReleaseRepoPrefix.svr = b.versions.latestRepoPrefix.svr
+		b.versions.toReleaseRepoPrefix.txt = b.versions.latestRepoPrefix.txt
+		b.versions.toReleaseRepoPrefix.updateSemver()
 		b.versions.toReleaseRepoPrefix.svr.Patch++
 		b.versions.toReleaseRepoPrefix.svr.Minor = 0
 		b.versions.toReleaseRepoPrefix.updateTxt()
 	} else if versionOverride == "minor" {
-		b.versions.toReleaseRepoPrefix.svr = b.versions.latestRepoPrefix.svr
+		b.versions.toReleaseRepoPrefix.txt = b.versions.latestRepoPrefix.txt
+		b.versions.toReleaseRepoPrefix.updateSemver()
 		b.versions.toReleaseRepoPrefix.svr.Minor++
 		b.versions.toReleaseRepoPrefix.svr.Patch = 0
 		b.versions.toReleaseRepoPrefix.updateTxt()