From d743ff94609c6fd9f7b52539e773987bfd743eb3 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon <96087589+jalauzon-msft@users.noreply.github.com> Date: Mon, 27 Feb 2023 15:51:03 -0800 Subject: [PATCH] [Storage] Fix Storage CredScan warnings and update baseline (#29005) --- eng/python.gdnbaselines | 560 ------------------ .../tests/test_block_blob.py | 15 +- .../tests/test_block_blob_async.py | 16 +- .../azure-storage-blob/tests/test_cpk.py | 4 +- .../tests/test_cpk_async.py | 4 +- 5 files changed, 19 insertions(+), 580 deletions(-) diff --git a/eng/python.gdnbaselines b/eng/python.gdnbaselines index ad954e912492..b629a1f31ce6 100644 --- a/eng/python.gdnbaselines +++ b/eng/python.gdnbaselines @@ -120,102 +120,6 @@ "expirationDate": null, "type": null }, - "346ab8018b23101bd10c2d7ccc76664c78b2ce247afe14ece1fdf4970660c38d": { - "signature": "346ab8018b23101bd10c2d7ccc76664c78b2ce247afe14ece1fdf4970660c38d", - "alternativeSignatures": [ - "92692d6548322206da3b593e8277e4721ebdf00cfe3d6fcb2c3030794c37910d" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_block_blob.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "2fce1bbc104b0a4e5ce795ef72514188b6e88c985d3226abe8d80894bd35f60c": { - "signature": "2fce1bbc104b0a4e5ce795ef72514188b6e88c985d3226abe8d80894bd35f60c", - "alternativeSignatures": [ - "3d66abf697dbee5da39cf04829628c826a95b9b07f591c33b45db1bd40add288" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_block_blob.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "d5e56d36f29ae35fcc5e1380428f327f87452b6fa63686e36a0aaaabd42bf29d": { - "signature": "d5e56d36f29ae35fcc5e1380428f327f87452b6fa63686e36a0aaaabd42bf29d", - "alternativeSignatures": [ - "4c8674c1486296df2f28fff6ad967b041749d646e74cb7645f0c78781cfeeaa7" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_block_blob_async.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "c29825510492c4476e29303b6dc96596e32a949ca7bf82548924ab04dc95fcc5": { - "signature": "c29825510492c4476e29303b6dc96596e32a949ca7bf82548924ab04dc95fcc5", - "alternativeSignatures": [ - "62b17167625c19b6292434aa5b8a7c0b6e03feb0709f9f8980eabde6125af023" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_block_blob_async.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "664f9aa74a7926da7e2c77df7d91ffd7b4d9a91951aaf79a77277ae3423ebefb": { - "signature": "664f9aa74a7926da7e2c77df7d91ffd7b4d9a91951aaf79a77277ae3423ebefb", - "alternativeSignatures": [ - "e23e89d63eba335259bd206059658f018afcf9ebefcbdab386bc1ba5a9e8d55e" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_cpk.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "0b6299dd6ed7677b7b7b701eb5655fad3fe4af24d664e9292a291ee561ed2c07": { - "signature": "0b6299dd6ed7677b7b7b701eb5655fad3fe4af24d664e9292a291ee561ed2c07", - "alternativeSignatures": [ - "9f2053a9bb03712942cb5a64bfd35452c7a1d2c04d67e074e6e35f88fddfe5e9" - ], - "target": "sdk/storage/azure-storage-blob/tests/test_cpk_async.py", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-GENERAL0140", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, "5fe5227f13b0099d164ce41aa18134c5ea943c9728376f5b04595553913fb575": { "signature": "5fe5227f13b0099d164ce41aa18134c5ea943c9728376f5b04595553913fb575", "alternativeSignatures": [ @@ -552,54 +456,6 @@ "expirationDate": null, "type": null }, - "e7131d7ebb8b2931589d5ce433628d99bc6b92295b39798bcaae4d5621f0d69e": { - "signature": "e7131d7ebb8b2931589d5ce433628d99bc6b92295b39798bcaae4d5621f0d69e", - "alternativeSignatures": [ - "730648d775a4df9a7c38ad61e8f838db0fe2f0ae4322f797dd0bb83c060de4cf" - ], - "target": "sdk/core/azure-servicemanagement-legacy/tests/recordings/test_legacy_mgmt_storage.test_get_storage_account_keys.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0070", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "07fd6361be8739e0f4cc44ef559a3243659c024b5abd6f5e37c659433ddfe91c": { - "signature": "07fd6361be8739e0f4cc44ef559a3243659c024b5abd6f5e37c659433ddfe91c", - "alternativeSignatures": [ - "9e17ade61c97b111036d69336be9176cfdc7d3bd8ee9e3caa11bd1476a5e1fa2" - ], - "target": "sdk/core/azure-servicemanagement-legacy/tests/recordings/test_legacy_mgmt_storage.test_regenerate_storage_account_keys.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0070", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "e196953e9ae927f0250254ef2fef5c09c8f7bdf1eec5f03b993d5b85c42ace3a": { - "signature": "e196953e9ae927f0250254ef2fef5c09c8f7bdf1eec5f03b993d5b85c42ace3a", - "alternativeSignatures": [ - "2dc3a31ed0082e099110b6a5158be4a07b256b1e544fae58d3f2fc77eac42695" - ], - "target": "sdk/core/azure-servicemanagement-legacy/tests/recordings/test_legacy_mgmt_storage.test_regenerate_storage_account_keys.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0070", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, "a1914f341cdb6d59b13ee9784986ca800402ecb754389b9855a47af09ed6335b": { "signature": "a1914f341cdb6d59b13ee9784986ca800402ecb754389b9855a47af09ed6335b", "alternativeSignatures": [ @@ -1064,422 +920,6 @@ "expirationDate": null, "type": null }, - "68b2508bf046e9d9409d7270601a9ef28d1dc2d5bf68d2ebcb6a62f191de672a": { - "signature": "68b2508bf046e9d9409d7270601a9ef28d1dc2d5bf68d2ebcb6a62f191de672a", - "alternativeSignatures": [ - "1ea8e6f3044a53663f1da80a1d57717366c289437d6a8af62a0f5bc1b56bbe93" - ], - "target": "sdk/storage/azure-storage-blob/tests/recordings/test_common_blob.test_sas_signed_identifier.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0060", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "ac33674f27e7929fa46b5e8bc166ece5b3165d51eb3395ac532e224f8ef60937": { - "signature": "ac33674f27e7929fa46b5e8bc166ece5b3165d51eb3395ac532e224f8ef60937", - "alternativeSignatures": [ - "58e3a8970ead9329627fa2440ef08f8a13fe6c737a4add42f8e40f0b636e1875" - ], - "target": "sdk/storage/azure-storage-blob/tests/recordings/test_container.test_delete_blobs_with_if_tagss.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "d72668c0c94ea7630c1e863715218ad831e5d8c10d1b8b254c75af0b0a73eeb5": { - "signature": "d72668c0c94ea7630c1e863715218ad831e5d8c10d1b8b254c75af0b0a73eeb5", - "alternativeSignatures": [ - "fadb2c53e538722c6c099994e8a32484d1596d0ac0259422f2b85aa9d3053556" - ], - "target": "sdk/storage/azure-storage-blob/tests/recordings/test_container.test_delete_blobs_with_if_tagss.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "d4f94da078097f6dee06a5961e66cd22478012c4e542b7c3aa4a4e1e66addab8": { - "signature": "d4f94da078097f6dee06a5961e66cd22478012c4e542b7c3aa4a4e1e66addab8", - "alternativeSignatures": [ - "8f643dc1c3fb92f41fbc06c4d86fc83652f6469d18e191785e179a1ce13cfc2e" - ], - "target": "sdk/storage/azure-storage-blob/tests/recordings/test_container.test_delete_blobs_with_if_tagss.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "c68a5e2f13135ba807a7d714bd15bca810cd33016b43514023627ae530ccdb05": { - "signature": "c68a5e2f13135ba807a7d714bd15bca810cd33016b43514023627ae530ccdb05", - "alternativeSignatures": [ - "c67b3761d5d851df7b6c186dba7cfd187c4443771392e570c2698e25f9a34459" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "aa7b16efabeae42213b33aed7dfac04bf801404419eebaf302b7f48ddcfa4345": { - "signature": "aa7b16efabeae42213b33aed7dfac04bf801404419eebaf302b7f48ddcfa4345", - "alternativeSignatures": [ - "673b892fc78859857ccc613a600dd2a96b8486cd112566e44e2fe83d1d4e0f98" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "26f534e32b1ffb05ff4d8310fd4aa24c7f14e0c250f8102a55d5686a3a56c911": { - "signature": "26f534e32b1ffb05ff4d8310fd4aa24c7f14e0c250f8102a55d5686a3a56c911", - "alternativeSignatures": [ - "b80cd6d20a9c9d22971ed3936f57587034dda2715e1efc6ee7a84d3a95161015" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "7a5f235307ce3b86077a40edc174684431b918a337f586cceda776dda39828f3": { - "signature": "7a5f235307ce3b86077a40edc174684431b918a337f586cceda776dda39828f3", - "alternativeSignatures": [ - "db523fccd7c0f36e8bc60e289be55a38025912573b871dd8d2019a0a2204acf3" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "359c198e648a51b8d65491215c9721f86ee9ac21c55e63d599c278ca86cdebc1": { - "signature": "359c198e648a51b8d65491215c9721f86ee9ac21c55e63d599c278ca86cdebc1", - "alternativeSignatures": [ - "d05c84597978d2d01c4aad2cfd1158a7571775e782be5b356ebef5c1bce7c23d" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "3b8c857436e6eb7f95e0906e413f7b9a5ef751943ff167f7ea404d4e8e02802a": { - "signature": "3b8c857436e6eb7f95e0906e413f7b9a5ef751943ff167f7ea404d4e8e02802a", - "alternativeSignatures": [ - "230dc07dd717156a0c8c9c3492c6b1f93f78010dea696755012c2b6bdaa854d5" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "f8ce7845014df03231dbb3294d9f3c15d00fd5f0405f28813495231c1ed2ee64": { - "signature": "f8ce7845014df03231dbb3294d9f3c15d00fd5f0405f28813495231c1ed2ee64", - "alternativeSignatures": [ - "939934908648937ca218fc52538e0c2923ba4216f1b23b83909dfd1e5be58630" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "cbe921e40e5f863a65611916f30332489a031a0f42a2dbee5283cdb9db572a94": { - "signature": "cbe921e40e5f863a65611916f30332489a031a0f42a2dbee5283cdb9db572a94", - "alternativeSignatures": [ - "b42eeaac46b877574f394986fcfc575d2c1eb1b2362b609c53a81245580ff7ab" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "df5df8d2a06ea91551eb5c12c102f1211f9df6f1bcf9b96a20f3658c162a5ca7": { - "signature": "df5df8d2a06ea91551eb5c12c102f1211f9df6f1bcf9b96a20f3658c162a5ca7", - "alternativeSignatures": [ - "792a6de8c35ee40de38f778179e24c6503406104ef682a25c04c21b7ef1ef5e1" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "35e658d1ea24e3c04effa804aea14a2c6093052ad6c839837398d8473f130e9b": { - "signature": "35e658d1ea24e3c04effa804aea14a2c6093052ad6c839837398d8473f130e9b", - "alternativeSignatures": [ - "a3d0f14afa93092aadec3cdf4b7960fc4d3e517bf784bac2c3d2805fb47845e7" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "9856fbb2c3f2c2a62b298a6a547cfb4b39a610e84887ae9d7b4c575f4e5d0f52": { - "signature": "9856fbb2c3f2c2a62b298a6a547cfb4b39a610e84887ae9d7b4c575f4e5d0f52", - "alternativeSignatures": [ - "853122f2680a5cfc332a875e2675e34ee6f6c7fcbc7febfe58d9e72b6b6bfac5" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "963cb432d78285645f0d4dcdce411239b956c28bbe80a6bbc7c1c4e0cc80601c": { - "signature": "963cb432d78285645f0d4dcdce411239b956c28bbe80a6bbc7c1c4e0cc80601c", - "alternativeSignatures": [ - "a3682702ba200da0c28a32458386b4dfc3ba22748bf0f362a8a9da08a919af46" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "9a5ad7001ae9444fecb9f1b1bf1e1addc697280f28e1d8cc20a59049c48045ba": { - "signature": "9a5ad7001ae9444fecb9f1b1bf1e1addc697280f28e1d8cc20a59049c48045ba", - "alternativeSignatures": [ - "20fefac87b7e4042b3b02bd9e6b5306841c8b8037f2689592ffd91539cc8661f" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "35655bd704118532bc1ef31bae4b7ea85b13f3fe9bfd38936f2ea503b21a1004": { - "signature": "35655bd704118532bc1ef31bae4b7ea85b13f3fe9bfd38936f2ea503b21a1004", - "alternativeSignatures": [ - "ae14e57e855fa20d4f965e979f54fa2f5611ad3b8f5564cc1997254770427114" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "880b82a2478f44c2ed0a333764ae19a0af57c2f6f8222e1b55ce5a9b7012eba6": { - "signature": "880b82a2478f44c2ed0a333764ae19a0af57c2f6f8222e1b55ce5a9b7012eba6", - "alternativeSignatures": [ - "f174080916787ebc76c09abc4c95c6cde9f5e2a622d13463921e9ffdba6ea199" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_simple_no_raise.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "a0f9a8eb40016f1d1a84cd5f10652fb91b6d70b3667ab91695920477d8ef7d80": { - "signature": "a0f9a8eb40016f1d1a84cd5f10652fb91b6d70b3667ab91695920477d8ef7d80", - "alternativeSignatures": [ - "c7d9bd463d61c77d5c32188626b50f292e7ec5ea84200fcce6436088b34f3ab4" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "763bc6bb160f3a3030ce372ca59be49aa1b9e97a06fb95f8795ce39d5ceb1372": { - "signature": "763bc6bb160f3a3030ce372ca59be49aa1b9e97a06fb95f8795ce39d5ceb1372", - "alternativeSignatures": [ - "95ac64f559f61470d2d0e709dec2b2dc01a29a8fb38a6d99a7bdb80684182290" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "3b41d1342fb89ea33d2b1d9883a8367ec0dd3318650cc009c50382784e4760ff": { - "signature": "3b41d1342fb89ea33d2b1d9883a8367ec0dd3318650cc009c50382784e4760ff", - "alternativeSignatures": [ - "bd4d076172c225e7c8a9072d75495be33138a1be626a268efca298202774b378" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "0ab8d6e644e65ec3d9254aeda0fad7905611b5196babbc22ad9e6e2b5b1a8aa2": { - "signature": "0ab8d6e644e65ec3d9254aeda0fad7905611b5196babbc22ad9e6e2b5b1a8aa2", - "alternativeSignatures": [ - "aa41c9219fd2d630732f8ee247c2f079c7a9b05f3426ecb490294b69a0ddeb20" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "cd4da3707851f187d5c11cc98465c3ffc53cc1de8f0da61a1cf0758b438a4c7e": { - "signature": "cd4da3707851f187d5c11cc98465c3ffc53cc1de8f0da61a1cf0758b438a4c7e", - "alternativeSignatures": [ - "54406c31d8f60a45c37e346799eb833aab53e1e74a3571b5bf7b9cd577af0d7a" - ], - "target": "sdk/storage/azure-storage-file-datalake/tests/recordings/test_file_system_async.test_delete_files_with_failed_subrequest.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0130", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "111741c17c535857bd2febd51f20323c8971863e25308ade4fb08b42faca97c2": { - "signature": "111741c17c535857bd2febd51f20323c8971863e25308ade4fb08b42faca97c2", - "alternativeSignatures": [ - "953b29290c818baf240eca509cda56be7776a5698b2569c7194632b9449411fa" - ], - "target": "sdk/storage/azure-storage-file-share/tests/recordings/test_file_async.test_update_range_from_file_url_when_source_file_does_not_have_enough_bytes.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0060", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, - "7b9ed1f9bdac178e3148559a80e207f65b52440f92514c77f3b9267037fee231": { - "signature": "7b9ed1f9bdac178e3148559a80e207f65b52440f92514c77f3b9267037fee231", - "alternativeSignatures": [ - "1156aa6370755a3106f27d596b6d501f43b5db424d3cb19f6baf12729d7a824e" - ], - "target": "sdk/storage/azure-storage-file-share/tests/recordings/test_file_async.test_update_range_from_file_url_when_source_file_does_not_have_enough_bytes_async.yaml", - "memberOf": [ - "baseline" - ], - "tool": "credscan", - "ruleId": "CSCAN-AZURE0060", - "justification": null, - "createdDate": "2022-02-18 01:42:17Z", - "expirationDate": null, - "type": null - }, "2e7465a04c1dbba0d4c023349e82ae91395332f43fa70623aea90945632589ef": { "signature": "2e7465a04c1dbba0d4c023349e82ae91395332f43fa70623aea90945632589ef", "alternativeSignatures": [ diff --git a/sdk/storage/azure-storage-blob/tests/test_block_blob.py b/sdk/storage/azure-storage-blob/tests/test_block_blob.py index 029872e36c77..0db4213f78df 100644 --- a/sdk/storage/azure-storage-blob/tests/test_block_blob.py +++ b/sdk/storage/azure-storage-blob/tests/test_block_blob.py @@ -27,12 +27,14 @@ from devtools_testutils import recorded_by_proxy from devtools_testutils.storage import StorageRecordedTestCase +from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE from settings.testcase import BlobPreparer from test_helpers import NonSeekableStream, ProgressTracker #------------------------------------------------------------------------------ TEST_BLOB_PREFIX = 'blob' LARGE_BLOB_SIZE = 5 * 1024 + 5 +TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH) #------------------------------------------------------------------------------ @@ -321,8 +323,6 @@ def test_upload_blob_from_url_with_cpk(self, **kwargs): # Act self._setup(storage_account_name, storage_account_key) source_blob = self._create_blob(data=b"This is test data to be copied over.") - test_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") sas = self.generate_sas( generate_blob_sas, account_name=storage_account_name, @@ -337,12 +337,12 @@ def test_upload_blob_from_url_with_cpk(self, **kwargs): blob_name = self.get_resource_name("blobcopy") new_blob = self.bsc.get_blob_client(self.container_name, blob_name) new_blob.upload_blob_from_url( - source_blob_url, include_source_blob_properties=True, cpk=test_cpk) + source_blob_url, include_source_blob_properties=True, cpk=TEST_ENCRYPTION_KEY) # Assert with pytest.raises(HttpResponseError): new_blob.create_snapshot() - new_blob.create_snapshot(cpk=test_cpk) + new_blob.create_snapshot(cpk=TEST_ENCRYPTION_KEY) assert new_blob.create_snapshot is not None @BlobPreparer() @@ -357,8 +357,7 @@ def test_upload_blob_from_url_overwrite_properties(self, **kwargs): new_blob_content_settings = ContentSettings(content_language='english') source_blob_tags = {"tag1": "sourcetag", "tag2": "secondsourcetag"} new_blob_tags = {"tag1": "copytag"} - new_blob_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") + source_blob = self._create_blob( data=b"This is test data to be copied over.", tags=source_blob_tags, @@ -382,8 +381,8 @@ def test_upload_blob_from_url_overwrite_properties(self, **kwargs): tags=new_blob_tags, content_settings=new_blob_content_settings, overwrite=True, - cpk=new_blob_cpk) - new_blob_props = new_blob.get_blob_properties(cpk=new_blob_cpk) + cpk=TEST_ENCRYPTION_KEY) + new_blob_props = new_blob.get_blob_properties(cpk=TEST_ENCRYPTION_KEY) # Assert that source blob properties did not take precedence. assert new_blob_props.tag_count == 1 diff --git a/sdk/storage/azure-storage-blob/tests/test_block_blob_async.py b/sdk/storage/azure-storage-blob/tests/test_block_blob_async.py index bc315e615565..2002a7188a67 100644 --- a/sdk/storage/azure-storage-blob/tests/test_block_blob_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_block_blob_async.py @@ -24,12 +24,14 @@ from devtools_testutils.aio import recorded_by_proxy_async from devtools_testutils.storage.aio import AsyncStorageRecordedTestCase +from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE from settings.testcase import BlobPreparer from test_helpers_async import NonSeekableStream, ProgressTracker # ------------------------------------------------------------------------------ TEST_BLOB_PREFIX = 'blob' LARGE_BLOB_SIZE = 5 * 1024 + 5 +TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH) # ------------------------------------------------------------------------------ @@ -344,8 +346,7 @@ async def test_upload_blob_from_url_with_cpk(self, **kwargs): # Act await self._setup(storage_account_name, storage_account_key) source_blob = await self._create_blob(data=b"This is test data to be copied over.") - test_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") + sas = self.generate_sas( generate_blob_sas, account_name=storage_account_name, @@ -360,12 +361,12 @@ async def test_upload_blob_from_url_with_cpk(self, **kwargs): blob_name = self.get_resource_name("blobcopy") new_blob = self.bsc.get_blob_client(self.container_name, blob_name) await new_blob.upload_blob_from_url( - source_blob_url, include_source_blob_properties=True, cpk=test_cpk) + source_blob_url, include_source_blob_properties=True, cpk=TEST_ENCRYPTION_KEY) # Assert with pytest.raises(HttpResponseError): await new_blob.create_snapshot() - await new_blob.create_snapshot(cpk=test_cpk) + await new_blob.create_snapshot(cpk=TEST_ENCRYPTION_KEY) assert new_blob.create_snapshot is not None @BlobPreparer() @@ -380,8 +381,7 @@ async def test_upload_blob_from_url_overwrite_properties(self, **kwargs): new_blob_content_settings = ContentSettings(content_language='english') source_blob_tags = {"tag1": "sourcetag", "tag2": "secondsourcetag"} new_blob_tags = {"tag1": "copytag"} - new_blob_cpk = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") + source_blob = await self._create_blob( data=b"This is test data to be copied over.", tags=source_blob_tags, @@ -404,8 +404,8 @@ async def test_upload_blob_from_url_overwrite_properties(self, **kwargs): include_source_blob_properties=True, tags=new_blob_tags, content_settings=new_blob_content_settings, - cpk=new_blob_cpk) - new_blob_props = await new_blob.get_blob_properties(cpk=new_blob_cpk) + cpk=TEST_ENCRYPTION_KEY) + new_blob_props = await new_blob.get_blob_properties(cpk=TEST_ENCRYPTION_KEY) # Assert that source blob properties did not take precedence. assert new_blob_props.tag_count == 1 diff --git a/sdk/storage/azure-storage-blob/tests/test_cpk.py b/sdk/storage/azure-storage-blob/tests/test_cpk.py index 47d842877dc3..38ea332eceb6 100644 --- a/sdk/storage/azure-storage-blob/tests/test_cpk.py +++ b/sdk/storage/azure-storage-blob/tests/test_cpk.py @@ -19,11 +19,11 @@ from devtools_testutils import recorded_by_proxy from devtools_testutils.storage import StorageRecordedTestCase +from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE from settings.testcase import BlobPreparer # ------------------------------------------------------------------------------ -TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") +TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH) # ------------------------------------------------------------------------------ diff --git a/sdk/storage/azure-storage-blob/tests/test_cpk_async.py b/sdk/storage/azure-storage-blob/tests/test_cpk_async.py index 4529d4d0708e..1cb7ae7057b4 100644 --- a/sdk/storage/azure-storage-blob/tests/test_cpk_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_cpk_async.py @@ -20,11 +20,11 @@ from devtools_testutils.aio import recorded_by_proxy_async from devtools_testutils.storage.aio import AsyncStorageRecordedTestCase +from fake_credentials import CPK_KEY_HASH, CPK_KEY_VALUE from settings.testcase import BlobPreparer # ------------------------------------------------------------------------------ -TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value="MDEyMzQ1NjcwMTIzNDU2NzAxMjM0NTY3MDEyMzQ1Njc=", - key_hash="3QFFFpRA5+XANHqwwbT4yXDmrT/2JaLt/FKHjzhOdoE=") +TEST_ENCRYPTION_KEY = CustomerProvidedEncryptionKey(key_value=CPK_KEY_VALUE, key_hash=CPK_KEY_HASH) # ------------------------------------------------------------------------------