From a56e561c4a14ee8db46201b57939f96b8dca35fa Mon Sep 17 00:00:00 2001 From: David Zager Date: Wed, 31 Jul 2024 14:14:59 -0400 Subject: [PATCH] :bug: skip windup-shim if .net framework analysis Signed-off-by: David Zager --- cmd/analyze.go | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/cmd/analyze.go b/cmd/analyze.go index 4d3e8a75..9f90bf86 100644 --- a/cmd/analyze.go +++ b/cmd/analyze.go @@ -201,11 +201,6 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command { if analyzeCmd.providersMap == nil { analyzeCmd.providersMap = make(map[string]ProviderInit) } - xmlOutputDir, err := analyzeCmd.ConvertXML(cmd.Context()) - if err != nil { - log.Error(err, "failed to convert xml rules") - return err - } languages, err := recognizer.Analyze(analyzeCmd.input) if err != nil { log.Error(err, "Failed to determine languages for input") @@ -221,17 +216,6 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command { log.Error(err, "failed to set provider info") return err } - // alizer does not detect certain files such as xml - // in this case we need to run only the analyzer to use builtin provider - if len(foundProviders) == 0 { - analyzeCmd.needsBuiltin = true - err = analyzeCmd.RunAnalysis(cmd.Context(), xmlOutputDir, analyzeCmd.input) - if err != nil { - log.Error(err, "failed to run analysis") - return err - } - return nil - } err = analyzeCmd.validateProviders(foundProviders) if err != nil { return err @@ -240,6 +224,18 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command { if len(foundProviders) == 1 && foundProviders[0] == dotnetFrameworkProvider { return analyzeCmd.analyzeDotnetFramework(cmd.Context()) } + xmlOutputDir, err := analyzeCmd.ConvertXML(cmd.Context()) + if err != nil { + log.Error(err, "failed to convert xml rules") + return err + } + // alizer does not detect certain files such as xml + // in this case we need to run only the analyzer to use builtin provider + if len(foundProviders) == 0 { + analyzeCmd.needsBuiltin = true + return analyzeCmd.RunAnalysis(cmd.Context(), xmlOutputDir, analyzeCmd.input) + } + err = analyzeCmd.setProviderInitInfo(foundProviders) if err != nil { log.Error(err, "failed to set provider init info")