From e40e32dc05088613193888006da11e18dcbb71f9 Mon Sep 17 00:00:00 2001
From: Radovan Zvoncek <rzvoncek@gmail.com>
Date: Tue, 23 Apr 2024 13:46:58 +0200
Subject: [PATCH] Fix flake errors

---
 medusa/medusacli.py        | 12 ++++++++----
 medusa/storage/__init__.py |  6 +-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/medusa/medusacli.py b/medusa/medusacli.py
index a02c55b6..e38d34cf 100644
--- a/medusa/medusacli.py
+++ b/medusa/medusacli.py
@@ -179,7 +179,8 @@ def fetch_tokenmap(medusaconfig, backup_name, bucket_name, prefix):
 
 @cli.command(name='list-backups')
 @click.option('--show-all/--no-show-all', default=False, help="List all backups in the bucket")
-@click.option('--bucket-name', help='Explicit bucket name to over-ride the one from config', required=False, default=None)
+@click.option('--bucket-name',
+              help='Explicit bucket name to over-ride the one from config', required=False, default=None)
 @click.option('--prefix', help='Path prefix in multi-tenant buckets', required=False, default=None)
 @pass_MedusaConfig
 def list_backups(medusaconfig, show_all, bucket_name, prefix):
@@ -198,7 +199,8 @@ def list_backups(medusaconfig, show_all, bucket_name, prefix):
               multiple=True, default={})
 @click.option('--ignore-system-keyspaces', help='Do not download cassandra system keyspaces', required=True,
               is_flag=True, default=False)
-@click.option('--bucket-name', help='Explicit bucket name to over-ride the one from config', required=False, default=None)
+@click.option('--bucket-name',
+              help='Explicit bucket name to over-ride the one from config', required=False, default=None)
 @click.option('--prefix', help='Path prefix in multi-tenant buckets', required=False, default=None)
 @pass_MedusaConfig
 def download(medusaconfig, backup_name, download_destination, keyspaces, tables, ignore_system_keyspaces, bucket_name,
@@ -231,7 +233,8 @@ def download(medusaconfig, backup_name, download_destination, keyspaces, tables,
 @click.option('--version-target', help='Target Cassandra version', required=False, default="3.11.9")
 @click.option('--ignore-racks', help='Disable matching nodes based on rack topology', required=False, default=False,
               is_flag=True)
-@click.option('--bucket-name', help='Explicit bucket name to over-ride the one from config', required=False, default=None)
+@click.option('--bucket-name',
+              help='Explicit bucket name to over-ride the one from config', required=False, default=None)
 @click.option('--prefix', help='Path prefix in multi-tenant buckets', required=False, default=None)
 @pass_MedusaConfig
 def restore_cluster(medusaconfig, backup_name, seed_target, temp_dir, host_list, keep_auth, bypass_checks,
@@ -276,7 +279,8 @@ def restore_cluster(medusaconfig, backup_name, seed_target, temp_dir, host_list,
 @click.option('--use-sstableloader', help='Use the sstableloader to load the backup into the cluster',
               default=False, is_flag=True)
 @click.option('--version-target', help='Target Cassandra version', required=False, default="3.11.9")
-@click.option('--bucket-name', help='Explicit bucket name to over-ride the one from config', required=False, default=None)
+@click.option('--bucket-name',
+              help='Explicit bucket name to over-ride the one from config', required=False, default=None)
 @click.option('--prefix', help='Path prefix in multi-tenant buckets', required=False, default=None)
 @pass_MedusaConfig
 def restore_node(medusaconfig, temp_dir, backup_name, in_place, keep_auth, seeds, verify, keyspaces, tables,
diff --git a/medusa/storage/__init__.py b/medusa/storage/__init__.py
index 18fbcdd8..23bb477c 100644
--- a/medusa/storage/__init__.py
+++ b/medusa/storage/__init__.py
@@ -24,18 +24,14 @@
 
 import medusa.index
 
-from medusa.storage.cluster_backup import ClusterBackup
-from medusa.storage.node_backup import NodeBackup
 from medusa.storage.abstract_storage import ManifestObject, AbstractBlob
 from medusa.storage.azure_storage import AzureStorage
 from medusa.storage.cluster_backup import ClusterBackup
 from medusa.storage.google_storage import GoogleStorage
 from medusa.storage.local_storage import LocalStorage
 from medusa.storage.node_backup import NodeBackup
-from medusa.storage.s3_base_storage import S3BaseStorage
-
 from medusa.storage.s3_rgw import S3RGWStorage
-from medusa.storage.s3_storage import S3Storage
+from medusa.storage.s3_storage import S3BaseStorage, S3Storage
 from medusa.utils import evaluate_boolean
 
 # pattern meant to match just the blob name, not the entire path