fix(vefaas): fix request app_id and app_name

Author: floritange

veadk/integrations/ve_faas/ve_faas.py

@@ -219,19 +219,25 @@ def _get_application_status(self, app_id: str):
         )
         return response["Result"]["Status"], response
 
-    def _list_application(self, app_name: str = None):
+    def _list_application(self, app_id: str = None, app_name: str = None):
+        # firt match app_id. if app_id is None,then match app_name and remove app_id
+        request_body = {
+            "OrderBy": {"Key": "CreateTime", "Ascend": False},
+            "FunctionId": app_id if app_id else None,
+            "Filters": [{"Item": {"Key": "Name", "Value": [app_name]}}]
+            if app_name and not app_id
+            else None,
+        }
+        # remove None
+        request_body = {k: v for k, v in request_body.items() if v is not None}
+
         page_size = 50
         page_number = 1
         all_items = []
         total_page = None
         while True:
             try:
-                request_body = {
-                    "PageNumber": page_number,
-                    "PageSize": page_size,
-                    "Filters": [{"Item": {"Key": "Name", "Value": [app_name]}}],
-                    "OrderBy": {"Key": "CreateTime", "Ascend": False},
-                }
+                request_body.update({"PageNumber": page_number, "PageSize": page_size})
                 response = ve_request(
                     request_body=request_body,
                     action="ListApplications",
@@ -255,7 +261,7 @@ def _list_application(self, app_name: str = None):
                 page_number += 1
             except Exception as e:
                 raise ValueError(
-                    f"List application failed. Response: {response}. Error: {str(e)}"
+                    f"List application failed. Error: {str(e)}. Response: {response}."
                 )
         return all_items
 
@@ -333,7 +339,7 @@ def _update_function_code(
     def get_application_details(self, app_id: str = None, app_name: str = None):
         if not app_id and not app_name:
             raise ValueError("app_id and app_name cannot be both empty.")
-        apps = self._list_application(app_name=app_name)
+        apps = self._list_application(app_id=app_id, app_name=app_name)
         if app_id:
             for app in apps:
                 if app["Id"] == app_id: