Merge pull request #121 from fullstack-devops/bugfix/false-release-version

Fix: false release version override

Author: eksrha

.github/workflows/Release.yaml

@@ -45,6 +45,7 @@ jobs:
             awesome-ci-${{ github.sha }}
 
   publish_release:
+    environment: production
     runs-on: ubuntu-latest
     needs: [create_release, build]
     steps:

Makefile

@@ -32,10 +32,10 @@ awesome-ci: dep
 	GOOS=windows GOARCH=amd64 go build ${GOARGS} -tags "${GOTAGS}" -ldflags "${LDFLAGS}" -o ${BUILD_DIR}/package/awesome-ci_${VERSION}_amd64.exe ./cmd/awesome-ci
 	GOOS=windows GOARCH=arm64 go build ${GOARGS} -tags "${GOTAGS}" -ldflags "${LDFLAGS}" -o ${BUILD_DIR}/package/awesome-ci_${VERSION}_arm64.exe ./cmd/awesome-ci
 
-test: awesome-ci ## Run unittests
-	go test -short -v ./internal/pkg/...
+test: ## Run unittests
+	-go test -short -v ./internal/pkg/...
 
-race: awesome-ci ## Run data race detector
+race: ## Run data race detector
 	-go test -race -short -v ${PKG_LIST}
 
 # this requires ruby with the gem asciidoctor, asciidoctor-pdf and asciidoctor-diagram installed -> gem install asciidoctor-**

internal/app/awesome-ci/ces/detect.go

