Merge pull request #84 from fullstack-devops/feature/hotfix-release

Feature/hotfix release

Author: eksrha

.github/workflows/Release.yaml

@@ -1,5 +1,9 @@
 name: Publish Release
 
+concurrency:
+  group: ci-${{ github.repository }}-release
+  cancel-in-progress: false
+
 on:
   push:
     branches:

Makefile

@@ -11,7 +11,8 @@ lint: ## Lint the files
 	@golint -set_exit_status ${PKG_LIST}
 
 test: ## Run unittests
-	@go test -short ${PKG_LIST}
+	export ACI_TEST_REPO=fullstack-devops/awesome-ci-test
+	@go test ./...
 
 race: dep ## Run data race detector
 	@go test -race -short -v main.go

go.mod

@@ -3,28 +3,46 @@ module awesome-ci
 go 1.17
 
 require (
+	github.com/coreos/go-semver v0.3.0
+	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/go-github/v39 v39.2.0
-	github.com/xanzy/go-gitlab v0.55.1
+	github.com/xanzy/go-gitlab v0.58.0
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/Microsoft/go-winio v0.5.2 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.1.0 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
+	github.com/xanzy/ssh-agent v0.3.1 // indirect
+	golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70 // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
+	golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 // indirect
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -62,6 +62,7 @@ func init() {
 	releaseSet.Create.Fs.StringVar(&releaseSet.Create.Body, "body", "", "custom release message (markdow string or file)")
 	releaseSet.Create.Fs.StringVar(&releaseSet.Create.PatchLevel, "patchLevel", "", "predefine version to Update")
 	releaseSet.Create.Fs.BoolVar(&releaseSet.Create.DryRun, "dry-run", false, "make dry-run before writing version to Git by calling it")
+	releaseSet.Create.Fs.BoolVar(&releaseSet.Create.Hotfix, "hotfix", false, "create a hotfix release")
 	releaseSet.Create.Fs.Usage = func() {
 		fmt.Println("Available options:")
 		releaseSet.Create.Fs.PrintDefaults()
@@ -76,6 +77,7 @@ func init() {
 	releaseSet.Publish.Fs.StringVar(&releaseSet.Publish.Assets, "assets", "", "upload assets to release. eg.: \"file=awesome-ci\"")
 	releaseSet.Publish.Fs.Int64Var(&releaseSet.Publish.ReleaseId, "releaseid", 0, "publish an early defined release")
 	releaseSet.Publish.Fs.BoolVar(&releaseSet.Publish.DryRun, "dry-run", false, "make dry-run before writing version to Git by calling it")
+	releaseSet.Publish.Fs.BoolVar(&releaseSet.Publish.Hotfix, "hotfix", false, "create a hotfix release")
 
 	// parseJSON
 	parseSet.Fs = flag.NewFlagSet("parse", flag.ExitOnError)
@@ -116,6 +118,7 @@ func printNoValidCommand(usage func()) {
 }
 
 func main() {
+
 	flag.Usage = func() {
 		fmt.Println("awesome-ci makes your CI easy.")
 		fmt.Println("  Find more information and examples at: https://github.com/fullstack-devops/awesome-ci")

main.go

@@ -1,6 +1,7 @@
 package acigithub
 
 import (
+	"awesome-ci/src/tools"
 	"context"
 	"fmt"
 	"log"
@@ -17,15 +18,17 @@ var (
 	githubServerUrl, isgithubServerUrl   = os.LookupEnv("GITHUB_ENTERPRISE_SERVER_URL")
 	githubRepository, isgithubRepository = os.LookupEnv("GITHUB_REPOSITORY")
 	githubToken, isgithubToken           = os.LookupEnv("GITHUB_TOKEN")
+	owner, repo                          string
 )
 
 // NewGitHubClient Creates a new GitHub Client
 // Needs the Environment Variables: GITHUB_TOKEN
 // Needs the optional Environment Variables: GITHUB_ENTERPRISE_SERVER_URL
 func NewGitHubClient() (githubClient *github.Client, err error) {
 	if !isgithubToken {
-		log.Fatalln("pleas set the GITHUB_TOKEN as environment variable!")
+		log.Fatalln("please set the GITHUB_TOKEN as environment variable!")
 	}
+
 	gitHubTs := oauth2.StaticTokenSource(
 		&oauth2.Token{AccessToken: githubToken},
 	)
@@ -44,6 +47,11 @@ func NewGitHubClient() (githubClient *github.Client, err error) {
 	} else {
 		githubClient = github.NewClient(githubTc)
 	}
+
+	if isgithubRepository {
+		owner, repo = tools.DevideOwnerAndRepo(githubRepository)
+	}
+
 	GithubClient = githubClient
 	return
 }

src/acigithub/github-client.go

@@ -13,7 +13,7 @@ var (
 	direction, sort = "asc", "created"
 )
 
-func GetIssueComments(issueNumber int, owner string, repo string) (issueComments []*github.IssueComment, err error) {
+func GetIssueComments(issueNumber int) (issueComments []*github.IssueComment, err error) {
 	var commentOpts = &github.IssueListCommentsOptions{
 		Direction: &direction,
 		// Sort:      &sort,
@@ -30,7 +30,6 @@ func CommentHelpToPullRequest(number int) (err error) {
 	if !isgithubRepository {
 		log.Fatalln("make shure the GITHUB_REPOSITORY is available!")
 	}
-	owner, repo := tools.DevideOwnerAndRepo(githubRepository)
 
 	var commentOpts = &github.IssueListCommentsOptions{
 		Direction: &direction,

src/acigithub/issues.go

@@ -72,7 +72,7 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
 	var version = ""
 	var latestVersion = ""
 	// if an comment exists with aci_patch_level=major, make a major version!
-	issueComments, err := GetIssueComments(prNumber, owner, repo)
+	issueComments, err := GetIssueComments(prNumber)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -95,7 +95,7 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
 	}
 
 	if version == "" {
-		repositoryRelease, err := GetLatestReleaseVersion(owner, repo)
+		repositoryRelease, err := GetLatestReleaseVersion()
 		if err == nil {
 			latestVersion = *repositoryRelease.TagName
 			version, err = semver.IncreaseVersion(patchLevel, latestVersion)

src/acigithub/pullrequest.go

@@ -2,12 +2,14 @@ package acigithub
 
 import (
 	"awesome-ci/src/tools"
+	"errors"
 	"fmt"
 	"log"
 	"os"
 	"strconv"
 	"time"
 
+	"github.com/go-git/go-git/v5"
 	"github.com/google/go-github/v39/github"
 )
 
@@ -153,7 +155,54 @@ func PublishRelease(version string, releaseBranch string, body string, releaseId
 }
 
 // GetLatestReleaseVersion
-func GetLatestReleaseVersion(owner string, repo string) (latestRelease *github.RepositoryRelease, err error) {
-	latestRelease, _, err = GithubClient.Repositories.GetLatestRelease(ctx, owner, repo)
-	return
+func GetLatestReleaseVersion() (latestRelease *github.RepositoryRelease, err error) {
+	owner, repo := tools.DevideOwnerAndRepo(githubRepository)
+	var releaseMap = make(map[string]*github.RepositoryRelease)
+
+	var listOptions github.ListOptions = github.ListOptions{
+		PerPage: 100,
+		Page:    0,
+	}
+
+	for listOptions.Page >= 0 {
+		releases, response, err := GithubClient.Repositories.ListReleases(ctx, owner, repo, &listOptions)
+
+		if err != nil {
+			return nil, err
+		}
+
+		for _, release := range releases {
+			releaseMap[*release.TagName] = release
+		}
+
+		if listOptions.Page == response.NextPage {
+			break
+		}
+
+		listOptions.Page = response.NextPage
+	}
+
+	return findLatestRelease(`.`, releaseMap)
+}
+
+func findLatestRelease(directory string, githubReleaseMap map[string]*github.RepositoryRelease) (latestRelease *github.RepositoryRelease, err error) {
+	gitRepo, err := git.PlainOpen(directory)
+
+	if err != nil {
+		return nil, err
+	}
+
+	tags, err := tools.GetGitTagsUpToHead(gitRepo)
+
+	if err != nil {
+		return nil, err
+	}
+
+	for i := len(tags) - 1; i >= 0; i-- {
+		if latestRelease, found := githubReleaseMap[tags[i].String()]; found {
+			return latestRelease, nil
+		}
+	}
+
+	return nil, errors.New("could not find latest release")
 }