Merge pull request #37 from cloudblue/LITE-25308_fix_validations_and_…

…dependencies

LITE-25308 fix validations and dependencies

connect/eaas/core/validation/validators/base.py

@@ -163,7 +163,7 @@ def validate_docker_compose_yml(context):
 
     for service in data['services']:
         image = data['services'][service].get('image')
-        if image != runner_image:
+        if image.startswith('cloudblueconnect/connect-extension-runner') and image != runner_image:
             messages.append(
                 ValidationItem(
                     level='ERROR',

connect/eaas/core/validation/validators/webapp.py

@@ -110,7 +110,7 @@ def _check_ui_component_url(extension_class, page_name, value, code_pattern):
     page_path = value[8:]
     full_path = os.path.join(
         os.path.dirname(inspect.getsourcefile(extension_class)),
-        'static_root',
+        'static',
         page_path,
     )
     if not os.path.exists(full_path):

pyproject.toml

@@ -30,6 +30,8 @@ fastapi = "^0.78.0"
 fastapi-utils = "^0.2.1"
 logzio-python-handler = "^3.1.1"
 anvil-uplink = "^0.4.0"
+toml = "^0.10.2"
+PyYAML = "^6.0"
 
 [tool.poetry.dev-dependencies]
 ipython = "^7.21.0"

tests/connect/eaas/core/validation/validators/test_base.py

@@ -462,7 +462,7 @@ def test_validate_docker_compose_yml_invalid_image(mocker):
         return_value={
             'services': {
                 'dev': {
-                    'image': 'invalid:image',
+                    'image': 'cloudblueconnect/connect-extension-runner:0.3',
                 },
             },
         },
@@ -478,7 +478,8 @@ def test_validate_docker_compose_yml_invalid_image(mocker):
     assert item.level == 'ERROR'
     assert (
         'Invalid image for service *dev*: expected '
-        '*cloudblueconnect/connect-extension-runner:1.0* got *invalid:image*.'
+        '*cloudblueconnect/connect-extension-runner:1.0* '
+        'got *cloudblueconnect/connect-extension-runner:0.3*.'
     ) in item.message
     assert item.file == 'fake_dir/docker-compose.yml'