@@ -24,7 +24,7 @@ func DetectCes() (cesType CES,
 
 	if creds, errRc := rcFile.Load(); errRc == nil {
 		cesType = CES{
-			Type:    rcFile.CESType,
+			Type:    rcpersist.CESTypeLoMa,
 			EnvFile: envFile,
 		}
 		scmPortalType = rcFile.SCMPortalType

internal/app/awesome-ci/cmd/pullrequest/pullrequest.go

@@ -7,8 +7,9 @@ import (
 )
 
 var (
-	number    int
-	formatOut string
+	number         int
+	formatOut      string
+	mergeCommitSha string
 )
 
 var Cmd = &cobra.Command{
@@ -25,7 +26,7 @@ var infoCmd = &cobra.Command{
 	Short: "get pull request info",
 	Long:  `Print all infos about a pull request in GitHub.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		service.PrintPRInfos(number, formatOut)
+		service.PrintPRInfos(number, mergeCommitSha, formatOut)
 	},
 }
 
@@ -35,6 +36,7 @@ func init() {
 
 	// Flags
 	infoCmd.Flags().IntVarP(&number, "number", "n", 0, "overwrite the issue number")
+	infoCmd.Flags().StringVarP(&mergeCommitSha, "merge-commit-sha", "c", "", "send a given merge commit sha")
 	// needs to be implemented
 	// infoCmd.Flags().StringVarP(&formatOut, "output", "o", "", "define output available: [json, yaml]")
 }

internal/app/awesome-ci/cmd/root_test.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/fullstack-devops/awesome-ci/internal/app/awesome-ci/cmd"
 
@@ -20,7 +19,6 @@ const fmTemplate = `---
 layout: default
 nav_order: 2
 parent: CLI
-date: %s
 title: "%s"
 ---
 `
@@ -39,14 +37,13 @@ func TestCreateCobraDocs(t *testing.T) {
 }
 
 func filePrepender(filename string) string {
-	now := time.Now().Format(time.RFC3339)
 	name := filepath.Base(filename)
 	base := strings.TrimSuffix(name, path.Ext(name))
 
 	if base != "awesome-ci" {
 		base = strings.Replace(base, "awesome-ci", "", -1)
 	}
-	return fmt.Sprintf(fmTemplate, now, strings.Replace(base, "_", " ", -1))
+	return fmt.Sprintf(fmTemplate, strings.Replace(base, "_", " ", -1))
 }
 
 func linkHandler(name string) string {

internal/app/awesome-ci/scm-portal/github/issues.go

@@ -116,6 +116,7 @@ func (ghrc *GitHubRichClient) SearchIssuesForOverrides(prNumber int) (nextVersio
 
 			if aciVersionOverride.MatchString(*comment.Body) {
 				nextVersion = aciVersionOverride.FindStringSubmatch(*comment.Body)[1]
+				log.Infof("found version override in comment form %s at %s", comment.User.GetLogin(), comment.GetCreatedAt())
 				break
 			}
 
@@ -124,6 +125,7 @@ func (ghrc *GitHubRichClient) SearchIssuesForOverrides(prNumber int) (nextVersio
 				if err != nil && err != semver.ErrUseMinimalPatchVersion {
 					log.Warnln(err)
 				}
+				log.Infof("found patchLevel override in comment form %s at %s", comment.User.GetLogin(), comment.GetCreatedAt())
 				break
 			}
 		}

internal/app/awesome-ci/scm-portal/github/pullrequest.go

@@ -4,32 +4,41 @@ import (
 	"fmt"
 
 	"github.com/google/go-github/v49/github"
+	log "github.com/sirupsen/logrus"
 )
 
 // GetPrInfos need the PullRequest-Number
 func (ghrc *GitHubRichClient) GetPrInfos(prNumber int, mergeCommitSha string) (prInfos *github.PullRequest, err error) {
 	if prNumber != 0 {
+
 		prInfos, _, err = ghrc.Client.PullRequests.Get(ctx, ghrc.Owner, ghrc.Repository, prNumber)
 		if err != nil {
 			return nil, fmt.Errorf("could not load any information about the given pull request  %d: %v", prNumber, err)
 		}
-	}
-	if mergeCommitSha != "" && prNumber == 0 {
+		log.Infof("found pull request '%s' with given number %d", *prInfos.Title, prNumber)
+
+		return
+	} else if mergeCommitSha != "" {
+
+		log.Infoln("listing pull requests to compare with merge commit sha")
 		prOpts := github.PullRequestListOptions{
 			State:     "all",
 			Sort:      "updated",
 			Direction: "desc",
 			ListOptions: github.ListOptions{
-				PerPage: 10,
+				PerPage: 50,
 			},
 		}
 		pullRequests, _, err := ghrc.Client.PullRequests.List(ctx, ghrc.Owner, ghrc.Repository, &prOpts)
 		if err != nil {
 			return nil, fmt.Errorf("could not load any information about the given pull request  %d: %v", prNumber, err)
 		}
+
+		log.Infof("listed %d pull requests, searching for maching mergeCommitSha", len(pullRequests))
 		var found int = 0
 		for _, pr := range pullRequests {
 			if pr.GetMergeCommitSHA() == mergeCommitSha {
+				log.Infof("found matching pull requests with number %d, and mergeCommitSha %s", *pr.Number, *pr.MergeCommitSHA)
 				prInfos = pr
 				found = found + 1
 			}

internal/app/awesome-ci/scm-portal/prmr_request.go

@@ -14,7 +14,6 @@ import (
 // 3. read comments from pr/mr and looking for overrides
 func (lay SCMLayer) GetPrInfos(number int, mergeCommitSha string) (infos *PrMrRequestInfos, err error) {
 	infos = &PrMrRequestInfos{}
-	infos.Number = number
 
 	// 1. get pr/mr infos from github or gitlab
 	switch grc := lay.Grc.(type) {
@@ -25,6 +24,7 @@ func (lay SCMLayer) GetPrInfos(number int, mergeCommitSha string) (infos *PrMrRe
 			return nil, err
 		}
 
+		infos.Number = *prInfos.Number
 		infos.Sha = *prInfos.Head.SHA
 		infos.ShaShort = infos.Sha[:8]
 		infos.BranchName = *prInfos.Head.Ref
@@ -42,12 +42,12 @@ func (lay SCMLayer) GetPrInfos(number int, mergeCommitSha string) (infos *PrMrRe
 	}
 
 	// 2. comment help instructions to issue
-	if errCommHelp := lay.CommentHelpToPullRequest(number); errCommHelp != nil {
+	if errCommHelp := lay.CommentHelpToPullRequest(infos.Number); errCommHelp != nil {
 		log.Warnln(errCommHelp)
 	}
 
 	// 3. read comments from pr/mr and looking for overrides
-	version, patchLevel, err := lay.SearchIssuesForOverrides(number)
+	version, patchLevel, err := lay.SearchIssuesForOverrides(infos.Number)
 	if err != nil {
 		return nil, err
 	}
@@ -75,7 +75,7 @@ func (lay SCMLayer) GetPrInfos(number int, mergeCommitSha string) (infos *PrMrRe
 		return infos, nil
 
 	} else {
-		log.Traceln("version override via pr comments specified")
+		log.Infoln("version override via pr comments specified")
 		infos.NextVersion = *version
 	}
 

internal/app/awesome-ci/service/externalTasks.go

@@ -10,17 +10,22 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func PrintPRInfos(number int, formatOut string) {
+func PrintPRInfos(number int, mergeCommitSha string, formatOut string) {
 	scmLayer, err := scmportal.LoadSCMPortalLayer()
 	if err != nil {
 		log.Fatalln(err)
 	}
 
-	if err = evalPrNumber(&number); err != nil {
-		log.Fatalln(err)
+	log.Infof("detected ces type: %s", scmLayer.CES.Type)
+
+	if mergeCommitSha == "" {
+		if err = evalPrNumber(&number); err != nil {
+			log.Fatalln(err)
+		}
+		log.Infof("evaluated pull request number %d", number)
 	}
 
-	prInfos, err := scmLayer.GetPrInfos(number, "")
+	prInfos, err := scmLayer.GetPrInfos(number, mergeCommitSha)
 	if err != nil {
 		log.Fatalln(err)
 	}