From c1ec82a812323da4dd4a9e0af12a0c59419d01ac Mon Sep 17 00:00:00 2001
From: Emily McMullan <emcmulla@redhat.com>
Date: Tue, 26 Sep 2023 17:46:57 -0400
Subject: [PATCH] do not create discovery dir for convert

---
 main.go                   |  2 +-
 pkg/conversion/convert.go | 12 +++++++-----
 pkg/execution/execute.go  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 409a43f2..d70929e5 100644
--- a/main.go
+++ b/main.go
@@ -48,7 +48,7 @@ func main() {
 				if err != nil {
 					fmt.Println(err)
 				}
-				_, err = conversion.ConvertWindupRulesetsToAnalyzer(rulesets, location, outputDir, flattenRulesets)
+				_, err = conversion.ConvertWindupRulesetsToAnalyzer(rulesets, location, outputDir, flattenRulesets, os.Args[1])
 				if err != nil {
 					log.Fatal(err)
 				}
diff --git a/pkg/conversion/convert.go b/pkg/conversion/convert.go
index 6acb9941..1dd10704 100644
--- a/pkg/conversion/convert.go
+++ b/pkg/conversion/convert.go
@@ -22,11 +22,13 @@ type analyzerRules struct {
 	relativePath string
 }
 
-func ConvertWindupRulesetsToAnalyzer(windups []windup.Ruleset, baseLocation, outputDir string, flattenRulesets bool) (map[string]*analyzerRules, error) {
-	// Write discovery rules
-	err := writeDiscoveryRules(outputDir)
-	if err != nil {
-		return nil, err
+func ConvertWindupRulesetsToAnalyzer(windups []windup.Ruleset, baseLocation, outputDir string, flattenRulesets bool, cmd string) (map[string]*analyzerRules, error) {
+	if cmd != "convert" {
+		// Write discovery rules
+		err := writeDiscoveryRules(outputDir)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	outputRulesets := map[string]*analyzerRules{}
diff --git a/pkg/execution/execute.go b/pkg/execution/execute.go
index 85013660..eb3bb2a1 100644
--- a/pkg/execution/execute.go
+++ b/pkg/execution/execute.go
@@ -136,7 +136,7 @@ func ExecuteRulesets(rulesets []windup.Ruleset, baseLocation, datadir string) (s
 	for _, ruleset := range rulesets {
 		sourceFiles = append(sourceFiles, ruleset.SourceFile)
 	}
-	conversion.ConvertWindupRulesetsToAnalyzer(rulesets, baseLocation, filepath.Join(dir, "rules"), true)
+	conversion.ConvertWindupRulesetsToAnalyzer(rulesets, baseLocation, filepath.Join(dir, "rules"), true, "")
 	// Template config file for analyzer
 	providerConfig := []provider.Config{
 		{