Merge pull request #102 from cloudblue/LITE-28266-add-files-to-eaas-p…

…roxy LITE-28266 Add files to eaas proxy
cloudblue · Aug 2, 2023 · c9b89fa · c9b89fa
2 parents 4680f2d + c7eba62
commit c9b89fa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/connect/eaas/core/constants.py b/connect/eaas/core/constants.py
@@ -15,3 +15,8 @@
 
 PROXIED_CONNECT_API_ENDPOINTS_MAX_ALLOWED_NUMBER = 100
 PROXIED_CONNECT_API_ENDPOINTS_PUBLIC_PREFIX = '/public/'
+PROXIED_CONNECT_API_ENDPOINTS_FILES_PREFIX = '/files'
+PROXIED_CONNECT_API_ALLOWED_PREFIXES = (
+    PROXIED_CONNECT_API_ENDPOINTS_PUBLIC_PREFIX,
+    PROXIED_CONNECT_API_ENDPOINTS_FILES_PREFIX,
+)
diff --git a/connect/eaas/core/validation/validators/webapp.py b/connect/eaas/core/validation/validators/webapp.py
@@ -8,8 +8,8 @@
 from fastapi_utils.cbv import CBV_CLASS_KEY
 
 from connect.eaas.core.constants import (
+    PROXIED_CONNECT_API_ALLOWED_PREFIXES,
     PROXIED_CONNECT_API_ENDPOINTS_MAX_ALLOWED_NUMBER,
-    PROXIED_CONNECT_API_ENDPOINTS_PUBLIC_PREFIX,
 )
 from connect.eaas.core.extension import WebApplicationBase
 from connect.eaas.core.validation.helpers import get_code_context
@@ -193,12 +193,12 @@ def _validate_webapp_proxied_connect_api(context):
         )
         return errors
 
-    public_prefix = PROXIED_CONNECT_API_ENDPOINTS_PUBLIC_PREFIX
-    if not all(v.startswith(public_prefix) for v in api_paths):
+    allowed_prefixes = PROXIED_CONNECT_API_ALLOWED_PREFIXES
+    if not all(v.startswith(allowed_prefixes) for v in api_paths):
         errors.append(
             ValidationItem(
                 level='ERROR',
-                message='Only Public API can be referenced in `@proxied_connect_api`.',
+                message='Only Public or Files API can be referenced in `@proxied_connect_api`.',
                 **get_code_context(extension_class, code_pattern),
             ),
         )

diff --git a/tests/connect/eaas/core/validation/validators/test_webapp.py b/tests/connect/eaas/core/validation/validators/test_webapp.py
@@ -1203,18 +1203,19 @@ def example(self):
     (set(), 'The argument of the `@proxied_connect_api` must be a list of strings or a dict.'),
     (['str', 1], 'The argument of the `@proxied_connect_api` must be a list of strings or a dict.'),
     (['/public/v1/auth'] * 101, 'Max allowed length of the `@proxied_connect_api` argument: 100.'),
-    (['/media'], 'Only Public API can be referenced in `@proxied_connect_api`.'),
+    (['/media'], 'Only Public or Files API can be referenced in `@proxied_connect_api`.'),
     (
         {f'/public/v1/ep{i}': 'view' for i in range(200)},
         'Max allowed length of the `@proxied_connect_api` argument: 100.',
     ),
     (
         {
+            '/files': 'view',
             '/public/v1/marketplaces': 'view',
             '/public/v1/products': 'edit',
             '/private/api': 'view',
         },
-        'Only Public API can be referenced in `@proxied_connect_api`.',
+        'Only Public or Files API can be referenced in `@proxied_connect_api`.',
     ),
     (
         {