fix the error calling cli (#1585)

motatoes · web-flow · commit 353215e40bce · 2024-06-20T15:55:37.000+01:00
* fix the error calling cli

* fix build
diff --git a/cli/cmd/digger/root.go b/cli/cmd/digger/root.go
@@ -36,8 +36,8 @@ func (r *RunConfig) GetServices() (*orchestrator.PullRequestService, *orchestrat
 	switch r.Reporter {
 	case "github":
 		repoOwner, repositoryName := utils.ParseRepoNamespace(r.RepoNamespace)
-		prService = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, repositoryName, repoOwner)
-		orgService = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, r.RepoNamespace, r.Actor)
+		prService, _ = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, repositoryName, repoOwner)
+		orgService, _ = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, r.RepoNamespace, r.Actor)
 		reporter = &reporting.CiReporter{
 			CiService:         prService,
 			ReportStrategy:    ReportStrategy,
diff --git a/cli/pkg/github/github.go b/cli/pkg/github/github.go
@@ -80,7 +80,10 @@ func GitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 	}
 
 	repoOwner, repositoryName := utils.ParseRepoNamespace(ghRepository)
-	githubPrService := githubServiceProvider.NewService(ghToken, repositoryName, repoOwner)
+	githubPrService, err := githubServiceProvider.NewService(ghToken, repositoryName, repoOwner)
+	if err != nil {
+		usage.ReportErrorAndExit(githubActor, fmt.Sprintf("could not create pr service: %v", err), 4)
+	}
 
 	currentDir, err := os.Getwd()
 	if err != nil {
diff --git a/cli/pkg/integration/integration_test.go b/cli/pkg/integration/integration_test.go
@@ -43,7 +43,7 @@ func getProjectLockForTests() (error, *locking.PullRequestLock) {
 	repoOwner := "diggerhq"
 	repositoryName := "test_dynamodb_lock"
 	ghToken := "token"
-	githubPrService := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
+	githubPrService, _ := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
 	reporter := reporting.CiReporter{
 		CiService:      &githubPrService,
 		PrNumber:       1,
@@ -388,7 +388,7 @@ func TestHappyPath(t *testing.T) {
 	ghEvent := parsedNewPullRequestContext.Event
 	repoOwner := parsedNewPullRequestContext.RepositoryOwner
 	repositoryName := parsedNewPullRequestContext.Repository
-	githubPrService := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
+	githubPrService, _ := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
 
 	assert.Equal(t, "pull_request", parsedNewPullRequestContext.EventName)
 
@@ -545,7 +545,7 @@ func TestMultiEnvHappyPath(t *testing.T) {
 	repoOwner := parsedNewPullRequestContext.RepositoryOwner
 	repositoryName := parsedNewPullRequestContext.Repository
 	diggerProjectNamespace := repoOwner + "/" + repositoryName
-	githubPrService := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
+	githubPrService, _ := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
 
 	assert.Equal(t, "pull_request", parsedNewPullRequestContext.EventName)
 
@@ -765,7 +765,7 @@ workflows:
 	ghEvent := parsedNewPullRequestContext.Event
 	repoOwner := parsedNewPullRequestContext.RepositoryOwner
 	repositoryName := parsedNewPullRequestContext.Repository
-	githubPrService := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
+	githubPrService, _ := dg_github.GithubServiceProviderBasic{}.NewService(ghToken, repositoryName, repoOwner)
 	diggerProjectNamespace := repoOwner + "/" + repositoryName
 
 	assert.Equal(t, "pull_request", parsedNewPullRequestContext.EventName)
diff --git a/ee/cli/cmd/digger/root.go b/ee/cli/cmd/digger/root.go
@@ -36,8 +36,8 @@ func (r *RunConfig) GetServices() (*orchestrator.PullRequestService, *orchestrat
 	switch r.Reporter {
 	case "github":
 		repoOwner, repositoryName := utils.ParseRepoNamespace(r.RepoNamespace)
-		prService = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, repositoryName, repoOwner)
-		orgService = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, r.RepoNamespace, r.Actor)
+		prService, _ = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, repositoryName, repoOwner)
+		orgService, _ = orchestrator_github.GithubServiceProviderBasic{}.NewService(r.GithubToken, r.RepoNamespace, r.Actor)
 		reporter = &reporting.CiReporter{
 			CiService:         prService,
 			ReportStrategy:    ReportStrategy,
diff --git a/ee/cli/pkg/github/providers.go b/ee/cli/pkg/github/providers.go
@@ -10,23 +10,28 @@ import (
 
 type GithubServiceProviderAdvanced struct{}
 
-func (_ GithubServiceProviderAdvanced) NewService(ghToken string, repoName string, owner string) dg_github.GithubService {
+func (_ GithubServiceProviderAdvanced) NewService(ghToken string, repoName string, owner string) (dg_github.GithubService, error) {
 	client := github.NewClient(nil)
 	if ghToken != "" {
 		client = client.WithAuthToken(ghToken)
 	}
 
 	githubHostname := os.Getenv("DIGGER_GITHUB_HOSTNAME")
+	var err error
 	if githubHostname != "" {
 		log.Printf("info: using github hostname: %v", githubHostname)
 		githubEnterpriseBaseUrl := fmt.Sprintf("https://%v/api/v3/", githubHostname)
 		githubEnterpriseUploadUrl := fmt.Sprintf("https://%v/api/uploads/", githubHostname)
-		client.WithEnterpriseURLs(githubEnterpriseBaseUrl, githubEnterpriseUploadUrl)
+		client, err = client.WithEnterpriseURLs(githubEnterpriseBaseUrl, githubEnterpriseUploadUrl)
+		if err != nil {
+			log.Printf("error: could not create enterprise client: %v", err)
+			return dg_github.GithubService{}, fmt.Errorf("could not create enterprise client: %v", err)
+		}
 	}
 
 	return dg_github.GithubService{
 		Client:   client,
 		RepoName: repoName,
 		Owner:    owner,
-	}
+	}, nil
 }
diff --git a/libs/orchestrator/github/github.go b/libs/orchestrator/github/github.go
@@ -15,12 +15,12 @@ import (
 )
 
 type GithubServiceProvider interface {
-	NewService(ghToken string, repoName string, owner string) GithubService
+	NewService(ghToken string, repoName string, owner string) (GithubService, error)
 }
 
 type GithubServiceProviderBasic struct{}
 
-func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string, owner string) GithubService {
+func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string, owner string) (GithubService, error) {
 	client := github.NewClient(nil)
 	if ghToken != "" {
 		client = client.WithAuthToken(ghToken)
@@ -30,7 +30,7 @@ func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string,
 		Client:   client,
 		RepoName: repoName,
 		Owner:    owner,
-	}
+	}, nil
 }
 
 type GithubService struct {
diff --git a/libs/orchestrator/github/github_test.go b/libs/orchestrator/github/github_test.go
@@ -115,7 +115,7 @@ func TestFindAllProjectsDependantOnImpactedProjects(t *testing.T) {
 }
 
 func TestFindAllChangedFilesOfPR(t *testing.T) {
-	githubPrService := GithubServiceProviderBasic{}.NewService("", "digger", "diggerhq")
+	githubPrService, _ := GithubServiceProviderBasic{}.NewService("", "digger", "diggerhq")
 	files, _ := githubPrService.GetChangedFiles(98)
 	// 45 changed files including 1 renamed file so the previous filename is included
 	assert.Equal(t, 46, len(files))
diff --git a/libs/spec/providers.go b/libs/spec/providers.go
@@ -175,7 +175,7 @@ func (v VCSProvider) GetPrService(vcsSpec VcsSpec) (orchestrator.PullRequestServ
 		if token == "" {
 			return nil, fmt.Errorf("failed to get githbu service: GITHUB_TOKEN not specified")
 		}
-		return github.GithubServiceProviderBasic{}.NewService(token, vcsSpec.RepoName, vcsSpec.RepoOwner), nil
+		return github.GithubServiceProviderBasic{}.NewService(token, vcsSpec.RepoName, vcsSpec.RepoOwner)
 	default:
 		return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)
 	}

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type GithubServiceProvider interface {`
`18`		`- NewService(ghToken string, repoName string, owner string) GithubService`
	`18`	`+ NewService(ghToken string, repoName string, owner string) (GithubService, error)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`type GithubServiceProviderBasic struct{}`
`22`	`22`
`23`		`-func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string, owner string) GithubService {`
	`23`	`+func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string, owner string) (GithubService, error) {`
`24`	`24`	`client := github.NewClient(nil)`
`25`	`25`	`if ghToken != "" {`
`26`	`26`	`client = client.WithAuthToken(ghToken)`
`@@ -30,7 +30,7 @@ func (_ GithubServiceProviderBasic) NewService(ghToken string, repoName string,`
`30`	`30`	`Client: client,`
`31`	`31`	`RepoName: repoName,`
`32`	`32`	`Owner: owner,`
`33`		`- }`
	`33`	`+ }, nil`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`type GithubService struct {`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func TestFindAllProjectsDependantOnImpactedProjects(t *testing.T) {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`func TestFindAllChangedFilesOfPR(t *testing.T) {`
`118`		`- githubPrService := GithubServiceProviderBasic{}.NewService("", "digger", "diggerhq")`
	`118`	`+ githubPrService, _ := GithubServiceProviderBasic{}.NewService("", "digger", "diggerhq")`
`119`	`119`	`files, _ := githubPrService.GetChangedFiles(98)`
`120`	`120`	`// 45 changed files including 1 renamed file so the previous filename is included`
`121`	`121`	`assert.Equal(t, 46, len(files))`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func (v VCSProvider) GetPrService(vcsSpec VcsSpec) (orchestrator.PullRequestServ`
`175`	`175`	`if token == "" {`
`176`	`176`	`return nil, fmt.Errorf("failed to get githbu service: GITHUB_TOKEN not specified")`
`177`	`177`	`}`
`178`		`- return github.GithubServiceProviderBasic{}.NewService(token, vcsSpec.RepoName, vcsSpec.RepoOwner), nil`
	`178`	`+ return github.GithubServiceProviderBasic{}.NewService(token, vcsSpec.RepoName, vcsSpec.RepoOwner)`
`179`	`179`	`default:`
`180`	`180`	`return nil, fmt.Errorf("could not get PRService, unknown type %v", vcsSpec.VcsType)`
`181`	`181`	`}`