feat(release): added option to extend the release lifetime (#189)

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>

Author: lukidzi

cmd/internal/github/graphql.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"net/http"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 
@@ -75,6 +76,17 @@ func (r GQLRelease) IsLTS() bool {
 	return regexp.MustCompile("^> LTS").MatchString(r.Description)
 }
 
+// ExtendedMonths returns the number of additional months this release's lifetime is extended by,
+// as specified by a `> ExtensionMonths: N` line in the description. Returns 0 if not set.
+func (r GQLRelease) ExtendedMonths() int {
+	res := regexp.MustCompile(`(?m)^> ExtensionMonths: ([0-9]+)`).FindStringSubmatch(r.Description)
+	if len(res) == 2 {
+		n, _ := strconv.Atoi(res[1])
+		return n
+	}
+	return 0
+}
+
 // Branch branch that this release was first on
 func (r GQLRelease) Branch() string {
 	// In theory we could extract this from the tag but let's keep this simple

cmd/internal/versionfile/version_file.go

@@ -13,15 +13,16 @@ import (
 )
 
 type VersionEntry struct {
-	Edition       string `yaml:"edition"`
-	Version       string `yaml:"version"`
-	Release       string `yaml:"release"`
-	Latest        bool   `yaml:"latest,omitempty"`
-	ReleaseDate   string `yaml:"releaseDate,omitempty"`
-	EndOfLifeDate string `yaml:"endOfLifeDate,omitempty"`
-	Branch        string `yaml:"branch"`
-	Label         string `yaml:"label,omitempty"`
-	LTS           bool   `yaml:"lts,omitempty"`
+	Edition         string `yaml:"edition"`
+	Version         string `yaml:"version"`
+	Release         string `yaml:"release"`
+	Latest          bool   `yaml:"latest,omitempty"`
+	ReleaseDate     string `yaml:"releaseDate,omitempty"`
+	EndOfLifeDate   string `yaml:"endOfLifeDate,omitempty"`
+	Branch          string `yaml:"branch"`
+	Label           string `yaml:"label,omitempty"`
+	LTS             bool   `yaml:"lts,omitempty"`
+	ExtensionMonths int    `yaml:"extensionMonths,omitempty"`
 }
 
 func (v VersionEntry) Less(o VersionEntry) bool {
@@ -50,6 +51,10 @@ func BuildVersionEntry(edition string, releaseName string, lifetimeMonths int, l
 			out.LTS = true
 			lifetime = ltslifetimeMonths
 		}
+		if ext := releases[0].ExtendedMonths(); ext > 0 {
+			lifetime += ext
+			out.ExtensionMonths = ext
+		}
 		releaseDate, err := releases[0].ExtractReleaseDate()
 		if err != nil {
 			return out, fmt.Errorf("failed to extract release date for %s because of: %s", releases[0].Name, err.Error())

cmd/internal/versionfile/version_file_test.go

@@ -96,6 +96,37 @@ func TestBuildVersionEntry(t *testing.T) {
 			},
 			versionfile.VersionEntry{Edition: "mesh", Version: "1.2.1", Release: "1.2.x", Latest: true, ReleaseDate: "2020-12-12", EndOfLifeDate: "2021-12-12", Branch: "release-1.2"},
 		),
+		simpleCase(
+			"extended adds months on top of regular lifetime",
+			[]github.GQLRelease{
+				{Name: "1.2.0", Description: "> ExtensionMonths: 6", PublishedAt: d1},
+				{Name: "1.2.1", PublishedAt: d1.Add(time.Hour * 24 * 8), IsLatest: true},
+			},
+			versionfile.VersionEntry{Edition: "mesh", Version: "1.2.1", Release: "1.2.x", Latest: true, ReleaseDate: "2020-12-12", EndOfLifeDate: "2022-06-12", Branch: "release-1.2", ExtensionMonths: 6},
+		),
+		simpleCase(
+			"extended combined with lts adds months on top of lts lifetime",
+			[]github.GQLRelease{
+				{Name: "1.2.0", Description: "> LTS\n> ExtensionMonths: 6", PublishedAt: d1},
+				{Name: "1.2.1", PublishedAt: d1.Add(time.Hour * 48)},
+			},
+			versionfile.VersionEntry{Edition: "mesh", Version: "1.2.1", Release: "1.2.x", LTS: true, ReleaseDate: "2020-12-12", EndOfLifeDate: "2023-06-12", Branch: "release-1.2", ExtensionMonths: 6},
+		),
+		simpleCase(
+			"extended combined with custom release date",
+			[]github.GQLRelease{
+				{Name: "1.2.0", Description: "> Released on 2019/01/01\n> ExtensionMonths: 6"},
+			},
+			versionfile.VersionEntry{Edition: "mesh", Version: "1.2.0", Release: "1.2.x", ReleaseDate: "2019-01-01", EndOfLifeDate: "2020-07-01", Branch: "release-1.2", ExtensionMonths: 6},
+		),
+		simpleCase(
+			"extended on non-first release is ignored",
+			[]github.GQLRelease{
+				{Name: "1.2.1", Description: "> ExtensionMonths: 6", PublishedAt: d1.Add(time.Hour * 48)},
+				{Name: "1.2.0", Description: "foo", PublishedAt: d1},
+			},
+			versionfile.VersionEntry{Edition: "mesh", Version: "1.2.1", Release: "1.2.x", ReleaseDate: "2020-12-12", EndOfLifeDate: "2021-12-12", Branch: "release-1.2"},
+		),
 	} {
 		t.Run(v.desc, func(t *testing.T) {
 			res, err := versionfile.BuildVersionEntry(v.inEdition, v.inReleaseName, v.inLifetimeMonths, v.inLtsLifetimeMonths, v.inReleases)

go.mod

@@ -1,6 +1,6 @@
 module github.com/kumahq/ci-tools
 
-go 1.25.1
+go 1.26.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.4.0

mise.toml

@@ -1,2 +1,2 @@
 [tools]
-golangci-lint = "2.6.2"
+golangci-lint = "2.9.0"