[Storage] Move test keys into CredScan-suppressed helper files (#20330)

Azure · Sep 2, 2021 · 15cd636 · 15cd636
1 parent 45df88b
commit 15cd636
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 104 deletions.
diff --git a/eng/CredScanSuppression.json b/eng/CredScanSuppression.json
@@ -44,8 +44,8 @@
                 "sdk/identity/azure-identity/tests/certificate.pfx",
                 "sdk/identity/azure-identity/tests/certificate-with-password.pfx",
                 "sdk/core/azure-servicemanagement-legacy/tests/legacy_mgmt_settings_fake.py",
-                "sdk/storage/azure-storage-blob/tests/blob_settings_fake.py",
-                "sdk/storage/azure-storage-file-datalake/tests/data_lake_settings_fake.py",
+                "sdk/storage/azure-storage-blob/tests/fake_credentials.py",
+                "sdk/storage/azure-storage-file-datalake/tests/fake_credentials.py",
                 "tools/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py"
             ],
             "_justification": "File contains private key used by test code."

diff --git a/sdk/storage/azure-storage-blob/tests/blob_settings_fake.py b/sdk/storage/azure-storage-blob/tests/blob_settings_fake.py
diff --git a/sdk/storage/azure-storage-blob/tests/fake_credentials.py b/sdk/storage/azure-storage-blob/tests/fake_credentials.py
@@ -0,0 +1,8 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+CPK_KEY_VALUE = "MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc="
+CPK_KEY_HASH = "3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE="
diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_access_conditions.py b/sdk/storage/azure-storage-blob/tests/test_blob_access_conditions.py
@@ -29,6 +29,7 @@
     ResourceTypes,
     AccountSasPermissions, generate_container_sas, ContainerClient, CustomerProvidedEncryptionKey,
 )
+from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE
 from _shared.testcase import GlobalStorageAccountPreparer
 from devtools_testutils.storage import StorageTestCase
 
@@ -862,8 +863,7 @@ def test_if_blob_with_cpk_exists(self, resource_group, location, storage_account
             connection_data_block_size=4 * 1024)
         cc.create_container()
         self._setup()
-        test_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=",
-                                                 key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=")
+        test_cpk = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH)
         blob_client = cc.get_blob_client("test_blob")
         blob_client.upload_blob(b"hello world", cpk=test_cpk)
         # Act

diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_access_conditions_async.py b/sdk/storage/azure-storage-blob/tests/test_blob_access_conditions_async.py
@@ -28,6 +28,7 @@
     AccessPolicy, generate_account_sas, ResourceTypes, AccountSasPermissions, generate_blob_sas, BlobSasPermissions,
     generate_container_sas, CustomerProvidedEncryptionKey,
 )
+from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE
 from _shared.testcase import GlobalStorageAccountPreparer
 from devtools_testutils.storage.aio import AsyncStorageTestCase
 
@@ -884,8 +885,7 @@ async def test_if_blob_with_cpk_exists(self, resource_group, location, storage_a
             connection_data_block_size=4 * 1024)
         await cc.create_container()
         self._setup()
-        test_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=",
-                                                 key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=")
+        test_cpk = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH)
         blob_client = cc.get_blob_client("test_blob")
         await blob_client.upload_blob(b"hello world", cpk=test_cpk)
         # Act

diff --git a/sdk/storage/azure-storage-file-datalake/tests/data_lake_settings_fake.py b/sdk/storage/azure-storage-file-datalake/tests/data_lake_settings_fake.py
diff --git a/sdk/storage/azure-storage-file-datalake/tests/fake_credentials.py b/sdk/storage/azure-storage-file-datalake/tests/fake_credentials.py
@@ -0,0 +1,7 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+
+STORAGE_DATA_LAKE_ACCOUNT_FAKE_KEY = "NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg=="
diff --git a/sdk/storage/azure-storage-file-datalake/tests/testcase.py b/sdk/storage/azure-storage-file-datalake/tests/testcase.py
@@ -18,6 +18,7 @@
 
 from azure_devtools.scenario_tests import RecordingProcessor
 from devtools_testutils import AzureTestCase, PowerShellPreparer
+from fake_credentials import STORAGE_DATA_LAKE_ACCOUNT_FAKE_KEY
 
 try:
     from cStringIO import StringIO      # Python 2
@@ -38,7 +39,7 @@
 DataLakePreparer = functools.partial(
     PowerShellPreparer, "storage",
     datalake_storage_account_name="storagename",
-    datalake_storage_account_key="NzhL3hKZbJBuJ2484dPTR+xF30kYaWSSCbs2BzLgVVI1woqeST/1IgqaLm6QAOTxtGvxctSNbIR/1hW8yH+bJg=="
+    datalake_storage_account_key=STORAGE_DATA_LAKE_ACCOUNT_FAKE_KEY
 )