From 374e4babfe0036720733671c1306b17679dba497 Mon Sep 17 00:00:00 2001 From: Pranav Gaikwad Date: Tue, 5 Sep 2023 15:00:32 -0400 Subject: [PATCH] :sparkles: pass maven settings for analysis Signed-off-by: Pranav Gaikwad --- cmd/analyze.go | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/cmd/analyze.go b/cmd/analyze.go index 3386ecd..58e42ec 100644 --- a/cmd/analyze.go +++ b/cmd/analyze.go @@ -46,6 +46,7 @@ type analyzeCommand struct { listTargets bool skipStaticReport bool analyzeKnownLibraries bool + mavenSettingsFile string sources []string targets []string input string @@ -133,6 +134,7 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command { analyzeCommand.Flags().StringVarP(&analyzeCmd.output, "output", "o", "", "path to the directory for analysis output") analyzeCommand.Flags().BoolVar(&analyzeCmd.skipStaticReport, "skip-static-report", false, "do not generate static report") analyzeCommand.Flags().BoolVar(&analyzeCmd.analyzeKnownLibraries, "analyze-known-libraries", false, "analyze known open-source libraries") + analyzeCommand.Flags().StringVar(&analyzeCmd.mavenSettingsFile, "maven-settings", "", "path to a custom maven settings file to use") analyzeCommand.Flags().StringVarP(&analyzeCmd.mode, "mode", "m", string(provider.FullAnalysisMode), "analysis mode. Must be one of 'full' or 'source-only'") return analyzeCommand @@ -175,6 +177,9 @@ func (a *analyzeCommand) Validate() error { a.mode != string(provider.SourceOnlyAnalysisMode) { return fmt.Errorf("mode must be one of 'full' or 'source-only'") } + if _, err := os.Stat(a.mavenSettingsFile); a.mavenSettingsFile != "" && err != nil { + return fmt.Errorf("%w failed to stat maven settings file at path %s", err, a.mavenSettingsFile) + } // try to get abs path, if not, continue with relative path if absPath, err := filepath.Abs(a.output); err == nil { a.output = absPath @@ -182,6 +187,9 @@ func (a *analyzeCommand) Validate() error { if absPath, err := filepath.Abs(a.input); err == nil { a.input = absPath } + if absPath, err := filepath.Abs(a.mavenSettingsFile); err == nil { + a.mavenSettingsFile = absPath + } return nil } @@ -312,6 +320,8 @@ func listOptionsFromLabels(sl []string, label string) { } func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) { + vols := map[string]string{} + tempDir, err := os.MkdirTemp("", "analyze-config-") if err != nil { a.log.V(1).Error(err, "failed creating temp dir", "dir", tempDir) @@ -328,6 +338,12 @@ func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) { otherProvsMountPath = filepath.Dir(otherProvsMountPath) } + var mavenSettingsFile string + if a.mavenSettingsFile != "" { + mavenSettingsFile = fmt.Sprintf("%s/%s", ConfigMountPath, "settings.xml") + vols[a.mavenSettingsFile] = mavenSettingsFile + } + provConfig := []provider.Config{ { Name: "go", @@ -354,6 +370,7 @@ func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) { ProviderSpecificConfig: map[string]interface{}{ "bundles": "/jdtls/java-analyzer-bundle/java-analyzer-bundle.core/target/java-analyzer-bundle.core-1.0.0-SNAPSHOT.jar", "depOpenSourceLabelsFile": "/usr/local/etc/maven.default.index", + "mavenSettingsFile": mavenSettingsFile, provider.LspServerPathConfigKey: "/jdtls/bin/jdtls", }, }, @@ -379,9 +396,8 @@ func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) { a.log.V(1).Error(err, "failed to write provider config", "dir", tempDir, "file", "settings.json") return nil, err } - return map[string]string{ - tempDir: ConfigMountPath, - }, nil + vols[tempDir] = ConfigMountPath + return vols, nil } func (a *analyzeCommand) getRulesVolumes() (map[string]string, error) {