Skip to content

Commit b43e101

Browse files
authored
fix: live tests playback performance (#636)
* fix: live tests playback performance
1 parent 0433fba commit b43e101

File tree

123 files changed

+43941
-105286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+43941
-105286
lines changed

azure-quantum/tests/unit/common.py

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,20 @@ class RegexScrubbingPatterns:
5555
URL_STORAGE_ACCOUNT = r"https://[^\.]+.blob.core.windows.net"
5656
URL_QUANTUM_ENDPOINT = r"https://[^\.]+.quantum(-test)?.azure.com/"
5757
URL_OAUTH_ENDPOINT = \
58-
f"https://login.(microsoftonline.com|windows-ppe.net)/{GUID_REGEX_CAPTURE}/oauth2/.*"
59-
URL_QUERY_SAS_KEY_SIGNATURE = r"sig=[^&]+\&"
60-
URL_QUERY_SAS_KEY_VALUE = r"sv=[^&]+\&"
61-
URL_QUERY_SAS_KEY_EXPIRATION = r"se=[^&]+\&"
62-
URL_QUERY_AUTH_CLIENT_ID = r"client_id=[^&]+\&"
63-
URL_QUERY_AUTH_CLIENT_SECRET = r"client_secret=[^&]+\&"
64-
URL_QUERY_AUTH_CLIENT_ASSERTION = r"client_assertion=[^&]+\&"
65-
URL_QUERY_AUTH_CLIENT_ASSERTION_TYPE = r"client_assertion_type=[^&]+\&"
66-
URL_QUERY_AUTH_CLAIMS = r"claims=[^&]+\&"
67-
URL_QUERY_AUTH_CODE_VERIFIER = r"code_verifier=[^&]+\&"
68-
URL_QUERY_AUTH_CODE = r"code=[^&]+\&"
58+
f"https://login.(microsoftonline.com|windows-ppe.net)/{GUID_REGEX_CAPTURE}/oauth2/token"
59+
URL_OPENID_ENDPOINT = \
60+
f"https://login.(microsoftonline.com|windows-ppe.net)/{GUID_REGEX_CAPTURE}/v2.0/.well-known/openid-configuration"
61+
URL_QUERY_SAS_KEY_SIGNATURE = r"sig=[\w\%\-\.]+"
62+
URL_QUERY_SAS_KEY_VALUE = r"sv=[\w\%\-\.]+"
63+
URL_QUERY_SAS_KEY_START_DATE = r"st=[\w\%\-\.]+"
64+
URL_QUERY_SAS_KEY_EXPIRATION = r"se=[\w\%\-\.]+"
65+
URL_QUERY_AUTH_CLIENT_ID = r"client_id=[\w\%\-\.]+"
66+
URL_QUERY_AUTH_CLIENT_SECRET = r"client_secret=[\w\%\-\.]+"
67+
URL_QUERY_AUTH_CLIENT_ASSERTION = r"client_assertion=[\w\%\-\.]+"
68+
URL_QUERY_AUTH_CLIENT_ASSERTION_TYPE = r"client_assertion_type=[\w\%\-\.]+"
69+
URL_QUERY_AUTH_CLAIMS = r"claims=[\w\%\-\.]+"
70+
URL_QUERY_AUTH_CODE_VERIFIER = r"code_verifier=[\w\%\-\.]+"
71+
URL_QUERY_AUTH_CODE = r"code=[\w\%\-\.]+"
6972
URL_HTTP = r"http://" # Devskim: ignore DS137138
7073

7174
class QuantumTestBase(ReplayableTest):
@@ -155,31 +158,37 @@ def __init__(self, method_name):
155158
RegexScrubbingPatterns.URL_OAUTH_ENDPOINT,
156159
f'https://login.microsoftonline.com/{ZERO_UID}/oauth2/v2.0/token'
157160
)
161+
self._regex_replacer.register_scrubbing(
162+
RegexScrubbingPatterns.URL_OPENID_ENDPOINT,
163+
f'https://login.microsoftonline.com/{ZERO_UID}/v2.0/.well-known/openid-configuration'
164+
)
158165
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_SAS_KEY_SIGNATURE,
159-
"sig=PLACEHOLDER&")
166+
"sig=PLACEHOLDER")
160167
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_SAS_KEY_VALUE,
161-
"sv=PLACEHOLDER&")
168+
"sv=PLACEHOLDER")
169+
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_SAS_KEY_START_DATE,
170+
"st=2000-01-01T00%3A00%3A00Z")
162171
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_SAS_KEY_EXPIRATION,
163-
"se=2050-01-01T00%3A00%3A00Z&")
172+
"se=2050-01-01T00%3A00%3A00Z")
164173
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_AUTH_CLIENT_ID,
165-
"client_id=PLACEHOLDER&")
174+
"client_id=PLACEHOLDER")
166175
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_AUTH_CLIENT_SECRET,
167-
"client_secret=PLACEHOLDER&")
176+
"client_secret=PLACEHOLDER")
168177
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_AUTH_CLAIMS,
169-
"claims=PLACEHOLDER&")
178+
"claims=PLACEHOLDER")
170179
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_AUTH_CODE_VERIFIER,
171-
"code_verifier=PLACEHOLDER&")
180+
"code_verifier=PLACEHOLDER")
172181
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_QUERY_AUTH_CODE,
173-
"code=PLACEHOLDER&")
182+
"code=PLACEHOLDER")
174183
self._regex_replacer.register_scrubbing(RegexScrubbingPatterns.URL_HTTP, "https://")
175184

176185
self._regex_replacer.register_scrubbing(
177186
RegexScrubbingPatterns.URL_QUERY_AUTH_CLIENT_ASSERTION,
178-
"client_assertion=PLACEHOLDER&"
187+
"client_assertion=PLACEHOLDER"
179188
)
180189
self._regex_replacer.register_scrubbing(
181190
RegexScrubbingPatterns.URL_QUERY_AUTH_CLIENT_ASSERTION_TYPE,
182-
"client_assertion_type=PLACEHOLDER&"
191+
"client_assertion_type=PLACEHOLDER"
183192
)
184193

185194
def disable_scrubbing(self, pattern: str) -> None:
@@ -265,8 +274,7 @@ def resume_recording(self):
265274

266275
@property
267276
def is_playback(self):
268-
return (self.connection_params.subscription_id == SUBSCRIPTION_ID
269-
and not self.in_recording
277+
return (not self.in_recording
270278
and not self.is_live)
271279

272280
def clear_env_vars(self, os_environ):
@@ -633,11 +641,10 @@ class AuthenticationMetadataFilter(RecordingProcessor):
633641

634642
def process_request(self, request):
635643
if (
636-
"/.well-known/openid-configuration" in request.uri
637-
or "/common/discovery/instance" in request.uri
644+
"/common/discovery/instance" in request.uri
638645
or "&discover-tenant-id-and-authority" in request.uri
639646
):
640-
return None
647+
return request
641648
return request
642649

643650

0 commit comments

Comments
 (0)