Skip to content
Snippets Groups Projects
Commit ed7d2d91 authored by Yan Sushchynski (EPAM)'s avatar Yan Sushchynski (EPAM)
Browse files

GONRG-2320: Switch file handler API to v2

parent 754ce67e
No related branches found
No related tags found
1 merge request!56GONRG-2320: Switch file handler API to v2
Pipeline #43386 passed
......@@ -148,7 +148,7 @@ class FileHandler(HeadersMixin):
:rtype: FileUploadUrlResponse
"""
logger.debug("Getting upload signed url.")
endpoint = f"{self._file_service_host}/v1/files/uploadURL"
endpoint = f"{self._file_service_host}/v2/files/uploadURL"
response = self._send_get_request(headers, endpoint).json()
logger.debug("Signed url got.")
upload_url_response = FileUploadUrlResponse(file_id=response["FileID"],
......@@ -168,7 +168,7 @@ class FileHandler(HeadersMixin):
:rtype: FileDownloadUrlResponse
"""
logger.debug("Getting download signed url.")
endpoint = f"{self._file_service_host}/v1/files/{record_id}/downloadURL"
endpoint = f"{self._file_service_host}/v2/files/{record_id}/downloadURL"
response = self._send_get_request(headers, endpoint).json()
logger.debug("Signed url got.")
download_url_response = self._handle_download_url_response(response)
......@@ -269,7 +269,7 @@ class FileHandler(HeadersMixin):
f"surrogate_name_{file_record['data']['DatasetProperties']['FileSourceInfo']['PreloadFilePath'].split('/')[-1]}"
logger.info(f"Generated name: {file_record['data']['Name']}")
logger.info("Sending file record metadata to File service")
endpoint = f"{self._file_service_host}/v1/files/metadata"
endpoint = f"{self._file_service_host}/v2/files/metadata"
response = self._send_post_request(self.request_headers, endpoint, json.dumps(file_record))
return response.json()["id"]
......
......@@ -91,7 +91,7 @@ class TestFileHandler:
"unsignedUrl": test_permanent_location,
"kind": "test_kind"
}
responses.add(responses.GET, f"{self.BASE_TEST_HOST}/v1/files/{test_record_id}/downloadURL",
responses.add(responses.GET, f"{self.BASE_TEST_HOST}/v2/files/{test_record_id}/downloadURL",
json=json_response, status=http.HTTPStatus.OK)
assert test_permanent_location == file_handler.get_file_permanent_location(test_record_id)
......@@ -106,7 +106,7 @@ class TestFileHandler:
def test_get_file_permanent_location_error(self, file_handler: FileHandler,
http_status: str, reason: str):
test_record_id = "test_record_id"
responses.add(responses.GET, f"{self.BASE_TEST_HOST}/v1/files/{test_record_id}/downloadURL",
responses.add(responses.GET, f"{self.BASE_TEST_HOST}/v2/files/{test_record_id}/downloadURL",
status=http_status, body=reason)
with pytest.raises((tenacity.RetryError, requests.exceptions.HTTPError)):
......@@ -124,7 +124,7 @@ class TestFileHandler:
file_record, unused_wpc_record, unused_wp_record = json.load(cf)
test_record_id = "test_record_id"
responses.add(responses.POST, f"{self.BASE_TEST_HOST}/v1/files/metadata",
responses.add(responses.POST, f"{self.BASE_TEST_HOST}/v2/files/metadata",
json={"id": test_record_id}, status=http.HTTPStatus.OK)
assert test_record_id == file_handler.save_file_record(file_record)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment