Fix a bug where 'None' got into the path prefix we actually list with (#770)

Author: rzvoncek

medusa/storage/__init__.py

@@ -487,12 +487,16 @@ def get_keyspace_and_table(manifest_object: ManifestObject) -> t.Tuple[str, str,
         keyspace, table = Storage.sanitize_keyspace_and_table_name(p)
         return keyspace, table, manifest_object
 
-    def list_files_per_table(self) -> t.Dict[str, t.Dict[str, t.Set[ManifestObject]]]:
-        if self.config.prefix != '':
-            prefix = f"{self.config.prefix}/"
+    @staticmethod
+    def _get_table_prefix(config_prefix, fqdn):
+        if config_prefix is not None and config_prefix != '':
+            prefix = f"{config_prefix}/"
         else:
             prefix = ""
-        fdns_data_prefix = f"{prefix}{self.config.fqdn}/data/"
+        return f"{prefix}{fqdn}/data/"
+
+    def list_files_per_table(self) -> t.Dict[str, t.Dict[str, t.Set[ManifestObject]]]:
+        fdns_data_prefix = self._get_table_prefix(self.config.prefix, self.config.fqdn)
         all_blobs: t.List[AbstractBlob] = self.storage_driver.list_blobs(prefix=fdns_data_prefix)
         all_files = [ManifestObject(blob.name, blob.size, blob.hash) for blob in all_blobs]
         keyspace_table_mo_tuples = map(Storage.get_keyspace_and_table, all_files)

tests/storage_test.py

@@ -449,6 +449,11 @@ def test_saniitize_keyspace_and_table_name(self):
             self.storage.sanitize_keyspace_and_table_name(p)
         )
 
+    def test_get_table_prefix(self):
+        self.assertEqual('localhost/data/', self.storage._get_table_prefix(None, 'localhost'))
+        self.assertEqual('localhost/data/', self.storage._get_table_prefix('', 'localhost'))
+        self.assertEqual('prefix/localhost/data/', self.storage._get_table_prefix('prefix', 'localhost'))
+
 
 def make_node_backup(storage, name, backup_date, differential=False, fqdn="localhost"):
     if differential is True: