support private VCS in ee (#1613)

diggerhq · Jul 11, 2024 · 18a9944 · 18a9944
1 parent 3ab8baf
commit 18a9944
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 17 deletions.
diff --git a/backend/utils/gitlab.go b/backend/utils/gitlab.go
@@ -12,19 +12,26 @@ import (
 )
 
 type GitlabProvider interface {
-	NewClient(token string) (*gitlab.Client, error)
+	NewClient(token string, baseUrl string) (*gitlab.Client, error)
 }
 
 type GitlabClientProvider struct{}
 
-func (g GitlabClientProvider) NewClient(token string) (*gitlab.Client, error) {
-	client, err := gitlab.NewClient(token)
-	return client, err
+func (g GitlabClientProvider) NewClient(token string, baseUrl string) (*gitlab.Client, error) {
+	if baseUrl == "" {
+		client, err := gitlab.NewClient(token)
+		return client, err
+	} else {
+		client, err := gitlab.NewClient(token, gitlab.WithBaseURL(baseUrl))
+		return client, err
+	}
 }
 
 func GetGitlabService(gh GitlabProvider, projectId int, repoName string, repoFullName string, prNumber int, discussionId string) (*orchestrator_gitlab.GitLabService, error) {
 	token := os.Getenv("DIGGER_GITLAB_ACCESS_TOKEN")
-	client, err := gh.NewClient(token)
+	baseUrl := os.Getenv("DIGGER_GITLAB_BASE_URL")
+
+	client, err := gh.NewClient(token, baseUrl)
 	if err != nil {
 		return nil, fmt.Errorf("could not get gitlab client: %v", err)
 	}

diff --git a/cli/cmd/digger/default.go b/cli/cmd/digger/default.go
@@ -31,7 +31,7 @@ var defaultCmd = &cobra.Command{
 			}
 			err = spec2.RunSpec(
 				spec,
-				lib_spec.VCSProvider{},
+				lib_spec.VCSProviderBasic{},
 				lib_spec.JobSpecProvider{},
 				lib_spec.LockProvider{},
 				lib_spec.ReporterProvider{},

diff --git a/cli/cmd/digger/run_spec.go b/cli/cmd/digger/run_spec.go
@@ -33,7 +33,7 @@ var runSpecCmd = &cobra.Command{
 		}
 		err = spec2.RunSpec(
 			spec,
-			lib_spec.VCSProvider{},
+			lib_spec.VCSProviderBasic{},
 			lib_spec.JobSpecProvider{},
 			lib_spec.LockProvider{},
 			lib_spec.ReporterProvider{},

diff --git a/ee/cli/cmd/digger/default.go b/ee/cli/cmd/digger/default.go
@@ -11,6 +11,7 @@ import (
 	"github.com/diggerhq/digger/ee/cli/pkg/drift"
 	github2 "github.com/diggerhq/digger/ee/cli/pkg/github"
 	"github.com/diggerhq/digger/ee/cli/pkg/policy"
+	"github.com/diggerhq/digger/ee/cli/pkg/vcs"
 	comment_summary "github.com/diggerhq/digger/libs/comment_utils/summary"
 	lib_spec "github.com/diggerhq/digger/libs/spec"
 	"github.com/spf13/cobra"
@@ -32,7 +33,7 @@ var defaultCmd = &cobra.Command{
 			}
 			err = spec2.RunSpec(
 				spec,
-				lib_spec.VCSProvider{},
+				vcs.VCSProviderAdvanced{},
 				lib_spec.JobSpecProvider{},
 				lib_spec.LockProvider{},
 				lib_spec.ReporterProvider{},

diff --git a/ee/cli/cmd/digger/run_spec.go b/ee/cli/cmd/digger/run_spec.go
@@ -34,7 +34,7 @@ var runSpecCmd = &cobra.Command{
 		}
 		err = spec2.RunSpec(
 			spec,
-			lib_spec.VCSProvider{},
+			lib_spec.VCSProviderBasic{},
 			lib_spec.JobSpecProvider{},
 			lib_spec.LockProvider{},
 			lib_spec.ReporterProvider{},

diff --git a/ee/cli/pkg/vcs/providers.go b/ee/cli/pkg/vcs/providers.go
@@ -0,0 +1,54 @@
+package vcs
+
+import (
+	"fmt"
+	github2 "github.com/diggerhq/digger/ee/cli/pkg/github"
+	"github.com/diggerhq/digger/libs/ci"
+	"github.com/diggerhq/digger/libs/ci/gitlab"
+	"github.com/diggerhq/digger/libs/spec"
+	"os"
+)
+
+type VCSProviderAdvanced struct{}
+
+func (v VCSProviderAdvanced) GetPrService(vcsSpec spec.VcsSpec) (ci.PullRequestService, error) {
+	switch vcsSpec.VcsType {
+	case "github":
+		token := os.Getenv("GITHUB_TOKEN")
+		if token == "" {
+			return nil, fmt.Errorf("failed to get github service: GITHUB_TOKEN not specified")
+		}
+		return github2.GithubServiceProviderAdvanced{}.NewService(token, vcsSpec.RepoName, vcsSpec.RepoOwner)
+	case "gitlab":
+		token := os.Getenv("GITLAB_TOKEN")
+		if token == "" {
+			return nil, fmt.Errorf("failed to get gitlab service: GITLAB_TOKEN not specified")
+		}
+		context, err := gitlab.ParseGitLabContext()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get gitlab service, could not parse context: %v", err)
+		}
+		baseUrl := os.Getenv("DIGGER_GITLAB_BASE_URL")
+		return gitlab.NewGitLabService(token, context, baseUrl)
+	default:
+		return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)
+	}
+}
+
+func (v VCSProviderAdvanced) GetOrgService(vcsSpec spec.VcsSpec) (ci.OrgService, error) {
+	switch vcsSpec.VcsType {
+	case "gitlab":
+		token := os.Getenv("GITLAB_TOKEN")
+		if token == "" {
+			return nil, fmt.Errorf("failed to get gitlab service: GITLAB_TOKEN not specified")
+		}
+		context, err := gitlab.ParseGitLabContext()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get gitlab service, could not parse context: %v", err)
+		}
+		baseUrl := os.Getenv("DIGGER_GITLAB_BASE_URL")
+		return gitlab.NewGitLabService(token, context, baseUrl)
+	default:
+		return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)
+	}
+}
diff --git a/libs/ci/gitlab/gitlab.go b/libs/ci/gitlab/gitlab.go
@@ -68,8 +68,15 @@ func ParseGitLabContext() (*GitLabContext, error) {
 	return &parsedGitLabContext, nil
 }
 
-func NewGitLabService(token string, gitLabContext *GitLabContext) (*GitLabService, error) {
-	client, err := go_gitlab.NewClient(token)
+func NewGitLabService(token string, gitLabContext *GitLabContext, gitlabBaseUrl string) (*GitLabService, error) {
+	var client *go_gitlab.Client
+	var err error
+	if gitlabBaseUrl == "" {
+		client, err = go_gitlab.NewClient(token, go_gitlab.WithBaseURL(gitlabBaseUrl))
+	} else {
+		client, err = go_gitlab.NewClient(token)
+	}
+
 	if err != nil {
 		log.Fatalf("failed to create gitlab client: %v", err)
 	}

diff --git a/libs/spec/providers.go b/libs/spec/providers.go
@@ -167,9 +167,14 @@ func (b BackendApiProvider) GetBackendApi(backendSpec BackendSpec) (backend2.Api
 	}
 }
 
-type VCSProvider struct{}
+type VCSProvider interface {
+	GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error)
+	GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error)
+}
+
+type VCSProviderBasic struct{}
 
-func (v VCSProvider) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error) {
+func (v VCSProviderBasic) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error) {
 	switch vcsSpec.VcsType {
 	case "github":
 		token := os.Getenv("GITHUB_TOKEN")
@@ -186,13 +191,13 @@ func (v VCSProvider) GetPrService(vcsSpec VcsSpec) (ci.PullRequestService, error
 		if err != nil {
 			return nil, fmt.Errorf("failed to get gitlab service, could not parse context: %v", err)
 		}
-		return gitlab.NewGitLabService(token, context)
+		return gitlab.NewGitLabService(token, context, "")
 	default:
 		return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)
 	}
 }
 
-func (v VCSProvider) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error) {
+func (v VCSProviderBasic) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error) {
 	switch vcsSpec.VcsType {
 	case "github":
 		token := os.Getenv("GITHUB_TOKEN")
@@ -209,11 +214,10 @@ func (v VCSProvider) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to get gitlab service, could not parse context: %v", err)
 		}
-		return gitlab.NewGitLabService(token, context)
+		return gitlab.NewGitLabService(token, context, "")
 	default:
 		return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)
 	}
-
 }
 
 type SpecPolicyProvider interface {