{LTS} Backport #30993 (#31367)

Author: bebound

src/azure-cli-core/azure/cli/core/tests/test_credential_helper.py

@@ -12,7 +12,7 @@ class TestCredentialHelper(unittest.TestCase):
     def _get_test_secret_masker(self):
         from microsoft_security_utilities_secret_masker import SecretMasker, load_regex_pattern_from_json
         email_address_json = {
-            "Pattern": r"(?<refine>[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})",
+            "Pattern": r"(?P<refine>[\w.%#+-]+)(%40|@)([a-z0-9.-]*.[a-z]{2,})",
             "Id": "001",
             "Name": "EmailAddress",
             "Signatures": [
@@ -22,7 +22,7 @@ def _get_test_secret_masker(self):
             "DetectionMetadata": "HighConfidence"
         }
         guid_json = {
-            "Pattern": r"(?<refine>[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12})",
+            "Pattern": r"(?P<refine>[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12})",
             "Id": "002",
             "Name": "GUID",
             "DetectionMetadata": "LowConfidence"

src/azure-cli-core/setup.py

@@ -53,6 +53,7 @@
     'humanfriendly~=10.0',
     'jmespath',
     'knack~=0.11.0',
+    'microsoft-security-utilities-secret-masker~=1.0.0b4',
     'msal-extensions==1.2.0',
     'msal[broker]==1.31.0',
     'msrestazure~=0.6.4',
@@ -63,7 +64,6 @@
     'PyJWT>=2.1.0',
     'pyopenssl>=17.1.0',  # https://github.com/pyca/pyopenssl/pull/612
     'requests[socks]',
-    'microsoft-security-utilities-secret-masker~=1.0.0b2',
 ]
 
 with open('README.rst', 'r', encoding='utf-8') as f: