Skip to content

[Storage] Begin migration to test proxy #24570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mccoyp wants to merge 6 commits into from
Closed

[Storage] Begin migration to test proxy #24570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e631293
Add StorageRecordedTestCase
mccoyp May 24, 2022
348efbd
Update test_blob_client; record
mccoyp May 24, 2022
7407c6a
Async test case; Update test_blob_client_async
mccoyp May 26, 2022
3ed853a
Delete some old recordings
mccoyp May 26, 2022
66eb8b3
Update test_blob_encryption
mccoyp May 26, 2022
b5be295
Sanitize SAS and x-ms-copy-source
mccoyp Jun 6, 2022
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
13 changes: 7 additions & 6 deletions sdk/storage/azure-storage-blob/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@
# IN THE SOFTWARE.
#
# --------------------------------------------------------------------------
import platform
import sys
import pytest

from devtools_testutils import test_proxy

# fixture needs to be visible from conftest

# 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")

@pytest.fixture(scope="session", autouse=True)
def start_proxy(test_proxy):
return
92 changes: 92 additions & 0 deletions ...s/recordings/test_blob_client.pyTestStorageClienttest_request_callback_signed_header.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"Entries": [
{
"RequestUri": "https://storagename.blob.core.windows.net/contdfad2e0d?restype=container",
"RequestMethod": "PUT",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:43 GMT",
"x-ms-meta-hello": "world",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 201,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Wed, 25 May 2022 00:20:43 GMT",
"ETag": "\u00220x8DA3DE4687C9256\u0022",
"Last-Modified": "Wed, 25 May 2022 00:20:44 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-version": "2021-06-08"
},
"ResponseBody": null
},
{
"RequestUri": "https://storagename.blob.core.windows.net/contdfad2e0d?restype=container",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:44 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Wed, 25 May 2022 00:20:43 GMT",
"ETag": "\u00220x8DA3DE4687C9256\u0022",
"Last-Modified": "Wed, 25 May 2022 00:20:44 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-default-encryption-scope": "$account-encryption-key",
"x-ms-deny-encryption-scope-override": "false",
"x-ms-has-immutability-policy": "false",
"x-ms-has-legal-hold": "false",
"x-ms-immutable-storage-with-versioning-enabled": "false",
"x-ms-lease-state": "available",
"x-ms-lease-status": "unlocked",
"x-ms-meta-hello": "world",
"x-ms-version": "2021-06-08"
},
"ResponseBody": null
},
{
"RequestUri": "https://storagename.blob.core.windows.net/contdfad2e0d?restype=container",
"RequestMethod": "DELETE",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:44 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 202,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Wed, 25 May 2022 00:20:43 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-version": "2021-06-08"
},
"ResponseBody": null
}
],
"Variables": {}
}
35 changes: 35 additions & 0 deletions ...age-blob/tests/recordings/test_blob_client.pyTestStorageClienttest_response_callback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"Entries": [
{
"RequestUri": "https://storagename.blob.core.windows.net/cont9e4f28d2?restype=container",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:44 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 404,
"ResponseHeaders": {
"Content-Length": "225",
"Content-Type": "application/xml",
"Date": "Wed, 25 May 2022 00:20:43 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-error-code": "ContainerNotFound",
"x-ms-version": "2021-06-08"
},
"ResponseBody": [
"\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CError\u003E\u003CCode\u003EContainerNotFound\u003C/Code\u003E\u003CMessage\u003EThe specified container does not exist.\n",
"RequestId:a6240d7f-801e-0059-3bcd-6f0295000000\n",
"Time:2022-05-25T00:20:44.6265863Z\u003C/Message\u003E\u003C/Error\u003E"
]
}
],
"Variables": {}
}
30 changes: 30 additions & 0 deletions ...age-blob/tests/recordings/test_blob_client.pyTestStorageClienttest_user_agent_append.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"Entries": [
{
"RequestUri": "https://storagename.blob.core.windows.net/?restype=service\u0026comp=properties",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "customer_user_agent azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:46 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Wed, 25 May 2022 00:20:45 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Efalse\u003C/Write\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003CHourMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CIncludeAPIs\u003Etrue\u003C/IncludeAPIs\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CDays\u003E7\u003C/Days\u003E\u003C/RetentionPolicy\u003E\u003C/HourMetrics\u003E\u003CMinuteMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/MinuteMetrics\u003E\u003CCors /\u003E\u003CDeleteRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CAllowPermanentDelete\u003Efalse\u003C/AllowPermanentDelete\u003E\u003C/DeleteRetentionPolicy\u003E\u003CStaticWebsite\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/StaticWebsite\u003E\u003C/StorageServiceProperties\u003E"
}
],
"Variables": {}
}
55 changes: 55 additions & 0 deletions ...age-blob/tests/recordings/test_blob_client.pyTestStorageClienttest_user_agent_custom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"Entries": [
{
"RequestUri": "https://storagename.blob.core.windows.net/?restype=service\u0026comp=properties",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "TestApp/v1.0 azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:45 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Wed, 25 May 2022 00:20:44 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Efalse\u003C/Write\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003CHourMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CIncludeAPIs\u003Etrue\u003C/IncludeAPIs\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CDays\u003E7\u003C/Days\u003E\u003C/RetentionPolicy\u003E\u003C/HourMetrics\u003E\u003CMinuteMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/MinuteMetrics\u003E\u003CCors /\u003E\u003CDeleteRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CAllowPermanentDelete\u003Efalse\u003C/AllowPermanentDelete\u003E\u003C/DeleteRetentionPolicy\u003E\u003CStaticWebsite\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/StaticWebsite\u003E\u003C/StorageServiceProperties\u003E"
},
{
"RequestUri": "https://storagename.blob.core.windows.net/?restype=service\u0026comp=properties",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "TestApp/v2.0 TestApp/v1.0 azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:45 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Wed, 25 May 2022 00:20:44 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Efalse\u003C/Write\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003CHourMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CIncludeAPIs\u003Etrue\u003C/IncludeAPIs\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CDays\u003E7\u003C/Days\u003E\u003C/RetentionPolicy\u003E\u003C/HourMetrics\u003E\u003CMinuteMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/MinuteMetrics\u003E\u003CCors /\u003E\u003CDeleteRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CAllowPermanentDelete\u003Efalse\u003C/AllowPermanentDelete\u003E\u003C/DeleteRetentionPolicy\u003E\u003CStaticWebsite\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/StaticWebsite\u003E\u003C/StorageServiceProperties\u003E"
}
],
"Variables": {}
}
30 changes: 30 additions & 0 deletions ...ge-blob/tests/recordings/test_blob_client.pyTestStorageClienttest_user_agent_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"Entries": [
{
"RequestUri": "https://storagename.blob.core.windows.net/?restype=service\u0026comp=properties",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-storage-blob/12.12.1 Python/3.10.0 (Windows-10-10.0.22000-SP0)",
"x-ms-date": "Wed, 25 May 2022 00:20:45 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Wed, 25 May 2022 00:20:44 GMT",
"Server": [
"Windows-Azure-Blob/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CStorageServiceProperties\u003E\u003CLogging\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CRead\u003Efalse\u003C/Read\u003E\u003CWrite\u003Efalse\u003C/Write\u003E\u003CDelete\u003Efalse\u003C/Delete\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/Logging\u003E\u003CHourMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CIncludeAPIs\u003Etrue\u003C/IncludeAPIs\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Etrue\u003C/Enabled\u003E\u003CDays\u003E7\u003C/Days\u003E\u003C/RetentionPolicy\u003E\u003C/HourMetrics\u003E\u003CMinuteMetrics\u003E\u003CVersion\u003E1.0\u003C/Version\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/RetentionPolicy\u003E\u003C/MinuteMetrics\u003E\u003CCors /\u003E\u003CDeleteRetentionPolicy\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003CAllowPermanentDelete\u003Efalse\u003C/AllowPermanentDelete\u003E\u003C/DeleteRetentionPolicy\u003E\u003CStaticWebsite\u003E\u003CEnabled\u003Efalse\u003C/Enabled\u003E\u003C/StaticWebsite\u003E\u003C/StorageServiceProperties\u003E"
}
],
"Variables": {}
}
126 changes: 0 additions & 126 deletions ...e-storage-blob/tests/recordings/test_blob_client.test_request_callback_signed_header.yaml
View file
Open in desktop

This file was deleted.

Loading