Updated Azure SDK version and refactoring

Author: alfonsof

azureblobstoragecopy/README.md

@@ -14,12 +14,12 @@ Copy a Blob from a Blob Storage container to another Blob Storage container in a
   * Python 3
   * Azure SDKs for Python
 
-* Install the Azure SDKs for Python.
+* You install individual Azure library packages on a per-project basis depending on your needs. It is recommended using Python virtual environments for each project. There is no standalone "SDK" installer for Python.
 
-  Install the latest stable version (supports Python 2.7 and 3.x) via pip:
+* Install the specified python packages.
 
   ```bash
-  pip install azure
+  pip install -r requirements.txt
   ```
 
 ## Using the code
@@ -95,41 +95,39 @@ Copy a Blob from a Blob Storage container to another Blob Storage container in a
   
     1. Navigate to `Storage Account`.
     2. Select your storage account.
-    3. Select `Access keys` and you can see your Storage account name, connection strings and account keys.
+    3. Select `Access keys` and you can see your Storage account connection string.
 
   The connection string looks like this:
 
-    ```bash
-    DefaultEndpointsProtocol=https;AccountName=<ACCOUNT_NAME>;AccountKey=<ACCOUNT_KEY>;EndpointSuffix=core.windows.net
-    ```
+  ```bash
+  DefaultEndpointsProtocol=https;AccountName=<ACCOUNT_NAME>;AccountKey=<ACCOUNT_KEY>;EndpointSuffix=core.windows.net
+  ```
   
   The application configuration is stored in the `app.cfg` file. The file content is:
 
   ```bash
-  [StorageAuthentication]
-  AccountName=<ACCOUNT_NAME>
-  AccountKey=<ACCOUNT_KEY>
+  [Configuration]
+  StorageAccountConnectionString=<STORAGE_ACCOUNT_CONNECTION_STRING>
   ```
 
-  You must edit the `app.cfg` file and replace the values of:
+  You must edit the `app.cfg` file and replace the value of:
   
-  * `<ACCOUNT_NAME>` by the account name of your storage account.
-  * `<ACCOUNT_KEY>` by the account key of your storage account.
+  * `<STORAGE_ACCOUNT_CONNECTION_STRING>` by the connection string of your storage account.
   
   The application uses this information for accessing your Azure storage account.
 
 * Run the code.
 
-  You must provide 3 parameters:
+  You must provide 3 parameters, replace the values of:
 
-  * `<SOURCE_CONTAINER>`      = Source container name
-  * `<SOURCE_BLOB>`           = Source blob name
-  * `<DESTINATION_CONTAINER>` = Destination container name
+  * `<SOURCE_CONTAINER>`      by source container name.
+  * `<SOURCE_BLOB>`           by source blob name.
+  * `<DESTINATION_CONTAINER>` by destination container name.
 
   Run application:
 
   ```bash
-  python blobstoragecopy.py source-container source-blob destination-container
+  python blobstoragecopy.py <SOURCE_CONTAINER> <SOURCE_BLOB> <DESTINATION_CONTAINER>
   ```
 
 * Test the application.

azureblobstoragecopy/app.cfg

@@ -1,3 +1,2 @@
-[StorageAuthentication]
-AccountName=<ACCOUNT_NAME>
-AccountKey=<ACCOUNT_KEY>
+[Configuration]
+StorageAccountConnectionString=<STORAGE_ACCOUNT_CONNECTION_STRING>

azureblobstoragecopy/blobstoragecopy.py

@@ -12,12 +12,12 @@
 import os
 import time
 import configparser
-from azure.storage.blob import BlockBlobService, PublicAccess
+from azure.storage.blob import BlobClient, BlobLeaseClient
 
 
-def loadcfg():
+def load_cfg():
     """
-    Read storage authentication information from a config file
+    Read storage account authentication information from a config file
     and return the values in a dictionary.
     """
     config_file = 'app.cfg'
@@ -28,7 +28,63 @@ def loadcfg():
         print('Config file "' + config_file + '" does not exist')
         sys.exit(1)
 
