Skip to content

Commit 302a9ab

Browse files
committedJan 16, 2025
Adjustment of threagile call in server mode to new Cobra-based args
1 parent 070f028 commit 302a9ab

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed
 

‎pkg/server/execute.go

+18-11
Original file line numberDiff line numberDiff line change
@@ -182,36 +182,43 @@ func (s *server) doItViaRuntimeCall(modelFile string, outputDir string,
182182
dpi int) {
183183
// Remember to also add the same args to the exec based sub-process calls!
184184
var cmd *exec.Cmd
185-
args := []string{"-model", modelFile, "-output", outputDir, "-execute-model-macro", s.config.GetExecuteModelMacro(), "-custom-risk-rules-plugins", strings.Join(s.config.GetRiskRulePlugins(), ","), "-skip-risk-rules", strings.Join(s.config.GetSkipRiskRules(), ","), "-diagram-dpi", strconv.Itoa(dpi)}
185+
args := []string{"analyze-model",
186+
"--model", modelFile,
187+
"--output", outputDir,
188+
"--execute-model-macro", s.config.GetExecuteModelMacro(),
189+
"--custom-risk-rules-plugin", strings.Join(s.config.GetRiskRulePlugins(), ","),
190+
"--skip-risk-rules", strings.Join(s.config.GetSkipRiskRules(), ","),
191+
"--diagram-dpi", strconv.Itoa(dpi),
192+
}
186193
if s.config.GetVerbose() {
187-
args = append(args, "-verbose")
194+
args = append(args, "--verbose")
188195
}
189196
if s.config.GetIgnoreOrphanedRiskTracking() { // TODO why add all them as arguments, when they are also variables on outer level?
190-
args = append(args, "-ignore-orphaned-risk-tracking")
197+
args = append(args, "--ignore-orphaned-risk-tracking")
191198
}
192199
if generateDataFlowDiagram {
193-
args = append(args, "-generate-data-flow-diagram")
200+
args = append(args, "--generate-data-flow-diagram")
194201
}
195202
if generateDataAssetDiagram {
196-
args = append(args, "-generate-data-asset-diagram")
203+
args = append(args, "--generate-data-asset-diagram")
197204
}
198205
if generateReportPdf {
199-
args = append(args, "-generate-report-pdf")
206+
args = append(args, "--generate-report-pdf")
200207
}
201208
if generateRisksExcel {
202-
args = append(args, "-generate-risks-excel")
209+
args = append(args, "--generate-risks-excel")
203210
}
204211
if generateTagsExcel {
205-
args = append(args, "-generate-tags-excel")
212+
args = append(args, "--generate-tags-excel")
206213
}
207214
if generateRisksJSON {
208-
args = append(args, "-generate-risks-json")
215+
args = append(args, "--generate-risks-json")
209216
}
210217
if generateTechnicalAssetsJSON {
211-
args = append(args, "-generate-technical-assets-json")
218+
args = append(args, "--generate-technical-assets-json")
212219
}
213220
if generateStatsJSON {
214-
args = append(args, "-generate-stats-json")
221+
args = append(args, "--generate-stats-json")
215222
}
216223
self, nameError := os.Executable()
217224
if nameError != nil {

0 commit comments

Comments
 (0)