Merge pull request #226 from diggerhq/rename-pull-request-manager

rename PullRequestManager to CIService

Author: veziak

pkg/ci/main.go

@@ -0,0 +1,11 @@
+package ci
+
+type CIService interface {
+	GetChangedFiles(prNumber int) ([]string, error)
+	PublishComment(prNumber int, comment string)
+	SetStatus(prNumber int, status string, statusContext string) error
+	GetCombinedPullRequestStatus(prNumber int) (string, error)
+	MergePullRequest(prNumber int) error
+	IsMergeable(prNumber int) (bool, string, error)
+	IsClosed(prNumber int) (bool, error)
+}

pkg/digger/digger.go

@@ -2,8 +2,8 @@ package digger
 
 import (
 	"bytes"
+	"digger/pkg/ci"
 	"digger/pkg/configuration"
-	"digger/pkg/github"
 	"digger/pkg/models"
 	"digger/pkg/terraform"
 	"digger/pkg/utils"
@@ -19,7 +19,7 @@ import (
 	"strings"
 )
 
-func ProcessGitHubEvent(ghEvent models.Event, diggerConfig *configuration.DiggerConfig, prManager github.PullRequestManager) ([]configuration.Project, int, bool, error) {
+func ProcessGitHubEvent(ghEvent models.Event, diggerConfig *configuration.DiggerConfig, prManager ci.CIService) ([]configuration.Project, int, bool, error) {
 	var impactedProjects []configuration.Project
 	var prNumber int
 	var mergePrIfCmdSuccessfull = false
@@ -58,7 +58,7 @@ func ProcessGitHubEvent(ghEvent models.Event, diggerConfig *configuration.Digger
 	return impactedProjects, prNumber, mergePrIfCmdSuccessfull, nil
 }
 
-func RunCommandsPerProject(commandsPerProject []ProjectCommand, repoOwner string, repoName string, eventName string, prNumber int, prManager github.PullRequestManager, lock utils.Lock, planStorage utils.PlanStorage, workingDir string) (bool, error) {
+func RunCommandsPerProject(commandsPerProject []ProjectCommand, repoOwner string, repoName string, eventName string, prNumber int, prManager ci.CIService, lock utils.Lock, planStorage utils.PlanStorage, workingDir string) (bool, error) {
 	allAppliesSuccess := true
 	appliesPerProject := make(map[string]bool)
 	for _, projectCommands := range commandsPerProject {
@@ -146,7 +146,7 @@ func RunCommandsPerProject(commandsPerProject []ProjectCommand, repoOwner string
 	return allAppliesSuccess, nil
 }
 
-func MergePullRequest(githubPrService github.PullRequestManager, prNumber int) {
+func MergePullRequest(githubPrService ci.CIService, prNumber int) {
 	combinedStatus, err := githubPrService.GetCombinedPullRequestStatus(prNumber)
 
 	if err != nil {
@@ -351,7 +351,7 @@ type DiggerExecutor struct {
 	planStage         *configuration.Stage
 	commandRunner     CommandRun
 	terraformExecutor terraform.TerraformExecutor
-	prManager         github.PullRequestManager
+	prManager         ci.CIService
 	lock              utils.ProjectLock
 	planStorage       utils.PlanStorage
 }

pkg/github/github.go

@@ -2,11 +2,12 @@ package github
 
 import (
 	"context"
+	"digger/pkg/ci"
 	"github.com/google/go-github/v51/github"
 	"log"
 )
 
-func NewGithubPullRequestService(ghToken string, repoName string, owner string) PullRequestManager {
+func NewGithubPullRequestService(ghToken string, repoName string, owner string) ci.CIService {
 	client := github.NewTokenClient(context.Background(), ghToken)
 	return &GithubService{
 		Client:   client,
@@ -21,16 +22,6 @@ type GithubService struct {
 	Owner    string
 }
 
-type PullRequestManager interface {
-	GetChangedFiles(prNumber int) ([]string, error)
-	PublishComment(prNumber int, comment string)
-	SetStatus(prNumber int, status string, statusContext string) error
-	GetCombinedPullRequestStatus(prNumber int) (string, error)
-	MergePullRequest(prNumber int) error
-	IsMergeable(prNumber int) (bool, string, error)
-	IsClosed(prNumber int) (bool, error)
-}
-
 func (svc *GithubService) GetChangedFiles(prNumber int) ([]string, error) {
 	files, _, err := svc.Client.PullRequests.ListFiles(context.Background(), svc.Owner, svc.RepoName, prNumber, nil)
 	if err != nil {

pkg/utils/locking.go

@@ -4,8 +4,8 @@ import (
 	"digger/pkg/aws"
 	"digger/pkg/aws/envprovider"
 	"digger/pkg/azure"
+	"digger/pkg/ci"
 	"digger/pkg/gcp"
-	"digger/pkg/github"
 	"errors"
 	"fmt"
 	"log"
@@ -24,7 +24,7 @@ import (
 
 type ProjectLockImpl struct {
 	InternalLock Lock
-	PrManager    github.PullRequestManager
+	PrManager    ci.CIService
 	ProjectName  string
 	RepoName     string
 	RepoOwner    string