finish storage

Author: Yionse

Diff for: scripts/devops_tasks/test_run_samples.py

@@ -153,6 +153,13 @@
         "sample_abstract_summary.py",
         "sample_abstract_summary_async.py",
     ],
+    "azure-storage-blob": [
+        "blob_samples_proxy_configuration.py",
+    ],
+    "azure-storage-file-datalake": [
+        "datalake_samples-service.py",
+        "datalake_samples-service_async.py",
+    ]
 }
 
 def run_check_call_with_timeout(

Diff for: sdk/storage/azure-storage-blob/dev_requirements.txt

@@ -2,4 +2,5 @@
 -e ../../core/azure-core
 -e ../../identity/azure-identity
 azure-mgmt-storage==20.1.0
-aiohttp>=3.0
+aiohttp>=3.0
+azure-keyvault

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_authentication.py

@@ -16,29 +16,29 @@
 USAGE:
     python blob_samples_authentication.py
     Set the environment variables with your own values before running the sample:
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
     2) OAUTH_STORAGE_ACCOUNT_NAME - the oauth storage account name
-    3) AZURE_STORAGE_ACCOUNT_NAME - the name of the storage account
-    4) AZURE_STORAGE_ACCESS_KEY - the storage account access key
+    3) STORAGE_ACCOUNT_NAME - the name of the storage account
+    4) STORAGE_ACCOUNT_KEY - the storage account access key
 """
 
 import os
 import sys
 
 class AuthSamples(object):
     url = "https://{}.blob.core.windows.net".format(
-        os.getenv("AZURE_STORAGE_ACCOUNT_NAME")
+        os.getenv("STORAGE_ACCOUNT_NAME")
     )
     oauth_url = "https://{}.blob.core.windows.net".format(
         os.getenv("OAUTH_STORAGE_ACCOUNT_NAME")
     )
 
-    connection_string = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
-    shared_access_key = os.getenv("AZURE_STORAGE_ACCESS_KEY")
+    connection_string = os.getenv("STORAGE_CONNECTION_STRING")
+    shared_access_key = os.getenv("STORAGE_ACCOUNT_KEY")
 
     def auth_connection_string(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: auth_connection_string")
             sys.exit(1)
         # [START auth_from_connection_string]
@@ -63,7 +63,7 @@ def auth_connection_string(self):
 
     def auth_shared_key(self):
         if self.shared_access_key is None:
-            print("Missing required environment variable: AZURE_STORAGE_ACCESS_KEY." + '\n' +
+            print("Missing required environment variable: STORAGE_ACCOUNT_KEY." + '\n' +
                   "Test: auth_shared_key")
             sys.exit(1)
         # [START create_blob_service_client]
@@ -89,7 +89,7 @@ def auth_blob_url(self):
 
     def auth_shared_access_signature(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: auth_shared_access_signature")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -140,4 +140,4 @@ def auth_default_azure_credential(self):
     sample.auth_connection_string()
     sample.auth_shared_access_signature()
     sample.auth_blob_url()
-    sample.auth_default_azure_credential()
+    # sample.auth_default_azure_credential()

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_authentication_async.py

@@ -16,10 +16,10 @@
 USAGE:
     python blob_samples_authentication_async.py
     Set the environment variables with your own values before running the sample:
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
     2) OAUTH_STORAGE_ACCOUNT_NAME - the oauth storage account name
-    3) AZURE_STORAGE_ACCOUNT_NAME - the name of the storage account
-    4) AZURE_STORAGE_ACCESS_KEY - the storage account access key
+    3) STORAGE_ACCOUNT_NAME - the name of the storage account
+    4) STORAGE_ACCOUNT_KEY - the storage account access key
 """
 
 
@@ -29,18 +29,18 @@
 
 class AuthSamplesAsync(object):
     url = "https://{}.blob.core.windows.net".format(
-        os.getenv("AZURE_STORAGE_ACCOUNT_NAME")
+        os.getenv("STORAGE_ACCOUNT_NAME")
     )
     oauth_url = "https://{}.blob.core.windows.net".format(
         os.getenv("OAUTH_STORAGE_ACCOUNT_NAME")
     )
 
-    connection_string = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
-    shared_access_key = os.getenv("AZURE_STORAGE_ACCESS_KEY")
+    connection_string = os.getenv("STORAGE_CONNECTION_STRING")
+    shared_access_key = os.getenv("STORAGE_ACCOUNT_KEY")
 
     async def auth_connection_string_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: auth_connection_string_async")
             sys.exit(1)
         # [START auth_from_connection_string]
@@ -62,7 +62,7 @@ async def auth_connection_string_async(self):
 
     async def auth_shared_key_async(self):
         if self.shared_access_key is None:
