Skip to content

[Storage] [STG94] Support more service versions in Queue, propagate StorageBearer Challenge to all packages #35356

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

Merged
vincenttran-msft merged 9 commits into from
May 1, 2024
Merged

[Storage] [STG94] Support more service versions in Queue, propagate StorageBearer Challenge to all packages #35356

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4923e72
Service versions updated for all, bearer challenge to all remaining p…
vincenttran-msft Apr 25, 2024
9ff23e0
Queue recordings
vincenttran-msft Apr 25, 2024
9eb4171
Datalake tests & recordings
vincenttran-msft Apr 25, 2024
4a02c0e
Adjusted file-share tests, no recordings as unsure of correct behavio…
vincenttran-msft Apr 25, 2024
4b5c35d
lint
vincenttran-msft Apr 26, 2024
12b4382
Fix file-share test cases, add changelog entries
vincenttran-msft Apr 30, 2024
7b63c21
Missing recording for queue?
vincenttran-msft Apr 30, 2024
170e62d
Good ol lint
vincenttran-msft May 1, 2024
28e4de4
line too long nit
vincenttran-msft May 1, 2024
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
Next Next commit
Service versions updated for all, bearer challenge to all remaining p… 
…ackages, queue tests all adjusted
  • Loading branch information
@vincenttran-msft
vincenttran-msft committed Apr 25, 2024
commit 4923e72f513cb41ebcc3533d03305a8e7f3c68d3
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
'2020-06-12',
'2020-08-04',
'2020-10-02',
'2020-12-06',
'2021-02-12',
'2021-04-10',
'2021-06-08',
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from azure.core.pipeline.transport import HttpTransport, RequestsTransport # pylint: disable=non-abstract-transport-import, no-name-in-module
from azure.core.pipeline.policies import (
AzureSasCredentialPolicy,
BearerTokenCredentialPolicy,
ContentDecodePolicy,
DistributedTracingPolicy,
HttpLoggingPolicy,
Expand All @@ -38,6 +37,7 @@
from .policies import (
ExponentialRetry,
QueueMessagePolicy,
StorageBearerTokenCredentialPolicy,
StorageContentValidation,
StorageHeadersPolicy,
StorageHosts,
Expand Down Expand Up @@ -231,7 +231,7 @@ def _create_pipeline(
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = BearerTokenCredentialPolicy(cast(TokenCredential, credential), audience)
self._credential_policy = StorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
7 changes: 3 additions & 4 deletions ...orage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/base_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from azure.core.exceptions import HttpResponseError
from azure.core.pipeline import AsyncPipeline
from azure.core.pipeline.policies import (
AsyncBearerTokenCredentialPolicy,
AsyncRedirectPolicy,
AzureSasCredentialPolicy,
ContentDecodePolicy,
Expand All @@ -34,7 +33,7 @@
StorageHosts,
StorageRequestHook,
)
from .policies_async import AsyncStorageResponseHook
from .policies_async import AsyncStorageBearerTokenCredentialPolicy, AsyncStorageResponseHook
from .response_handlers import PartialBatchErrorException, process_storage_error
from .._shared_access_signature import _is_credential_sastoken

Expand Down Expand Up @@ -97,15 +96,15 @@ def _create_pipeline(
**kwargs: Any
) -> Tuple[StorageConfiguration, AsyncPipeline]:
self._credential_policy: Optional[
Union[AsyncBearerTokenCredentialPolicy,
Union[AsyncStorageBearerTokenCredentialPolicy,
SharedKeyCredentialPolicy,
AzureSasCredentialPolicy]] = None
if hasattr(credential, 'get_token'):
if kwargs.get('audience'):
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = AsyncBearerTokenCredentialPolicy(cast(AsyncTokenCredential, credential), audience)
self._credential_policy = AsyncStorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-share/azure/storage/fileshare/_serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
'2020-06-12',
'2020-08-04',
'2020-10-02',
'2020-12-06',
'2021-02-12',
'2021-04-10',
'2021-06-08',
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from azure.core.pipeline.transport import HttpTransport, RequestsTransport # pylint: disable=non-abstract-transport-import, no-name-in-module
from azure.core.pipeline.policies import (
AzureSasCredentialPolicy,
BearerTokenCredentialPolicy,
ContentDecodePolicy,
DistributedTracingPolicy,
HttpLoggingPolicy,
Expand All @@ -38,6 +37,7 @@
from .policies import (
ExponentialRetry,
QueueMessagePolicy,
StorageBearerTokenCredentialPolicy,
StorageContentValidation,
StorageHeadersPolicy,
StorageHosts,
Expand Down Expand Up @@ -231,7 +231,7 @@ def _create_pipeline(
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = BearerTokenCredentialPolicy(cast(TokenCredential, credential), audience)
self._credential_policy = StorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
7 changes: 3 additions & 4 deletions sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/base_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from azure.core.exceptions import HttpResponseError
from azure.core.pipeline import AsyncPipeline
from azure.core.pipeline.policies import (
AsyncBearerTokenCredentialPolicy,
AsyncRedirectPolicy,
AzureSasCredentialPolicy,
ContentDecodePolicy,
Expand All @@ -34,7 +33,7 @@
StorageHosts,
StorageRequestHook,
)
from .policies_async import AsyncStorageResponseHook
from .policies_async import AsyncStorageBearerTokenCredentialPolicy, AsyncStorageResponseHook
from .response_handlers import PartialBatchErrorException, process_storage_error
from .._shared_access_signature import _is_credential_sastoken

Expand Down Expand Up @@ -97,15 +96,15 @@ def _create_pipeline(
**kwargs: Any
) -> Tuple[StorageConfiguration, AsyncPipeline]:
self._credential_policy: Optional[
Union[AsyncBearerTokenCredentialPolicy,
Union[AsyncStorageBearerTokenCredentialPolicy,
SharedKeyCredentialPolicy,
AzureSasCredentialPolicy]] = None
if hasattr(credential, 'get_token'):
if kwargs.get('audience'):
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = AsyncBearerTokenCredentialPolicy(cast(AsyncTokenCredential, credential), audience)
self._credential_policy = AsyncStorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
11 changes: 11 additions & 0 deletions sdk/storage/azure-storage-queue/azure/storage/queue/_serialize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,18 @@
'2020-06-12',
'2020-08-04',
'2020-10-02',
'2020-12-06',
'2021-02-12',
'2021-04-10',
'2021-06-08',
'2021-08-06',
'2021-12-02',
'2022-11-02',
'2023-01-03',
'2023-05-03',
'2023-08-03',
'2023-11-03',
'2024-05-04',
'2024-08-04',
]

Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/azure-storage-queue/azure/storage/queue/_shared/base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from azure.core.pipeline.transport import HttpTransport, RequestsTransport # pylint: disable=non-abstract-transport-import, no-name-in-module
from azure.core.pipeline.policies import (
AzureSasCredentialPolicy,
BearerTokenCredentialPolicy,
ContentDecodePolicy,
DistributedTracingPolicy,
HttpLoggingPolicy,
Expand All @@ -38,6 +37,7 @@
from .policies import (
ExponentialRetry,
QueueMessagePolicy,
StorageBearerTokenCredentialPolicy,
StorageContentValidation,
StorageHeadersPolicy,
StorageHosts,
Expand Down Expand Up @@ -231,7 +231,7 @@ def _create_pipeline(
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = BearerTokenCredentialPolicy(cast(TokenCredential, credential), audience)
self._credential_policy = StorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
7 changes: 3 additions & 4 deletions sdk/storage/azure-storage-queue/azure/storage/queue/_shared/base_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from azure.core.exceptions import HttpResponseError
from azure.core.pipeline import AsyncPipeline
from azure.core.pipeline.policies import (
AsyncBearerTokenCredentialPolicy,
AsyncRedirectPolicy,
AzureSasCredentialPolicy,
ContentDecodePolicy,
Expand All @@ -34,7 +33,7 @@
StorageHosts,
StorageRequestHook,
)
from .policies_async import AsyncStorageResponseHook
from .policies_async import AsyncStorageBearerTokenCredentialPolicy, AsyncStorageResponseHook
from .response_handlers import PartialBatchErrorException, process_storage_error
from .._shared_access_signature import _is_credential_sastoken

Expand Down Expand Up @@ -97,15 +96,15 @@ def _create_pipeline(
**kwargs: Any
) -> Tuple[StorageConfiguration, AsyncPipeline]:
self._credential_policy: Optional[
Union[AsyncBearerTokenCredentialPolicy,
Union[AsyncStorageBearerTokenCredentialPolicy,
SharedKeyCredentialPolicy,
AzureSasCredentialPolicy]] = None
if hasattr(credential, 'get_token'):
if kwargs.get('audience'):
audience = str(kwargs.pop('audience')).rstrip('/') + DEFAULT_OAUTH_SCOPE
else:
audience = STORAGE_OAUTH_SCOPE
self._credential_policy = AsyncBearerTokenCredentialPolicy(cast(AsyncTokenCredential, credential), audience)
self._credential_policy = AsyncStorageBearerTokenCredentialPolicy(credential, audience)
elif isinstance(credential, SharedKeyCredentialPolicy):
self._credential_policy = credential
elif isinstance(credential, AzureSasCredential):
Expand Down
10 changes: 4 additions & 6 deletions sdk/storage/azure-storage-queue/tests/test_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,9 +1387,8 @@ def test_bad_audience_queue_service_client(self, **kwargs):
audience=f'https://badaudience.queue.core.windows.net'
)

# Assert
with pytest.raises(ClientAuthenticationError):
qsc.get_service_properties()
# Will not raise ClientAuthenticationError despite bad audience due to Bearer Challenge
qsc.get_service_properties()

@QueuePreparer()
@recorded_by_proxy
Expand Down Expand Up @@ -1429,9 +1428,8 @@ def test_bad_audience_queue_client(self, **kwargs):
audience=f'https://badaudience.queue.core.windows.net'
)

# Assert
with pytest.raises(ClientAuthenticationError):
queue.get_queue_properties()
# Will not raise ClientAuthenticationError despite bad audience due to Bearer Challenge
queue.get_queue_properties()


# ------------------------------------------------------------------------------
Expand Down
10 changes: 4 additions & 6 deletions sdk/storage/azure-storage-queue/tests/test_queue_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,9 +1417,8 @@ async def test_bad_audience_queue_service_client(self, **kwargs):
audience=f'https://badaudience.queue.core.windows.net'
)

# Assert
with pytest.raises(ClientAuthenticationError):
await qsc.get_service_properties()
# Will not raise ClientAuthenticationError despite bad audience due to Bearer Challenge
await qsc.get_service_properties()

@QueuePreparer()
@recorded_by_proxy_async
Expand Down Expand Up @@ -1461,9 +1460,8 @@ async def test_bad_audience_queue_client(self, **kwargs):
audience=f'https://badaudience.queue.core.windows.net'
)

# Assert
with pytest.raises(ClientAuthenticationError):
await queue.get_queue_properties()
# Will not raise ClientAuthenticationError despite bad audience due to Bearer Challenge
await queue.get_queue_properties()

# ------------------------------------------------------------------------------
if __name__ == '__main__':
Expand Down