Feature/pr comments issue 70 (#73)

Author: eksrha

docs/FUNDING.yml .github/FUNDING.ymldocs/FUNDING.yml renamed to .github/FUNDING.yml

@@ -25,22 +25,24 @@ jobs:
       - name: Setup awesome-ci
         uses: fullstack-devops/awesome-ci-action@main
 
+      - name: Build "${{ matrix.arch }}"
+        run: go build -v -ldflags "-X main.version=${{ needs.generate_infos.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
+        env:
+          GOOS: linux
+          GOARCH: "${{ matrix.arch }}"
+
       - name: debugging git
+        if: matrix.arch == 'amd64'
         run: |
           echo "git name-rev HEAD: $(git name-rev HEAD)"
           echo "git log -1 --pretty=format:"%s": $(git log -1 --pretty=format:"%s")"
           echo "git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@': $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')"
-      - name: set build Infos
-        run: awesome-ci pr info -number ${{ github.event.pull_request.number }}
+      - name: test build Infos
+        if: matrix.arch == 'amd64'
+        run: out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }} pr info -number ${{ github.event.pull_request.number }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build "${{ matrix.arch }}"
-        run: go build -v -ldflags "-X main.version=${{ needs.generate_infos.outputs.version }}" -o out/awesome-ci_${{ needs.generate_infos.outputs.version }}_${{ matrix.arch }}
-        env:
-          GOOS: linux
-          GOARCH: "${{ matrix.arch }}"
-
       - name: Cache build outputs
         uses: actions/cache@v2
         env:

.github/workflows/branchPR.yaml

@@ -1,11 +1,86 @@
 package acigithub
 
 import (
+	"awesome-ci/src/tools"
+	"fmt"
+	"log"
+	"strings"
+
 	"github.com/google/go-github/v39/github"
 )
 
+var (
+	direction, sort = "asc", "created"
+)
+
 func GetIssueComments(issueNumber int, owner string, repo string) (issueComments []*github.IssueComment, err error) {
-	// opts := github.IssueListCommentsOptions{}
-	issueComments, _, err = GithubClient.Issues.ListComments(ctx, owner, repo, issueNumber, nil)
+	var commentOpts = &github.IssueListCommentsOptions{
+		Direction: &direction,
+		// Sort:      &sort,
+		ListOptions: github.ListOptions{
+			PerPage: 100,
+			Page:    1,
+		},
+	}
+	issueComments, _, err = GithubClient.Issues.ListComments(ctx, owner, repo, issueNumber, commentOpts)
+	return
+}
+
+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,
+		Sort:      &sort,
+		ListOptions: github.ListOptions{
+			PerPage: 30,
+			Page:    1,
+		},
+	}
+	comments, _, err := GithubClient.Issues.ListComments(ctx, owner, repo, number, commentOpts)
+	if err != nil {
+		return fmt.Errorf("unable to list comments: %x", err)
+	}
+
+	body := `<details><summary>Possible awesome-ci commands for this Pull Request</summary>` +
+		`</br>aci_patch_level: major</br>aci_version_override: 2.1.0` +
+		`</br></br>Need more help?</br>Have a look at <a href="https://github.com/fullstack-devops/awesome-ci" target="_blank">my repo</a>` +
+		`</br>This message was created by awesome-ci and can be disabled by the env variable <code>ACI_SILENT=true</code></details>`
+
+	var prComment *github.IssueComment
+	for _, prc := range comments {
+		if strings.HasPrefix(*prc.Body, `<details><summary>Possible awesome-ci commands for this Pull Request</summary>`) {
+			prComment = prc
+		}
+	}
+
+	if prComment == nil {
+		var prComment = &github.IssueComment{
+			Body: &body,
+		}
+
+		err = CommentPullRequest(number, prComment)
+	} else {
+		// edit command if newer version deployed and commands changed
+		if *prComment.Body != body {
+			editedComment := &github.IssueComment{
+				Body: &body,
+			}
+			_, _, err = GithubClient.Issues.EditComment(ctx, owner, repo, *prComment.ID, editedComment)
+		}
+	}
+	return
+}
+
+func CommentPullRequest(number int, comment *github.IssueComment) (err error) {
+	if !isgithubRepository {
+		log.Fatalln("make shure the GITHUB_REPOSITORY is available!")
+	}
+	owner, repo := tools.DevideOwnerAndRepo(githubRepository)
+
+	_, _, err = GithubClient.Issues.CreateComment(ctx, owner, repo, number, comment)
 	return
 }

src/acigithub/issues.go

