Skip to content

Commit 3433082

Browse files
committed
Merge remote-tracking branch 'origin/bugfix' into sc-13569_dockerscout_docs
# Conflicts: # docs/content/import_data/pro/connectors/connectors_tool_reference.md
2 parents d9accf9 + 1fcab14 commit 3433082

55 files changed

Lines changed: 1912 additions & 61 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
137 KB
Loading
144 KB
Loading
278 KB
Loading
91.5 KB
Loading
123 KB
Loading
220 KB
Loading
5.35 KB
Loading

docs/content/asset_modelling/OS_hierarchy/OS__asset_hierarchy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ Examples include:
159159
**Report-Defined Test Type Naming Rules:**
160160
- If the report's `type` field equals the scan type → uses scan type directly (e.g., "Generic Findings Import")
161161
- If the report's `type` field differs → creates "{type} Scan ({scan_type})" format (e.g., "Tool1 Scan (Generic Findings Import)")
162+
- If the report's `type` field already ends with the " ({scan_type})" suffix → uses it verbatim, so the suffix is never doubled (e.g., "Tool1 (Generic Findings Import)" stays "Tool1 (Generic Findings Import)")
162163
- If no `type` field is provided → uses scan type directly
163164

164165
**Important Considerations:**

docs/content/asset_modelling/engagements_tests/OS__tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ While each method differs primarily in how scan data is parsed and ingested, the
3737

3838
When no native parser exists for a given tool, **Generic Findings Import** allows you to import findings using a standardized JSON or CSV schema, regardless of the original source.
3939

40-
DefectDojo parses the provided data, creates a new Test (or imports into an existing one), and attaches the Findings. A corresponding Test Type is also created in the format “{Test Name} (Generic Findings Import).”
40+
DefectDojo parses the provided data, creates a new Test (or imports into an existing one), and attaches the Findings. A corresponding Test Type is also created based on the report's optional `type` field: when `type` is omitted (or equals the scan type) the Test Type is “Generic Findings Import”; when `type` is provided it becomes “{type} Scan (Generic Findings Import)” (a `type` that already ends with the “(Generic Findings Import)” suffix is used verbatim).
4141

4242
| | **Native Parsers** | **Generic Findings Import** |
4343
|----------|---------------|------------------------|

docs/content/asset_modelling/engagements_tests/PRO__tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ While each method differs primarily in how scan data is parsed and ingested, the
3535

3636
When no native parser exists for a given tool, [**Generic Findings Import**](/supported_tools/parsers/generic_findings_import) allows you to import findings using a standardized JSON or CSV schema, regardless of the original source.
3737

38-
DefectDojo parses the provided data, creates a new Test (or imports into an existing one), and attaches the Findings. A corresponding Test Type is also created in the format “`{Test Name}` (Generic Findings Import).”
38+
DefectDojo parses the provided data, creates a new Test (or imports into an existing one), and attaches the Findings. A corresponding Test Type is also created based on the report's optional `type` field: when `type` is omitted (or equals the scan type) the Test Type is “Generic Findings Import”; when `type` is provided it becomes “`{type}` Scan (Generic Findings Import)” (a `type` that already ends with the “(Generic Findings Import)” suffix is used verbatim).
3939

4040
#### Universal Parser
4141

0 commit comments

Comments
 (0)