added-option-to-use-global-config-file (#5145)

SAP · Oct 18, 2024 · 769067e · 769067e
1 parent b317b1d
commit 769067e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/cmd/whitesourceExecuteScan.go b/cmd/whitesourceExecuteScan.go
@@ -490,6 +490,7 @@ func wsScanOptions(config *ScanOptions) *ws.ScanOptions {
 		AgentDownloadURL:                config.AgentDownloadURL,
 		AgentFileName:                   config.AgentFileName,
 		ConfigFilePath:                  config.ConfigFilePath,
+		UseGlobalConfiguration:          config.UseGlobalConfiguration,
 		Includes:                        config.Includes,
 		Excludes:                        config.Excludes,
 		JreDownloadURL:                  config.JreDownloadURL,

diff --git a/cmd/whitesourceExecuteScan_generated.go b/cmd/whitesourceExecuteScan_generated.go
diff --git a/pkg/whitesource/scanOptions.go b/pkg/whitesource/scanOptions.go
@@ -31,9 +31,10 @@ type ScanOptions struct {
 	DefaultNpmRegistry        string
 	NpmIncludeDevDependencies bool
 
-	AgentDownloadURL string
-	AgentFileName    string
-	ConfigFilePath   string
+	AgentDownloadURL       string
+	AgentFileName          string
+	ConfigFilePath         string
+	UseGlobalConfiguration bool
 
 	JreDownloadURL string
 

diff --git a/pkg/whitesource/scanUA.go b/pkg/whitesource/scanUA.go
@@ -127,6 +127,13 @@ func (s *Scan) ExecuteUAScanInPath(config *ScanOptions, utils Utils, scanPath st
 		}
 	}
 
+	if config.UseGlobalConfiguration {
+		config.ConfigFilePath, err = filepath.Abs(config.ConfigFilePath)
+		if err != nil {
+			return err
+		}
+	}
+
 	configPath, err := config.RewriteUAConfigurationFile(utils, s.AggregateProjectName, config.Verbose)
 	if err != nil {
 		return err

diff --git a/resources/metadata/whitesourceExecuteScan.yaml b/resources/metadata/whitesourceExecuteScan.yaml
@@ -128,6 +128,15 @@ spec:
           - STAGES
           - STEPS
         default: ./wss-unified-agent.config
+      - name: useGlobalConfiguration
+        type: bool
+        description: "The parameter is applicable for multi-module mend projects. If set to true, the configuration file will be used for all modules. Otherwise each module will require its own configuration file in the module folder."
+        scope:
+          - PARAMETERS
+          - GENERAL
+          - STAGES
+          - STEPS
+        default: false
       - name: containerRegistryPassword
         description: "For `buildTool: docker`: Password for container registry access - typically provided by the CI/CD environment."
         type: string