Skip to content

Commit 130f869

Browse files
committed
Add delete to vulnreport report
1 parent 52a818d commit 130f869

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

pulp_service/pulp_service/app/tasks/package_scan.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,12 @@ def _parse_npm_pkg_dependencies(package_lock_content):
9494
- the old/legacy packages[dependencies] field is not supported
9595
"""
9696
temp_file = PulpTemporaryFile.objects.get(pk=package_lock_content)
97-
package_lock_content = json.loads(temp_file.file.read())
98-
temp_file.delete()
97+
try:
98+
package_lock_content = json.loads(temp_file.file.read())
99+
except:
100+
raise RuntimeError("Failed to load the lock file!")
101+
finally:
102+
temp_file.delete()
99103
for pkg in package_lock_content.get("packages", None):
100104
if not package_lock_content["packages"][pkg].get("dependencies", None):
101105
continue

pulp_service/pulp_service/app/viewsets.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from rest_framework.exceptions import APIException
1414
from rest_framework.response import Response
1515
from rest_framework.views import APIView
16-
from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
16+
from rest_framework.mixins import DestroyModelMixin, ListModelMixin, RetrieveModelMixin
1717

1818
from pulpcore.app.response import OperationPostponedResponse
1919
from pulpcore.app.viewsets import ContentGuardViewSet, NamedModelViewSet, RolesMixin, TaskViewSet
@@ -147,14 +147,14 @@ def view_name(cls):
147147
return "admintasks"
148148

149149

150-
class VulnerabilityReport(NamedModelViewSet, ListModelMixin, RetrieveModelMixin):
150+
class VulnerabilityReport(NamedModelViewSet, ListModelMixin, RetrieveModelMixin, DestroyModelMixin):
151151

152152
endpoint_name = "vuln_report"
153153
queryset = VulnReport.objects.all()
154154
serializer_class = VulnerabilityReportSerializer
155155

156156
def create(self, request):
157-
serializer = ContentScanSerializer(data=request.data, context={'request': request})
157+
serializer = ContentScanSerializer(data=request.data, context={"request": request})
158158
serializer.is_valid(raise_exception=True)
159159

160160
shared_resources = None

0 commit comments

Comments
 (0)