Skip to content
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.

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

[Storage] [STG 98] Branch Prep #39392

Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
5 changes: 5 additions & 0 deletions sdk/storage/azure-storage-blob/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release History

## 12.26.0b1 (Unreleased)

### Features Added
- Added support for service version 2025-07-05.

## 12.25.0b1 (Unreleased)

### Features Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class AzureBlobStorage: # pylint: disable=client-accepts-api-version-keyword
:param base_url: Service URL. Required. Default value is "".
:type base_url: str
:keyword version: Specifies the version of the operation to use for this request. Default value
is "2025-01-05". Note that overriding this default value may result in unsupported behavior.
is "2025-07-05". Note that overriding this default value may result in unsupported behavior.
:paramtype version: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ class AzureBlobStorageConfiguration: # pylint: disable=too-many-instance-attrib
desired operation. Required.
:type url: str
:keyword version: Specifies the version of the operation to use for this request. Default value
is "2025-01-05". Note that overriding this default value may result in unsupported behavior.
is "2025-07-05". Note that overriding this default value may result in unsupported behavior.
:paramtype version: str
"""

def __init__(self, url: str, **kwargs: Any) -> None:
version: Literal["2025-01-05"] = kwargs.pop("version", "2025-01-05")
version: Literal["2025-07-05"] = kwargs.pop("version", "2025-07-05")

if url is None:
raise ValueError("Parameter 'url' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class AzureBlobStorage: # pylint: disable=client-accepts-api-version-keyword
:param base_url: Service URL. Required. Default value is "".
:type base_url: str
:keyword version: Specifies the version of the operation to use for this request. Default value
is "2025-01-05". Note that overriding this default value may result in unsupported behavior.
is "2025-07-05". Note that overriding this default value may result in unsupported behavior.
:paramtype version: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ class AzureBlobStorageConfiguration: # pylint: disable=too-many-instance-attrib
desired operation. Required.
:type url: str
:keyword version: Specifies the version of the operation to use for this request. Default value
is "2025-01-05". Note that overriding this default value may result in unsupported behavior.
is "2025-07-05". Note that overriding this default value may result in unsupported behavior.
:paramtype version: str
"""

def __init__(self, url: str, **kwargs: Any) -> None:
version: Literal["2025-01-05"] = kwargs.pop("version", "2025-01-05")
version: Literal["2025-07-05"] = kwargs.pop("version", "2025-07-05")

