group-review: add systemd file

instead of using command-line parameters, we can use env variables
Very helpful for services.

autogits.spec

@@ -169,6 +169,7 @@ install -D -m0755 gitea-events-rabbitmq-publisher/gitea-events-rabbitmq-publishe
 install -D -m0644 systemd/gitea-events-rabbitmq-publisher.service                  %{buildroot}%{_unitdir}/gitea-events-rabbitmq-publisher.service
 install -D -m0755 gitea_status_proxy/gitea_status_proxy                            %{buildroot}%{_bindir}/gitea_status_proxy
 install -D -m0755 group-review/group-review                                        %{buildroot}%{_bindir}/group-review
+install -D -m0644 systemd/group-review@.service                                    %{buildroot}%{_unitdir}/group-review@.service
 install -D -m0755 obs-forward-bot/obs-forward-bot                                  %{buildroot}%{_bindir}/obs-forward-bot
 install -D -m0755 obs-staging-bot/obs-staging-bot                                  %{buildroot}%{_bindir}/obs-staging-bot
 install -D -m0644 systemd/obs-staging-bot.service                                  %{buildroot}%{_unitdir}/obs-staging-bot.service
@@ -191,6 +192,18 @@ install -D -m0755 utils/hujson/hujson
 %postun gitea-events-rabbitmq-publisher
 %service_del_postun gitea-events-rabbitmq-publisher.service
 
+%pre group-review
+%service_add_pre group-review@.service
+
+%post group-review
+%service_add_post group-review@.service
+
+%preun group-review
+%service_del_preun group-review@.service
+
+%postun group-review
+%service_del_postun group-review@.service
+
 %pre obs-staging-bot
 %service_add_pre obs-staging-bot.service
 
@@ -251,6 +264,7 @@ install -D -m0755 utils/hujson/hujson
 %license COPYING
 %doc group-review/README.md
 %{_bindir}/group-review
+%{_unitdir}/group-review@.service
 
 %files obs-forward-bot
 %license COPYING

common/gitea_utils.go

@@ -75,10 +75,6 @@ type GiteaLabelSettter interface {
 	SetLabels(org, repo string, idx int64, labels []string) ([]*models.Label, error)
 }
 
-type GiteaIssueFetcher interface {
-	GetIssue(org, repo string, idx int64) (*models.Issue, error)
-}
-
 type GiteaTimelineFetcher interface {
 	GetTimeline(org, repo string, idx int64) ([]*models.TimelineComment, error)
 }
