Merge branch 'feature/azure-file-handing' into 'master'

feat(azure): add file handing support for azure provider

See merge request !15

osdu_ingestion/libs/handle_file.py

@@ -19,6 +19,7 @@ import dataclasses
 import io
 import json
 import logging
+import os
 from typing import List, Tuple
 
 import requests
@@ -26,6 +27,7 @@ import tenacity
 from osdu_api.auth.authorization import TokenRefresher, authorize
 from osdu_api.providers import blob_storage
 from osdu_api.providers.types import BlobStorageClient, FileLikeObject
+from osdu_api.utils.request import request_raiser
 
 from osdu_ingestion.libs.constants import RETRIES, WAIT
 from osdu_ingestion.libs.context import Context
@@ -123,6 +125,13 @@ class FileHandler(HeadersMixin):
                                            unsigned_url=None,
                                            kind=None)
 
+    @tenacity.retry(**RETRY_SETTINGS)
+    @authorize()
+    def _send_get_request(self, headers: dict, url: str) -> requests.Response:
+        response = requests.get(url, headers=headers)
+        logger.debug(response)
+        return response
+
     @tenacity.retry(**RETRY_SETTINGS)
     @authorize()
     def _send_post_request(self, headers: dict, url: str, request_body: str) -> requests.Response:
@@ -132,10 +141,14 @@ class FileHandler(HeadersMixin):
         return response
 
     @tenacity.retry(**RETRY_SETTINGS)
-    @authorize()
-    def _send_get_request(self, headers: dict, url: str) -> requests.Response:
-        response = requests.get(url, headers=headers)
-        logger.debug(response)
+    @request_raiser
+    def _send_put_request(self, headers: dict, url: str, request_body: str) -> requests.Response:
+        if os.getenv("CLOUD_PROVIDER") == "azure":
+            headers["x-ms-blob-type"] = "BlockBlob"
+
+        logger.debug(f"{request_body}")
+        response = requests.put(url, request_body, headers=headers)
+        logger.debug(response.content)
         return response
 
     def _get_upload_signed_url(self, headers: dict) -> FileUploadUrlResponse:
@@ -187,7 +200,7 @@ class FileHandler(HeadersMixin):
         """
         logger.debug("Uploading file.")
         buffer.seek(0)
-        requests.put(signed_url, buffer.read(), headers=headers)
+        self._send_put_request(headers, signed_url, buffer.read())
         logger.debug("File uploaded.")
 
     def _get_file_location_request(self, headers: dict, file_id: str) -> str: