[CI] Update more tests for the new TestProxy (#35562)

Several tests still need a few opt-outs for sanitizers. Some recordings were adjusted with extra sanitization in place. Signed-off-by: Paul Van Eck <[email protected]>
Azure · May 9, 2024 · 5ae47b7 · 5ae47b7
1 parent dd7fd47
commit 5ae47b7
Show file tree

Hide file tree

Showing 23 changed files with 137 additions and 36 deletions.
diff --git a/sdk/advisor/azure-mgmt-advisor/tests/conftest.py b/sdk/advisor/azure-mgmt-advisor/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -52,4 +52,8 @@ def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000")
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK2003: Location
+ remove_batch_sanitizers(["AZSDK2003"])
diff --git a/sdk/batch/azure-mgmt-batch/tests/conftest.py b/sdk/batch/azure-mgmt-batch/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 load_dotenv()
@@ -48,4 +48,8 @@ def add_sanitizers(test_proxy):
  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")
- add_body_key_sanitizer(json_path="$..storageUrl", value="storageUrl")
+ add_body_key_sanitizer(json_path="$..storageUrl", value="storageUrl")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
diff --git a/sdk/compute/azure-mgmt-compute/tests/conftest.py b/sdk/compute/azure-mgmt-compute/tests/conftest.py
@@ -31,14 +31,14 @@
 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
+from devtools_testutils import add_header_regex_sanitizer, remove_batch_sanitizers
 
 # Ignore async tests for Python < 3.5
 collect_ignore_glob = []
 if sys.version_info < (3, 5) or platform.python_implementation() == "PyPy":
  collect_ignore_glob.append("*_async.py")
 
- 
+
 load_dotenv()
 
 @pytest.fixture(scope="session", autouse=True)
@@ -54,4 +54,8 @@ def add_sanitizers(test_proxy):
  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")
- add_body_key_sanitizer(json_path="$....accessSAS", value="accessSAS")
+ add_body_key_sanitizer(json_path="$....accessSAS", value="accessSAS")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK2003: Location
+ remove_batch_sanitizers(["AZSDK2003"])
diff --git a/sdk/compute/azure-mgmt-compute/tests/test_mgmt_compute_galleries.py b/sdk/compute/azure-mgmt-compute/tests/test_mgmt_compute_galleries.py
@@ -308,8 +308,9 @@ def test_compute_galleries(self, resource_group):
  result = self.mgmt_client.gallery_images.begin_delete(resource_group.name, GALLERY_NAME, IMAGE_NAME)
  result = result.result()
 
- import time
- time.sleep(180)
+ if self.is_live:
+ import time
+ time.sleep(180)
 
  # TODO: need finish
  # # Delete a gallery Application Version.[delete]

diff --git a/sdk/confidentialledger/azure-confidentialledger/assets.json b/sdk/confidentialledger/azure-confidentialledger/assets.json
@@ -2,5 +2,5 @@
  "AssetsRepo": "Azure/azure-sdk-assets",
  "AssetsRepoPrefixPath": "python",
  "TagPrefix": "python/confidentialledger/azure-confidentialledger",
- "Tag": "python/confidentialledger/azure-confidentialledger_995077cfcf"
+ "Tag": "python/confidentialledger/azure-confidentialledger_27130e59c6"
 }
diff --git a/sdk/confidentialledger/azure-confidentialledger/tests/conftest.py b/sdk/confidentialledger/azure-confidentialledger/tests/conftest.py
@@ -1,8 +1,10 @@
-from devtools_testutils import test_proxy
+from devtools_testutils import test_proxy, remove_batch_sanitizers
 
 import pytest
 
 # autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
 @pytest.fixture(scope="session", autouse=True)
-def start_proxy(test_proxy):
- return
+def add_sanitizers(test_proxy):
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3433: $..userid
+ remove_batch_sanitizers(["AZSDK3433"])
diff --git a/sdk/consumption/azure-mgmt-consumption/tests/test_budgets.py b/sdk/consumption/azure-mgmt-consumption/tests/test_budgets.py
@@ -26,9 +26,8 @@ def test_budgets(self, resource_group):
  SUBSCRIPTION_ID = self.get_settings_value('SUBSCRIPTION_ID')
  SCOPE = '/subscriptions/{}/resourceGroups/{}'.format(SUBSCRIPTION_ID, resource_group.name)
  BUDGET_NAME = self.get_resource_name('budget')
- TODAY = datetime.datetime.now()
- start_date = TODAY.strftime('%Y-%m-01T00:00:00Z')
- end_date = (TODAY+datetime.timedelta(180)).strftime('%Y-%m-01T00:00:00Z')
+ start_date = "2022-12-01T00:00:00.000Z"
+ end_date = "2023-06-01T00:00:00.000Z"
  # create
  BODY = {
  "category": "Cost",

diff --git a/sdk/devcenter/azure-developer-devcenter/tests/conftest.py b/sdk/devcenter/azure-developer-devcenter/tests/conftest.py
@@ -4,7 +4,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from devtools_testutils import test_proxy, add_body_key_sanitizer, add_oauth_response_sanitizer
+from devtools_testutils import test_proxy, add_body_key_sanitizer, add_oauth_response_sanitizer, remove_batch_sanitizers
 import pytest
 
 # autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
@@ -13,4 +13,8 @@ def start_proxy(test_proxy):
  add_body_key_sanitizer(json_path="$..id_token", value="Sanitized")
  add_body_key_sanitizer(json_path="$..client_info", value="Sanitized")
  add_oauth_response_sanitizer()
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK2003: Location
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK2003", "AZSDK3493"])
  return
diff --git a/sdk/devtestlabs/azure-mgmt-devtestlabs/tests/conftest.py b/sdk/devtestlabs/azure-mgmt-devtestlabs/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -52,4 +52,8 @@ def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000")
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
diff --git a/sdk/digitaltwins/azure-digitaltwins-core/tests/conftest.py b/sdk/digitaltwins/azure-digitaltwins-core/tests/conftest.py
@@ -9,7 +9,8 @@
  add_body_key_sanitizer,
  add_header_regex_sanitizer,
  add_oauth_response_sanitizer,
- add_remove_header_sanitizer
+ add_remove_header_sanitizer,
+ remove_batch_sanitizers,
 )
 
 # Environment variable keys
@@ -39,6 +40,11 @@ def add_sanitizers(test_proxy, environment_variables):
  add_oauth_response_sanitizer()
  add_header_regex_sanitizer(key="Set-Cookie", value="[set-cookie;]")
 
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3430: $..id
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3430", "AZSDK3493"])
+
 
 @pytest.fixture(scope="session")
 def digitaltwin(environment_variables):

diff --git a/sdk/digitaltwins/azure-mgmt-digitaltwins/tests/conftest.py b/sdk/digitaltwins/azure-mgmt-digitaltwins/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -52,4 +52,8 @@ def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000")
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
diff --git a/sdk/easm/azure-defender-easm/assets.json b/sdk/easm/azure-defender-easm/assets.json
@@ -2,5 +2,5 @@
  "AssetsRepo": "Azure/azure-sdk-assets",
  "AssetsRepoPrefixPath": "python",
  "TagPrefix": "python/easm/azure-defender-easm",
- "Tag": "python/easm/azure-defender-easm_1ce88f356c"
+ "Tag": "python/easm/azure-defender-easm_615067aba2"
 }
diff --git a/sdk/easm/azure-defender-easm/tests/conftest.py b/sdk/easm/azure-defender-easm/tests/conftest.py
@@ -1,7 +1,12 @@
 import pytest
-from devtools_testutils import test_proxy
+from devtools_testutils import test_proxy, remove_batch_sanitizers
+
 
 # autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
 @pytest.fixture(scope="session", autouse=True)
 def start_proxy(test_proxy):
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3430: $..id
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3430", "AZSDK3493"])
  return
diff --git a/sdk/iothub/azure-iot-deviceprovisioning/tests/conftest.py b/sdk/iothub/azure-iot-deviceprovisioning/tests/conftest.py
@@ -10,6 +10,7 @@
  EnvironmentVariableLoader,
  add_general_regex_sanitizer,
  add_header_regex_sanitizer,
+ remove_batch_sanitizers,
  test_proxy,
 )
 
@@ -89,6 +90,10 @@ def add_sanitizers(test_proxy):
  add_body_key_sanitizer(json_path="$..secondaryKey", value="secondaryKey")
  add_body_key_sanitizer(json_path="$..sha256Thumbprint", value="thumbprint")
  add_body_key_sanitizer(json_path="$..sha1Thumbprint", value="thumbprint")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3490: $..etag
+ remove_batch_sanitizers(["AZSDK3490"])
  return
 
 

