add conditional to fetch the right token

Author: motatoes

cli/pkg/spec/manual.go

@@ -102,7 +102,7 @@ func RunSpecManualCommand(
 	cmd.Stderr = os.Stderr
 	cmd.Run()
 
-	policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken)
+	policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken, spec.VCS.VcsType)
 	if err != nil {
 		usage.ReportErrorAndExit(spec.VCS.Actor, fmt.Sprintf("could not get policy provider: %v", err), 1)
 	}

cli/pkg/spec/spec.go

@@ -105,7 +105,7 @@ func RunSpec(
 		reportError(spec, backendApi, message, err)
 	}
 
-	policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken)
+	policyChecker, err := policyProvider.GetPolicyProvider(spec.Policy, spec.Backend.BackendHostname, spec.Backend.BackendOrganisationName, spec.Backend.BackendJobToken, spec.VCS.VcsType)
 	if err != nil {
 		message := fmt.Sprintf("could not get policy provider: %v", err)
 		reportError(spec, backendApi, message, err)

ee/cli/pkg/policy/providers.go

@@ -10,11 +10,20 @@ import (
 
 type AdvancedPolicyProvider struct{}
 
-func (p AdvancedPolicyProvider) GetPolicyProvider(policySpec lib_spec.PolicySpec, diggerHost string, diggerOrg string, token string) (policy.Checker, error) {
+func (p AdvancedPolicyProvider) GetPolicyProvider(policySpec lib_spec.PolicySpec, diggerHost string, diggerOrg string, token string, vcsType string) (policy.Checker, error) {
 	managementRepo := os.Getenv("DIGGER_MANAGEMENT_REPO")
 	if managementRepo != "" {
 		log.Printf("info: using management repo policy provider")
-		token := os.Getenv("GITLAB_TOKEN")
+		var token = ""
+		switch vcsType {
+		case "github":
+			token = os.Getenv("GITHUB_TOKEN")
+		case "gitlab":
+			token = os.Getenv("GITLAB_TOKEN")
+		default:
+			token = os.Getenv("GITHUB_TOKEN")
+		}
+
 		if token == "" {
 			return nil, fmt.Errorf("failed to get managent repo policy provider: GITHUB_TOKEN not specified")
 		}
@@ -26,7 +35,7 @@ func (p AdvancedPolicyProvider) GetPolicyProvider(policySpec lib_spec.PolicySpec
 		}, nil
 	}
 
-	checker, err := lib_spec.BasicPolicyProvider{}.GetPolicyProvider(policySpec, diggerHost, diggerOrg, token)
+	checker, err := lib_spec.BasicPolicyProvider{}.GetPolicyProvider(policySpec, diggerHost, diggerOrg, token, "")
 	return checker, err
 }
 

libs/spec/providers.go

@@ -315,12 +315,12 @@ func (v VCSProviderBasic) GetOrgService(vcsSpec VcsSpec) (ci.OrgService, error)
 }
 
 type SpecPolicyProvider interface {
-	GetPolicyProvider(policySpec PolicySpec, diggerHost string, diggerOrg string, token string) (policy2.Checker, error)
+	GetPolicyProvider(policySpec PolicySpec, diggerHost string, diggerOrg string, token string, vcsType string) (policy2.Checker, error)
 }
 
 type BasicPolicyProvider struct{}
 
-func (p BasicPolicyProvider) GetPolicyProvider(policySpec PolicySpec, diggerHost string, diggerOrg string, token string) (policy2.Checker, error) {
+func (p BasicPolicyProvider) GetPolicyProvider(policySpec PolicySpec, diggerHost string, diggerOrg string, token string, vcsType string) (policy2.Checker, error) {
 	slog.Debug("Getting policy provider",
 		"policyType", policySpec.PolicyType,
 		"diggerHost", diggerHost,