Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions types/analysis.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,12 @@ type AnalysisReport struct {
}

type AnalysisResult struct {
RunID string `json:"run_id"`
Status Status `json:"status"`
CheckSeq string `json:"check_seq"`
Report AnalysisReport `json:"report"`
ReportObject string `json:"report_object"`
RunID string `json:"run_id"`
Status Status `json:"status"`
CheckSeq string `json:"check_seq"`
AnalyzerShortcode string `json:"analyzer_shortcode"`
Report AnalysisReport `json:"report"`
ReportObject string `json:"report_object"`
}

type AnalysisResultCeleryTask struct {
Expand Down
9 changes: 9 additions & 0 deletions types/autofixbot.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ const (
)

type AutofixBotAnalysis struct {
// Set by the config gen engine to denote whether the config has been passed through config gen.
// This ensures that we do not retry config gen if the number of analyzers and targets detected
// are zero.
IsGenerated bool `json:"is_generated"`

FlowID string `json:"flow_id"`
FlowType string `json:"flow_type"`
RepositoryID string `json:"repository_id"`
Expand Down Expand Up @@ -116,6 +121,10 @@ type AutofixBotAnalysis struct {
// based on the config.
ExpectedAnalyzers []string `json:"expected_analyzers"`

// ExpectedTargets are the final list of SCA targets that will be run
// based on the config.
ExpectedTargets []SCATarget `json:"expected_targets"`

// MarvinAnalyzerDataMap is generated with the analyzer container
// metadata based on the config generation step.
MarvinAnalyzerDataMap map[string]MarvinAnalyzerData `json:"marvin_analyzer_data_map,omitempty"`
Expand Down
3 changes: 2 additions & 1 deletion types/ds_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type DSConfig struct {
ExcludePatterns []string `toml:"exclude_patterns,omitempty" json:"exclude_patterns,omitempty"`
TestPatterns []string `toml:"test_patterns,omitempty" json:"test_patterns,omitempty"`
Analyzers []Analyzer `toml:"analyzers,omitempty" json:"analyzers,omitempty"`
SCATargets []SCATarget `toml:"sca_targets,omitempty" json:"sca_targets,omitempty"`
Transformers []Transformer `toml:"transformers,omitempty" json:"transformers,omitempty"`
}

Expand All @@ -35,5 +36,5 @@ type AnalysisConfig struct {

//proteus:generate
type IDEConfig struct {
IsIDE bool `json:"is_ide"`
IsIDE bool `json:"is_ide"`
}