Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
efbe4ca
wip: Add dummy test structure
zkdev Oct 9, 2025
0647df3
implement missing-test-result extension
Franziska-Schallhorn Dec 1, 2025
c927b67
implement create_missing_test_finding function
Franziska-Schallhorn Dec 4, 2025
79cb05f
add create_backlog_item_for_extension function
Franziska-Schallhorn Dec 4, 2025
f7f7817
add validate_test_result_finding function
Franziska-Schallhorn Dec 4, 2025
c74d6ec
Merge branch 'master' into missing-test-results-extension
Franziska-Schallhorn Dec 4, 2025
25c31c3
Update test_results.py
Franziska-Schallhorn Dec 11, 2025
c064f34
implement small improvements as per PR
Franziska-Schallhorn Dec 11, 2025
83b4a6b
Exit with error in BDBA scan if uploaded/scanned file seems to be empty
8R0WNI3 Dec 4, 2025
b49406e
Upgrade github.com/gardener/cc-utils
github-actions[bot] Dec 3, 2025
e1c346e
Always re-use discovery date per default if data key matches
8R0WNI3 Nov 28, 2025
46c6460
Drop (now) obsolete code paths
8R0WNI3 Nov 28, 2025
a84e730
Update documentation for changed discovery date default behaviour
8R0WNI3 Nov 28, 2025
f33bce3
Resolve generator object before logging
8R0WNI3 Dec 11, 2025
1390212
Upgrade github.com/gardener/cc-utils
github-actions[bot] Dec 5, 2025
f5c4a3f
release 0.1253.0
github-actions[bot] Dec 11, 2025
b1dd41b
next version: 0.1254.0-dev
github-actions[bot] Dec 11, 2025
bbc14a6
release 0.8.0
github-actions[bot] Dec 11, 2025
aadbcac
next version: 0.9.0-dev
github-actions[bot] Dec 11, 2025
52be69c
Upgrade ocm.software/ocm-gear/bdba-client
github-actions[bot] Dec 11, 2025
f69fe82
release 0.1254.0
github-actions[bot] Dec 11, 2025
d54d35f
next version: 0.1255.0-dev
github-actions[bot] Dec 11, 2025
8e92329
fix: Add default value to `binary_bytes` and `scanned_bytes`
8R0WNI3 Dec 11, 2025
487b5a8
Upgrade github.com/gardener/cc-utils
github-actions[bot] Dec 11, 2025
fb7a710
release 0.1255.0
github-actions[bot] Dec 11, 2025
0ed770f
next version: 0.1256.0-dev
github-actions[bot] Dec 11, 2025
639aa7e
add changes
Franziska-Schallhorn Dec 16, 2025
92b445e
implement create_missing_test_finding function
Franziska-Schallhorn Dec 4, 2025
3e4440c
add changes according to PR comments
Franziska-Schallhorn Dec 16, 2025
1ed57c7
move labels and value to module consts
Franziska-Schallhorn Dec 16, 2025
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
4 changes: 2 additions & 2 deletions .ocm/base-component.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
componentReferences:
- componentName: github.com/gardener/cc-utils
name: cc-utils
version: 1.2725.0
version: 1.2730.0
- componentName: ocm.software/ocm-gear/bdba-client
name: bdba
version: 0.7.0
version: 0.8.0
- componentName: ocm.software/ocm-gear/freshclam
name: freshclam
version: 1.12.0
Expand Down
2 changes: 1 addition & 1 deletion BDBA_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0-dev
0.9.0-dev
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1253.0-dev
0.1256.0-dev
20 changes: 19 additions & 1 deletion artefact_enumerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,23 @@ def _process_compliance_snapshot_of_artefact(
if uncommitted_backlog_item:
uncommitted_backlog_items.append(uncommitted_backlog_item)

if (
extensions_cfg.test_results
and extensions_cfg.test_results.enabled
and extensions_cfg.test_results.is_supported(artefact_kind=artefact.artefact_kind)
):
compliance_snapshot, uncommitted_backlog_item = _create_backlog_item_for_extension(
finding_cfgs=finding_cfgs,
finding_types=(odg.model.Datatype.TEST_RESULT_FINDING,),
artefact=artefact,
compliance_snapshot=compliance_snapshot,
service=odg.extensions_cfg.Services.TEST_RESULT_FINDING,
interval_seconds=extensions_cfg.osid.interval,
now=now,
)
if uncommitted_backlog_item:
uncommitted_backlog_items.append(uncommitted_backlog_item)

if (
extensions_cfg.osid
and extensions_cfg.osid.enabled
Expand Down Expand Up @@ -568,7 +585,8 @@ def main():

extensions_cfg = odg.extensions_cfg.ExtensionsConfiguration.from_file(extensions_cfg_path)
extensions_cfg: odg.extensions_cfg.ExtensionsConfiguration
logger.info(f'{extensions_cfg.enabled_extensions()=}')
enabled_extensions = list(extensions_cfg.enabled_extensions())
logger.info(f'{enabled_extensions=}')

if not (findings_cfg_path := parsed_arguments.findings_cfg_path):
findings_cfg_path = paths.findings_cfg_path()
Expand Down
2 changes: 2 additions & 0 deletions bdba/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ class AnalysisResult(Result):
fail_reason: str | None
components: list[Component] = dataclasses.field(default_factory=list)
custom_data: dict[str, str] = dataclasses.field(default_factory=dict)
binary_bytes: int | None = None
scanned_bytes: int | None = None


@dataclasses.dataclass
Expand Down
7 changes: 7 additions & 0 deletions bdba_utils/scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,13 @@ def process(
logger.error(f'scan of {scanned_element=} failed; {scan_result=}')
return

if not (scan_result.binary_bytes and scan_result.scanned_bytes):
logger.error(
f'scan of {scanned_element=} failed: uploaded or scanned file is empty '
f'({scan_result.binary_bytes=}, {scan_result.scanned_bytes=})'
)
return

logger.info(
f'scan of {scan_result.display_name} succeeded, going to post-process results'
)
Expand Down
7 changes: 7 additions & 0 deletions charts/extensions/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,10 @@ sast:
image:
repository: null
tag: null
test-results:
deployment:
annotations: []
enabled: false
image:
repository: null
tag: null
10 changes: 6 additions & 4 deletions docs/model.rst
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,12 @@ Findings (deviations from rulesets) typically have to be processed within an
allowed timeframe. Hence, the date of first discovery is stored to allow for
the calculation for latest due-dates. Thereby, the initial `discovery_date`
must be retained during subsequent updates. Therefore, the `discovery_date` is
part of the `ArtefactMetadata` model. To re-use the initial `discovery_date` of
a finding, and don't reset it as part of every new scan, it must be defined
when a finding is to be interpreted as equal so that the `discovery_date` must
be re-used.
part of the `ArtefactMetadata` model. By default, the initial `discovery_date`
of a finding is re-used in case the OCM identity (except its version and extra
identity) and the `key` property of the finding match. In case it is desired to
deviate from this defalt behaviour (e.g. in case the `key` contains a package
version which should not be considered for the re-use), a custom check must be
implemented as part of the upload metadata route.

Considerations
^^^^^^^^^^^^^^
Expand Down
84 changes: 42 additions & 42 deletions extension-definitions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ installation:
ocm_references:
- helm_chart_name: delivery-service
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: delivery-service
Expand Down Expand Up @@ -87,13 +87,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -119,13 +119,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -144,13 +144,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -170,13 +170,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -196,13 +196,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -222,13 +222,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -254,13 +254,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -286,13 +286,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -317,13 +317,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -349,13 +349,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -381,13 +381,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -413,13 +413,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand All @@ -439,13 +439,13 @@ installation:
ocm_references:
- helm_chart_name: extensions
name: ocm.software/ocm-gear/delivery-service
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact:
name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
mappings:
- name: extensions
version: "0.1253.0-dev"
version: "0.1256.0-dev"
artefact_type: helmchart-imagemap
value_templates:
- helm_chart_name: extensions
Expand Down
Loading
Loading