diff --git a/sdk/iothub/azure-mgmt-iothub/tests/conftest.py b/sdk/iothub/azure-mgmt-iothub/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -52,4 +52,9 @@ def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000")
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
+ return
diff --git a/sdk/netapp/azure-mgmt-netapp/tests/conftest.py b/sdk/netapp/azure-mgmt-netapp/tests/conftest.py
@@ -31,7 +31,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_general_string_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -53,4 +53,10 @@ def add_sanitizers(test_proxy):
  add_general_string_sanitizer(value="00000000-0000-0000-0000-000000000000", target=urllib.parse.quote(client_secret))
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3430: $..id
+ # - AZSDK3493: $..name
+ # - AZSDK2003: Location
+ remove_batch_sanitizers(["AZSDK3430", "AZSDK3493", "AZSDK2003"])
diff --git a/sdk/network/azure-mgmt-dns/tests/conftest.py b/sdk/network/azure-mgmt-dns/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 # Ignore async tests for Python < 3.5
@@ -52,4 +52,8 @@ def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex=client_secret, value="00000000-0000-0000-0000-000000000000")
  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")
+ add_body_key_sanitizer(json_path="$..access_token", value="access_token")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
diff --git a/sdk/network/azure-mgmt-network/tests/conftest.py b/sdk/network/azure-mgmt-network/tests/conftest.py
@@ -30,7 +30,7 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer
+from devtools_testutils import test_proxy, add_general_regex_sanitizer, remove_batch_sanitizers
 from devtools_testutils import add_header_regex_sanitizer, add_body_key_sanitizer
 
 
@@ -54,3 +54,8 @@ def add_sanitizers(test_proxy):
  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")
+
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ # - AZSDK2003: Location
+ remove_batch_sanitizers(["AZSDK3493", "AZSDK2003"])
diff --git a/sdk/purview/azure-purview-sharing/tests/conftest.py b/sdk/purview/azure-purview-sharing/tests/conftest.py
@@ -30,7 +30,14 @@
 
 from dotenv import load_dotenv
 
-from devtools_testutils import test_proxy, add_general_regex_sanitizer, add_body_key_sanitizer, add_header_regex_sanitizer
+from devtools_testutils import (
+ test_proxy,
+ add_general_regex_sanitizer,
+ add_body_key_sanitizer,
+ add_header_regex_sanitizer,
+ remove_batch_sanitizers,
+)
+
 
 # Ignore async tests for Python < 3.5
 collect_ignore_glob = []
@@ -61,3 +68,6 @@ def add_sanitizers(test_proxy):
  add_body_key_sanitizer(json_path="$..atlasKafkaPrimaryEndpoint", value="000")
  add_body_key_sanitizer(json_path="$..atlasKafkaSecondaryEndpoint", value="000")
  add_body_key_sanitizer(json_path="$..systemData.createdBy", value="000")
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3430: $..id
+ remove_batch_sanitizers(["AZSDK3430"])
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py b/sdk/remoterendering/azure-mixedreality-remoterendering/tests/conftest.py
@@ -13,7 +13,8 @@
  add_body_key_sanitizer,
  add_general_regex_sanitizer,
  add_remove_header_sanitizer,
- is_live
+ is_live,
+ remove_batch_sanitizers,
 )
 
 # Environment variable keys
@@ -58,6 +59,10 @@ def add_sanitizers(test_proxy, environment_variables):
  value=TEST_ID_PLACEHOLDER
  )
 
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3430: $..id
+ remove_batch_sanitizers(["AZSDK3430"])
+
 
 @pytest.fixture(scope="session")
 def account_info(environment_variables):

diff --git a/sdk/schemaregistry/azure-schemaregistry-avroencoder/conftest.py b/sdk/schemaregistry/azure-schemaregistry-avroencoder/conftest.py
@@ -1,12 +1,21 @@
 import pytest
-from devtools_testutils import add_general_regex_sanitizer, test_proxy, add_oauth_response_sanitizer
+from devtools_testutils import (
+ test_proxy,
+ add_general_regex_sanitizer,
+ add_oauth_response_sanitizer,
+ remove_batch_sanitizers,
+)
 
 # autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
 @pytest.fixture(scope="session", autouse=True)
 def add_sanitizers(test_proxy):
  add_general_regex_sanitizer(regex="(?<=\\/\\/)[a-z-]+(?=\\.servicebus\\.windows\\.net)", value="fake_resource_avro")
  add_oauth_response_sanitizer()
 
+ # Remove the following sanitizers since certain fields are needed in tests and are non-sensitive:
+ # - AZSDK3493: $..name
+ remove_batch_sanitizers(["AZSDK3493"])
+
 # autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
 @pytest.fixture(scope="session", autouse=True)
 def start_proxy(test_proxy):