if url is None:
raise ValueError("Parameter 'url' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ async def append_block_from_url(
transactional_content_md5: Optional[bytes] = None,
request_id_parameter: Optional[str] = None,
copy_source_authorization: Optional[str] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
cpk_info: Optional[_models.CpkInfo] = None,
cpk_scope_info: Optional[_models.CpkScopeInfo] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
Expand Down Expand Up @@ -486,6 +487,8 @@ async def append_block_from_url(
:param copy_source_authorization: Only Bearer type is supported. Credentials should be a valid
OAuth access token to copy source. Default value is None.
:type copy_source_authorization: str
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param cpk_info: Parameter group. Default value is None.
:type cpk_info: ~azure.storage.blob.models.CpkInfo
:param cpk_scope_info: Parameter group. Default value is None.
Expand Down Expand Up @@ -584,6 +587,7 @@ async def append_block_from_url(
source_if_none_match=_source_if_none_match,
request_id_parameter=request_id_parameter,
copy_source_authorization=copy_source_authorization,
file_request_intent=file_request_intent,
comp=comp,
version=self._config.version,
headers=_headers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2287,6 +2287,7 @@ async def copy_from_url(
legal_hold: Optional[bool] = None,
copy_source_authorization: Optional[str] = None,
copy_source_tags: Optional[Union[str, _models.BlobCopySourceTags]] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
source_modified_access_conditions: Optional[_models.SourceModifiedAccessConditions] = None,
modified_access_conditions: Optional[_models.ModifiedAccessConditions] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
Expand Down Expand Up @@ -2344,6 +2345,8 @@ async def copy_from_url(
copied or replaced with the tags specified by x-ms-tags. Known values are: "REPLACE" and
"COPY". Default value is None.
:type copy_source_tags: str or ~azure.storage.blob.models.BlobCopySourceTags
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param source_modified_access_conditions: Parameter group. Default value is None.
:type source_modified_access_conditions:
~azure.storage.blob.models.SourceModifiedAccessConditions
Expand Down Expand Up @@ -2425,6 +2428,7 @@ async def copy_from_url(
copy_source_authorization=copy_source_authorization,
encryption_scope=_encryption_scope,
copy_source_tags=copy_source_tags,
file_request_intent=file_request_intent,
x_ms_requires_sync=x_ms_requires_sync,
version=self._config.version,
headers=_headers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ async def put_blob_from_url(
copy_source_blob_properties: Optional[bool] = None,
copy_source_authorization: Optional[str] = None,
copy_source_tags: Optional[Union[str, _models.BlobCopySourceTags]] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
blob_http_headers: Optional[_models.BlobHTTPHeaders] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
cpk_info: Optional[_models.CpkInfo] = None,
Expand Down Expand Up @@ -367,6 +368,8 @@ async def put_blob_from_url(
copied or replaced with the tags specified by x-ms-tags. Known values are: "REPLACE" and
"COPY". Default value is None.
:type copy_source_tags: str or ~azure.storage.blob.models.BlobCopySourceTags
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param blob_http_headers: Parameter group. Default value is None.
:type blob_http_headers: ~azure.storage.blob.models.BlobHTTPHeaders
:param lease_access_conditions: Parameter group. Default value is None.
Expand Down Expand Up @@ -482,6 +485,7 @@ async def put_blob_from_url(
copy_source_blob_properties=copy_source_blob_properties,
copy_source_authorization=copy_source_authorization,
copy_source_tags=copy_source_tags,
file_request_intent=file_request_intent,
blob_type=blob_type,
version=self._config.version,
headers=_headers,
Expand Down Expand Up @@ -690,6 +694,7 @@ async def stage_block_from_url(
timeout: Optional[int] = None,
request_id_parameter: Optional[str] = None,
copy_source_authorization: Optional[str] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
cpk_info: Optional[_models.CpkInfo] = None,
cpk_scope_info: Optional[_models.CpkScopeInfo] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
Expand Down Expand Up @@ -728,6 +733,8 @@ async def stage_block_from_url(
:param copy_source_authorization: Only Bearer type is supported. Credentials should be a valid
OAuth access token to copy source. Default value is None.
:type copy_source_authorization: str
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param cpk_info: Parameter group. Default value is None.
:type cpk_info: ~azure.storage.blob.models.CpkInfo
:param cpk_scope_info: Parameter group. Default value is None.
Expand Down Expand Up @@ -798,6 +805,7 @@ async def stage_block_from_url(
source_if_none_match=_source_if_none_match,
request_id_parameter=request_id_parameter,
copy_source_authorization=copy_source_authorization,
file_request_intent=file_request_intent,
comp=comp,
version=self._config.version,
headers=_headers,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ async def upload_pages_from_url(
timeout: Optional[int] = None,
request_id_parameter: Optional[str] = None,
copy_source_authorization: Optional[str] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
cpk_info: Optional[_models.CpkInfo] = None,
cpk_scope_info: Optional[_models.CpkScopeInfo] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
Expand Down Expand Up @@ -666,6 +667,8 @@ async def upload_pages_from_url(
:param copy_source_authorization: Only Bearer type is supported. Credentials should be a valid
OAuth access token to copy source. Default value is None.
:type copy_source_authorization: str
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param cpk_info: Parameter group. Default value is None.
:type cpk_info: ~azure.storage.blob.models.CpkInfo
:param cpk_scope_info: Parameter group. Default value is None.
Expand Down Expand Up @@ -770,6 +773,7 @@ async def upload_pages_from_url(
source_if_none_match=_source_if_none_match,
request_id_parameter=request_id_parameter,
copy_source_authorization=copy_source_authorization,
file_request_intent=file_request_intent,
comp=comp,
page_write=page_write,
version=self._config.version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
CopyStatusType,
DeleteSnapshotsOptionType,
EncryptionAlgorithmType,
FileShareTokenIntent,
FilterBlobsIncludeItem,
GeoReplicationStatusType,
LeaseDurationType,
Expand Down Expand Up @@ -165,6 +166,7 @@
"CopyStatusType",
"DeleteSnapshotsOptionType",
"EncryptionAlgorithmType",
"FileShareTokenIntent",
"FilterBlobsIncludeItem",
"GeoReplicationStatusType",
"LeaseDurationType",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ class EncryptionAlgorithmType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
AES256 = "AES256"


class FileShareTokenIntent(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""FileShareTokenIntent."""

BACKUP = "backup"


class FilterBlobsIncludeItem(str, Enum, metaclass=CaseInsensitiveEnumMeta):
"""FilterBlobsIncludeItem."""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def build_create_request(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})

blob_type: Literal["AppendBlob"] = kwargs.pop("blob_type", _headers.pop("x-ms-blob-type", "AppendBlob"))
version: Literal["2025-01-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-01-05"))
version: Literal["2025-07-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-07-05"))
accept = _headers.pop("Accept", "application/xml")

# Construct URL
Expand Down Expand Up @@ -182,7 +182,7 @@ def build_append_block_request(

comp: Literal["appendblock"] = kwargs.pop("comp", _params.pop("comp", "appendblock"))
content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None))
version: Literal["2025-01-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-01-05"))
version: Literal["2025-07-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-07-05"))
accept = _headers.pop("Accept", "application/xml")

# Construct URL
Expand Down Expand Up @@ -278,13 +278,14 @@ def build_append_block_from_url_request(
source_if_none_match: Optional[str] = None,
request_id_parameter: Optional[str] = None,
copy_source_authorization: Optional[str] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
**kwargs: Any
) -> HttpRequest:
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})

comp: Literal["appendblock"] = kwargs.pop("comp", _params.pop("comp", "appendblock"))
version: Literal["2025-01-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-01-05"))
version: Literal["2025-07-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-07-05"))
accept = _headers.pop("Accept", "application/xml")

# Construct URL
Expand Down Expand Up @@ -360,6 +361,8 @@ def build_append_block_from_url_request(
_headers["x-ms-copy-source-authorization"] = _SERIALIZER.header(
"copy_source_authorization", copy_source_authorization, "str"
)
if file_request_intent is not None:
_headers["x-ms-file-request-intent"] = _SERIALIZER.header("file_request_intent", file_request_intent, "str")
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")

return HttpRequest(method="PUT", url=_url, params=_params, headers=_headers, **kwargs)
Expand All @@ -382,7 +385,7 @@ def build_seal_request(
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})

comp: Literal["seal"] = kwargs.pop("comp", _params.pop("comp", "seal"))
version: Literal["2025-01-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-01-05"))
version: Literal["2025-07-05"] = kwargs.pop("version", _headers.pop("x-ms-version", "2025-07-05"))
accept = _headers.pop("Accept", "application/xml")

# Construct URL
Expand Down Expand Up @@ -823,6 +826,7 @@ def append_block_from_url( # pylint: disable=inconsistent-return-statements
transactional_content_md5: Optional[bytes] = None,
request_id_parameter: Optional[str] = None,
copy_source_authorization: Optional[str] = None,
file_request_intent: Optional[Union[str, _models.FileShareTokenIntent]] = None,
cpk_info: Optional[_models.CpkInfo] = None,
cpk_scope_info: Optional[_models.CpkScopeInfo] = None,
lease_access_conditions: Optional[_models.LeaseAccessConditions] = None,
Expand Down Expand Up @@ -864,6 +868,8 @@ def append_block_from_url( # pylint: disable=inconsistent-return-statements
:param copy_source_authorization: Only Bearer type is supported. Credentials should be a valid
OAuth access token to copy source. Default value is None.
:type copy_source_authorization: str
:param file_request_intent: Valid value is backup. "backup" Default value is None.
:type file_request_intent: str or ~azure.storage.blob.models.FileShareTokenIntent
:param cpk_info: Parameter group. Default value is None.
:type cpk_info: ~azure.storage.blob.models.CpkInfo
:param cpk_scope_info: Parameter group. Default value is None.
Expand Down Expand Up @@ -962,6 +968,7 @@ def append_block_from_url( # pylint: disable=inconsistent-return-statements
source_if_none_match=_source_if_none_match,
request_id_parameter=request_id_parameter,
copy_source_authorization=copy_source_authorization,
file_request_intent=file_request_intent,
comp=comp,
version=self._config.version,
headers=_headers,
Expand Down
Loading
Loading