From 9f8857406413062b854e272e56807c58b78c3a78 Mon Sep 17 00:00:00 2001 From: Cristiano Hoshikawa Date: Mon, 18 Mar 2024 21:58:29 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20dos=20casos:=20-=20Setando?= =?UTF-8?q?=20como=20path=5Fprefix=20o=20titulo=20da=20API=20ocasiona=20er?= =?UTF-8?q?ro=20pois=20o=20titulo=20contem=20espacos=20em=20branco?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/OCI_API_Gateway_Automation_files.zip | Bin 27321 -> 27322 bytes files/applyValidationApi/func.py | 66 ++++++++++++++++++--- 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/files/OCI_API_Gateway_Automation_files.zip b/files/OCI_API_Gateway_Automation_files.zip index ce6b2f00d7c1bbd3138803baaa5c382ddf5330e7..f4fec7155d24b9f9878875fc3e503d535815a07e 100644 GIT binary patch delta 6393 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 c{@$qn|F3|iDi-$D>OgcBUh?wL`Kj}_g> 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 diff --git a/files/applyValidationApi/func.py b/files/applyValidationApi/func.py index 8a3eeb0..3584d8c 100644 --- a/files/applyValidationApi/func.py +++ b/files/applyValidationApi/func.py @@ -48,6 +48,51 @@ def find_base_path(strPath): base_path = "/" + base_path return base_path +def has_path_endpoint(endPoint): + endPointAux = endPoint.replace("//", "#") + endPointSplited = endPointAux.split('/') + if (len(endPointSplited) > 1): + return True + else: + return False + +def find_base_pathendpoint(endPoint, strPath): + base_path = strPath.split('/')[1] + if (len(base_path) == 0 and has_path_endpoint(endPoint)): + endPointAux = endPoint.replace("//", "#") + endPointSplited = endPointAux.split('/') + if (len(endPointSplited) > 1): + endPointSplitedStr = endPointSplited[1] + if (endPointSplitedStr != None): + base_path = "/" + endPointSplitedStr + else: + base_path = strPath + else: + base_path = strPath + else: + endPointAux = endPoint.replace("//", "#") + endPointSplited = endPointAux.split('/') + if (len(endPointSplited) > 1): + endPointSplitedStr = endPointSplited[1] + if (endPointSplitedStr != None): + base_path = "/" + endPointSplitedStr + endPoint = endPointSplited[0].replace("#", "//") + else: + base_path = "/" + base_path + else: + base_path = "/" + base_path + return base_path + + +def find_base_endpoint(endPoint): + endPointAux = endPoint.replace("//", "#") + endPointSplited = endPointAux.split('/') + if (len(endPointSplited) > 1): + endPointSplitedStr = endPointSplited[1] + if (endPointSplitedStr != None): + endPoint = endPointSplited[0].replace("#", "//") + return endPoint + def find_path(strPath): base_path = strPath.split('/') if (len(base_path) == 0): @@ -358,7 +403,7 @@ def verify_path(json_data_list): 'TYPE': item2["TYPE"], 'ENVIRONMENT': item2["ENVIRONMENT"], 'METHOD': item2["METHOD"], - 'PATH_PREFIX': "/" + item2["API_NAME"], + 'PATH_PREFIX': "/", 'PATH': item2["PATH_PREFIX"], 'ENDPOINT': item2["ENDPOINT"], 'SCHEMA_BODY_VALIDATION': item2["SCHEMA_BODY_VALIDATION"], @@ -409,15 +454,21 @@ def process_api_spec(api_id, compartmentId, environment, swagger, functionId, ho json_data_list = [] + endPointOrigin = endPoint for spec in api_spec["routes"]: status = spec["backend"]["status"] + specPath = spec["path"] + if (has_path_endpoint(endPointOrigin)): + endPoint = find_base_endpoint(endPointOrigin) + specPath = (find_base_pathendpoint(endPointOrigin, specPath) + spec["path"]).replace("//", "/") + if (version == "3"): - fullEndpoint = (endPoint + find_base_path(spec["path"]) + find_path(spec["path"])).replace("{", "${request.path[").replace("}", "]}") - FULL_PATH = spec["path"] + fullEndpoint = (endPoint + find_base_path(specPath) + find_path(specPath)).replace("{", "${request.path[").replace("}", "]}") + FULL_PATH = specPath ENDPOINT = fullEndpoint - PATH = find_path(spec["path"]) - PATH_PREFIX = find_base_path(spec["path"]) - METHOD = accMethods(api_spec["routes"], PATH, status) + PATH = find_path(specPath) + PATH_PREFIX = find_base_path(specPath) + METHOD = accMethods(api_spec["routes"], find_path(spec["path"]), status) else: schemes = "" try: @@ -649,5 +700,4 @@ def handler(ctx, data: io.BytesIO = None): ctx, status_code=401, response_data=json.dumps({"active": False, "wwwAuthenticate": jsonData}) - ) - + ) \ No newline at end of file