import fix for aws

gcp class name as aws

Author: 116davinder

backup.py

@@ -2,7 +2,7 @@
 import os
 import logging
 import threading
-from cloud.aws import Upload
+from cloud import aws
 from common import common
 
 class KBackup:
@@ -106,7 +106,7 @@ def main():
                 logging.debug(f"setting RETRY_UPLOAD_SECONDS to default 60 ")
                 retry_upload_seconds = 60
 
-            Upload.s3_upload(bucket,tmp_dir,topic_name,retry_upload_seconds,b.NUMBER_OF_KAFKA_THREADS + 1)
+            aws.Upload.s3_upload(bucket,tmp_dir,topic_name,retry_upload_seconds,b.NUMBER_OF_KAFKA_THREADS + 1)
 
         except KeyError as e:
             logging.error(f"unable to set s3 required variables {e}")

cloud/gcp.py

@@ -5,7 +5,7 @@
 from common import common
 from google.cloud import storage
 
-class gUpload:
+class Upload:
 
     def gcs_upload_file(gcs_client,bucket,file_name,object_name):
 
@@ -40,7 +40,7 @@ def gcs_upload(bucket,dir,topic_name,retry_upload_seconds,thread_count):
                 logging.info(f"gcs upload retry for new files in {retry_upload_seconds} seconds")
                 time.sleep(retry_upload_seconds)
 
-class gDownload:
+class Download:
 
     def gcs_list_blobs_with_prefix(gcs_client,bucket,start_offset=None,end_offset=None,prefix=None):
         return gcs_client.list_blobs(

restore.py

@@ -5,7 +5,7 @@
 import confluent_kafka
 import time
 from common import common
-from cloud.aws import Download
+from cloud import aws
 
 class KRestore:
 
@@ -129,7 +129,7 @@ def main():
 
     if b.FILESYSTEM_TYPE == "S3":
         threading.Thread(
-            target=Download.s3_download,
+            target=aws.Download.s3_download,
             args=[b.BUCKET_NAME, b.BACKUP_TOPIC_NAME,b.FILESYSTEM_BACKUP_DIR,b.RETRY_SECONDS],
             name="S3 Download"
         ).start()