Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/compute/azure-mgmt-compute/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from dotenv import load_dotenv

from devtools_testutils import test_proxy, add_general_regex_sanitizer, add_body_key_sanitizer
from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer

# Ignore async tests for Python < 3.5
collect_ignore_glob = []
Expand All @@ -45,7 +46,6 @@ def add_sanitizers(test_proxy):
subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", "00000000-0000-0000-0000-000000000000")
tenant_id = os.environ.get("AZURE_TENANT_ID", "00000000-0000-0000-0000-000000000000")
add_general_regex_sanitizer(regex=subscription_id, value="00000000-0000-0000-0000-000000000000")
add_general_regex_sanitizer(regex=tenant_id, value="00000000-0000-0000-0000-000000000000")
add_general_regex_sanitizer(regex='eyJ0eXAiOiJKV.*?"', value='access_token"')
add_general_regex_sanitizer(regex='fpc=.*?;', value='fpc=fpc;')
add_body_key_sanitizer(json_path="$..accessSAS")
add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]")
add_header_regex_sanitizer(key="Cookie", value="cookie;")
add_body_key_sanitizer(json_path="$..access_token", value="access_token")

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"Entries": [
{
"RequestUri": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration",
"RequestUri": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/v2.0/.well-known/openid-configuration",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "*/*",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-identity/1.8.0b2 Python/3.8.8 (Windows-10-10.0.19041-SP0)"
"User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.6.2 (Windows-10-10.0.19041-SP0)"
},
"RequestBody": null,
"StatusCode": 200,
Expand All @@ -17,26 +17,22 @@
"Cache-Control": "max-age=86400, private",
"Content-Length": "1753",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:10 GMT",
"Date": "Wed, 09 Mar 2022 13:18:29 GMT",
"P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022",
"Set-Cookie": [
"fpc=fpc; expires=Fri, 01-Apr-2022 03:43:11 GMT; path=/; secure; HttpOnly; SameSite=None",
"x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly",
"stsservicecookie=estsfd; path=/; secure; samesite=none; httponly"
],
"Set-Cookie": "[set-cookie;]",
"Strict-Transport-Security": "max-age=31536000; includeSubDomains",
"X-Content-Type-Options": "nosniff",
"x-ms-ests-server": "2.1.12507.17 - WUS2 ProdSlices",
"x-ms-request-id": "08add27b-4f96-4a17-b36a-bb11a0517200"
"x-ms-ests-server": "2.1.12529.17 - SCUS ProdSlices",
"x-ms-request-id": "cba0a9d8-ef8c-4f79-9dbb-7923c4c8f300"
},
"ResponseBody": {
"token_endpoint": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/token",
"token_endpoint": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/oauth2/v2.0/token",
"token_endpoint_auth_methods_supported": [
"client_secret_post",
"private_key_jwt",
"client_secret_basic"
],
"jwks_uri": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/discovery/v2.0/keys",
"jwks_uri": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/discovery/v2.0/keys",
"response_modes_supported": [
"query",
"fragment",
Expand All @@ -60,14 +56,14 @@
"email",
"offline_access"
],
"issuer": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0",
"issuer": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/v2.0",
"request_uri_parameter_supported": false,
"userinfo_endpoint": "https://graph.microsoft.com/oidc/userinfo",
"authorization_endpoint": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/authorize",
"device_authorization_endpoint": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/devicecode",
"authorization_endpoint": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/oauth2/v2.0/authorize",
"device_authorization_endpoint": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/oauth2/v2.0/devicecode",
"http_logout_supported": true,
"frontchannel_logout_supported": true,
"end_session_endpoint": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/logout",
"end_session_endpoint": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/oauth2/v2.0/logout",
"claims_supported": [
"sub",
"iss",
Expand All @@ -89,7 +85,7 @@
"c_hash",
"email"
],
"kerberos_endpoint": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/kerberos",
"kerberos_endpoint": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/kerberos",
"tenant_region_scope": "NA",
"cloud_instance_name": "microsoftonline.com",
"cloud_graph_host_name": "graph.windows.net",
Expand All @@ -104,8 +100,8 @@
"Accept": "application/json",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Cookie": "fpc=fpc; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd",
"User-Agent": "azsdk-python-identity/1.8.0b2 Python/3.8.8 (Windows-10-10.0.19041-SP0)"
"Cookie": "cookie;",
"User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.6.2 (Windows-10-10.0.19041-SP0)"
},
"RequestBody": null,
"StatusCode": 200,
Expand All @@ -115,17 +111,13 @@
"Cache-Control": "max-age=86400, private",
"Content-Length": "945",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:11 GMT",
"Date": "Wed, 09 Mar 2022 13:18:30 GMT",
"P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022",
"Set-Cookie": [
"fpc=fpc; expires=Fri, 01-Apr-2022 03:43:11 GMT; path=/; secure; HttpOnly; SameSite=None",
"x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly",
"stsservicecookie=estsfd; path=/; secure; samesite=none; httponly"
],
"Set-Cookie": "[set-cookie;]",
"Strict-Transport-Security": "max-age=31536000; includeSubDomains",
"X-Content-Type-Options": "nosniff",
"x-ms-ests-server": "2.1.12529.16 - SEASLR2 ProdSlices",
"x-ms-request-id": "877e778d-0bdf-411f-9da9-658bd5f92800"
"x-ms-ests-server": "2.1.12559.5 - KRSLR2 ProdSlices",
"x-ms-request-id": "6fd3393b-1a68-4088-a912-47d10ec70700"
},
"ResponseBody": {
"tenant_discovery_endpoint": "https://login.microsoftonline.com/common/.well-known/openid-configuration",
Expand Down Expand Up @@ -175,46 +167,42 @@
}
},
{
"RequestUri": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/oauth2/v2.0/token",
"RequestUri": "https://login.microsoftonline.com/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a/oauth2/v2.0/token",
"RequestMethod": "POST",
"RequestHeaders": {
"Accept": "application/json",
"Accept-Encoding": "gzip, deflate",
"client-request-id": "90bb0cd5-d9d8-444a-b067-31eb395f1aa2",
"client-request-id": "57fbb041-9c72-48f8-8bb6-99d46b89f1b5",
"Connection": "keep-alive",
"Content-Length": "289",
"Content-Length": "291",
"Content-Type": "application/x-www-form-urlencoded",
"Cookie": "fpc=fpc; stsservicecookie=estsfd; x-ms-gateway-slice=estsfd",
"User-Agent": "azsdk-python-identity/1.8.0b2 Python/3.8.8 (Windows-10-10.0.19041-SP0)",
"Cookie": "cookie;",
"User-Agent": "azsdk-python-identity/1.9.0b2 Python/3.6.2 (Windows-10-10.0.19041-SP0)",
"x-client-cpu": "x64",
"x-client-current-telemetry": "4|730,0|",
"x-client-last-telemetry": "4|0|||",
"x-client-os": "win32",
"x-client-sku": "MSAL.Python",
"x-client-ver": "1.16.0",
"x-client-ver": "1.17.0",
"x-ms-lib-capability": "retry-after, h429"
},
"RequestBody": "client_id=a2df54d5-ab03-4725-9b80-9a00b3b1967f\u0026grant_type=client_credentials\u0026client_info=1\u0026client_secret=0vj7Q~IsFayrD0V_8oyOfygU-GE3ELOabq95a\u0026claims=%7B%22access_token%22%3A\u002B%7B%22xms_cc%22%3A\u002B%7B%22values%22%3A\u002B%5B%22CP1%22%5D%7D%7D%7D\u0026scope=https%3A%2F%2Fmanagement.azure.com%2F.default",
"RequestBody": "client_id=a2df54d5-ab03-4725-9b80-9a00b3b1967f\u0026grant_type=client_credentials\u0026client_info=1\u0026client_secret=0vj7Q%7EIsFayrD0V_8oyOfygU-GE3ELOabq95a\u0026claims=%7B%22access_token%22%3A\u002B%7B%22xms_cc%22%3A\u002B%7B%22values%22%3A\u002B%5B%22CP1%22%5D%7D%7D%7D\u0026scope=https%3A%2F%2Fmanagement.azure.com%2F.default",
"StatusCode": 200,
"ResponseHeaders": {
"Cache-Control": "no-store, no-cache",
"client-request-id": "90bb0cd5-d9d8-444a-b067-31eb395f1aa2",
"client-request-id": "57fbb041-9c72-48f8-8bb6-99d46b89f1b5",
"Content-Length": "93",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:11 GMT",
"Date": "Wed, 09 Mar 2022 13:18:30 GMT",
"Expires": "-1",
"P3P": "CP=\u0022DSP CUR OTPi IND OTRi ONL FIN\u0022",
"Pragma": "no-cache",
"Set-Cookie": [
"fpc=fpc; expires=Fri, 01-Apr-2022 03:43:12 GMT; path=/; secure; HttpOnly; SameSite=None",
"x-ms-gateway-slice=estsfd; path=/; secure; samesite=none; httponly",
"stsservicecookie=estsfd; path=/; secure; samesite=none; httponly"
],
"Set-Cookie": "[set-cookie;]",
"Strict-Transport-Security": "max-age=31536000; includeSubDomains",
"X-Content-Type-Options": "nosniff",
"x-ms-clitelem": "1,0,0,,",
"x-ms-ests-server": "2.1.12507.17 - EUS ProdSlices",
"x-ms-request-id": "91c3ef18-7cd7-4a42-a167-0bba88e71000"
"x-ms-ests-server": "2.1.12529.17 - SCUS ProdSlices",
"x-ms-request-id": "cba0a9d8-ef8c-4f79-9dbb-7923eac8f300"
},
"ResponseBody": {
"token_type": "Bearer",
Expand All @@ -231,16 +219,16 @@
"Accept-Encoding": "gzip, deflate",
"Authorization": "Sanitized",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.8.8 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "e24177f5-99da-11ec-8687-70b5e82527ff"
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.6.2 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "68fe5c9c-9fab-11ec-9a16-c0b6f9946f2d"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Cache-Control": "no-cache",
"Content-Encoding": "gzip",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:12 GMT",
"Date": "Wed, 09 Mar 2022 13:18:30 GMT",
"Expires": "-1",
"Pragma": "no-cache",
"Server": [
Expand All @@ -251,12 +239,12 @@
"Transfer-Encoding": "chunked",
"Vary": "Accept-Encoding",
"X-Content-Type-Options": "nosniff",
"x-ms-correlation-request-id": "9129b35d-77c4-468c-9ec5-85cd4d12de2e",
"x-ms-correlation-request-id": "0cba84de-fbc7-4fbc-99db-5b91767e1065",
"x-ms-ratelimit-remaining-resource": "Microsoft.Compute/GetVMExtension3Min;9999,Microsoft.Compute/GetVMExtension30Min;21999",
"x-ms-ratelimit-remaining-subscription-reads": "11867",
"x-ms-request-id": "ad02c6dd-8b07-47fe-a9a3-14a57f46c073",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220302T034312Z:9129b35d-77c4-468c-9ec5-85cd4d12de2e",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132887178911805742"
"x-ms-ratelimit-remaining-subscription-reads": "11932",
"x-ms-request-id": "c729778c-4430-41f8-9258-fd96a36e20a5",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220309T131831Z:0cba84de-fbc7-4fbc-99db-5b91767e1065",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132498284633170067"
},
"ResponseBody": {
"properties": {
Expand Down Expand Up @@ -284,16 +272,16 @@
"Accept-Encoding": "gzip, deflate",
"Authorization": "Sanitized",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.8.8 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "e303db64-99da-11ec-832a-70b5e82527ff"
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.6.2 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "6a088a36-9fab-11ec-91f3-c0b6f9946f2d"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Cache-Control": "no-cache",
"Content-Encoding": "gzip",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:12 GMT",
"Date": "Wed, 09 Mar 2022 13:18:31 GMT",
"Expires": "-1",
"Pragma": "no-cache",
"Server": [
Expand All @@ -304,12 +292,12 @@
"Transfer-Encoding": "chunked",
"Vary": "Accept-Encoding",
"X-Content-Type-Options": "nosniff",
"x-ms-correlation-request-id": "d84633ea-a11d-45b1-a456-92753c573677",
"x-ms-correlation-request-id": "4a93a07d-dfaa-4472-95fc-5813c9c810c0",
"x-ms-ratelimit-remaining-resource": "Microsoft.Compute/ListVMExtensionTypes3Min;17999,Microsoft.Compute/ListVMExtensionTypes30Min;22499",
"x-ms-ratelimit-remaining-subscription-reads": "11866",
"x-ms-request-id": "6abf129e-0001-49bc-8d87-5cfc8e0aa556",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220302T034313Z:d84633ea-a11d-45b1-a456-92753c573677",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132887178911805742"
"x-ms-ratelimit-remaining-subscription-reads": "11931",
"x-ms-request-id": "31b0007b-1f19-4af4-92c9-7a2643fb8a1a",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220309T131831Z:4a93a07d-dfaa-4472-95fc-5813c9c810c0",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132498284633170067"
},
"ResponseBody": [
"[\r\n",
Expand Down Expand Up @@ -344,16 +332,16 @@
"Accept-Encoding": "gzip, deflate",
"Authorization": "Sanitized",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.8.8 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "e3367828-99da-11ec-b856-70b5e82527ff"
"User-Agent": "azsdk-python-azure-mgmt-compute/26.1.0 Python/3.6.2 (Windows-10-10.0.19041-SP0)",
"x-ms-client-request-id": "6a3d3fc6-9fab-11ec-920d-c0b6f9946f2d"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Cache-Control": "no-cache",
"Content-Encoding": "gzip",
"Content-Type": "application/json; charset=utf-8",
"Date": "Wed, 02 Mar 2022 03:43:13 GMT",
"Date": "Wed, 09 Mar 2022 13:18:31 GMT",
"Expires": "-1",
"Pragma": "no-cache",
"Server": [
Expand All @@ -364,12 +352,12 @@
"Transfer-Encoding": "chunked",
"Vary": "Accept-Encoding",
"X-Content-Type-Options": "nosniff",
"x-ms-correlation-request-id": "943a2d16-aad9-496e-9322-8a362e7e374c",
"x-ms-correlation-request-id": "bcad2ddd-88d4-4915-bcf4-d418a449cb93",
"x-ms-ratelimit-remaining-resource": "Microsoft.Compute/ListVMExtensions3Min;9999,Microsoft.Compute/ListVMExtensions30Min;21999",
"x-ms-ratelimit-remaining-subscription-reads": "11865",
"x-ms-request-id": "99e3636e-a6b6-49e6-bb81-211098d1d671",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220302T034313Z:943a2d16-aad9-496e-9322-8a362e7e374c",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132887178911805742"
"x-ms-ratelimit-remaining-subscription-reads": "11930",
"x-ms-request-id": "d0f26f60-ed58-4d67-8904-0c702ab48d39",
"x-ms-routing-request-id": "SOUTHEASTASIA:20220309T131831Z:bcad2ddd-88d4-4915-bcf4-d418a449cb93",
"x-ms-served-by": "ab90d441-6939-4ab1-9dfa-bef247d64088_132498284633170067"
},
"ResponseBody": [
"[\r\n",
Expand Down
Loading