Rename CloudInterface.destination_url to a more generic url

Signed-off-by: Gabriele Bartolini <gabriele.bartolini@2ndQuadrant.it>

barman/clients/cloud_backup.py

@@ -86,7 +86,7 @@ def main(args=None):
 
         with closing(postgres):
             cloud_interface = CloudInterface(
-                destination_url=config.destination_url,
+                url=config.destination_url,
                 encryption=config.encryption,
                 jobs=config.jobs,
                 profile_name=config.profile)

barman/clients/cloud_walarchive.py

@@ -52,7 +52,7 @@ def main(args=None):
 
     try:
         cloud_interface = CloudInterface(
-            destination_url=config.destination_url,
+            url=config.destination_url,
             encryption=config.encryption,
             profile_name=config.profile)
 

barman/cloud.py

@@ -412,26 +412,26 @@ def set_part_start_time(self, part_number, start_time):
 
 
 class CloudInterface(object):
-    def __init__(self, destination_url, encryption, jobs=2, profile_name=None):
+    def __init__(self, url, encryption, jobs=2, profile_name=None):
         """
         Create a new S3 interface given the S3 destination url and the profile
         name
 
-        :param str destination_url: Full URL of the cloud destination
+        :param str url: Full URL of the cloud destination/source
         :param str|None encryption: Encryption type string
         :param int jobs: How many sub-processes to use for asynchronous
           uploading, defaults to 2.
         :param str profile_name: Amazon auth profile identifier
         """
-        self.destination_url = destination_url
+        self.url = url
         self.profile_name = profile_name
         self.encryption = encryption
 
         # Extract information from the destination URL
-        parsed_url = urlparse(destination_url)
+        parsed_url = urlparse(url)
         # If netloc is not present, the s3 url is badly formatted.
         if parsed_url.netloc == '' or parsed_url.scheme != 's3':
-            raise ValueError('Invalid s3 URL address: %s' % destination_url)
+            raise ValueError('Invalid s3 URL address: %s' % url)
         self.bucket_name = parsed_url.netloc
         self.bucket_exists = None
         self.path = parsed_url.path

tests/test_cloud.py

@@ -39,7 +39,7 @@ def test_uploader_minimal(self, boto_mock):
         Minimal build of the CloudInterface class
         """
         cloud_interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         assert cloud_interface.bucket_name == 'bucket'
         assert cloud_interface.path == '/path/to/dir'
@@ -60,7 +60,7 @@ def test_uploader_minimal(self, boto_mock):
     def test_ensure_async(self, mp):
         jobs_count = 30
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None,
             jobs=jobs_count)
 
@@ -85,7 +85,7 @@ def test_ensure_async(self, mp):
 
     def test_retrieve_results(self):
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.queue = Queue()
         interface.done_queue = Queue()
@@ -207,7 +207,7 @@ def test_worker_process_main(self, worker_process_execute_job_mock):
         ]
 
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.queue = mock.MagicMock()
         interface.errors_queue = Queue()
@@ -255,7 +255,7 @@ def test_worker_process_execute_job(self,
         # Unknown job type, no boto functions are being called and
         # an exception is being raised
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.result_queue = Queue()
         interface.done_queue = Queue()
@@ -312,7 +312,7 @@ def test_handle_async_errors(self):
         # If we the upload process has already raised an error, we immediately
         # exit without doing anything
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.error = "test"
         interface.errors_queue = None  # If get called raises AttributeError
@@ -342,7 +342,7 @@ def test_async_upload_part(self,
         temp_stream.name = temp_name
 
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.queue = Queue()
         interface.async_upload_part(
@@ -369,7 +369,7 @@ def test_async_complete_multipart_upload(self,
                                              handle_async_errors_mock,
                                              retrieve_results_mock):
         interface = CloudInterface(
-            destination_url='s3://bucket/path/to/dir',
+            url='s3://bucket/path/to/dir',
             encryption=None)
         interface.queue = mock.MagicMock()
         interface.parts_db = {