Skip to content
Merged
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
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
bazel test //apollo/tests:test_csaf_processing --test_output=all
bazel test //apollo/tests:test_api_keys --test_output=all
bazel test //apollo/tests:test_auth --test_output=all
bazel test //apollo/tests:test_api_updateinfo --test_output=all
bazel test //apollo/tests:test_validation --test_output=all
bazel test //apollo/tests:test_admin_routes_supported_products --test_output=all
bazel test //apollo/tests:test_api_osv --test_output=all
Expand Down
26 changes: 25 additions & 1 deletion apollo/db/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class AdvisoryPackage(Model):
module_stream = fields.TextField(null=True)
module_version = fields.TextField(null=True)
repo_name = fields.TextField()
package_name = fields.TextField()
_package_name = fields.TextField(source_field='package_name')
product_name = fields.TextField()
supported_products_rh_mirror = fields.ForeignKeyField(
"models.SupportedProductsRhMirror",
Expand All @@ -319,6 +319,30 @@ class Meta:
table = "advisory_packages"
unique_together = ("advisory_id", "nevra")

def __init__(self, **kwargs):
if 'package_name' in kwargs:
kwargs['package_name'] = self._clean_package_name(
kwargs['package_name']
)
super().__init__(**kwargs)

@property
def package_name(self):
return self._clean_package_name(self._package_name)

@package_name.setter
def package_name(self, value):
self._package_name = self._clean_package_name(value)

def _clean_package_name(self, value):
if isinstance(value, str) and value.startswith('module.'):
return value.replace('module.', '')
return value

async def save(self, *args, **kwargs):
self._package_name = self._clean_package_name(self._package_name)
await super().save(*args, **kwargs)


class AdvisoryCVE(Model):
id = fields.BigIntField(pk=True)
Expand Down
Loading