Fixed issue with empty project tokens after scanning (#4808)

* Fixed issue with empty project tokens after scanning

cmd/whitesourceExecuteScan.go

@@ -134,9 +134,10 @@ func newWhitesourceUtils(config *ScanOptions, client *github.Client) *whitesourc
 
 func newWhitesourceScan(config *ScanOptions) *ws.Scan {
 	return &ws.Scan{
-		AggregateProjectName: config.ProjectName,
-		ProductVersion:       config.Version,
-		BuildTool:            config.BuildTool,
+		AggregateProjectName:        config.ProjectName,
+		ProductVersion:              config.Version,
+		BuildTool:                   config.BuildTool,
+		SkipProjectsWithEmptyTokens: config.SkipProjectsWithEmptyTokens,
 	}
 }
 

pkg/whitesource/scan.go

@@ -17,14 +17,15 @@ type Scan struct {
 	// It does not include the ProductVersion.
 	AggregateProjectName string
 	// ProductVersion is the global version that is used across all Projects (modules) during the scan.
-	BuildTool       string
-	ProductToken    string
-	ProductVersion  string
-	scannedProjects map[string]Project
-	scanTimes       map[string]time.Time
-	AgentName       string
-	AgentVersion    string
-	Coordinates     versioning.Coordinates
+	BuildTool                   string
+	ProductToken                string
+	ProductVersion              string
+	scannedProjects             map[string]Project
+	scanTimes                   map[string]time.Time
+	AgentName                   string
+	AgentVersion                string
+	Coordinates                 versioning.Coordinates
+	SkipProjectsWithEmptyTokens bool
 }
 
 func (s *Scan) init() {
@@ -83,6 +84,10 @@ func (s *Scan) ProjectByName(projectName string) (Project, bool) {
 func (s *Scan) ScannedProjects() []Project {
 	var projects []Project
 	for _, project := range s.scannedProjects {
+		if len(project.Token) == 0 && s.SkipProjectsWithEmptyTokens {
+			log.Entry().Debugf("Project will be skipped as the token is empty, project_name: %s", project.Name)
+			continue
+		}
 		projects = append(projects, project)
 	}
 	return projects

resources/metadata/whitesourceExecuteScan.yaml

@@ -653,6 +653,15 @@ spec:
           - type: vaultSecret
             name: golangPrivateModulesGitTokenVaultSecret
             default: golang
+      - name: SkipProjectsWithEmptyTokens
+        description: Skips projects with empty tokens after scanning. This is for testing purposes only and should not be used until we roll out the new parameter
+        scope:
+          - GENERAL
+          - PARAMETERS
+          - STAGES
+          - STEPS
+        type: bool
+        default: false
     resources:
       - name: buildDescriptor
         type: stash