raise proper storage manager exceptions

hkube_python_wrapper/storage/base_storage_manager.py

@@ -4,19 +4,35 @@ def __init__(self, adpter):
         self.adapter = adpter
 
     def put(self, options):
-        return self.adapter.put(options)
+        try:
+            return self.adapter.put(options)
+        except Exception:
+            raise Exception('Failed to write data to storage')
 
     def get(self, options):
-        data = self.adapter.get(options)
-        if(data is None):
-            return None
-        return data
+        try:
+            data = self.adapter.get(options)
+            if(data is None):
+                return None
+            return data
+        except Exception:
+            raise Exception('Failed to read data from storage')
+
 
     def list(self, options):
-        return self.adapter.list(options)
+        try:
+            return self.adapter.list(options)
+        except Exception:
+            raise Exception('Failed to list storage data')
 
     def listPrefix(self, options):
-        return self.adapter.listPrefix(options)
+        try:
+            return self.adapter.listPrefix(options)
+        except Exception:
+            raise Exception('Failed to listPrefix storage data')
 
     def delete(self, options):
-        self.adapter.delete(options)
+        try:
+            self.adapter.delete(options)
+        except Exception:
+            raise Exception('Failed to delete storage data')

hkube_python_wrapper/storage/fs_adapter.py

@@ -21,9 +21,6 @@ def put(self, options):
 
     def get(self, options):
         filePath = self.getPath(self.basePath, options['path'])
-        if not (os.path.exists(filePath)):
-            return None
-
         result = None
         with open(filePath, 'rb') as f:
             result = f.read()

tests/test_storage_manager_fs.py

@@ -41,9 +41,8 @@ def test_put_get():
 
 def test_fail_to_get():
     options = {'path': dir1 + os.path.sep + 'no_such_path.txt', 'data': encoded}
-    a = sm.storage.get(options)
-    assert a == None
-
+    with pytest.raises(Exception, match='Failed to read data from storage'):
+        sm.storage.get(options)
 
 def test_list():
     options = {'path': dir1 + os.path.sep + 'a.txt', 'data': encoded}

tests/test_storage_manager_s3.py

@@ -29,7 +29,7 @@ def test_put_get():
 def test_fail_to_get():
     options = {'path': bucket + os.path.sep + 'no_such_key', 'data': encoded}
 
-    with pytest.raises(Exception, match='The specified key does not exist'):
+    with pytest.raises(Exception, match='Failed to read data from storage'):
         sm.storage.get(options)