@@ -204,7 +200,6 @@ type Gitea interface {
 	GiteaSetRepoOptions
 	GiteaLabelGetter
 	GiteaLabelSettter
-	GiteaIssueFetcher
 
 	GetNotifications(Type string, since *time.Time) ([]*models.NotificationThread, error)
 	GetDoneNotifications(Type string, page int64) ([]*models.NotificationThread, error)
@@ -513,16 +508,6 @@ func (gitea *GiteaTransport) SetLabels(owner, repo string, idx int64, labels []s
 	return ret.Payload, nil
 }
 
-func (gitea *GiteaTransport) GetIssue(owner, repo string, idx int64) (*models.Issue, error) {
-	ret, err := gitea.client.Issue.IssueGetIssue(
-		issue.NewIssueGetIssueParams().WithOwner(owner).WithRepo(repo).WithIndex(idx),
-		gitea.transport.DefaultAuthentication)
-	if  err != nil {
-		return nil, err
-	}
-	return ret.Payload, nil
-}
-
 const (
 	GiteaNotificationType_Pull = "Pull"
 )

group-review/README.md

@@ -39,3 +39,16 @@ Requirements
      + R/W Notification
      + R   User
 
+Env Variables
+-------------
+The following variables can be used (and override) command line parameters.
+
+  * `AUTOGITS_CONFIG` - config file location
+  * `AUTOGITS_URL` - Gitea URL
+  * `AUTOGITS_RABBITURL` - RabbitMQ url
+  * `AUTOGITS_DEBUG` - when set, debug level logging enabled
+
+Authentication env variables
+  * `GITEA_TOKEN` - Gitea user token
+  * `AMQP_USERNAME`, `AMQP_PASSWORD` - username and password for rabbitmq
+

group-review/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"net/url"
+	"os"
 	"regexp"
 	"runtime/debug"
 	"slices"
@@ -252,7 +253,7 @@ func ProcessPR(pr *models.PullRequest) error {
 				if !common.IsDryRun {
 					text := reviewer + " requested changes on behalf of " + groupName + ". See " + review.HTMLURL
 					if review := FindOurLastReviewInTimeline(timeline); review == nil || review.Body != text {
-						_, err := gitea.AddReviewComment(pr, common.ReviewStateRequestChanges, "Changes requested. See review by: "+reviewer)
+						_, err := gitea.AddReviewComment(pr, common.ReviewStateRequestChanges, text)
 						if err != nil {
 							common.LogError("    -> failed to write rejecting comment", err)
 						}
@@ -328,6 +329,24 @@ func main() {
 	flag.BoolVar(&common.IsDryRun, "dry", false, "Dry run, no effect. For debugging")
 	flag.Parse()
 
+	if err := common.SetLoggingLevelFromString(*logging); err != nil {
+		common.LogError(err.Error())
+		return
+	}
+
+	if cf := os.Getenv("AUTOGITS_CONFIG"); len(cf) > 0 {
+		*configFile = cf
+	}
+	if url := os.Getenv("AUTOGITS_URL"); len(url) > 0 {
+		*giteaUrl = url
+	}
+	if url := os.Getenv("AUTOGITS_RABBITURL"); len(url) > 0 {
+		*rabbitMqHost = url
+	}
+	if debug := os.Getenv("AUTOGITS_DEBUG"); len(debug) > 0 {
+		common.SetLoggingLevel(common.LogLevelDebug)
+	}
+
 	args := flag.Args()
 	if len(args) != 1 {
 		log.Println("  syntax:")
@@ -372,11 +391,6 @@ func main() {
 		return
 	}
 
-	if err := common.SetLoggingLevelFromString(*logging); err != nil {
-		common.LogError(err.Error())
-		return
-	}
-
 	if *interval < 1 {
 		*interval = 1
 	}

systemd/group-review@.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Group Review bot for %i
+After=network-online.target
+
+[Service]
+Type=exec
+ExecStart=/usr/bin/group-review %i
+EnvironmentFile=-/etc/default/group-review/%i.env
+DynamicUser=yes
+NoNewPrivileges=yes
+ProtectSystem=strict
+
+[Install]
+WantedBy=multi-user.target
+

workflow-pr/pr_processor.go

@@ -626,23 +626,6 @@ func ProcesPullRequest(pr *models.PullRequest, configs []*common.AutogitConfig)
 	return PRProcessor.Process(pr)
 }
 
-func ProcessIssue(issue *models.Issue, configs []*common.AutogitConfig) error {
-	title := issue.Title
-
-	if len(title) > 5 && strings.EqualFold(title[0:5], "[ADD]") {
-		// we need "New Package" label and "Approval Required" label, unless already approved
-		// either via Label "Approved" or via review comment.
-		NewIssues := common.FindNewReposInIssueBody(issue.Body)
-
-	} else if len(title) > 4 && strings.EqualFold(title[0:4], "[RM]") {
-		// to remove a package, no approval is required. This should happen via
-		// project git PR reviews
-	} else {
-		common.LogError("Non-standard issue created. Ignoring", common.IssueToString(issue))
-		return nil
-	}
-}
-
 func (w *RequestProcessor) ProcessFunc(request *common.Request) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
@@ -671,18 +654,6 @@ func (w *RequestProcessor) ProcessFunc(request *common.Request) (err error) {
 			common.LogError("Cannot find PR for issue:", req.Repository.Owner.Username, req.Repository.Name, int64(req.Issue.Number))
 			return err
 		}
-	} else if req, ok := request.Data.(*common.IssueWebhookEvent); ok {
-		issue, err := Gitea.GetIssue(req.Repository.Owner.Username, req.Repository.Name, int64(req.Issue.Number))
-		if err != nil {
-			common.LogError("Cannot find issue for issue event:", req.Repository.Owner.Username, req.Repository.Name, int64(req.Issue.Number))
-			return err
-		}
-		configs, ok := w.configuredRepos[req.Repository.Owner.Username]
-		if !ok {
-			common.LogError("*** Cannot find config for org:", req.Repository.Owner.Username)
-			return nil
-		}
-		return processIssue(issue, configs)
 	} else {
 		common.LogError("*** Invalid data format for PR processing.")
 		return fmt.Errorf("*** Invalid data format for PR processing.")