From 2de174b2e4955bd9141906f1cd40b89dc5ef1d52 Mon Sep 17 00:00:00 2001 From: Cristiano Hoshikawa Date: Fri, 22 Mar 2024 13:06:50 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o:=20N=C3=A3o=20estava=20monta?= =?UTF-8?q?ndo=20o=20path=5Fprefix=20correto=20(obtendo=20apenas=20o=201o?= =?UTF-8?q?=20path)=20para=20a=20vers=C3=A3o=20Swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/OCI_API_Gateway_Automation_files.zip | Bin 26951 -> 26975 bytes files/applyValidationApi/func.py | 27 +++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/files/OCI_API_Gateway_Automation_files.zip b/files/OCI_API_Gateway_Automation_files.zip index 136cec8a620a96dfb0103e0bcc5437fad7be5a67..203e601c8f1d0305f195c8ce30213a79f9017e75 100644 GIT binary patch delta 6337 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 diff --git a/files/applyValidationApi/func.py b/files/applyValidationApi/func.py index d856b5f..836df40 100644 --- a/files/applyValidationApi/func.py +++ b/files/applyValidationApi/func.py @@ -467,17 +467,24 @@ def process_api_spec(api_id, compartmentId, environment, swagger, functionId, ho for spec in api_spec["routes"]: status = spec["backend"]["status"] specPath = spec["path"] - if (has_path_endpoint(endPointOrigin) and version == "3"): - endPoint = find_base_endpoint(endPointOrigin) - specPath = (find_base_pathendpoint(endPointOrigin, specPath) + spec["path"]).replace("//", "/") if (version == "3"): - fullEndpoint = (endPoint + find_base_path(specPath) + find_path(specPath)).replace("{", "${request.path[").replace("}", "]}") - FULL_PATH = specPath - ENDPOINT = fullEndpoint - PATH = find_path(specPath) - PATH_PREFIX = find_base_path(specPath) - METHOD = accMethods(api_spec["routes"], find_path(spec["path"]), status) + if (has_path_endpoint(endPointOrigin)): + endPoint = find_base_endpoint(endPointOrigin) + specPath = (find_base_pathendpoint(endPointOrigin, specPath)).replace("//", "/") + fullEndpoint = (endPoint + specPath + spec["path"]).replace("{", "${request.path[").replace("}", "]}") + FULL_PATH = specPath + ENDPOINT = fullEndpoint + PATH = spec["path"] + PATH_PREFIX = specPath + METHOD = accMethods(api_spec["routes"], find_path(spec["path"]), status) + else: + fullEndpoint = (endPoint + find_base_path(specPath) + find_path(specPath)).replace("{", "${request.path[").replace("}", "]}") + FULL_PATH = specPath + ENDPOINT = fullEndpoint + PATH = find_path(specPath) + PATH_PREFIX = find_base_path(specPath) + METHOD = accMethods(api_spec["routes"], find_path(spec["path"]), status) else: schemes = "" try: @@ -709,4 +716,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