diff --git a/src/blob/generated/artifacts/parameters.ts b/src/blob/generated/artifacts/parameters.ts index 9f5509b5f..1457b18a7 100644 --- a/src/blob/generated/artifacts/parameters.ts +++ b/src/blob/generated/artifacts/parameters.ts @@ -98,21 +98,6 @@ export const appendPosition: msRest.OperationParameter = { } } }; -export const blob: msRest.OperationURLParameter = { - parameterPath: "blob", - mapper: { - required: true, - serializedName: "blob", - constraints: { - MaxLength: 1024, - MinLength: 1, - Pattern: /^[a-zA-Z0-9]+(?:\/[a-zA-Z0-9]+)*(?:\.[a-zA-Z0-9]+){0,1}$/ - }, - type: { - name: "String" - } - } -}; export const blobCacheControl: msRest.OperationParameter = { parameterPath: [ "options", @@ -599,16 +584,6 @@ export const comp9: msRest.OperationQueryParameter = { } } }; -export const containerName: msRest.OperationURLParameter = { - parameterPath: "containerName", - mapper: { - required: true, - serializedName: "containerName", - type: { - name: "String" - } - } -}; export const contentLength: msRest.OperationParameter = { parameterPath: "contentLength", mapper: { diff --git a/src/blob/generated/artifacts/specifications.ts b/src/blob/generated/artifacts/specifications.ts index c0b1f17e2..6c3355f6c 100644 --- a/src/blob/generated/artifacts/specifications.ts +++ b/src/blob/generated/artifacts/specifications.ts @@ -297,8 +297,7 @@ const containerCreateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -328,8 +327,7 @@ const containerGetPropertiesOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -356,8 +354,7 @@ const containerGetPropertiesWithHeadOperationSpec: msRest.OperationSpec = { httpMethod: "HEAD", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -384,8 +381,7 @@ const containerDeleteOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -414,8 +410,7 @@ const containerSetMetadataOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -445,8 +440,7 @@ const containerGetAccessPolicyOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -487,8 +481,7 @@ const containerSetAccessPolicyOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -540,8 +533,7 @@ const containerRestoreOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -570,8 +562,7 @@ const containerSubmitBatchOperationSpec: msRest.OperationSpec = { httpMethod: "POST", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -617,8 +608,7 @@ const containerFilterBlobsOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -650,8 +640,7 @@ const containerAcquireLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -683,8 +672,7 @@ const containerReleaseLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -715,8 +703,7 @@ const containerRenewLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -747,8 +734,7 @@ const containerBreakLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -779,8 +765,7 @@ const containerChangeLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -812,8 +797,7 @@ const containerListBlobFlatSegmentOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.prefix, @@ -845,8 +829,7 @@ const containerListBlobHierarchySegmentOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.prefix, @@ -879,8 +862,7 @@ const containerGetAccountInfoOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.restype1, @@ -905,8 +887,7 @@ const containerGetAccountInfoWithHeadOperationSpec: msRest.OperationSpec = { httpMethod: "HEAD", path: "{containerName}", urlParameters: [ - Parameters.url, - Parameters.containerName + Parameters.url ], queryParameters: [ Parameters.restype1, @@ -932,9 +913,7 @@ const blobDownloadOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -988,9 +967,7 @@ const blobGetPropertiesOperationSpec: msRest.OperationSpec = { httpMethod: "HEAD", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -1026,9 +1003,7 @@ const blobDeleteOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -1063,9 +1038,7 @@ const blobUndeleteOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1091,9 +1064,7 @@ const blobSetExpiryOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1121,9 +1092,7 @@ const blobSetHTTPHeadersOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1161,9 +1130,7 @@ const blobSetImmutabilityPolicyOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1192,9 +1159,7 @@ const blobDeleteImmutabilityPolicyOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1220,9 +1185,7 @@ const blobSetLegalHoldOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1249,9 +1212,7 @@ const blobSetMetadataOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1288,9 +1249,7 @@ const blobAcquireLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1324,9 +1283,7 @@ const blobReleaseLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1359,9 +1316,7 @@ const blobRenewLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1394,9 +1349,7 @@ const blobChangeLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1430,9 +1383,7 @@ const blobBreakLeaseOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1465,9 +1416,7 @@ const blobCreateSnapshotOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1504,9 +1453,7 @@ const blobStartCopyFromURLOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -1551,9 +1498,7 @@ const blobCopyFromURLOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -1600,9 +1545,7 @@ const blobAbortCopyFromURLOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.copyId, @@ -1631,9 +1574,7 @@ const blobSetTierOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -1668,9 +1609,7 @@ const blobGetAccountInfoOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.restype1, @@ -1695,9 +1634,7 @@ const blobGetAccountInfoWithHeadOperationSpec: msRest.OperationSpec = { httpMethod: "HEAD", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.restype1, @@ -1722,9 +1659,7 @@ const blobQueryOperationSpec: msRest.OperationSpec = { httpMethod: "POST", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -1783,9 +1718,7 @@ const blobGetTagsOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1816,9 +1749,7 @@ const blobSetTagsOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1858,9 +1789,7 @@ const pageBlobCreateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -1911,9 +1840,7 @@ const pageBlobUploadPagesOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -1968,9 +1895,7 @@ const pageBlobClearPagesOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2012,9 +1937,7 @@ const pageBlobUploadPagesFromURLOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2065,9 +1988,7 @@ const pageBlobGetPageRangesOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -2104,9 +2025,7 @@ const pageBlobGetPageRangesDiffOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, @@ -2145,9 +2064,7 @@ const pageBlobResizeOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2184,9 +2101,7 @@ const pageBlobUpdateSequenceNumberOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2220,9 +2135,7 @@ const pageBlobCopyIncrementalOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2255,9 +2168,7 @@ const appendBlobCreateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -2305,9 +2216,7 @@ const appendBlobAppendBlockOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2359,9 +2268,7 @@ const appendBlobAppendBlockFromUrlOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2410,9 +2317,7 @@ const appendBlobSealOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2445,9 +2350,7 @@ const blockBlobUploadOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -2509,9 +2412,7 @@ const blockBlobPutBlobFromUrlOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout @@ -2568,9 +2469,7 @@ const blockBlobStageBlockOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.blockId, @@ -2616,9 +2515,7 @@ const blockBlobStageBlockFromURLOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.blockId, @@ -2660,9 +2557,7 @@ const blockBlobCommitBlockListOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.timeout, @@ -2720,9 +2615,7 @@ const blockBlobGetBlockListOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "{containerName}/{blob}", urlParameters: [ - Parameters.url, - Parameters.containerName, - Parameters.blob + Parameters.url ], queryParameters: [ Parameters.snapshot, diff --git a/src/blob/generated/handlers/IBlobHandler.ts b/src/blob/generated/handlers/IBlobHandler.ts index da348f143..66a93d61f 100644 --- a/src/blob/generated/handlers/IBlobHandler.ts +++ b/src/blob/generated/handlers/IBlobHandler.ts @@ -34,6 +34,7 @@ export default interface IBlobHandler { abortCopyFromURL(copyId: string, options: Models.BlobAbortCopyFromURLOptionalParams, context: Context): Promise; setTier(tier: Models.AccessTier, options: Models.BlobSetTierOptionalParams, context: Context): Promise; getAccountInfo(context: Context): Promise; + getAccountInfoWithHead(context: Context): Promise; query(options: Models.BlobQueryOptionalParams, context: Context): Promise; getTags(options: Models.BlobGetTagsOptionalParams, context: Context): Promise; setTags(options: Models.BlobSetTagsOptionalParams, context: Context): Promise; diff --git a/src/blob/generated/handlers/IContainerHandler.ts b/src/blob/generated/handlers/IContainerHandler.ts index f04e429fa..1971c43d0 100644 --- a/src/blob/generated/handlers/IContainerHandler.ts +++ b/src/blob/generated/handlers/IContainerHandler.ts @@ -31,4 +31,5 @@ export default interface IContainerHandler { listBlobFlatSegment(options: Models.ContainerListBlobFlatSegmentOptionalParams, context: Context): Promise; listBlobHierarchySegment(delimiter: string, options: Models.ContainerListBlobHierarchySegmentOptionalParams, context: Context): Promise; getAccountInfo(context: Context): Promise; + getAccountInfoWithHead(context: Context): Promise; } diff --git a/src/blob/generated/handlers/IServiceHandler.ts b/src/blob/generated/handlers/IServiceHandler.ts index 468d4e8e0..e76522958 100644 --- a/src/blob/generated/handlers/IServiceHandler.ts +++ b/src/blob/generated/handlers/IServiceHandler.ts @@ -19,6 +19,7 @@ export default interface IServiceHandler { listContainersSegment(options: Models.ServiceListContainersSegmentOptionalParams, context: Context): Promise; getUserDelegationKey(keyInfo: Models.KeyInfo, options: Models.ServiceGetUserDelegationKeyOptionalParams, context: Context): Promise; getAccountInfo(context: Context): Promise; + getAccountInfoWithHead(context: Context): Promise; submitBatch(body: NodeJS.ReadableStream, contentLength: number, multipartContentType: string, options: Models.ServiceSubmitBatchOptionalParams, context: Context): Promise; filterBlobs(options: Models.ServiceFilterBlobsOptionalParams, context: Context): Promise; } diff --git a/src/blob/generated/handlers/handlerMappers.ts b/src/blob/generated/handlers/handlerMappers.ts index df0fe4d4d..3c1491e76 100644 --- a/src/blob/generated/handlers/handlerMappers.ts +++ b/src/blob/generated/handlers/handlerMappers.ts @@ -8,7 +8,7 @@ export interface IHandlerPath { arguments: string[]; } -const operationHandlerMapping: { [key: number]: IHandlerPath } = {}; +const operationHandlerMapping: {[key: number]: IHandlerPath} = {}; operationHandlerMapping[Operation.Service_SetProperties] = { arguments: [ @@ -55,7 +55,7 @@ operationHandlerMapping[Operation.Service_GetAccountInfo] = { operationHandlerMapping[Operation.Service_GetAccountInfoWithHead] = { arguments: [], handler: "serviceHandler", - method: "getAccountInfo" + method: "getAccountInfoWithHead" }; operationHandlerMapping[Operation.Service_SubmitBatch] = { arguments: [ @@ -93,7 +93,7 @@ operationHandlerMapping[Operation.Container_GetPropertiesWithHead] = { "options" ], handler: "containerHandler", - method: "getProperties" + method: "getPropertiesWithHead" }; operationHandlerMapping[Operation.Container_Delete] = { arguments: [ @@ -202,16 +202,14 @@ operationHandlerMapping[Operation.Container_ListBlobHierarchySegment] = { method: "listBlobHierarchySegment" }; operationHandlerMapping[Operation.Container_GetAccountInfo] = { - arguments: [ - ], + arguments: [], handler: "containerHandler", method: "getAccountInfo" }; operationHandlerMapping[Operation.Container_GetAccountInfoWithHead] = { - arguments: [ - ], + arguments: [], handler: "containerHandler", - method: "getAccountInfo" + method: "getAccountInfoWithHead" }; operationHandlerMapping[Operation.Blob_Download] = { arguments: [ @@ -364,16 +362,14 @@ operationHandlerMapping[Operation.Blob_SetTier] = { method: "setTier" }; operationHandlerMapping[Operation.Blob_GetAccountInfo] = { - arguments: [ - ], + arguments: [], handler: "blobHandler", method: "getAccountInfo" }; operationHandlerMapping[Operation.Blob_GetAccountInfoWithHead] = { - arguments: [ - ], + arguments: [], handler: "blobHandler", - method: "getAccountInfo" + method: "getAccountInfoWithHead" }; operationHandlerMapping[Operation.Blob_Query] = { arguments: [ diff --git a/src/blob/handlers/BlobHandler.ts b/src/blob/handlers/BlobHandler.ts index b9da01ae2..1480d7bc3 100644 --- a/src/blob/handlers/BlobHandler.ts +++ b/src/blob/handlers/BlobHandler.ts @@ -122,16 +122,16 @@ export default class BlobHandler extends BaseHandler implements IBlobHandler { const response: Models.BlobGetPropertiesResponse = againstMetadata ? { - statusCode: 200, - metadata: res.metadata, - eTag: res.properties.etag, - requestId: context.contextId, - version: BLOB_API_VERSION, - date: context.startTime, - clientRequestId: options.requestId, - contentLength: res.properties.contentLength, - lastModified: res.properties.lastModified - } + statusCode: 200, + metadata: res.metadata, + eTag: res.properties.etag, + requestId: context.contextId, + version: BLOB_API_VERSION, + date: context.startTime, + clientRequestId: options.requestId, + contentLength: res.properties.contentLength, + lastModified: res.properties.lastModified + } : { statusCode: 200, metadata: res.metadata, @@ -1103,7 +1103,7 @@ export default class BlobHandler extends BaseHandler implements IBlobHandler { tagCount: getBlobTagsCount(blob.blobTags), isServerEncrypted: true, clientRequestId: options.requestId, - creationTime:blob.properties.creationTime, + creationTime: blob.properties.creationTime, blobCommittedBlockCount: blob.properties.blobType === Models.BlobType.AppendBlob ? (blob.committedBlocksInOrder || []).length @@ -1176,9 +1176,9 @@ export default class BlobHandler extends BaseHandler implements IBlobHandler { contentLength <= 0 ? [] : this.rangesManager.fillZeroRanges(blob.pageRangesInOrder, { - start: rangeStart, - end: rangeEnd - }); + start: rangeStart, + end: rangeEnd + }); const bodyGetter = async () => { return this.extentStore.readExtents( @@ -1233,7 +1233,7 @@ export default class BlobHandler extends BaseHandler implements IBlobHandler { blobContentMD5: blob.properties.contentMD5, tagCount: getBlobTagsCount(blob.blobTags), isServerEncrypted: true, - creationTime:blob.properties.creationTime, + creationTime: blob.properties.creationTime, clientRequestId: options.requestId }; @@ -1243,7 +1243,7 @@ export default class BlobHandler extends BaseHandler implements IBlobHandler { public async query( options: Models.BlobQueryOptionalParams, context: Context - ): Promise{ + ): Promise { throw new NotImplementedError(context.contextId); } diff --git a/swagger/blob-storage-2021-10-04.json b/swagger/blob-storage-2021-10-04.json index ec52a2132..a134704c8 100644 --- a/swagger/blob-storage-2021-10-04.json +++ b/swagger/blob-storage-2021-10-04.json @@ -1236,9 +1236,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1328,9 +1325,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1521,9 +1515,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1611,9 +1602,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1702,9 +1690,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1801,9 +1786,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -1911,9 +1893,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "comp", "description": "comp", @@ -2029,9 +2008,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "comp", "description": "comp", @@ -2152,9 +2128,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "comp", "description": "comp", @@ -2275,9 +2248,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "comp", "description": "comp", @@ -2401,9 +2371,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "comp", "description": "comp", @@ -2523,9 +2490,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -2632,9 +2596,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -2825,9 +2786,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, { "name": "restype", "description": "restype", @@ -3938,14 +3896,7 @@ } } }, - "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - } - ] + "parameters": [] }, "/{containerName}/{blob}?PageBlob": { "put": { @@ -4118,12 +4069,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "x-ms-blob-type", "x-ms-client-name": "blobType", @@ -4304,12 +4249,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "x-ms-blob-type", "x-ms-client-name": "blobType", @@ -4502,12 +4441,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "x-ms-blob-type", "x-ms-client-name": "blobType", @@ -4715,12 +4648,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "x-ms-blob-type", "x-ms-client-name": "blobType", @@ -4798,12 +4725,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -4890,12 +4811,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5018,12 +4933,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5181,12 +5090,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5266,12 +5169,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5405,12 +5302,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5517,12 +5408,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5637,12 +5522,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5762,12 +5641,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -5890,12 +5763,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -6015,12 +5882,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -6165,12 +6026,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -6335,14 +6190,7 @@ } } }, - "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - } - ] + "parameters": [] }, "/{containerName}/{blob}?comp=copy&sync": { "put": { @@ -6512,12 +6360,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "x-ms-requires-sync", "description": "This header indicates that this is a synchronous Copy Blob From URL instead of a Asynchronous Copy Blob.", @@ -6595,12 +6437,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -6717,12 +6553,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -6903,12 +6733,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "restype", "description": "restype", @@ -7048,12 +6872,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -7198,12 +7016,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -7486,12 +7298,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -7660,12 +7466,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -7826,12 +7626,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8029,12 +7823,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8173,12 +7961,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8307,12 +8089,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8432,12 +8208,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8548,12 +8318,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8672,12 +8436,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -8844,12 +8602,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -9029,12 +8781,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -9138,12 +8884,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -9649,12 +9389,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", @@ -9816,12 +9550,6 @@ } }, "parameters": [ - { - "$ref": "#/parameters/ContainerName" - }, - { - "$ref": "#/parameters/Blob" - }, { "name": "comp", "description": "comp", diff --git a/swagger/blob.md b/swagger/blob.md index 118be0ec2..644091e78 100644 --- a/swagger/blob.md +++ b/swagger/blob.md @@ -63,4 +63,18 @@ enum-types: true 15. Add "x-ms-delete-type-permanent" to "Blob_Delete" API response. -16. Add "Cold" to "AccessTier", "AccessTierRequired", "AccessTierOptional"; and add "rehydrate-pending-to-cold" to "ArchiveStatus". (can be removed when upgrade to new API version.) +16. Remove + " + { + "$ref": "#/parameters/ContainerName" + }, + " and + " + { + "$ref": "#/parameters/Blob" + } + " + from parameters of each container/blob operation. + +17. Add "Cold" to "AccessTier", "AccessTierRequired", "AccessTierOptional"; and add "rehydrate-pending-to-cold" to "ArchiveStatus". (can be removed when upgrade to new API version.) +