-            print("Missing required environment variable: AZURE_STORAGE_ACCESS_KEY." + '\n' +
+            print("Missing required environment variable: STORAGE_ACCOUNT_KEY." + '\n' +
                   "Test: auth_shared_key_async")
             sys.exit(1)
         # [START create_blob_service_client]
@@ -85,7 +85,7 @@ async def auth_blob_url_async(self):
 
     async def auth_shared_access_signature_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: auth_shared_access_signature_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_batch_delete_blobs.py

@@ -10,18 +10,19 @@
 USAGE:
     python blob_samples_batch_delete_blobs.py
     Set the environment variables with your own values before running the sample:
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
 """
 
-SOURCE_FOLDER = "./sample-blobs/"
+current_dir = os.path.dirname(os.path.abspath(__file__))
+SOURCE_FOLDER = os.path.join(current_dir, "./sample-blobs/")
 
 
 def batch_delete_blobs_sample(local_path):
     # Set the connection string and container name values to initialize the Container Client
-    connection_string = os.getenv('AZURE_STORAGE_CONNECTION_STRING')
+    connection_string = os.getenv('STORAGE_CONNECTION_STRING')
 
     if connection_string is None:
-        print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+        print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
               "Test: batch_delete_blobs_sample")
         sys.exit(1)
 

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_client_side_encryption.py

@@ -13,12 +13,12 @@
     This example contains sample code for the KeyWrapper and KeyResolver classes
     needed to use Storage client side encryption, as well as code that illustrates
     key usage patterns for client side encryption features. This sample expects that
-    the `AZURE_STORAGE_CONNECTION_STRING` environment variable is set. It SHOULD NOT
+    the `STORAGE_CONNECTION_STRING` environment variable is set. It SHOULD NOT
     be hardcoded in any code derived from this sample.
 
 USAGE: python blob_samples_client_side_encryption.py
     Set the environment variables with your own values before running the sample:
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
 """
 
 import os
@@ -275,9 +275,9 @@ def alternate_key_algorithms(self):
             self.container_client.delete_container()
 
 try:
-    CONNECTION_STRING = os.environ['AZURE_STORAGE_CONNECTION_STRING']
+    CONNECTION_STRING = os.environ['STORAGE_CONNECTION_STRING']
 except KeyError:
-    print("AZURE_STORAGE_CONNECTION_STRING must be set.")
+    print("STORAGE_CONNECTION_STRING must be set.")
     sys.exit(1)
 
 # Configure max_single_put_size to make blobs in this sample smaller

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_client_side_encryption_keyvault.py

@@ -41,8 +41,8 @@
 from azure.storage.blob import BlobServiceClient
 
 # Environment variable keys which must be set to run this sample
-STORAGE_URL = 'AZURE_STORAGE_ACCOUNT_URL'
-KEYVAULT_URL = 'AZURE_KEYVAULT_DNS_NAME'
+STORAGE_URL = 'STORAGE_ACCOUNT_BLOB_URL'
+KEYVAULT_URL = 'KEYVAULT_URL'
 CLIENT_ID = 'ACTIVE_DIRECTORY_APPLICATION_ID'
 CLIENT_SECRET = 'ACTIVE_DIRECTORY_APPLICATION_SECRET'
 TENANT_ID = 'ACTIVE_DIRECTORY_TENANT_ID'
@@ -93,6 +93,12 @@ def get_kid(self):
 credential = DefaultAzureCredential()
 secret_client = SecretClient(keyvault_url, credential=credential)
 
+# Generate a random 256-bit key for AES  
+key = os.urandom(32)  # 32 bytes = 256 bits   
+
+# Base64 encode the binary key  
+encoded_key = base64.urlsafe_b64encode(key).decode('utf-8')
+secret_client.set_secret(name="symmetric-key", value=encoded_key)
 # The secret is url-safe base64 encoded bytes, content type 'application/octet-stream'
 secret = secret_client.get_secret('symmetric-key')
 key_bytes = base64.urlsafe_b64decode(secret.value)

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_common.py

@@ -14,7 +14,7 @@
 USAGE:
     python blob_samples_common.py
     Set the environment variables with your own values before running the sample.
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
 """
 
 import os
@@ -23,18 +23,19 @@
 from azure.core.exceptions import HttpResponseError, ResourceExistsError
 from azure.storage.blob import BlobServiceClient
 
-SOURCE_FILE = 'SampleSource.txt'
+current_dir = os.path.dirname(os.path.abspath(__file__))
+SOURCE_FILE = os.path.join(current_dir, 'SampleSource.txt')
 
 
 class CommonBlobSamples(object):
 
-    connection_string = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
+    connection_string = os.getenv("STORAGE_CONNECTION_STRING_SOFT")
 
     #--Begin Blob Samples-----------------------------------------------------------------
 
     def blob_snapshots(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: blob_snapshots")
             sys.exit(1)
 
@@ -74,7 +75,7 @@ def blob_snapshots(self):
 
     def soft_delete_and_undelete_blob(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: soft_delete_and_undelete_blob")
             sys.exit(1)
 
@@ -120,7 +121,7 @@ def soft_delete_and_undelete_blob(self):
 
     def delete_multiple_blobs(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: delete_multiple_blobs")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -157,7 +158,7 @@ def delete_multiple_blobs(self):
 
     def acquire_lease_on_blob(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: acquire_lease_on_blob")
             sys.exit(1)
 
@@ -194,7 +195,7 @@ def acquire_lease_on_blob(self):
 
     def start_copy_blob_from_url_and_abort_copy(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: start_copy_blob_from_url_and_abort_copy")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_common_async.py

@@ -14,27 +14,27 @@
 USAGE:
     python blob_samples_common_async.py
     Set the environment variables with your own values before running the sample.
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
 """
 
 import os
 import sys
 import asyncio
 from azure.core.exceptions import ResourceExistsError
 
-
-SOURCE_FILE = './SampleSource.txt'
+current_dir = os.path.dirname(os.path.abspath(__file__))
+SOURCE_FILE = os.path.join(current_dir, 'SampleSource.txt')
 
 
 class CommonBlobSamplesAsync(object):
 
-    connection_string = os.getenv("AZURE_STORAGE_CONNECTION_STRING")
+    connection_string = os.getenv("STORAGE_CONNECTION_STRING_SOFT")
 
     #--Begin Blob Samples-----------------------------------------------------------------
 
     async def blob_snapshots_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: blob_snapshots_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -74,7 +74,7 @@ async def blob_snapshots_async(self):
 
     async def soft_delete_and_undelete_blob_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: soft_delete_and_undelete_blob_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -120,7 +120,7 @@ async def soft_delete_and_undelete_blob_async(self):
 
     async def delete_multiple_blobs_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: delete_multiple_blobs_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -158,7 +158,7 @@ async def delete_multiple_blobs_async(self):
 
     async def acquire_lease_on_blob_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: acquire_lease_on_blob_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string
@@ -195,7 +195,7 @@ async def acquire_lease_on_blob_async(self):
 
     async def start_copy_blob_from_url_and_abort_copy_async(self):
         if self.connection_string is None:
-            print("Missing required environment variable: AZURE_STORAGE_CONNECTION_STRING." + '\n' +
+            print("Missing required environment variable: STORAGE_CONNECTION_STRING." + '\n' +
                   "Test: start_copy_blob_from_url_and_abort_copy_async")
             sys.exit(1)
         # Instantiate a BlobServiceClient using a connection string

Diff for: sdk/storage/azure-storage-blob/samples/blob_samples_container_access_policy.py

@@ -12,12 +12,12 @@
 DESCRIPTION:
     This example shows how to set the container access policy when creating the container
     and also how to get the access policy of a container after the container has been
-    created. This sample expects that the `AZURE_STORAGE_CONNECTION_STRING` environment
+    created. This sample expects that the `STORAGE_CONNECTION_STRING` environment
     variable is set. It SHOULD NOT be hardcoded in any code derived from this sample.
 
 USAGE: python blob_samples_container_access_policy.py
     Set the environment variables with your own values before running the sample:
-    1) AZURE_STORAGE_CONNECTION_STRING - the connection string to your storage account
+    1) STORAGE_CONNECTION_STRING - the connection string to your storage account
 
 EXAMPLE OUTPUT:
 
@@ -36,14 +36,14 @@
 from azure.storage.blob import AccessPolicy, BlobServiceClient, ContainerSasPermissions, PublicAccess
 
 try:
-    CONNECTION_STRING = os.environ['AZURE_STORAGE_CONNECTION_STRING']
+    CONNECTION_STRING = os.environ['STORAGE_CONNECTION_STRING']
 except KeyError:
-    print("AZURE_STORAGE_CONNECTION_STRING must be set.")
+    print("STORAGE_CONNECTION_STRING must be set.")
     sys.exit(1)
 
 def get_and_set_container_access_policy():
     service_client = BlobServiceClient.from_connection_string(CONNECTION_STRING)
-    container_client = service_client.get_container_client("mynewconwertainer")
+    container_client = service_client.get_container_client("mynewcontaineraccess")
 
     print("\n..Creating container")
     container_client.create_container()
@@ -52,7 +52,6 @@ def get_and_set_container_access_policy():
     access_policy = AccessPolicy(permission=ContainerSasPermissions(read=True, write=True),
                                     expiry=datetime.utcnow() + timedelta(hours=1),
                                     start=datetime.utcnow() - timedelta(minutes=1))
-
     identifiers = {'read': access_policy}
 
     # Specifies full public read access for container and blob data.