fix: fixed proxy validator

apigee · Feb 3, 2025 · 901e45d · 901e45d
1 parent fdbbcc2
commit 901e45d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core_wrappers.py b/core_wrappers.py
@@ -285,15 +285,15 @@ def validate_artifacts(cfg, resources_list, export_data):  # noqa pylint: disabl
         apps = export_data['orgConfig']['apps']
         report['apps'] = apigee_validator.validate_org_resource('apps', apps)
     if 'all' in resources_list or 'apis' in resources_list:
-        validation = apigee_validator.validate_proxy_bundles(export_dir, 'apis')
+        apis_validation = apigee_validator.validate_proxy_bundles(export_dir, 'apis')
         # Todo  # pylint: disable=W0511
         # validate proxy unifier output bundles
-        report.update(validation)
+        report.update(apis_validation)
     if 'all' in resources_list or 'sharedflows' in resources_list:
-        validation = apigee_validator.validate_proxy_bundles(export_dir, 'sharedflows')
+        sf_validation = apigee_validator.validate_proxy_bundles(export_dir, 'sharedflows')
         # Todo  # pylint: disable=W0511
         # validate proxy unifier output bundles
-        report.update(validation)
+        report.update(sf_validation)
     return report
 
 

diff --git a/validator.py b/validator.py
@@ -210,13 +210,12 @@ def validate_proxy_bundles(self, export_dir, api_type):
                 sharedflows.
         """
         objects = self.target_export_data.get('orgConfig', {}).get(api_type, {}).keys()    # noqa pylint: disable=C0301
-        objects_list = {api_type: objects}
-        validation = {'apis': [], 'sharedflows': []}
+        validation = {api_type: []}
         bundle_dir = f"{export_dir}/{api_type}"
         for proxy_bundle in list_dir(bundle_dir):
             each_validation = self.validate_proxy(bundle_dir, api_type, proxy_bundle)    # noqa pylint: disable=C0301
             api_name = proxy_bundle.split(".zip")[0]
-            if api_name in objects_list[api_type]:
+            if api_name in objects:
                 each_validation['imported'] = True
             else:
                 each_validation['imported'] = False