do not create discovery dir for convert

Signed-off-by: Emily McMullan <emcmulla@redhat.com>
konveyor · Sep 26, 2023 · 6a079d4 · 6a079d4
1 parent 085ca70
commit 6a079d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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{
 		{