0001-applications-report-scan-errors-68017.patch

Lauréline Guérin, 03 novembre 2022 09:31

Voir les différences: en ligne côte à côte

Subject: [PATCH] applications: report scan errors (#68017)

 hobo/applications/models.py                   | 19 ++++++-
 .../templates/hobo/applications/job.html      |  1 +
 tests/test_application.py                     | 53 ++++++++++++++++++-
 3 files changed, 70 insertions(+), 3 deletions(-)

     requests = Requests()
     class DeploymentError(Exception):
     class ApplicationError(Exception):
         def __init__(self, msg):
             self.msg = msg
     class ScanError(ApplicationError):
         pass
     class DeploymentError(ApplicationError):
         pass
     class Application(models.Model):
         SUPPORTED_MODULES = ('wcs',)
-...
                     if not dependencies_url:
                         continue
                     response = requests.get(dependencies_url)
                     if not response.ok:
                         raise ScanError(
                             _(
                                 'Failed to scan "%s" (type %s, slug %s) dependencies (%s)'
                                 % (el.name, el.type, el.slug, response.status_code)
+                            )
+                        )
                     for dependency in response.json()['data']:
                         if (dependency['type'], dependency['id']) in elements:
                             continue
-...
                     self.version.create_bundle()
                 elif self.action == 'deploy':
                     self.version.deploy()
             except DeploymentError as e:
             except ApplicationError as e:
                 self.status = 'failed'
                 self.exception = e.msg
                 if self.raise_exception:

hobo/applications/templates/hobo/applications/job.html
9	9	{% if object.status == 'failed' %}
10	10	<div class="pk-error">
11	11	<p>{% trans "Error running the job." %}</p>
	12	{% if object.exception %}<pre>{{ object.exception }}</pre>{% endif %}
12	13	<p><a class="pk-button" href="{{ view.get_redirect_url }}">{% trans "Back" %}</a></p>
13	14	</div>
14	15	{% else %}

     from test_manager import login
     from webtest import Upload
     from hobo.applications.models import Application, AsyncJob, DeploymentError, Element, Relation, Version
     from hobo.applications.models import (
         Application,
         AsyncJob,
         DeploymentError,
         Element,
         Relation,
         ScanError,
         Version,
+    )
     from hobo.environment.models import Authentic, Wcs
     pytestmark = pytest.mark.django_db
-...
             app.get('/applications/manifest/test/delete/%s/' % application.relation_set.first().pk, status=404)
     def test_scandeps_on_unknown_element(app, admin_user, settings):
         Wcs.objects.create(base_url='https://wcs.example.invalid', slug='foobar', title='Foobar')
         settings.KNOWN_SERVICES = {
             'wcs': {
                 'foobar': {
                     'title': 'Foobar',
                     'url': 'https://wcs.example.invalid/',
                     'orig': 'example.org',
                     'secret': 'xxx',
+                }
+            }
+        }
         application = Application.objects.create(name='Test', slug='test')
         element = Element.objects.create(
             type='forms',
             slug='unknown',
             name='Unknown',
             cache={
                 'urls': {
                     "dependencies": "https://wcs.example.invalid/api/export-import/forms/unknown/dependencies/",
+                }
             },
+        )
         Relation.objects.create(application=application, element=element)
         def response_content(url, request):
             if url.path == '/api/export-import/forms/unknown/dependencies/':
                 return {'status_code': 404}
             return mocked_http(url, request)
         login(app)
         with HTTMock(response_content):
             with pytest.raises(ScanError) as e:
                 app.get('/applications/manifest/test/scandeps/').follow()
             assert str(e.value) == 'Failed to scan "Unknown" (type forms, slug unknown) dependencies (404)'
             job = AsyncJob.objects.latest('pk')
             assert job.status == 'failed'
             assert job.exception == 'Failed to scan "Unknown" (type forms, slug unknown) dependencies (404)'
     @pytest.mark.parametrize('editable', [True, False])
     def test_redirect_application_element(app, admin_user, settings, editable):
         Wcs.objects.create(base_url='https://wcs.example.invalid', slug='foobar', title='Foobar')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-applications-report-scan-errors-68017.patch