-    return dict(config.items('StorageAuthentication'))
+    return dict(config.items('Configuration'))
+
+
+def copy_blob(storage_account_conn_str, source_container_name, source_blob_name, dest_container_name):
+    """
+    Copy a blob in a blob storage container to another blob storage container in a storage account.
+    """
+    try:
+        # Create the blob object representing the source
+        source_blob_client = BlobClient.from_connection_string(conn_str=storage_account_conn_str,
+                                                                    container_name=source_container_name,
+                                                                    blob_name=source_blob_name)
+
+        # Create the blob object representing the destination
+        dest_blob_client = BlobClient.from_connection_string(conn_str=storage_account_conn_str,
+                                                                    container_name=dest_container_name,
+                                                                    blob_name=source_blob_name)
+
+        print('Copying a Blob from a Blob container to another one ... ')
+        
+        # Lease the source blob for the copy operation
+        # to prevent another client from modifying it.
+        lease = BlobLeaseClient(source_blob_client)
+        lease.acquire()
+
+        # Get the source blob's properties and display the lease state.
+        source_props = source_blob_client.get_blob_properties()
+        print("Lease state: " + source_props.lease.state)
+
+        # Start the copy operation.
+        dest_blob_client.start_copy_from_url(source_blob_client.url)
+
+        # Get the destination blob's properties to check the copy status.
+        properties = dest_blob_client.get_blob_properties()
+        copy_props = properties.copy
+
+        # Display the copy status.
+        print("Copy status: " + copy_props["status"])
+        print("Copy progress: " + copy_props["progress"])
+        print("Completion time: " + str(copy_props["completion_time"]))
+        print("Total bytes: " + str(properties.size))
+        
+        if (source_props.lease.state == "leased"):
+            # Break the lease on the source blob.
+            lease.break_lease()
+
+            # Update the destination blob's properties to check the lease state.
+            source_props = source_blob_client.get_blob_properties()
+            print("Lease state: " + source_props.lease.state)
+
+        print('\nCopied')
+            
+    except Exception as e:
+        print("\nError:")
+        print(e)
+
+    return
 
 
 def main():
@@ -50,37 +106,12 @@ def main():
     print('Destination container name: ' + dest_container_name)
     dest_blob_name = source_blob_name
 
-    # Read storage authentication information
-    config_dict = loadcfg()
-    cfg_account_name = config_dict['accountname']
-    cfg_account_key = config_dict['accountkey']
+    # Read storage account authentication information
+    config_dict = load_cfg()
+    cfg_storage_account_conn_str = config_dict['storageaccountconnectionstring']
 
-    # Create the BlockBlockService that is used to call the Blob service for the storage account
-    block_blob_service = BlockBlobService(account_name=cfg_account_name, account_key=cfg_account_key)
-
-    try:
-        if block_blob_service.exists(source_container_name):
-            if block_blob_service.exists(source_container_name, source_blob_name):
-                if block_blob_service.exists(dest_container_name):
-                    print('Copying a Blob from a Blob container to another one ...')
-                    # Get blob url: https://storageaccountname.blob.core.windows.net/containername/blobname
-                    source_blob_url = block_blob_service.make_blob_url(source_container_name, source_blob_name)
-                    # Copy Blob
-                    copy = block_blob_service.copy_blob(dest_container_name, dest_blob_name, source_blob_url)
-                    # Poll for copy completion
-                    while copy.status != 'success':
-                        time.sleep(30)
-                        copy = block_blob_service.get_blob_properties(dest_container_name, dest_blob_name).properties.copy
-                    print('\nCopied')
-                else:
-                    print('\nError: Destination Blob Storage container "' + source_container_name + '" does NOT exist.')
-            else:
-                print('\nError: Blob "' + source_blob_name + '" does NOT exist.')
-        else:
-            print('\nError: Source Blob Storage container "' + source_container_name + '" does NOT exist.')
-    except Exception as e:
-        print("\nError:")
-        print(e)
+    # Copy a blob in a blob storage container to another blob storage container in a storage account
+    copy_blob(cfg_storage_account_conn_str, source_container_name, source_blob_name, dest_container_name)
 
     return
 

azureblobstoragecopy/requirements.txt

@@ -0,0 +1 @@
+azure-storage-blob