@@ -6,6 +6,8 @@ import (
 	"awesome-ci/src/tools"
 	"fmt"
 	"log"
+	"os"
+	"regexp"
 	"strings"
 
 	"github.com/google/go-github/v39/github"
@@ -53,31 +55,55 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
 		return nil, nil, fmt.Errorf("no pull request found, please check if all resources are specified")
 	}
 
+	isCI, isCIBool := os.LookupEnv("CI")
+	_, isSilentBool := os.LookupEnv("ACI_SILENT")
+	if isCIBool && !isSilentBool {
+		if *prInfos.State == "open" && isCI == "true" {
+			err = CommentHelpToPullRequest(*prInfos.Number)
+			if err != nil {
+				log.Println(err)
+			}
+		}
+	}
+
 	prSHA := *prInfos.Head.SHA
 	branchName := *prInfos.Head.Ref
 	patchLevel := branchName[:strings.Index(branchName, "/")]
 
-	// if an comment exists with aci=major, make a major version!
+	var version = ""
+	// if an comment exists with aci_patch_level=major, make a major version!
 	issueComments, err := GetIssueComments(prNumber, owner, repo)
 	if err != nil {
 		return nil, nil, err
 	}
 	for _, comment := range issueComments {
 		// Must have permission in the repo to create a major version
 		// MANNEQUIN|NONE https://docs.github.com/en/graphql/reference/enums#commentauthorassociation
-		if strings.Contains(*comment.Body, "aci=major") && strings.Contains("OWNER|CONTRIBUTOR|COLLABORATOR", *comment.AuthorAssociation) {
-			patchLevel = "major"
-			break
+		if strings.Contains("OWNER|CONTRIBUTOR|COLLABORATOR", *comment.AuthorAssociation) {
+			aciVersionOverride := regexp.MustCompile(`aci_version_override: ([0-9]+\.[0-9]+\.[0-9]+)`)
+			aciPatchLevel := regexp.MustCompile(`aci_patch_level: ([a-zA-Z]+)`)
+
+			if aciPatchLevel.MatchString(*comment.Body) {
+				patchLevel = aciVersionOverride.FindStringSubmatch(*comment.Body)[1]
+				break
+			}
+			if aciVersionOverride.MatchString(*comment.Body) {
+				version = aciVersionOverride.FindStringSubmatch(*comment.Body)[1]
+				break
+			}
 		}
 	}
 
 	repositoryRelease, err := GetLatestReleaseVersion(owner, repo)
 	if err != nil {
 		return nil, nil, err
 	}
-	nextVersion, err := semver.IncreaseVersion(patchLevel, *repositoryRelease.TagName)
-	if err != nil {
-		return nil, nil, err
+
+	if version == "" {
+		version, err = semver.IncreaseVersion(patchLevel, *repositoryRelease.TagName)
+		if err != nil {
+			return nil, nil, err
+		}
 	}
 
 	standardPrInfos = &models.StandardPrInfos{
@@ -90,7 +116,7 @@ func GetPrInfos(prNumber int, mergeCommitSha string) (standardPrInfos *models.St
 		PatchLevel:     patchLevel,
 		LatestVersion:  *repositoryRelease.TagName,
 		CurrentVersion: "",
-		NextVersion:    nextVersion,
+		NextVersion:    version,
 		MergeCommitSha: *prInfos.MergeCommitSHA,
 	}
 	return

src/acigithub/pullrequest.go

@@ -1,11 +1,11 @@
-ACI_PR=0
-ACI_PR_SHA=790b5b99184e2ea1b4b2dc6912f3f4bf7bf8e1bc
-ACI_PR_SHA_SHORT=790b5b99
-ACI_PR_BRANCH=feature/awesome-feature
+ACI_PR=6
+ACI_PR_SHA=c2d509ad0f5291b0ce59ac636848177ea6c9d490
+ACI_PR_SHA_SHORT=c2d509ad
+ACI_PR_BRANCH=bugfix/test-else
 ACI_OWNER=eksrha
 ACI_REPO=playground
-ACI_PATCH_LEVEL=major
-ACI_VERSION=3.0.0
-ACI_LATEST_VERSION=2.0.0
-ACI_MERGE_COMMIT_SHA=de7de7bc7e09fb244fb1cd022efa49f7cfc9b289
+ACI_PATCH_LEVEL=bugfix
+ACI_VERSION=3.0.1
+ACI_LATEST_VERSION=3.0.0
+ACI_MERGE_COMMIT_SHA=d54c83dc7e2017c91931d4a6041abb240e0fe445
 ACI_RELEASE_ID=58357424