Skip to content

Commit f49eba3

Browse files
author
Rakshith Bhyravabhotla
authored
[Storage Blob] Regenerate Swagger (#7572)
* Regenerate Swagger * small fix
1 parent 0451790 commit f49eba3

File tree

10 files changed

+45
-13
lines changed

10 files changed

+45
-13
lines changed

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/operations_async/_append_blob_operations_async.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ async def append_block_from_url(self, source_url, content_length, source_range=N
532532
'x-ms-blob-append-offset': self._deserialize('str', response.headers.get('x-ms-blob-append-offset')),
533533
'x-ms-blob-committed-block-count': self._deserialize('int', response.headers.get('x-ms-blob-committed-block-count')),
534534
'x-ms-encryption-key-sha256': self._deserialize('str', response.headers.get('x-ms-encryption-key-sha256')),
535+
'x-ms-request-server-encrypted': self._deserialize('bool', response.headers.get('x-ms-request-server-encrypted')),
535536
'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
536537
}
537538
return cls(response, None, response_headers)

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/aio/operations_async/_page_blob_operations_async.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer) -> None:
3737
self._config = config
3838
self.x_ms_blob_type = "PageBlob"
3939

40-
async def create(self, content_length, blob_content_length, timeout=None, metadata=None, blob_sequence_number=0, request_id=None, blob_http_headers=None, lease_access_conditions=None, cpk_info=None, modified_access_conditions=None, *, cls=None, **kwargs):
40+
async def create(self, content_length, blob_content_length, timeout=None, tier=None, metadata=None, blob_sequence_number=0, request_id=None, blob_http_headers=None, lease_access_conditions=None, cpk_info=None, modified_access_conditions=None, *, cls=None, **kwargs):
4141
"""The Create operation creates a new page blob.
4242
4343
:param content_length: The length of the request.
@@ -51,6 +51,11 @@ async def create(self, content_length, blob_content_length, timeout=None, metada
5151
href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations">Setting
5252
Timeouts for Blob Service Operations.</a>
5353
:type timeout: int
54+
:param tier: Optional. Indicates the tier to be set on the page blob.
55+
Possible values include: 'P4', 'P6', 'P10', 'P15', 'P20', 'P30',
56+
'P40', 'P50', 'P60', 'P70', 'P80'
57+
:type tier: str or
58+
~azure.storage.blob.models.PremiumPageBlobAccessTier
5459
:param metadata: Optional. Specifies a user-defined name-value pair
5560
associated with the blob. If no name-value pairs are specified, the
5661
operation will copy the metadata from the source blob or file to the
@@ -147,6 +152,8 @@ async def create(self, content_length, blob_content_length, timeout=None, metada
147152
# Construct headers
148153
header_parameters = {}
149154
header_parameters['Content-Length'] = self._serialize.header("content_length", content_length, 'long')
155+
if tier is not None:
156+
header_parameters['x-ms-access-tier'] = self._serialize.header("tier", tier, 'str')
150157
if metadata is not None:
151158
header_parameters['x-ms-meta'] = self._serialize.header("metadata", metadata, 'str')
152159
header_parameters['x-ms-blob-content-length'] = self._serialize.header("blob_content_length", blob_content_length, 'long')
@@ -702,6 +709,7 @@ async def upload_pages_from_url(self, source_url, source_range, content_length,
702709
'x-ms-version': self._deserialize('str', response.headers.get('x-ms-version')),
703710
'Date': self._deserialize('rfc-1123', response.headers.get('Date')),
704711
'x-ms-request-server-encrypted': self._deserialize('bool', response.headers.get('x-ms-request-server-encrypted')),
712+
'x-ms-encryption-key-sha256': self._deserialize('str', response.headers.get('x-ms-encryption-key-sha256')),
705713
'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
706714
}
707715
return cls(response, None, response_headers)

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
ListBlobsIncludeItem,
110110
ListContainersIncludeType,
111111
PathRenameMode,
112+
PremiumPageBlobAccessTier,
112113
PublicAccessType,
113114
RehydratePriority,
114115
SequenceNumberActionType,
@@ -170,6 +171,7 @@
170171
'GeoReplicationStatusType',
171172
'AccessTierRequired',
172173
'AccessTierOptional',
174+
'PremiumPageBlobAccessTier',
173175
'RehydratePriority',
174176
'BlockListType',
175177
'DeleteSnapshotsOptionType',

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_azure_blob_storage_enums.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ class StorageErrorCode(str, Enum):
185185
blob_being_rehydrated = "BlobBeingRehydrated"
186186
blob_archived = "BlobArchived"
187187
blob_not_archived = "BlobNotArchived"
188+
authorization_source_ip_mismatch = "AuthorizationSourceIPMismatch"
189+
authorization_protocol_mismatch = "AuthorizationProtocolMismatch"
190+
authorization_permission_mismatch = "AuthorizationPermissionMismatch"
191+
authorization_service_mismatch = "AuthorizationServiceMismatch"
192+
authorization_resource_type_mismatch = "AuthorizationResourceTypeMismatch"
188193

189194

190195
class GeoReplicationStatusType(str, Enum):
@@ -230,6 +235,21 @@ class AccessTierOptional(str, Enum):
230235
archive = "Archive"
231236

232237

238+
class PremiumPageBlobAccessTier(str, Enum):
239+
240+
p4 = "P4"
241+
p6 = "P6"
242+
p10 = "P10"
243+
p15 = "P15"
244+
p20 = "P20"
245+
p30 = "P30"
246+
p40 = "P40"
247+
p50 = "P50"
248+
p60 = "P60"
249+
p70 = "P70"
250+
p80 = "P80"
251+
252+
233253
class RehydratePriority(str, Enum):
234254

235255
high = "High"

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -904,8 +904,6 @@ class ListBlobsFlatSegmentResponse(Model):
904904
:type marker: str
905905
:param max_results:
906906
:type max_results: int
907-
:param delimiter:
908-
:type delimiter: str
909907
:param segment: Required.
910908
:type segment: ~azure.storage.blob.models.BlobFlatListSegment
911909
:param next_marker:
@@ -924,7 +922,6 @@ class ListBlobsFlatSegmentResponse(Model):
924922
'prefix': {'key': 'Prefix', 'type': 'str', 'xml': {'name': 'Prefix'}},
925923
'marker': {'key': 'Marker', 'type': 'str', 'xml': {'name': 'Marker'}},
926924
'max_results': {'key': 'MaxResults', 'type': 'int', 'xml': {'name': 'MaxResults'}},
927-
'delimiter': {'key': 'Delimiter', 'type': 'str', 'xml': {'name': 'Delimiter'}},
928925
'segment': {'key': 'Segment', 'type': 'BlobFlatListSegment', 'xml': {'name': 'Segment'}},
929926
'next_marker': {'key': 'NextMarker', 'type': 'str', 'xml': {'name': 'NextMarker'}},
930927
}
@@ -939,7 +936,6 @@ def __init__(self, **kwargs):
939936
self.prefix = kwargs.get('prefix', None)
940937
self.marker = kwargs.get('marker', None)
941938
self.max_results = kwargs.get('max_results', None)
942-
self.delimiter = kwargs.get('delimiter', None)
943939
self.segment = kwargs.get('segment', None)
944940
self.next_marker = kwargs.get('next_marker', None)
945941

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models_py3.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -904,8 +904,6 @@ class ListBlobsFlatSegmentResponse(Model):
904904
:type marker: str
905905
:param max_results:
906906
:type max_results: int
907-
:param delimiter:
908-
:type delimiter: str
909907
:param segment: Required.
910908
:type segment: ~azure.storage.blob.models.BlobFlatListSegment
911909
:param next_marker:
@@ -924,22 +922,20 @@ class ListBlobsFlatSegmentResponse(Model):
924922
'prefix': {'key': 'Prefix', 'type': 'str', 'xml': {'name': 'Prefix'}},
925923
'marker': {'key': 'Marker', 'type': 'str', 'xml': {'name': 'Marker'}},
926924
'max_results': {'key': 'MaxResults', 'type': 'int', 'xml': {'name': 'MaxResults'}},
927-
'delimiter': {'key': 'Delimiter', 'type': 'str', 'xml': {'name': 'Delimiter'}},
928925
'segment': {'key': 'Segment', 'type': 'BlobFlatListSegment', 'xml': {'name': 'Segment'}},
929926
'next_marker': {'key': 'NextMarker', 'type': 'str', 'xml': {'name': 'NextMarker'}},
930927
}
931928
_xml_map = {
932929
'name': 'EnumerationResults'
933930
}
934931

935-
def __init__(self, *, service_endpoint: str, container_name: str, segment, prefix: str=None, marker: str=None, max_results: int=None, delimiter: str=None, next_marker: str=None, **kwargs) -> None:
932+
def __init__(self, *, service_endpoint: str, container_name: str, segment, prefix: str=None, marker: str=None, max_results: int=None, next_marker: str=None, **kwargs) -> None:
936933
super(ListBlobsFlatSegmentResponse, self).__init__(**kwargs)
937934
self.service_endpoint = service_endpoint
938935
self.container_name = container_name
939936
self.prefix = prefix
940937
self.marker = marker
941938
self.max_results = max_results
942-
self.delimiter = delimiter
943939
self.segment = segment
944940
self.next_marker = next_marker
945941

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/operations/_append_blob_operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ def append_block_from_url(self, source_url, content_length, source_range=None, s
532532
'x-ms-blob-append-offset': self._deserialize('str', response.headers.get('x-ms-blob-append-offset')),
533533
'x-ms-blob-committed-block-count': self._deserialize('int', response.headers.get('x-ms-blob-committed-block-count')),
534534
'x-ms-encryption-key-sha256': self._deserialize('str', response.headers.get('x-ms-encryption-key-sha256')),
535+
'x-ms-request-server-encrypted': self._deserialize('bool', response.headers.get('x-ms-request-server-encrypted')),
535536
'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
536537
}
537538
return cls(response, None, response_headers)

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/operations/_page_blob_operations.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
3737
self._config = config
3838
self.x_ms_blob_type = "PageBlob"
3939

40-
def create(self, content_length, blob_content_length, timeout=None, metadata=None, blob_sequence_number=0, request_id=None, blob_http_headers=None, lease_access_conditions=None, cpk_info=None, modified_access_conditions=None, cls=None, **kwargs):
40+
def create(self, content_length, blob_content_length, timeout=None, tier=None, metadata=None, blob_sequence_number=0, request_id=None, blob_http_headers=None, lease_access_conditions=None, cpk_info=None, modified_access_conditions=None, cls=None, **kwargs):
4141
"""The Create operation creates a new page blob.
4242
4343
:param content_length: The length of the request.
@@ -51,6 +51,11 @@ def create(self, content_length, blob_content_length, timeout=None, metadata=Non
5151
href="https://docs.microsoft.com/en-us/rest/api/storageservices/fileservices/setting-timeouts-for-blob-service-operations">Setting
5252
Timeouts for Blob Service Operations.</a>
5353
:type timeout: int
54+
:param tier: Optional. Indicates the tier to be set on the page blob.
55+
Possible values include: 'P4', 'P6', 'P10', 'P15', 'P20', 'P30',
56+
'P40', 'P50', 'P60', 'P70', 'P80'
57+
:type tier: str or
58+
~azure.storage.blob.models.PremiumPageBlobAccessTier
5459
:param metadata: Optional. Specifies a user-defined name-value pair
5560
associated with the blob. If no name-value pairs are specified, the
5661
operation will copy the metadata from the source blob or file to the
@@ -147,6 +152,8 @@ def create(self, content_length, blob_content_length, timeout=None, metadata=Non
147152
# Construct headers
148153
header_parameters = {}
149154
header_parameters['Content-Length'] = self._serialize.header("content_length", content_length, 'long')
155+
if tier is not None:
156+
header_parameters['x-ms-access-tier'] = self._serialize.header("tier", tier, 'str')
150157
if metadata is not None:
151158
header_parameters['x-ms-meta'] = self._serialize.header("metadata", metadata, 'str')
152159
header_parameters['x-ms-blob-content-length'] = self._serialize.header("blob_content_length", blob_content_length, 'long')
@@ -702,6 +709,7 @@ def upload_pages_from_url(self, source_url, source_range, content_length, range,
702709
'x-ms-version': self._deserialize('str', response.headers.get('x-ms-version')),
703710
'Date': self._deserialize('rfc-1123', response.headers.get('Date')),
704711
'x-ms-request-server-encrypted': self._deserialize('bool', response.headers.get('x-ms-request-server-encrypted')),
712+
'x-ms-encryption-key-sha256': self._deserialize('str', response.headers.get('x-ms-encryption-key-sha256')),
705713
'x-ms-error-code': self._deserialize('str', response.headers.get('x-ms-error-code')),
706714
}
707715
return cls(response, None, response_headers)

sdk/storage/azure-storage-blob/azure/storage/blob/aio/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ async def _extract_data_cb(self, get_next_return):
148148
self.results_per_page = self._response.max_results
149149
self.container = self._response.container_name
150150
self.current_page = [self._build_item(item) for item in self._response.segment.blob_items]
151-
self.delimiter = self._response.delimiter
152151

153152
return self._response.next_marker or None, self.current_page
154153

@@ -211,6 +210,7 @@ async def _extract_data_cb(self, get_next_return):
211210
continuation_token, _ = await super(BlobPrefixPaged, self)._extract_data_cb(get_next_return)
212211
self.current_page = self._response.segment.blob_prefixes + self._response.segment.blob_items
213212
self.current_page = [self._build_item(item) for item in self.current_page]
213+
self.delimiter = self._response.delimiter
214214

215215
return continuation_token, self.current_page
216216

sdk/storage/azure-storage-blob/azure/storage/blob/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,6 @@ def _extract_data_cb(self, get_next_return):
534534
self.results_per_page = self._response.max_results
535535
self.container = self._response.container_name
536536
self.current_page = [self._build_item(item) for item in self._response.segment.blob_items]
537-
self.delimiter = self._response.delimiter
538537

539538
return self._response.next_marker or None, self.current_page
540539

@@ -599,6 +598,7 @@ def _extract_data_cb(self, get_next_return):
599598
continuation_token, _ = super(BlobPrefixPaged, self)._extract_data_cb(get_next_return)
600599
self.current_page = self._response.segment.blob_prefixes + self._response.segment.blob_items
601600
self.current_page = [self._build_item(item) for item in self.current_page]
601+
self.delimiter = self._response.delimiter
602602

603603
return continuation_token, self.current_page
604604

0 commit comments

Comments
 (0)