refactor: use generic client in gitlab build tests

- Use generic, provider-agnostic, Git client
functions leading to a nicer,
more readable and maintainable code

pkg/clients/git/git.go

@@ -30,5 +30,6 @@ type Client interface {
 	GetFileContent(repository, pathToFile, branchName string) (string, error)
 	CreatePullRequest(repository, title, body, head, base string) (*PullRequest, error)
 	MergePullRequest(repository string, prNumber int) (*PullRequest, error)
+	DeleteBranchAndClosePullRequest(repository string, prNumber int) error
 	CleanupWebhooks(repository, clusterAppDomain string) error
 }

pkg/clients/git/github.go

@@ -103,3 +103,15 @@ func (g *GitHubClient) CleanupWebhooks(repository, clusterAppDomain string) erro
 	}
 	return nil
 }
+
+func (g *GitHubClient) DeleteBranchAndClosePullRequest(repository string, prNumber int) error {
+	pr, err := g.Github.GetPullRequest(repository, prNumber)
+	if err != nil {
+		return err
+	}
+	err = g.DeleteBranch(repository, pr.Head.GetRef())
+	if err != nil && strings.Contains(err.Error(), "Reference does not exist") {
+		return nil
+	}
+	return err
+}

pkg/clients/git/gitlab.go

@@ -95,3 +95,15 @@ func (g *GitLabClient) CreatePullRequest(repository, title, body, head, base str
 func (g *GitLabClient) CleanupWebhooks(repository, clusterAppDomain string) error {
 	return g.DeleteWebhooks(repository, clusterAppDomain)
 }
+
+func (g *GitLabClient) DeleteBranchAndClosePullRequest(repository string, prNumber int) error {
+	mr, _, err := g.GitlabClient.GetClient().MergeRequests.GetMergeRequest(repository, prNumber, nil)
+	if err != nil {
+		return err
+	}
+	err = g.DeleteBranch(repository, mr.SourceBranch)
+	if err != nil {
+		return err
+	}
+	return g.CloseMergeRequest(repository, prNumber)
+}