Merge pull request #118 from Threagile/fix-interactive-mode

joreiche · web-flow · commit bab72aed0a60 · 2024-11-18T16:00:59.000-08:00
fixed interactive mode, fixed script any/all/count/contains expressions
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@ stats.json
 /config.json
 /config.yaml
 /tmp/
+/threagile.yaml
diff --git a/internal/threagile/config.go b/internal/threagile/config.go
@@ -17,6 +17,9 @@ import (
 )
 
 type Config struct {
+	ConfigGetter
+	ConfigSetter
+
 	BuildTimestampValue string `json:"BuildTimestamp,omitempty" yaml:"BuildTimestamp"`
 	VerboseValue        bool   `json:"Verbose,omitempty" yaml:"Verbose"`
 	InteractiveValue    bool   `json:"Interactive,omitempty" yaml:"Interactive"`
@@ -65,6 +68,75 @@ type Config struct {
 	ReportConfigurationValue report.ReportConfiguation `json:"ReportConfiguration" yaml:"ReportConfiguration"`
 }
 
+type ConfigGetter interface {
+	GetBuildTimestamp() string
+	GetVerbose() bool
+	GetInteractive() bool
+	GetAppFolder() string
+	GetPluginFolder() string
+	GetDataFolder() string
+	GetOutputFolder() string
+	GetServerFolder() string
+	GetTempFolder() string
+	GetKeyFolder() string
+	GetTechnologyFilename() string
+	GetInputFile() string
+	GetDataFlowDiagramFilenamePNG() string
+	GetDataAssetDiagramFilenamePNG() string
+	GetDataFlowDiagramFilenameDOT() string
+	GetDataAssetDiagramFilenameDOT() string
+	GetReportFilename() string
+	GetExcelRisksFilename() string
+	GetExcelTagsFilename() string
+	GetJsonRisksFilename() string
+	GetJsonTechnicalAssetsFilename() string
+	GetJsonStatsFilename() string
+	GetReportLogoImagePath() string
+	GetTemplateFilename() string
+	GetRiskRulePlugins() []string
+	GetSkipRiskRules() []string
+	GetExecuteModelMacro() string
+	GetRiskExcelConfigHideColumns() []string
+	GetRiskExcelConfigSortByColumns() []string
+	GetRiskExcelConfigWidthOfColumns() map[string]float64
+	GetRiskExcelWrapText() bool
+	GetRiskExcelShrinkColumnsToFit() bool
+	GetRiskExcelColorText() bool
+	GetServerMode() bool
+	GetDiagramDPI() int
+	GetServerPort() int
+	GetGraphvizDPI() int
+	GetMinGraphvizDPI() int
+	GetMaxGraphvizDPI() int
+	GetBackupHistoryFilesToKeep() int
+	GetAddModelTitle() bool
+	GetKeepDiagramSourceFiles() bool
+	GetIgnoreOrphanedRiskTracking() bool
+	GetAttractiveness() Attractiveness
+	GetReportConfiguration() report.ReportConfiguation
+	GetThreagileVersion() string
+	GetProgressReporter() types.ProgressReporter
+	GetReportConfigurationHideChapters() map[report.ChaptersToShowHide]bool
+}
+
+type ConfigSetter interface {
+	SetVerbose(verbose bool)
+	SetInteractive(interactive bool)
+	SetAppFolder(appFolder string)
+	SetPluginFolder(pluginFolder string)
+	SetOutputFolder(outputFolder string)
+	SetServerFolder(serverFolder string)
+	SetTempFolder(tempFolder string)
+	SetInputFile(inputFile string)
+	SetTemplateFilename(templateFilename string)
+	SetRiskRulePlugins(riskRulePlugins []string)
+	SetSkipRiskRules(skipRiskRules []string)
+	SetServerMode(serverMode bool)
+	SetDiagramDPI(diagramDPI int)
+	SetServerPort(serverPort int)
+	SetIgnoreOrphanedRiskTracking(ignoreOrphanedRiskTracking bool)
+}
+
 func (c *Config) Defaults(buildTimestamp string) *Config {
 	*c = Config{
 		BuildTimestampValue: buildTimestamp,
diff --git a/internal/threagile/root.go b/internal/threagile/root.go
@@ -82,13 +82,19 @@ func (what *Threagile) initRoot() *Threagile {
 	what.rootCmd.PersistentFlags().BoolVar(&what.flags.generateTagsExcelFlag, generateTagsExcelFlagName, true, "generate tags excel")
 	what.rootCmd.PersistentFlags().BoolVar(&what.flags.generateReportPDFFlag, generateReportPDFFlagName, true, "generate report pdf, including diagrams")
 	what.rootCmd.PersistentFlags().BoolVar(&what.flags.generateReportADOCFlag, generateReportADOCFlagName, true, "generate report adoc, including diagrams")
+
+	_ = what.rootCmd.PersistentFlags().Parse(os.Args[1:])
+
 	return what
 }
 
 func (what *Threagile) run(cmd *cobra.Command, _ []string) {
 	if !what.flags.interactiveFlag {
-		cmd.Println("Please add the --interactive flag to run in interactive mode.")
-		return
+		cfg := what.readConfig(cmd, what.buildTimestamp)
+		if !cfg.GetInteractive() {
+			cmd.Println("Please add the --interactive flag to run in interactive mode.")
+			return
+		}
 	}
 
 	completer := readline.NewPrefixCompleter()
diff --git a/internal/threagile/threagile.go b/internal/threagile/threagile.go
@@ -18,6 +18,11 @@ func (what *Threagile) Execute() {
 		what.rootCmd.Println(err)
 		os.Exit(1)
 	}
+
+	cfg := what.readConfig(what.rootCmd, what.buildTimestamp)
+	if what.flags.interactiveFlag || cfg.GetInteractive() {
+		what.run(what.rootCmd, nil)
+	}
 }
 
 func (what *Threagile) Init(buildTimestamp string) *Threagile {
diff --git a/pkg/risks/script/expressions/all-expression.go b/pkg/risks/script/expressions/all-expression.go
@@ -185,6 +185,9 @@ func (what *AllExpression) evalBool(scope *common.Scope, inValue common.Value) (
 	case common.Value:
 		return what.evalBool(scope, common.SomeValue(castValue.Value(), inValue.Event()))
 
+	case nil:
+		return common.SomeBoolValue(false, nil), "", nil
+
 	default:
 		return common.EmptyBoolValue(), what.Literal(), fmt.Errorf("failed to eval all-expression: expected iterable type, got %T", inValue)
 	}
diff --git a/pkg/risks/script/expressions/any-expression.go b/pkg/risks/script/expressions/any-expression.go
@@ -182,6 +182,9 @@ func (what *AnyExpression) evalBool(scope *common.Scope, inValue common.Value) (
 	case common.Value:
 		return what.evalBool(scope, common.SomeValue(castValue.Value(), inValue.Event()))
 
+	case nil:
+		return common.SomeBoolValue(false, nil), "", nil
+
 	default:
 		return common.EmptyBoolValue(), what.Literal(), fmt.Errorf("failed to eval any-expression: expected iterable type, got %T", inValue)
 	}
diff --git a/pkg/risks/script/expressions/contains-expression.go b/pkg/risks/script/expressions/contains-expression.go
@@ -120,6 +120,9 @@ func (what *ContainsExpression) evalBool(scope *common.Scope, item common.Value,
 	case common.Value:
 		return what.evalBool(scope, item, common.SomeValue(castValue.Value(), inValue.Event()))
 
+	case nil:
+		return common.SomeBoolValue(false, nil), "", nil
+
 	default:
 		return common.EmptyBoolValue(), "", fmt.Errorf("failed to eval contains-expression: expected iterable type, got %T", inValue)
 	}
diff --git a/pkg/risks/script/expressions/count-expression.go b/pkg/risks/script/expressions/count-expression.go
@@ -183,6 +183,9 @@ func (what *CountExpression) evalDecimal(scope *common.Scope, inValue common.Val
 	case common.Value:
 		return what.evalDecimal(scope, common.SomeValue(castValue.Value(), inValue.Event()))
 
+	case nil:
+		return common.EmptyDecimalValue(), "", nil
+
 	default:
 		return common.EmptyDecimalValue(), what.Literal(), fmt.Errorf("failed to eval all-expression: expected iterable type, got %T", inValue)
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ func (what *Threagile) Execute() {`
`18`	`18`	`what.rootCmd.Println(err)`
`19`	`19`	`os.Exit(1)`
`20`	`20`	`}`
	`21`	`+`
	`22`	`+ cfg := what.readConfig(what.rootCmd, what.buildTimestamp)`
	`23`	`+ if what.flags.interactiveFlag \|\| cfg.GetInteractive() {`
	`24`	`+ what.run(what.rootCmd, nil)`
	`25`	`+ }`
`21`	`26`	`}`
`22`	`27`
`23`	`28`	`func (what Threagile) Init(buildTimestamp string) Threagile {`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,9 @@ func (what AllExpression) evalBool(scope common.Scope, inValue common.Value) (`
`185`	`185`	`case common.Value:`
`186`	`186`	`return what.evalBool(scope, common.SomeValue(castValue.Value(), inValue.Event()))`
`187`	`187`
	`188`	`+ case nil:`
	`189`	`+ return common.SomeBoolValue(false, nil), "", nil`
	`190`	`+`
`188`	`191`	`default:`
`189`	`192`	`return common.EmptyBoolValue(), what.Literal(), fmt.Errorf("failed to eval all-expression: expected iterable type, got %T", inValue)`
`190`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,9 @@ func (what AnyExpression) evalBool(scope common.Scope, inValue common.Value) (`
`182`	`182`	`case common.Value:`
`183`	`183`	`return what.evalBool(scope, common.SomeValue(castValue.Value(), inValue.Event()))`
`184`	`184`
	`185`	`+ case nil:`
	`186`	`+ return common.SomeBoolValue(false, nil), "", nil`
	`187`	`+`
`185`	`188`	`default:`
`186`	`189`	`return common.EmptyBoolValue(), what.Literal(), fmt.Errorf("failed to eval any-expression: expected iterable type, got %T", inValue)`
`187`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,9 @@ func (what ContainsExpression) evalBool(scope common.Scope, item common.Value,`
`120`	`120`	`case common.Value:`
`121`	`121`	`return what.evalBool(scope, item, common.SomeValue(castValue.Value(), inValue.Event()))`
`122`	`122`
	`123`	`+ case nil:`
	`124`	`+ return common.SomeBoolValue(false, nil), "", nil`
	`125`	`+`
`123`	`126`	`default:`
`124`	`127`	`return common.EmptyBoolValue(), "", fmt.Errorf("failed to eval contains-expression: expected iterable type, got %T", inValue)`
`125`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ func (what CountExpression) evalDecimal(scope common.Scope, inValue common.Val`
`183`	`183`	`case common.Value:`
`184`	`184`	`return what.evalDecimal(scope, common.SomeValue(castValue.Value(), inValue.Event()))`
`185`	`185`
	`186`	`+ case nil:`
	`187`	`+ return common.EmptyDecimalValue(), "", nil`
	`188`	`+`
`186`	`189`	`default:`
`187`	`190`	`return common.EmptyDecimalValue(), what.Literal(), fmt.Errorf("failed to eval all-expression: expected iterable type, got %T", inValue)`
`188`	`191`	`}`