Gitlab improvements

cmd/digger/main.go

@@ -60,7 +60,7 @@ func gitHubCI(lock utils.Lock) {
 	eventName := parsedGhContext.EventName
 	splitRepositoryName := strings.Split(parsedGhContext.Repository, "/")
 	repoOwner, repositoryName := splitRepositoryName[0], splitRepositoryName[1]
-	githubPrService := dg_github.NewGithubPullRequestService(ghToken, repositoryName, repoOwner)
+	githubPrService := dg_github.NewGitHubService(ghToken, repositoryName, repoOwner)
 
 	impactedProjects, requestedProject, prNumber, err := digger.ProcessGitHubEvent(ghEvent, diggerConfig, githubPrService)
 	if err != nil {
@@ -106,7 +106,9 @@ func gitHubCI(lock utils.Lock) {
 
 func gitLabCI(lock utils.Lock) {
 	println("Using GitLab.")
+
 	projectNamespace := os.Getenv("CI_PROJECT_NAMESPACE")
+	projectName := os.Getenv("CI_PROJECT_NAME")
 	gitlabToken := os.Getenv("GITLAB_TOKEN")
 	if gitlabToken == "" {
 		fmt.Println("GITLAB_TOKEN is empty")
@@ -131,6 +133,12 @@ func gitLabCI(lock utils.Lock) {
 		os.Exit(4)
 	}
 
+	// it's ok to not have merge request info if it has been merged
+	if (gitLabContext.MergeRequestIId == nil || len(gitLabContext.OpenMergeRequests) == 0) && gitLabContext.EventType != "merge_request_merge" {
+		fmt.Println("No merge request found.")
+		os.Exit(0)
+	}
+
 	gitlabService, err := gitlab.NewGitLabService(gitlabToken, gitLabContext)
 	if err != nil {
 		fmt.Printf("failed to initialise GitLab service, %v", err)
@@ -153,21 +161,33 @@ func gitLabCI(lock utils.Lock) {
 	}
 	println("GitLab event converted to commands successfully")
 
+	println("Digger commands to be executed:")
 	for _, v := range commandsToRunPerProject {
 		fmt.Printf("command: %s, project: %s\n", strings.Join(v.Commands, ", "), v.ProjectName)
 	}
 
-	//planStorage := newPlanStorage(ghToken, repoOwner, repositoryName, prNumber)
-	var planStorage utils.PlanStorage
+	planStorage := newPlanStorage(gitlabToken, projectNamespace, projectName, *gitLabContext.MergeRequestIId)
 
-	result, err := gitlab.RunCommandsPerProject(commandsToRunPerProject, *gitLabContext, diggerConfig, gitlabService, lock, planStorage, currentDir)
+	allAppliesSuccess, err := gitlab.RunCommandsPerProject(commandsToRunPerProject, *gitLabContext, diggerConfig, gitlabService, lock, planStorage, currentDir)
 	if err != nil {
 		fmt.Printf("failed to execute command, %v", err)
 		os.Exit(8)
 	}
-	print(result)
+
+	if diggerConfig.AutoMerge && allAppliesSuccess {
+		digger.MergePullRequest(gitlabService, *gitLabContext.MergeRequestIId)
+		println("Merge request changes has been applied successfully")
+	}
 
 	println("Commands executed successfully")
+
+	reportErrorAndExit(projectName, "Digger finished successfully", 0)
+
+	defer func() {
+		if r := recover(); r != nil {
+			reportErrorAndExit(projectName, fmt.Sprintf("Panic occurred. %s", r), 1)
+		}
+	}()
 }
 
 /*
@@ -218,7 +238,8 @@ func main() {
 func newPlanStorage(ghToken string, repoOwner string, repositoryName string, prNumber int) utils.PlanStorage {
 	var planStorage utils.PlanStorage
 
-	if os.Getenv("PLAN_UPLOAD_DESTINATION") == "github" {
+	uploadDestination := strings.ToLower(os.Getenv("PLAN_UPLOAD_DESTINATION"))
+	if uploadDestination == "github" {
 		zipManager := utils.Zipper{}
 		planStorage = &utils.GithubPlanStorage{
 			Client:            github.NewTokenClient(context.Background(), ghToken),
@@ -227,9 +248,8 @@ func newPlanStorage(ghToken string, repoOwner string, repositoryName string, prN
 			PullRequestNumber: prNumber,
 			ZipManager:        zipManager,
 		}
-	} else if os.Getenv("PLAN_UPLOAD_DESTINATION") == "gcp" {
+	} else if uploadDestination == "gcp" {
 		ctx, client := gcp.GetGoogleStorageClient()
-
 		bucketName := strings.ToLower(os.Getenv("GOOGLE_STORAGE_BUCKET"))
 		if bucketName == "" {
 			reportErrorAndExit(repoOwner, fmt.Sprintf("GOOGLE_STORAGE_BUCKET is not defined"), 9)
@@ -240,7 +260,10 @@ func newPlanStorage(ghToken string, repoOwner string, repositoryName string, prN
 			Bucket:  bucket,
 			Context: ctx,
 		}
+	} else if uploadDestination == "gitlab" {
+		//TODO implement me
 	}
+
 	return planStorage
 }
 

pkg/ci/main.go

@@ -3,6 +3,8 @@ package ci
 type CIService interface {
 	GetChangedFiles(prNumber int) ([]string, error)
 	PublishComment(prNumber int, comment string)
+
+	// SetStatus set status of specified pull/merge request, status could be: "pending", "failure", "success"
 	SetStatus(prNumber int, status string, statusContext string) error
 	GetCombinedPullRequestStatus(prNumber int) (string, error)
 	MergePullRequest(prNumber int) error

pkg/configuration/digger_config.go

@@ -195,11 +195,50 @@ func (s *Step) extract(stepMap map[string]interface{}, action string) {
 	}
 }
 
+// duplicate copied from digger.go
+func defaultWorkflow() *Workflow {
+	return &Workflow{
+		Configuration: &WorkflowConfiguration{
+			OnCommitToDefault:   []string{"digger unlock"},
+			OnPullRequestPushed: []string{"digger plan"},
+			OnPullRequestClosed: []string{"digger unlock"},
+		},
+		Plan: &Stage{
+			Steps: []Step{
+				{
+					Action: "init", ExtraArgs: []string{},
+				},
+				{
+					Action: "plan", ExtraArgs: []string{},
+				},
+			},
+		},
+		Apply: &Stage{
+			Steps: []Step{
+				{
+					Action: "init", ExtraArgs: []string{},
+				},
+				{
+					Action: "apply", ExtraArgs: []string{},
+				},
+			},
+		},
+	}
+}
+
 func ConvertDiggerYamlToConfig(diggerYaml *DiggerConfigYaml, workingDir string, walker DirWalker) (*DiggerConfig, error) {
 	var diggerConfig DiggerConfig
 
 	diggerConfig.AutoMerge = diggerYaml.AutoMerge
-	diggerConfig.Workflows = diggerYaml.Workflows
+
+	if diggerYaml.Workflows != nil {
+		diggerConfig.Workflows = diggerYaml.Workflows
+	} else {
+		workflow := *defaultWorkflow()
+		diggerConfig.Workflows = make(map[string]Workflow)
+		diggerConfig.Workflows["default"] = workflow
+	}
+
 	diggerConfig.Projects = diggerYaml.Projects
 	diggerConfig.CollectUsageData = diggerYaml.CollectUsageData
 

pkg/github/github.go

@@ -9,7 +9,7 @@ import (
 	"github.com/google/go-github/v51/github"
 )
 
-func NewGithubPullRequestService(ghToken string, repoName string, owner string) ci.CIService {
+func NewGitHubService(ghToken string, repoName string, owner string) ci.CIService {
 	client := github.NewTokenClient(context.Background(), ghToken)
 	return &GithubService{
 		Client:   client,