From 94181293cb718a5e1b74b9b2b37c909e66f695d8 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 16 Jun 2020 18:26:30 +0800 Subject: [PATCH 01/10] add set expiry --- .../storage-blob-changefeed/package.json | 4 +- .../storage-blob/review/storage-blob.api.md | 29 +++ sdk/storage/storage-blob/src/Clients.ts | 62 ++++- .../storage-blob/src/generatedModels.ts | 5 +- .../storage-file-datalake/package.json | 4 +- .../recording_set_expiry__absolute.json | 179 +++++++++++++ .../recording_set_expiry__neverexpire.json | 159 ++++++++++++ .../recording_set_expiry__override.json | 207 +++++++++++++++ ...ording_set_expiry__relativetocreation.json | 160 ++++++++++++ .../recording_set_expiry__relativetonow.json | 149 +++++++++++ .../recording_set_expiry__absolute.js | 201 +++++++++++++++ .../recording_set_expiry__neverexpire.js | 176 +++++++++++++ .../recording_set_expiry__override.js | 243 ++++++++++++++++++ ...ecording_set_expiry__relativetocreation.js | 178 +++++++++++++ .../recording_set_expiry__relativetonow.js | 156 +++++++++++ .../review/storage-file-datalake.api.md | 11 + .../storage-file-datalake/src/clients.ts | 39 ++- .../src/operations/pathOperations.ts | 42 ++- .../storage-file-datalake/src/models.ts | 30 ++- .../storage-file-datalake/swagger/README.md | 11 + .../test/pathclient.spec.ts | 50 +++- 21 files changed, 2066 insertions(+), 29 deletions(-) create mode 100644 sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json create mode 100644 sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json create mode 100644 sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json create mode 100644 sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json create mode 100644 sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json create mode 100644 sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js create mode 100644 sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js create mode 100644 sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js create mode 100644 sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js create mode 100644 sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js diff --git a/sdk/storage/storage-blob-changefeed/package.json b/sdk/storage/storage-blob-changefeed/package.json index ca6e0a4ed34a..b86eb5b43a1c 100644 --- a/sdk/storage/storage-blob-changefeed/package.json +++ b/sdk/storage/storage-blob-changefeed/package.json @@ -94,7 +94,7 @@ ] }, "dependencies": { - "@azure/storage-blob": "^12.1.2", + "@azure/storage-blob": "^12.2.0-preview.1", "@azure/abort-controller": "^1.0.0", "@azure/core-http": "^1.1.1", "@azure/core-lro": "^1.0.2", @@ -160,4 +160,4 @@ "util": "^0.12.1", "sinon": "^9.0.2" } -} \ No newline at end of file +} diff --git a/sdk/storage/storage-blob/review/storage-blob.api.md b/sdk/storage/storage-blob/review/storage-blob.api.md index 3594b8ea9b76..bd4648e63493 100644 --- a/sdk/storage/storage-blob/review/storage-blob.api.md +++ b/sdk/storage/storage-blob/review/storage-blob.api.md @@ -379,6 +379,7 @@ export class BlobClient extends StorageClient { getTags(options?: BlobGetTagsOptions): Promise; get name(): string; setAccessTier(tier: BlockBlobTier | PremiumPageBlobTier | string, options?: BlobSetTierOptions): Promise; + setExpiry(mode: BlobExpiryMode, options?: BlobSetExpiryOptions): Promise; setHTTPHeaders(blobHTTPHeaders?: BlobHTTPHeaders, options?: BlobSetHTTPHeadersOptions): Promise; setMetadata(metadata?: Metadata, options?: BlobSetMetadataOptions): Promise; setTags(tags: Tags, options?: BlobSetTagsOptions): Promise; @@ -571,6 +572,9 @@ export interface BlobExistsOptions extends CommonOptions { customerProvidedKey?: CpkInfo; } +// @public +export type BlobExpiryMode = 'NeverExpire' | 'RelativeToCreation' | 'RelativeToNow' | 'Absolute'; + // @public export interface BlobFlatListSegment { // (undocumented) @@ -930,6 +934,31 @@ export interface BlobServiceStatistics { geoReplication?: GeoReplication; } +// @public +export interface BlobSetExpiryHeaders { + clientRequestId?: string; + date?: Date; + // (undocumented) + errorCode?: string; + etag?: string; + lastModified?: Date; + requestId?: string; + version?: string; +} + +// @public +export interface BlobSetExpiryOptions extends CommonOptions { + abortSignal?: AbortSignalLike; + expiresOn?: string; +} + +// @public +export type BlobSetExpiryResponse = BlobSetExpiryHeaders & { + _response: coreHttp.HttpResponse & { + parsedHeaders: BlobSetExpiryHeaders; + }; +}; + // @public export interface BlobSetHTTPHeadersHeaders { blobSequenceNumber?: number; diff --git a/sdk/storage/storage-blob/src/Clients.ts b/sdk/storage/storage-blob/src/Clients.ts index 4fcc9565e5b6..c812ad8fe566 100644 --- a/sdk/storage/storage-blob/src/Clients.ts +++ b/sdk/storage/storage-blob/src/Clients.ts @@ -89,7 +89,9 @@ import { ContainerListBlobFlatSegmentHeaders, BlobProperties, ContainerListBlobHierarchySegmentHeaders, - ListBlobsHierarchySegmentResponseModel + ListBlobsHierarchySegmentResponseModel, + BlobSetExpiryResponse, + BlobExpiryMode } from "./generatedModels"; import { AppendBlobRequestConditions, @@ -939,6 +941,32 @@ export interface BlobDownloadToBufferOptions extends CommonOptions { customerProvidedKey?: CpkInfo; } +/** + * Option interface for the {@link BlobClient.setExpiry} operation. + * + * @export + * @interface BlobSetExpiryOptions + */ +export interface BlobSetExpiryOptions extends CommonOptions { + /** + * An implementation of the `AbortSignalLike` interface to signal the request to cancel the operation. + * For example, use the @azure/abort-controller to create an `AbortSignal`. + * + * @type {AbortSignalLike} + * @memberof BlobSetExpiryOptions + */ + abortSignal?: AbortSignalLike; + + /** + * The time to set the blob to expiry. Number of milliseconds elapsed from the relative time + * or absolute time in RFC 1123 Format. + * + * @type {string} + * @memberof BlobSetExpiryOptions + */ + expiresOn?: string; +} + /** * A BlobClient represents a URL to an Azure Storage blob; the blob may be a block blob, * append blob, or page blob. @@ -1533,6 +1561,36 @@ export class BlobClient extends StorageClient { } } + /** + * Sets an expiry time on a blob, once that time is met the blob is deleted. + * Only supported in accounts that have a hierarchical namespace (Azure Data Lake Storage Gen2). + * + * @param {BlobExpiryMode} mode + * @param {BlobSetExpiryOptions} [options={}] + * @returns {Promise} + * @memberof BlobClient + */ + public async setExpiry( + mode: BlobExpiryMode, + options: BlobSetExpiryOptions = {} + ): Promise { + const { span, spanOptions } = createSpan("BlobClient-setExpiry", options.tracingOptions); + try { + return await this.blobContext.setExpiry(mode, { + ...options, + tracingOptions: { ...options.tracingOptions, spanOptions } + }); + } catch (e) { + span.setStatus({ + code: CanonicalCode.UNKNOWN, + message: e.message + }); + throw e; + } finally { + span.end(); + } + } + /** * Sets user-defined metadata for the specified blob as one or more name-value pairs. * @@ -6072,7 +6130,7 @@ export interface ContainerDeleteBlobOptions extends BlobDeleteOptions { /** * An opaque DateTime value that, when present, specifies the version * of the blob to delete. It's for service version 2019-10-10 and newer. - * + * * @type {string} * @memberof ContainerDeleteBlobOptions */ diff --git a/sdk/storage/storage-blob/src/generatedModels.ts b/sdk/storage/storage-blob/src/generatedModels.ts index 309d24270976..89802fb13742 100644 --- a/sdk/storage/storage-blob/src/generatedModels.ts +++ b/sdk/storage/storage-blob/src/generatedModels.ts @@ -142,5 +142,8 @@ export { UserDelegationKey as UserDelegationKeyModel, ContainerEncryptionScope, ServiceFilterBlobsResponse as ServiceFindBlobsByTagsSegmentResponse, - FilterBlobItem + FilterBlobItem, + BlobSetExpiryResponse, + BlobExpiryOptions as BlobExpiryMode, + BlobSetExpiryHeaders } from "./generated/src/models"; diff --git a/sdk/storage/storage-file-datalake/package.json b/sdk/storage/storage-file-datalake/package.json index 10834962e6ae..1f23d5168d3e 100644 --- a/sdk/storage/storage-file-datalake/package.json +++ b/sdk/storage/storage-file-datalake/package.json @@ -99,7 +99,7 @@ "@azure/core-paging": "^1.1.1", "@azure/core-tracing": "1.0.0-preview.8", "@azure/logger": "^1.0.0", - "@azure/storage-blob": "^12.1.2", + "@azure/storage-blob": "^12.2.0-preview.1", "events": "^3.0.0", "tslib": "^2.0.0" }, @@ -162,4 +162,4 @@ "typescript": "~3.9.3", "util": "^0.12.1" } -} \ No newline at end of file +} diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json new file mode 100644 index 000000000000..724bd061601f --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json @@ -0,0 +1,179 @@ +{ + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:36 GMT", + "etag": "\"0x8D811DE5A580C93\"", + "last-modified": "Tue, 16 Jun 2020 10:16:36 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "81f88cf6-310b-4baf-9759-952abbe4db60", + "x-ms-request-id": "e5fc48ee-401e-0052-3bc7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": { + "resource": "file" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:36 GMT", + "etag": "\"0x8D811DE5AB05A11\"", + "last-modified": "Tue, 16 Jun 2020 10:16:37 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "5a3a281c-ccd9-4d1c-b34f-6ae0fc31096c", + "x-ms-request-id": "3bbf9f6d-601f-0018-5bc7-43face000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": { + "position": "0", + "action": "append" + }, + "requestBody": "Hello World", + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:37 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "29607469-ac51-4e8a-a6d4-09fb018f3e9d", + "x-ms-request-id": "3bbf9f71-601f-0018-5fc7-43face000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": { + "position": "11", + "action": "flush" + }, + "requestBody": "", + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:37 GMT", + "etag": "\"0x8D811DE5B5CCDCC\"", + "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "93ef5651-70e7-4c02-889c-f02ea20e0ca5", + "x-ms-request-id": "3bbf9f73-601f-0018-61c7-43face000000", + "x-ms-request-server-encrypted": "false", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:38 GMT", + "etag": "\"0x8D811DE5B5CCDCC\"", + "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "048426e3-9c9d-492d-9ea4-31a8662a490d", + "x-ms-request-id": "e5fc49c1-401e-0052-7ac7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": {}, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "accept-ranges": "bytes", + "content-length": "11", + "content-type": "text/plain;charset=UTF-8", + "date": "Tue, 16 Jun 2020 10:16:38 GMT", + "etag": "\"0x8D811DE5B5CCDCC\"", + "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-access-tier": "Hot", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "44bb5640-21b8-4519-b9f6-a8fd7cfd57d7", + "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:37 GMT", + "x-ms-expiry-time": "Tue, 16 Jun 2020 10:16:43 GMT", + "x-ms-lease-state": "available", + "x-ms-lease-status": "unlocked", + "x-ms-request-id": "e5fc49e6-401e-0052-17c7-435941000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "query": {}, + "requestBody": null, + "status": 404, + "response": "", + "responseHeaders": { + "date": "Tue, 16 Jun 2020 10:16:44 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "transfer-encoding": "chunked", + "x-ms-client-request-id": "75cc2c4c-8fe9-461d-812c-4e95d4a50725", + "x-ms-error-code": "BlobNotFound", + "x-ms-request-id": "e5fc4b7e-401e-0052-78c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:45 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "c3b64267-6eaa-4a20-97e9-b695d7dcdd2e", + "x-ms-request-id": "e5fc4bb3-401e-0052-23c7-435941000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "filesystem": "filesystem159230259660502500", + "file": "file159230259717705171" + }, + "newDate": { + "now": "2020-06-16T10:16:38.876Z" + } + }, + "hash": "e789caba0e4e0fb5e34f6e82577a0979" +} \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json new file mode 100644 index 000000000000..5bc158b0190f --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json @@ -0,0 +1,159 @@ +{ + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:31 GMT", + "etag": "\"0x8D811DE5758F60E\"", + "last-modified": "Tue, 16 Jun 2020 10:16:31 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "00ce46f6-acb6-4da2-8cdf-df2b8d530995", + "x-ms-request-id": "e5fc4784-401e-0052-03c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "query": { + "resource": "file" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:32 GMT", + "etag": "\"0x8D811DE584B99C0\"", + "last-modified": "Tue, 16 Jun 2020 10:16:33 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "f4a7dd5e-4e5e-4c8d-8729-a06a4ad56164", + "x-ms-request-id": "3bbf9f63-601f-0018-54c7-43face000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "query": { + "position": "0", + "action": "append" + }, + "requestBody": "Hello World", + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:33 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "e4d5446b-8f9d-4c11-a4db-fb4b1fe3c3f0", + "x-ms-request-id": "3bbf9f65-601f-0018-56c7-43face000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "query": { + "position": "11", + "action": "flush" + }, + "requestBody": "", + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:33 GMT", + "etag": "\"0x8D811DE58F8BFEB\"", + "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "eabd8382-a2b2-47cb-8678-45b3787d46c4", + "x-ms-request-id": "3bbf9f69-601f-0018-58c7-43face000000", + "x-ms-request-server-encrypted": "false", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555/file159230259216907212", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:34 GMT", + "etag": "\"0x8D811DE58F8BFEB\"", + "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "bc52799d-1fbf-4060-893d-fc7779645743", + "x-ms-request-id": "e5fc4870-401e-0052-4ac7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555/file159230259216907212", + "query": {}, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "accept-ranges": "bytes", + "content-length": "11", + "content-type": "text/plain;charset=UTF-8", + "date": "Tue, 16 Jun 2020 10:16:34 GMT", + "etag": "\"0x8D811DE58F8BFEB\"", + "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-access-tier": "Hot", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "3ffaa511-21a5-448d-912a-3d4a4dcb9af5", + "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:33 GMT", + "x-ms-lease-state": "available", + "x-ms-lease-status": "unlocked", + "x-ms-request-id": "e5fc4897-401e-0052-6cc7-435941000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:35 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "d9b2be7f-a95d-477f-81ad-2d5eaca7d2bd", + "x-ms-request-id": "e5fc48be-401e-0052-11c7-435941000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "filesystem": "filesystem159230259056205555", + "file": "file159230259216907212" + }, + "newDate": {} + }, + "hash": "853f7f287f9eb69e7b12aee489e5d061" +} \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json new file mode 100644 index 000000000000..2c82cb68e98b --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json @@ -0,0 +1,207 @@ +{ + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:54 GMT", + "etag": "\"0x8D811DE65771E44\"", + "last-modified": "Tue, 16 Jun 2020 10:16:55 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "207b0e8d-0879-4c71-8cfb-b027e8016462", + "x-ms-request-id": "e5fc4ea8-401e-0052-23c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": { + "resource": "file" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:55 GMT", + "etag": "\"0x8D811DE65CF8FC7\"", + "last-modified": "Tue, 16 Jun 2020 10:16:56 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "96e437bc-dfe6-41e8-91bb-7c3cd450dc83", + "x-ms-request-id": "3bbf9f96-601f-0018-75c7-43face000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": { + "position": "0", + "action": "append" + }, + "requestBody": "Hello World", + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:55 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "a7dc949e-965d-4303-9bf0-6aeeb501a3c5", + "x-ms-request-id": "3bbf9f98-601f-0018-77c7-43face000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": { + "position": "11", + "action": "flush" + }, + "requestBody": "", + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:56 GMT", + "etag": "\"0x8D811DE667B4FA1\"", + "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "b0a6e0b0-e655-4475-b452-f7b44eac5cf7", + "x-ms-request-id": "3bbf9f9a-601f-0018-79c7-43face000000", + "x-ms-request-server-encrypted": "false", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:56 GMT", + "etag": "\"0x8D811DE667B4FA1\"", + "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "a1c6e077-dc3e-46d9-8d96-451bed057908", + "x-ms-request-id": "e5fc4f3c-401e-0052-29c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": {}, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "accept-ranges": "bytes", + "content-length": "11", + "content-type": "text/plain;charset=UTF-8", + "date": "Tue, 16 Jun 2020 10:16:57 GMT", + "etag": "\"0x8D811DE667B4FA1\"", + "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-access-tier": "Hot", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "2b2501aa-4855-4637-93fd-a69f35e36bd4", + "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:56 GMT", + "x-ms-expiry-time": "Tue, 16 Jun 2020 11:16:56 GMT", + "x-ms-lease-state": "available", + "x-ms-lease-status": "unlocked", + "x-ms-request-id": "e5fc4f66-401e-0052-4dc7-435941000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:57 GMT", + "etag": "\"0x8D811DE667B4FA1\"", + "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "38319128-052a-47eb-91e9-d66eacd01eeb", + "x-ms-request-id": "e5fc4f80-401e-0052-60c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "query": {}, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "accept-ranges": "bytes", + "content-length": "11", + "content-type": "text/plain;charset=UTF-8", + "date": "Tue, 16 Jun 2020 10:16:59 GMT", + "etag": "\"0x8D811DE667B4FA1\"", + "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-access-tier": "Hot", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "abe1a1c8-36de-4a0a-b48a-dbfd6974c0fb", + "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:56 GMT", + "x-ms-lease-state": "available", + "x-ms-lease-status": "unlocked", + "x-ms-request-id": "e5fc4fa9-401e-0052-07c7-435941000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:59 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "6873d43a-992a-4f55-9d27-8959f1c7a223", + "x-ms-request-id": "e5fc4fd8-401e-0052-31c7-435941000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "filesystem": "filesystem159230261526309547", + "file": "file159230261583407272" + }, + "newDate": {} + }, + "hash": "aedfa3555fb2b440c743c84d0d097173" +} \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json new file mode 100644 index 000000000000..9ed953425712 --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json @@ -0,0 +1,160 @@ +{ + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:50 GMT", + "etag": "\"0x8D811DE6312F92F\"", + "last-modified": "Tue, 16 Jun 2020 10:16:51 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "00d5e9d9-07a7-483b-96ce-4d57bcac84c6", + "x-ms-request-id": "e5fc4d5d-401e-0052-05c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "query": { + "resource": "file" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:51 GMT", + "etag": "\"0x8D811DE636B26E8\"", + "last-modified": "Tue, 16 Jun 2020 10:16:52 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "25423b02-b1d8-410c-99d0-60e9f3041f5c", + "x-ms-request-id": "3bbf9f8c-601f-0018-6cc7-43face000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "query": { + "position": "0", + "action": "append" + }, + "requestBody": "Hello World", + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:51 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "d4fd5929-0cac-4981-b306-d38740a6b090", + "x-ms-request-id": "3bbf9f8e-601f-0018-6ec7-43face000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "query": { + "position": "11", + "action": "flush" + }, + "requestBody": "", + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:52 GMT", + "etag": "\"0x8D811DE64174145\"", + "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "023b1f1a-f597-4edf-8506-1f5732eb8108", + "x-ms-request-id": "3bbf9f91-601f-0018-71c7-43face000000", + "x-ms-request-server-encrypted": "false", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905/file159230261182204515", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:52 GMT", + "etag": "\"0x8D811DE64174145\"", + "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "ac459147-9bd5-47d6-af78-d10de8952a59", + "x-ms-request-id": "e5fc4e0b-401e-0052-21c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905/file159230261182204515", + "query": {}, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "accept-ranges": "bytes", + "content-length": "11", + "content-type": "text/plain;charset=UTF-8", + "date": "Tue, 16 Jun 2020 10:16:53 GMT", + "etag": "\"0x8D811DE64174145\"", + "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-access-tier": "Hot", + "x-ms-access-tier-inferred": "true", + "x-ms-blob-type": "BlockBlob", + "x-ms-client-request-id": "ff1871d4-7287-4304-ae4a-abb9b789db1d", + "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:52 GMT", + "x-ms-expiry-time": "Tue, 16 Jun 2020 11:16:52 GMT", + "x-ms-lease-state": "available", + "x-ms-lease-status": "unlocked", + "x-ms-request-id": "e5fc4e37-401e-0052-46c7-435941000000", + "x-ms-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:53 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "ac841798-2187-461b-b3d3-266cea7b4b55", + "x-ms-request-id": "e5fc4e68-401e-0052-70c7-435941000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "filesystem": "filesystem159230261124904905", + "file": "file159230261182204515" + }, + "newDate": {} + }, + "hash": "79893de2c7ad9f366eab9107bef0e14a" +} \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json new file mode 100644 index 000000000000..9c4784c46bc3 --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json @@ -0,0 +1,149 @@ +{ + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:45 GMT", + "etag": "\"0x8D811DE60196041\"", + "last-modified": "Tue, 16 Jun 2020 10:16:46 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "496bd9f4-b23b-4243-911a-9c4badf7250f", + "x-ms-request-id": "e5fc4bd9-401e-0052-45c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "query": { + "resource": "file" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:46 GMT", + "etag": "\"0x8D811DE60731DB6\"", + "last-modified": "Tue, 16 Jun 2020 10:16:47 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "3c6591b8-33f3-41fd-b933-3915c78874f1", + "x-ms-request-id": "3bbf9f7c-601f-0018-66c7-43face000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "query": { + "position": "0", + "action": "append" + }, + "requestBody": "Hello World", + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:46 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "15ebd83c-1220-47e2-8c0b-9da55175f4fb", + "x-ms-request-id": "3bbf9f7e-601f-0018-68c7-43face000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PATCH", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "query": { + "position": "11", + "action": "flush" + }, + "requestBody": "", + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:47 GMT", + "etag": "\"0x8D811DE611EE162\"", + "last-modified": "Tue, 16 Jun 2020 10:16:48 GMT", + "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "81347dab-0763-42a2-86fc-7d5e257b2115", + "x-ms-request-id": "3bbf9f80-601f-0018-6ac7-43face000000", + "x-ms-request-server-encrypted": "false", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312/file159230260683203663", + "query": { + "comp": "expiry" + }, + "requestBody": null, + "status": 200, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:47 GMT", + "etag": "\"0x8D811DE611EE162\"", + "last-modified": "Tue, 16 Jun 2020 10:16:48 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "fd78da4d-9285-48a4-8f80-eef60a02a287", + "x-ms-request-id": "e5fc4c99-401e-0052-60c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "HEAD", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312/file159230260683203663", + "query": {}, + "requestBody": null, + "status": 404, + "response": "", + "responseHeaders": { + "date": "Tue, 16 Jun 2020 10:16:49 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "transfer-encoding": "chunked", + "x-ms-client-request-id": "3bc8b2d4-4fda-45e4-a7e1-1fa3d3173f87", + "x-ms-error-code": "BlobNotFound", + "x-ms-request-id": "e5fc4d01-401e-0052-39c7-435941000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Tue, 16 Jun 2020 10:16:50 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "be797657-0367-4dd2-8216-ac902a720740", + "x-ms-request-id": "e5fc4d29-401e-0052-5cc7-435941000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "filesystem": "filesystem159230260625109312", + "file": "file159230260683203663" + }, + "newDate": {} + }, + "hash": "223ed683e7510fa28446a368ffa6cd3c" +} \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js new file mode 100644 index 000000000000..c32c83d5346d --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js @@ -0,0 +1,201 @@ +let nock = require('nock'); + +module.exports.hash = "b1249eef1fa1409ab21b6b727de24370"; + +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230252342904735","file":"file159230252372302428"},"newDate":{"now":"2020-06-16T10:15:24.591Z"}} + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230252342904735') + .query(true) + .reply(201, "", [ + 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:23 GMT', + 'ETag', + '"0x8D811DE2E920360"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363630c-001e-000e-59c7-430c19000000', + 'x-ms-client-request-id', + '84fc3c08-348d-4a0a-a1cd-82b3078b6c9b', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:23 GMT' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230252342904735/file159230252372302428') + .query(true) + .reply(201, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:23 GMT', + 'ETag', + '"0x8D811DE2EBE3E66"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '386419d6-101f-005f-3cc7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'cbca7993-6c7c-43e4-9add-6f8a29bff846', + 'Date', + 'Tue, 16 Jun 2020 10:15:23 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230252342904735/file159230252372302428', "Hello World") + .query(true) + .reply(202, "", [ + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'true', + 'x-ms-request-id', + '386419d8-101f-005f-3ec7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '201cf66a-7bd2-43e5-ad55-677c53d4306e', + 'Date', + 'Tue, 16 Jun 2020 10:15:23 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230252342904735/file159230252372302428') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:24 GMT', + 'ETag', + '"0x8D811DE2F160E79"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'false', + 'x-ms-request-id', + '386419d9-101f-005f-3fc7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'b71be4ca-2a5a-4475-a6e0-b5174f9b9ae4', + 'Date', + 'Tue, 16 Jun 2020 10:15:24 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230252342904735/file159230252372302428') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:24 GMT', + 'ETag', + '"0x8D811DE2F160E79"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636354-001e-000e-16c7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'afdb0735-cbf1-4b15-bad9-427ef711d151', + 'Date', + 'Tue, 16 Jun 2020 10:15:24 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230252342904735/file159230252372302428') + .reply(200, "", [ + 'Content-Length', + '11', + 'Content-Type', + 'application/octet-stream', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:24 GMT', + 'Accept-Ranges', + 'bytes', + 'ETag', + '"0x8D811DE2F160E79"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636369-001e-000e-29c7-430c19000000', + 'x-ms-client-request-id', + 'b3a39079-d0d7-4e45-b271-e2cd44389460', + 'x-ms-version', + '2019-12-12', + 'x-ms-creation-time', + 'Tue, 16 Jun 2020 10:15:23 GMT', + 'x-ms-expiry-time', + 'Tue, 16 Jun 2020 10:15:29 GMT', + 'x-ms-lease-status', + 'unlocked', + 'x-ms-lease-state', + 'available', + 'x-ms-blob-type', + 'BlockBlob', + 'x-ms-server-encrypted', + 'true', + 'x-ms-access-tier', + 'Hot', + 'x-ms-access-tier-inferred', + 'true', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:24 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230252342904735/file159230252372302428') + .reply(404, "", [ + 'Transfer-Encoding', + 'chunked', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636531-001e-000e-34c7-430c19000000', + 'x-ms-client-request-id', + '4d20cd43-67a7-4c74-a316-99cb37e75f69', + 'x-ms-version', + '2019-12-12', + 'x-ms-error-code', + 'BlobNotFound', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-error-code,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:29 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/filesystem159230252342904735') + .query(true) + .reply(202, "", [ + 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363655d-001e-000e-5fc7-430c19000000', + 'x-ms-client-request-id', + '8f4f42db-52f6-4415-a74d-c3fd0e735ade', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:30 GMT' +]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js new file mode 100644 index 000000000000..f92dc9b22727 --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js @@ -0,0 +1,176 @@ +let nock = require('nock'); + +module.exports.hash = "33a08e805863b09bea0c58f4b6a9ff0e"; + +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230251915106669","file":"file159230252048904381"},"newDate":{}} + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230251915106669') + .query(true) + .reply(201, "", [ + 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:20 GMT', + 'ETag', + '"0x8D811DE2CA0DEBB"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636232-001e-000e-24c7-430c19000000', + 'x-ms-client-request-id', + '065023e5-4a0b-4c25-982b-8a073b52b17a', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:19 GMT' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230251915106669/file159230252048904381') + .query(true) + .reply(201, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:21 GMT', + 'ETag', + '"0x8D811DE2D71C09D"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '386419d2-101f-005f-39c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'f476c69d-f3eb-4c55-8b20-f8816636eaee', + 'Date', + 'Tue, 16 Jun 2020 10:15:21 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230251915106669/file159230252048904381', "Hello World") + .query(true) + .reply(202, "", [ + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'true', + 'x-ms-request-id', + '386419d3-101f-005f-3ac7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '7f1e8ba3-1b4c-4ab9-a536-4d66a64d9a15', + 'Date', + 'Tue, 16 Jun 2020 10:15:21 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230251915106669/file159230252048904381') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:22 GMT', + 'ETag', + '"0x8D811DE2DDC2F0C"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'false', + 'x-ms-request-id', + '386419d4-101f-005f-3bc7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'd0d3832b-194a-4ee2-af22-b3c05cfc3f7a', + 'Date', + 'Tue, 16 Jun 2020 10:15:21 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230251915106669/file159230252048904381') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:22 GMT', + 'ETag', + '"0x8D811DE2DDC2F0C"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236362c2-001e-000e-1ac7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '1d23345b-3215-454d-8d74-b152770aca8a', + 'Date', + 'Tue, 16 Jun 2020 10:15:22 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230251915106669/file159230252048904381') + .reply(200, "", [ + 'Content-Length', + '11', + 'Content-Type', + 'application/octet-stream', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:22 GMT', + 'Accept-Ranges', + 'bytes', + 'ETag', + '"0x8D811DE2DDC2F0C"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236362e6-001e-000e-36c7-430c19000000', + 'x-ms-client-request-id', + '318ee89c-e723-4467-b235-452a89f1f2fb', + 'x-ms-version', + '2019-12-12', + 'x-ms-creation-time', + 'Tue, 16 Jun 2020 10:15:21 GMT', + 'x-ms-lease-status', + 'unlocked', + 'x-ms-lease-state', + 'available', + 'x-ms-blob-type', + 'BlockBlob', + 'x-ms-server-encrypted', + 'true', + 'x-ms-access-tier', + 'Hot', + 'x-ms-access-tier-inferred', + 'true', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:22 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/filesystem159230251915106669') + .query(true) + .reply(202, "", [ + 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236362f8-001e-000e-47c7-430c19000000', + 'x-ms-client-request-id', + '34e0af94-268c-42cc-afa9-26c1696501c2', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:22 GMT' +]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js new file mode 100644 index 000000000000..1ab37bf92a8a --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js @@ -0,0 +1,243 @@ +let nock = require('nock'); + +module.exports.hash = "42d8a1eca14d1c1e1994260e2a4470a2"; + +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253581308327","file":"file159230253610604414"},"newDate":{}} + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253581308327') + .query(true) + .reply(201, "", [ + 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:35 GMT', + 'ETag', + '"0x8D811DE35F39D82"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363672f-001e-000e-74c7-430c19000000', + 'x-ms-client-request-id', + '343391cc-8295-4a8b-9543-590e310a179f', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:35 GMT' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253581308327/file159230253610604414') + .query(true) + .reply(201, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'ETag', + '"0x8D811DE361F51F4"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '386419f0-101f-005f-49c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '75efe0eb-0e57-4d0e-afbb-dc06561768b9', + 'Date', + 'Tue, 16 Jun 2020 10:15:35 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253581308327/file159230253610604414', "Hello World") + .query(true) + .reply(202, "", [ + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'true', + 'x-ms-request-id', + '386419f1-101f-005f-4ac7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '68bb9321-3070-4ef4-b985-701b4ec2efec', + 'Date', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253581308327/file159230253610604414') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'ETag', + '"0x8D811DE3676F29D"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'false', + 'x-ms-request-id', + '386419f2-101f-005f-4bc7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '795305b1-a7ce-42d7-92aa-e231caec9f67', + 'Date', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253581308327/file159230253610604414') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'ETag', + '"0x8D811DE3676F29D"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236367a4-001e-000e-58c7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '0ada7442-83e6-4843-ae2f-06ee5591295b', + 'Date', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230253581308327/file159230253610604414') + .reply(200, "", [ + 'Content-Length', + '11', + 'Content-Type', + 'application/octet-stream', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Accept-Ranges', + 'bytes', + 'ETag', + '"0x8D811DE3676F29D"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236367c3-001e-000e-70c7-430c19000000', + 'x-ms-client-request-id', + 'f6fb06f1-9141-4a5d-8cb5-0a76aad9725d', + 'x-ms-version', + '2019-12-12', + 'x-ms-creation-time', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'x-ms-expiry-time', + 'Tue, 16 Jun 2020 11:15:36 GMT', + 'x-ms-lease-status', + 'unlocked', + 'x-ms-lease-state', + 'available', + 'x-ms-blob-type', + 'BlockBlob', + 'x-ms-server-encrypted', + 'true', + 'x-ms-access-tier', + 'Hot', + 'x-ms-access-tier-inferred', + 'true', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:37 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253581308327/file159230253610604414') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'ETag', + '"0x8D811DE3676F29D"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236367d4-001e-000e-7dc7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'c65fb85a-e5ca-4904-a837-81c85b70e9c3', + 'Date', + 'Tue, 16 Jun 2020 10:15:37 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230253581308327/file159230253610604414') + .reply(200, "", [ + 'Content-Length', + '11', + 'Content-Type', + 'application/octet-stream', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Accept-Ranges', + 'bytes', + 'ETag', + '"0x8D811DE3676F29D"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236367e2-001e-000e-09c7-430c19000000', + 'x-ms-client-request-id', + '9fb848f2-09c8-4422-9e18-79ecb31d6e1c', + 'x-ms-version', + '2019-12-12', + 'x-ms-creation-time', + 'Tue, 16 Jun 2020 10:15:36 GMT', + 'x-ms-lease-status', + 'unlocked', + 'x-ms-lease-state', + 'available', + 'x-ms-blob-type', + 'BlockBlob', + 'x-ms-server-encrypted', + 'true', + 'x-ms-access-tier', + 'Hot', + 'x-ms-access-tier-inferred', + 'true', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:37 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/filesystem159230253581308327') + .query(true) + .reply(202, "", [ + 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236367f5-001e-000e-1ac7-430c19000000', + 'x-ms-client-request-id', + '5987a26d-8e0f-4748-a01b-800aef01d5ef', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:37 GMT' +]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js new file mode 100644 index 000000000000..91b89798c2a8 --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js @@ -0,0 +1,178 @@ +let nock = require('nock'); + +module.exports.hash = "4f32566919e5d600e90893cd6a3c2650"; + +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253377906386","file":"file159230253407400656"},"newDate":{}} + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253377906386') + .query(true) + .reply(201, "", [ + 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:33 GMT', + 'ETag', + '"0x8D811DE34BD963C"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363664a-001e-000e-24c7-430c19000000', + 'x-ms-client-request-id', + '7fdb477a-a076-43eb-b462-e5a4bf091608', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:33 GMT' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253377906386/file159230253407400656') + .query(true) + .reply(201, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'ETag', + '"0x8D811DE34E9F65E"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '386419ed-101f-005f-46c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '1a390f63-ab5f-47e4-8c4b-33b3958b8b88', + 'Date', + 'Tue, 16 Jun 2020 10:15:33 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253377906386/file159230253407400656', "Hello World") + .query(true) + .reply(202, "", [ + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'true', + 'x-ms-request-id', + '386419ee-101f-005f-47c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '723e59de-576d-446a-ba0a-04e722a1aa09', + 'Date', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253377906386/file159230253407400656') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'ETag', + '"0x8D811DE354288D0"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'false', + 'x-ms-request-id', + '386419ef-101f-005f-48c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + 'bd42659c-4953-4b94-99f8-7bf07e17f364', + 'Date', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253377906386/file159230253407400656') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'ETag', + '"0x8D811DE354288D0"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236366ca-001e-000e-1dc7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '08fb4ef2-a164-48ee-81a0-898a1aed8dc7', + 'Date', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230253377906386/file159230253407400656') + .reply(200, "", [ + 'Content-Length', + '11', + 'Content-Type', + 'application/octet-stream', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'Accept-Ranges', + 'bytes', + 'ETag', + '"0x8D811DE354288D0"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636703-001e-000e-4dc7-430c19000000', + 'x-ms-client-request-id', + 'e6abc96f-c172-4f0e-abcf-f12321ae83a7', + 'x-ms-version', + '2019-12-12', + 'x-ms-creation-time', + 'Tue, 16 Jun 2020 10:15:34 GMT', + 'x-ms-expiry-time', + 'Tue, 16 Jun 2020 11:15:34 GMT', + 'x-ms-lease-status', + 'unlocked', + 'x-ms-lease-state', + 'available', + 'x-ms-blob-type', + 'BlockBlob', + 'x-ms-server-encrypted', + 'true', + 'x-ms-access-tier', + 'Hot', + 'x-ms-access-tier-inferred', + 'true', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:35 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/filesystem159230253377906386') + .query(true) + .reply(202, "", [ + 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363671d-001e-000e-64c7-430c19000000', + 'x-ms-client-request-id', + '7d33cda0-da93-4c30-85a0-1b987e9a5f4e', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:35 GMT' +]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js new file mode 100644 index 000000000000..cde37074f3e8 --- /dev/null +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js @@ -0,0 +1,156 @@ +let nock = require('nock'); + +module.exports.hash = "aa31142aac524d8a8eb54f92c1ecb113"; + +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253075403698","file":"file159230253105003427"},"newDate":{}} + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253075403698') + .query(true) + .reply(201, "", [ + 'Content-Length', + '0', + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:30 GMT', + 'ETag', + '"0x8D811DE32EFF9B6"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636568-001e-000e-6ac7-430c19000000', + 'x-ms-client-request-id', + '1e68953f-b938-4e39-8231-8fb2589e8cf4', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:30 GMT' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253075403698/file159230253105003427') + .query(true) + .reply(201, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:31 GMT', + 'ETag', + '"0x8D811DE331C0AB0"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '386419e5-101f-005f-42c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '683ad088-f1fc-4db6-912c-d33840538525', + 'Date', + 'Tue, 16 Jun 2020 10:15:30 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253075403698/file159230253105003427', "Hello World") + .query(true) + .reply(202, "", [ + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'true', + 'x-ms-request-id', + '386419e6-101f-005f-43c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '040db930-b254-498a-a34b-b4bc59a3e714', + 'Date', + 'Tue, 16 Jun 2020 10:15:30 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) + .patch('/filesystem159230253075403698/file159230253105003427') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:31 GMT', + 'ETag', + '"0x8D811DE3373AF8C"', + 'Server', + 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-server-encrypted', + 'false', + 'x-ms-request-id', + '386419e7-101f-005f-44c7-439195000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '6fe4f10c-6202-452f-bdfc-b51defaa88eb', + 'Date', + 'Tue, 16 Jun 2020 10:15:31 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .put('/filesystem159230253075403698/file159230253105003427') + .query(true) + .reply(200, "", [ + 'Last-Modified', + 'Tue, 16 Jun 2020 10:15:31 GMT', + 'ETag', + '"0x8D811DE3373AF8C"', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '236365b7-001e-000e-28c7-430c19000000', + 'x-ms-version', + '2019-12-12', + 'x-ms-client-request-id', + '5d84bbb2-2b0c-413e-a4f8-0a6b5ccfe3c1', + 'Date', + 'Tue, 16 Jun 2020 10:15:31 GMT', + 'Content-Length', + '0' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .head('/filesystem159230253075403698/file159230253105003427') + .reply(404, "", [ + 'Transfer-Encoding', + 'chunked', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '23636610-001e-000e-6dc7-430c19000000', + 'x-ms-client-request-id', + '3501caeb-9111-4366-93f2-f32ab87629cd', + 'x-ms-version', + '2019-12-12', + 'x-ms-error-code', + 'BlobNotFound', + 'Access-Control-Expose-Headers', + 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-error-code,Content-Length,Date,Transfer-Encoding', + 'Access-Control-Allow-Origin', + '*', + 'Date', + 'Tue, 16 Jun 2020 10:15:32 GMT' +]); + +nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) + .delete('/filesystem159230253075403698') + .query(true) + .reply(202, "", [ + 'Content-Length', + '0', + 'Server', + 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', + 'x-ms-request-id', + '2363662c-001e-000e-08c7-430c19000000', + 'x-ms-client-request-id', + 'fef97ac3-3944-497c-9866-a0257b6c8810', + 'x-ms-version', + '2019-12-12', + 'Date', + 'Tue, 16 Jun 2020 10:15:33 GMT' +]); diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index fa3d6f8f6054..f6ebf61e7440 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -9,6 +9,9 @@ import { BaseRequestPolicy } from '@azure/core-http'; import { BlobLeaseClient } from '@azure/storage-blob'; import * as coreHttp from '@azure/core-http'; import { deserializationPolicy } from '@azure/core-http'; +import { BlobExpiryMode as FileExpiryMode } from '@azure/storage-blob'; +import { BlobSetExpiryOptions as FileSetExpiryOptions } from '@azure/storage-blob'; +import { BlobSetExpiryResponse as FileSetExpiryResponse } from '@azure/storage-blob'; import { HttpHeaders } from '@azure/core-http'; import { HttpOperationResponse } from '@azure/core-http'; import { HttpRequestBody } from '@azure/core-http'; @@ -149,6 +152,7 @@ export class DataLakeFileClient extends DataLakePathClient { readToBuffer(buffer: Buffer, offset?: number, count?: number, options?: FileReadToBufferOptions): Promise; readToBuffer(offset?: number, count?: number, options?: FileReadToBufferOptions): Promise; readToFile(filePath: string, offset?: number, count?: number, options?: FileReadOptions): Promise; + setExpiry(mode: FileExpiryMode, options?: FileSetExpiryOptions): Promise; upload(data: Buffer | Blob | ArrayBuffer | ArrayBufferView, options?: FileParallelUploadOptions): Promise; uploadFile(filePath: string, options?: FileParallelUploadOptions): Promise; uploadStream(stream: Readable, options?: FileParallelUploadOptions): Promise; @@ -295,6 +299,8 @@ export interface FileCreateOptions extends PathCreateOptions { export interface FileCreateResponse extends PathCreateResponse { } +export { FileExpiryMode } + // @public (undocumented) export interface FileFlushOptions extends CommonOptions { // (undocumented) @@ -421,6 +427,10 @@ export interface FileReadToBufferOptions extends CommonOptions { onProgress?: (progress: TransferProgressEvent) => void; } +export { FileSetExpiryOptions } + +export { FileSetExpiryResponse } + // @public (undocumented) export interface FileSystemCreateHeaders { // (undocumented) @@ -1029,6 +1039,7 @@ export interface PathGetPropertiesHeaders { encryptionKeySha256?: string; // (undocumented) etag?: string; + expiresOn?: Date; // (undocumented) isIncrementalCopy?: boolean; // (undocumented) diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index 5adbaaa0b7e4..f19b37d1bd91 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -47,7 +47,10 @@ import { PathSetMetadataOptions, PathSetMetadataResponse, PathSetPermissionsOptions, - PathSetPermissionsResponse + PathSetPermissionsResponse, + FileExpiryMode, + FileSetExpiryOptions, + FileSetExpiryResponse } from "./models"; import { newPipeline, Pipeline, StoragePipelineOptions } from "./Pipeline"; import { StorageClient } from "./StorageClient"; @@ -1228,7 +1231,7 @@ export class DataLakeFileClient extends DataLakePathClient { if (numBlocks > BLOCK_BLOB_MAX_BLOCKS) { throw new RangeError( `The data's size is too big or the chunkSize is too small;` + - `the number of chunks must be <= ${BLOCK_BLOB_MAX_BLOCKS}` + `the number of chunks must be <= ${BLOCK_BLOB_MAX_BLOCKS}` ); } @@ -1509,4 +1512,36 @@ export class DataLakeFileClient extends DataLakePathClient { span.end(); } } + + /** + * Sets an expiry time on a file, once that time is met the file is deleted. + * + * @param {FileExpiryMode} mode + * @param {FileSetExpiryOptions} [options={}] + * @returns {Promise} + * @memberof DataLakeFileClient + */ + public async setExpiry( + mode: FileExpiryMode, + options: FileSetExpiryOptions = {} + ): Promise { + const { span, spanOptions } = createSpan( + "DataLakeFileClient-setExpiry", + options.tracingOptions + ); + try { + return await this.blobClientInternal.setExpiry(mode, { + ...options, + tracingOptions: { ...options.tracingOptions, spanOptions } + }); + } catch (e) { + span.setStatus({ + code: CanonicalCode.UNKNOWN, + message: e.message + }); + throw e; + } finally { + span.end(); + } + } } diff --git a/sdk/storage/storage-file-datalake/src/generated/src/operations/pathOperations.ts b/sdk/storage/storage-file-datalake/src/generated/src/operations/pathOperations.ts index 98968b17ea7d..e8457dddec57 100644 --- a/sdk/storage/storage-file-datalake/src/generated/src/operations/pathOperations.ts +++ b/sdk/storage/storage-file-datalake/src/generated/src/operations/pathOperations.ts @@ -72,11 +72,15 @@ export class PathOperations { * the owner, owning group, and others, so the x-ms-permissions and x-ms-acl request headers are * mutually exclusive. Possible values include: 'append', 'flush', 'setProperties', * 'setAccessControl', 'setAccessControlRecursive' + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param body Initial data * @param [options] The optional parameters * @returns Promise */ - update(action: Models.PathUpdateAction, body: coreHttp.HttpRequestBody, options?: Models.PathUpdateOptionalParams): Promise; + update(action: Models.PathUpdateAction, mode: Models.PathSetAccessControlRecursiveMode, body: coreHttp.HttpRequestBody, options?: Models.PathUpdateOptionalParams): Promise; /** * @param action The action must be "append" to upload data to be appended to a file, "flush" to * flush previously uploaded data to a file, "setProperties" to set the properties of a file or @@ -87,10 +91,14 @@ export class PathOperations { * the owner, owning group, and others, so the x-ms-permissions and x-ms-acl request headers are * mutually exclusive. Possible values include: 'append', 'flush', 'setProperties', * 'setAccessControl', 'setAccessControlRecursive' + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param body Initial data * @param callback The callback */ - update(action: Models.PathUpdateAction, body: coreHttp.HttpRequestBody, callback: coreHttp.ServiceCallback): void; + update(action: Models.PathUpdateAction, mode: Models.PathSetAccessControlRecursiveMode, body: coreHttp.HttpRequestBody, callback: coreHttp.ServiceCallback): void; /** * @param action The action must be "append" to upload data to be appended to a file, "flush" to * flush previously uploaded data to a file, "setProperties" to set the properties of a file or @@ -101,15 +109,20 @@ export class PathOperations { * the owner, owning group, and others, so the x-ms-permissions and x-ms-acl request headers are * mutually exclusive. Possible values include: 'append', 'flush', 'setProperties', * 'setAccessControl', 'setAccessControlRecursive' + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param body Initial data * @param options The optional parameters * @param callback The callback */ - update(action: Models.PathUpdateAction, body: coreHttp.HttpRequestBody, options: Models.PathUpdateOptionalParams, callback: coreHttp.ServiceCallback): void; - update(action: Models.PathUpdateAction, body: coreHttp.HttpRequestBody, options?: Models.PathUpdateOptionalParams | coreHttp.ServiceCallback, callback?: coreHttp.ServiceCallback): Promise { + update(action: Models.PathUpdateAction, mode: Models.PathSetAccessControlRecursiveMode, body: coreHttp.HttpRequestBody, options: Models.PathUpdateOptionalParams, callback: coreHttp.ServiceCallback): void; + update(action: Models.PathUpdateAction, mode: Models.PathSetAccessControlRecursiveMode, body: coreHttp.HttpRequestBody, options?: Models.PathUpdateOptionalParams | coreHttp.ServiceCallback, callback?: coreHttp.ServiceCallback): Promise { return this.client.sendOperationRequest( { action, + mode, body, options }, @@ -286,22 +299,35 @@ export class PathOperations { /** * Set the access control list for a path and subpaths. + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param [options] The optional parameters * @returns Promise */ - setAccessControlRecursive(options?: Models.PathSetAccessControlRecursiveOptionalParams): Promise; + setAccessControlRecursive(mode: Models.PathSetAccessControlRecursiveMode, options?: Models.PathSetAccessControlRecursiveOptionalParams): Promise; /** + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param callback The callback */ - setAccessControlRecursive(callback: coreHttp.ServiceCallback): void; + setAccessControlRecursive(mode: Models.PathSetAccessControlRecursiveMode, callback: coreHttp.ServiceCallback): void; /** + * @param mode Mode "set" sets POSIX access control rights on files and directories, "modify" + * modifies one or more POSIX access control rights that pre-exist on files and directories, + * "remove" removes one or more POSIX access control rights that were present earlier on files and + * directories. Possible values include: 'set', 'modify', 'remove' * @param options The optional parameters * @param callback The callback */ - setAccessControlRecursive(options: Models.PathSetAccessControlRecursiveOptionalParams, callback: coreHttp.ServiceCallback): void; - setAccessControlRecursive(options?: Models.PathSetAccessControlRecursiveOptionalParams | coreHttp.ServiceCallback, callback?: coreHttp.ServiceCallback): Promise { + setAccessControlRecursive(mode: Models.PathSetAccessControlRecursiveMode, options: Models.PathSetAccessControlRecursiveOptionalParams, callback: coreHttp.ServiceCallback): void; + setAccessControlRecursive(mode: Models.PathSetAccessControlRecursiveMode, options?: Models.PathSetAccessControlRecursiveOptionalParams | coreHttp.ServiceCallback, callback?: coreHttp.ServiceCallback): Promise { return this.client.sendOperationRequest( { + mode, options }, setAccessControlRecursiveOperationSpec, diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index 92183357423c..afa1ac998ad7 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -22,7 +22,10 @@ export { ServiceListContainersSegmentResponse, Lease, LeaseOperationOptions, - LeaseOperationResponse + LeaseOperationResponse, + BlobExpiryMode as FileExpiryMode, + BlobSetExpiryResponse as FileSetExpiryResponse, + BlobSetExpiryOptions as FileSetExpiryOptions } from "@azure/storage-blob"; export { @@ -262,12 +265,12 @@ export interface SignedIdentifier { export type FileSystemGetAccessPolicyResponse = { signedIdentifiers: SignedIdentifier[]; } & FileSystemGetAccessPolicyHeaders & { - _response: HttpResponse & { - parsedHeaders: FileSystemGetAccessPolicyHeaders; - bodyAsText: string; - parsedBody: SignedIdentifier[]; + _response: HttpResponse & { + parsedHeaders: FileSystemGetAccessPolicyHeaders; + bodyAsText: string; + parsedBody: SignedIdentifier[]; + }; }; -}; export interface FileSystemSetAccessPolicyOptions extends CommonOptions { abortSignal?: AbortSignalLike; @@ -354,7 +357,7 @@ export interface Metadata { export interface DataLakeRequestConditions extends ModifiedAccessConditions, - LeaseAccessConditions { } + LeaseAccessConditions {} export interface RolePermissions { read: boolean; @@ -488,6 +491,11 @@ export interface PathGetPropertiesHeaders { accessTierInferred?: boolean; archiveStatus?: string; accessTierChangedOn?: Date; + + /** + * The time the file will expire. + */ + expiresOn?: Date; } export type PathGetPropertiesResponse = PathGetPropertiesHeaders & { @@ -593,9 +601,9 @@ export interface PathExistsOptions extends CommonOptions { /** DataLakeDirectoryClient option and response related models **/ /****************************************************************/ -export interface DirectoryCreateOptions extends PathCreateOptions { } +export interface DirectoryCreateOptions extends PathCreateOptions {} -export interface DirectoryCreateResponse extends PathCreateResponse { } +export interface DirectoryCreateResponse extends PathCreateResponse {} /***********************************************************/ /** DataLakeFileClient option and response related models **/ @@ -667,9 +675,9 @@ export interface FileFlushOptions extends CommonOptions { pathHttpHeaders?: PathHttpHeaders; } -export interface FileCreateOptions extends PathCreateOptions { } +export interface FileCreateOptions extends PathCreateOptions {} -export interface FileCreateResponse extends PathCreateResponse { } +export interface FileCreateResponse extends PathCreateResponse {} /** * Option interface for Data Lake file - Upload operations diff --git a/sdk/storage/storage-file-datalake/swagger/README.md b/sdk/storage/storage-file-datalake/swagger/README.md index b991f690b2b5..61c6cc200ddf 100644 --- a/sdk/storage/storage-file-datalake/swagger/README.md +++ b/sdk/storage/storage-file-datalake/swagger/README.md @@ -93,6 +93,7 @@ directive: ``` ### Rename eTag -> etag + ``` yaml directive: - from: swagger-document @@ -104,3 +105,13 @@ directive: transform: > $["x-ms-client-name"] = "etag"; ``` + +### workaround: adding parameter location for `PathSetAccessControlRecursiveMode` + +``` yaml +directive: +- from: swagger-document + where: $["parameters"].PathSetAccessControlRecursiveMode + transform: > + $["x-ms-parameter-location"] = "method"; +``` diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index 0fbc917c0b8f..b9b1666085dc 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -1,5 +1,5 @@ import { AbortController } from "@azure/abort-controller"; -import { isNode, URLBuilder } from "@azure/core-http"; +import { isNode, URLBuilder, delay } from "@azure/core-http"; import { setTracer, SpanGraph, TestTracer } from "@azure/core-tracing"; import { record } from "@azure/test-utils-recorder"; import * as assert from "assert"; @@ -332,4 +332,52 @@ describe("DataLakePathClient", () => { const dirResult = await newDirectoryClient.exists(); assert.ok(dirResult === false, "exists() should return false for a non-existing directory"); }); + + it("set expiry - NeverExpire", async () => { + await fileClient.setExpiry("NeverExpire"); + const getRes = await fileClient.getProperties(); + assert.equal(getRes.expiresOn, undefined); + }); + + it("set expiry - Absolute", async () => { + const now = recorder.newDate("now"); + const delta = 5 * 1000; + const later = new Date(now.getTime() + delta); + const expiresOn = later.toUTCString(); + await fileClient.setExpiry("Absolute", { expiresOn }); + + const getRes = await fileClient.getProperties(); + assert.equal(getRes.expiresOn?.getTime(), new Date(expiresOn).getTime()); // milliseconds dropped + + await delay(delta); + assert.ok(!(await fileClient.exists())); + }); + + it("set expiry - RelativeToNow", async () => { + const delta = 1000; + await fileClient.setExpiry("RelativeToNow", { expiresOn: delta.toString() }); + + await delay(delta); + assert.ok(!(await fileClient.exists())); + }); + + it("set expiry - RelativeToCreation", async () => { + const delta = 1000 * 3600; + await fileClient.setExpiry("RelativeToCreation", { expiresOn: delta.toString() }); + + const getRes = await fileClient.getProperties(); + assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); + }); + + it("set expiry - override", async () => { + const delta = 1000 * 3600; + await fileClient.setExpiry("RelativeToCreation", { expiresOn: delta.toString() }); + + const getRes = await fileClient.getProperties(); + assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); + + await fileClient.setExpiry("NeverExpire"); + const getRes2 = await fileClient.getProperties(); + assert.equal(getRes2.expiresOn, undefined); + }); }); From 7b3707475bb1c23009225bf3a74e1134a3158adc Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 16 Jun 2020 19:38:14 +0800 Subject: [PATCH 02/10] add check for input --- sdk/storage/storage-blob/src/Clients.ts | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/sdk/storage/storage-blob/src/Clients.ts b/sdk/storage/storage-blob/src/Clients.ts index c812ad8fe566..ab5f3ae17522 100644 --- a/sdk/storage/storage-blob/src/Clients.ts +++ b/sdk/storage/storage-blob/src/Clients.ts @@ -958,8 +958,10 @@ export interface BlobSetExpiryOptions extends CommonOptions { abortSignal?: AbortSignalLike; /** - * The time to set the blob to expiry. Number of milliseconds elapsed from the relative time + * The time to set the blob to expiry. Number of milliseconds elapsed from the relative time in decimal string * or absolute time in RFC 1123 Format. + * When specifying the number, it should be no greater than the maximum value of UINT64. + * When specifying time, an expiry time in the past is not allowed. * * @type {string} * @memberof BlobSetExpiryOptions @@ -1576,6 +1578,39 @@ export class BlobClient extends StorageClient { ): Promise { const { span, spanOptions } = createSpan("BlobClient-setExpiry", options.tracingOptions); try { + if (mode === "NeverExpire" && options.expiresOn) { + throw new Error(`Shouldn't specify options.expiresOn when using mode ${mode}`); + } + if (!options.expiresOn && mode !== "NeverExpire") { + throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); + } + + if (mode === "RelativeToNow" || mode === "RelativeToCreation") { + const regexp = /^\d+$/; + if (!regexp.test(options.expiresOn!)) { + throw new Error( + `options.expiresOn should be the number of milliseconds elapsed from the relative time in decimal string when using mode ${mode}, but is ${options.expiresOn}` + ); + } + // MINOR: need check against <= 2**64, but JS number has the precision problem. + } + if (mode === "Absolute") { + const expiresOn = new Date(options.expiresOn!); + if (isNaN(expiresOn.getTime())) { + throw new Error( + `options.expiresOn should be a time string when using mode ${mode}, but is ${options.expiresOn}` + ); + } + const now = new Date(); + if (expiresOn.getTime() <= now.getTime()) { + throw new Error( + `options.expiresOn should be later than now ${now.toUTCString()} when using mode ${mode}, but is ${ + options.expiresOn + }` + ); + } + } + return await this.blobContext.setExpiry(mode, { ...options, tracingOptions: { ...options.tracingOptions, spanOptions } From 35ee8294fadef795ac50e32da271e0e21de6bfaf Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 17 Jun 2020 19:47:04 +0800 Subject: [PATCH 03/10] use Date instead of a time string --- sdk/storage/storage-blob/src/Clients.ts | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sdk/storage/storage-blob/src/Clients.ts b/sdk/storage/storage-blob/src/Clients.ts index ab5f3ae17522..b49288319f02 100644 --- a/sdk/storage/storage-blob/src/Clients.ts +++ b/sdk/storage/storage-blob/src/Clients.ts @@ -958,15 +958,18 @@ export interface BlobSetExpiryOptions extends CommonOptions { abortSignal?: AbortSignalLike; /** - * The time to set the blob to expiry. Number of milliseconds elapsed from the relative time in decimal string - * or absolute time in RFC 1123 Format. + * The time to set the blob to expiry, used in combination with {@link BlobExpiryMode}. + * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time, in decimal string. + * when using 'Absolute', should be a valid time. + * When using 'NeverExpire', it shouldn't be provided. + * * When specifying the number, it should be no greater than the maximum value of UINT64. * When specifying time, an expiry time in the past is not allowed. * - * @type {string} + * @type {string | Date} * @memberof BlobSetExpiryOptions */ - expiresOn?: string; + expiresOn?: string | Date; } /** @@ -1584,10 +1587,9 @@ export class BlobClient extends StorageClient { if (!options.expiresOn && mode !== "NeverExpire") { throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); } - if (mode === "RelativeToNow" || mode === "RelativeToCreation") { const regexp = /^\d+$/; - if (!regexp.test(options.expiresOn!)) { + if (typeof options.expiresOn !== "string" || !regexp.test(options.expiresOn!)) { throw new Error( `options.expiresOn should be the number of milliseconds elapsed from the relative time in decimal string when using mode ${mode}, but is ${options.expiresOn}` ); @@ -1595,24 +1597,23 @@ export class BlobClient extends StorageClient { // MINOR: need check against <= 2**64, but JS number has the precision problem. } if (mode === "Absolute") { - const expiresOn = new Date(options.expiresOn!); - if (isNaN(expiresOn.getTime())) { + if (typeof options.expiresOn === "string") { throw new Error( - `options.expiresOn should be a time string when using mode ${mode}, but is ${options.expiresOn}` + `options.expiresOn should be a valid time when using mode ${mode}, but is ${options.expiresOn}` ); } const now = new Date(); - if (expiresOn.getTime() <= now.getTime()) { + if (options.expiresOn!.getTime() <= now.getTime()) { throw new Error( - `options.expiresOn should be later than now ${now.toUTCString()} when using mode ${mode}, but is ${ - options.expiresOn - }` + `options.expiresOn should be later than now: ${now.toUTCString()} when using mode ${mode}, but is ${options.expiresOn?.toUTCString()}` ); } + options.expiresOn = options.expiresOn?.toUTCString(); } + const adaptedOptions = { ...options, expiresOn: options.expiresOn as string }; return await this.blobContext.setExpiry(mode, { - ...options, + ...adaptedOptions, tracingOptions: { ...options.tracingOptions, spanOptions } }); } catch (e) { From aa9266aa714991710f44a5dbfb347e9f5a1eeaac Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 17 Jun 2020 21:14:58 +0800 Subject: [PATCH 04/10] call blob endpoint directly in datalake --- .../package.json | 2 +- .../storage-blob/review/storage-blob.api.md | 29 --- sdk/storage/storage-blob/src/Clients.ts | 96 +------- .../storage-blob/src/generatedModels.ts | 5 +- .../recording_set_expiry__absolute.json | 96 ++++---- .../recording_set_expiry__neverexpire.json | 84 +++---- .../recording_set_expiry__override.json | 112 ++++----- ...ording_set_expiry__relativetocreation.json | 86 +++---- .../recording_set_expiry__relativetonow.json | 78 +++--- .../recording_set_expiry__absolute.js | 188 ++++++++------- .../recording_set_expiry__neverexpire.js | 166 +++++++------ .../recording_set_expiry__override.js | 226 ++++++++++-------- ...ecording_set_expiry__relativetocreation.js | 168 +++++++------ .../recording_set_expiry__relativetonow.js | 152 ++++++------ .../review/storage-file-datalake.api.md | 40 +++- .../src/StorageClient.ts | 19 ++ .../storage-file-datalake/src/clients.ts | 47 +++- .../storage-file-datalake/src/models.ts | 41 +++- .../test/pathclient.spec.ts | 20 +- 19 files changed, 863 insertions(+), 792 deletions(-) diff --git a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json index 427a4f1c9da9..324463e05afa 100644 --- a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json +++ b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json @@ -61,7 +61,7 @@ "dependencies": { "@azure/event-hubs": "^5.0.0", "@azure/logger": "^1.0.0", - "@azure/storage-blob": "^12.1.2", + "@azure/storage-blob": "^12.2.0-preview.1", "events": "^3.0.0", "tslib": "^2.0.0" }, diff --git a/sdk/storage/storage-blob/review/storage-blob.api.md b/sdk/storage/storage-blob/review/storage-blob.api.md index bd4648e63493..3594b8ea9b76 100644 --- a/sdk/storage/storage-blob/review/storage-blob.api.md +++ b/sdk/storage/storage-blob/review/storage-blob.api.md @@ -379,7 +379,6 @@ export class BlobClient extends StorageClient { getTags(options?: BlobGetTagsOptions): Promise; get name(): string; setAccessTier(tier: BlockBlobTier | PremiumPageBlobTier | string, options?: BlobSetTierOptions): Promise; - setExpiry(mode: BlobExpiryMode, options?: BlobSetExpiryOptions): Promise; setHTTPHeaders(blobHTTPHeaders?: BlobHTTPHeaders, options?: BlobSetHTTPHeadersOptions): Promise; setMetadata(metadata?: Metadata, options?: BlobSetMetadataOptions): Promise; setTags(tags: Tags, options?: BlobSetTagsOptions): Promise; @@ -572,9 +571,6 @@ export interface BlobExistsOptions extends CommonOptions { customerProvidedKey?: CpkInfo; } -// @public -export type BlobExpiryMode = 'NeverExpire' | 'RelativeToCreation' | 'RelativeToNow' | 'Absolute'; - // @public export interface BlobFlatListSegment { // (undocumented) @@ -934,31 +930,6 @@ export interface BlobServiceStatistics { geoReplication?: GeoReplication; } -// @public -export interface BlobSetExpiryHeaders { - clientRequestId?: string; - date?: Date; - // (undocumented) - errorCode?: string; - etag?: string; - lastModified?: Date; - requestId?: string; - version?: string; -} - -// @public -export interface BlobSetExpiryOptions extends CommonOptions { - abortSignal?: AbortSignalLike; - expiresOn?: string; -} - -// @public -export type BlobSetExpiryResponse = BlobSetExpiryHeaders & { - _response: coreHttp.HttpResponse & { - parsedHeaders: BlobSetExpiryHeaders; - }; -}; - // @public export interface BlobSetHTTPHeadersHeaders { blobSequenceNumber?: number; diff --git a/sdk/storage/storage-blob/src/Clients.ts b/sdk/storage/storage-blob/src/Clients.ts index b49288319f02..63130bbf6ae0 100644 --- a/sdk/storage/storage-blob/src/Clients.ts +++ b/sdk/storage/storage-blob/src/Clients.ts @@ -89,9 +89,7 @@ import { ContainerListBlobFlatSegmentHeaders, BlobProperties, ContainerListBlobHierarchySegmentHeaders, - ListBlobsHierarchySegmentResponseModel, - BlobSetExpiryResponse, - BlobExpiryMode + ListBlobsHierarchySegmentResponseModel } from "./generatedModels"; import { AppendBlobRequestConditions, @@ -941,37 +939,6 @@ export interface BlobDownloadToBufferOptions extends CommonOptions { customerProvidedKey?: CpkInfo; } -/** - * Option interface for the {@link BlobClient.setExpiry} operation. - * - * @export - * @interface BlobSetExpiryOptions - */ -export interface BlobSetExpiryOptions extends CommonOptions { - /** - * An implementation of the `AbortSignalLike` interface to signal the request to cancel the operation. - * For example, use the @azure/abort-controller to create an `AbortSignal`. - * - * @type {AbortSignalLike} - * @memberof BlobSetExpiryOptions - */ - abortSignal?: AbortSignalLike; - - /** - * The time to set the blob to expiry, used in combination with {@link BlobExpiryMode}. - * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time, in decimal string. - * when using 'Absolute', should be a valid time. - * When using 'NeverExpire', it shouldn't be provided. - * - * When specifying the number, it should be no greater than the maximum value of UINT64. - * When specifying time, an expiry time in the past is not allowed. - * - * @type {string | Date} - * @memberof BlobSetExpiryOptions - */ - expiresOn?: string | Date; -} - /** * A BlobClient represents a URL to an Azure Storage blob; the blob may be a block blob, * append blob, or page blob. @@ -1566,67 +1533,6 @@ export class BlobClient extends StorageClient { } } - /** - * Sets an expiry time on a blob, once that time is met the blob is deleted. - * Only supported in accounts that have a hierarchical namespace (Azure Data Lake Storage Gen2). - * - * @param {BlobExpiryMode} mode - * @param {BlobSetExpiryOptions} [options={}] - * @returns {Promise} - * @memberof BlobClient - */ - public async setExpiry( - mode: BlobExpiryMode, - options: BlobSetExpiryOptions = {} - ): Promise { - const { span, spanOptions } = createSpan("BlobClient-setExpiry", options.tracingOptions); - try { - if (mode === "NeverExpire" && options.expiresOn) { - throw new Error(`Shouldn't specify options.expiresOn when using mode ${mode}`); - } - if (!options.expiresOn && mode !== "NeverExpire") { - throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); - } - if (mode === "RelativeToNow" || mode === "RelativeToCreation") { - const regexp = /^\d+$/; - if (typeof options.expiresOn !== "string" || !regexp.test(options.expiresOn!)) { - throw new Error( - `options.expiresOn should be the number of milliseconds elapsed from the relative time in decimal string when using mode ${mode}, but is ${options.expiresOn}` - ); - } - // MINOR: need check against <= 2**64, but JS number has the precision problem. - } - if (mode === "Absolute") { - if (typeof options.expiresOn === "string") { - throw new Error( - `options.expiresOn should be a valid time when using mode ${mode}, but is ${options.expiresOn}` - ); - } - const now = new Date(); - if (options.expiresOn!.getTime() <= now.getTime()) { - throw new Error( - `options.expiresOn should be later than now: ${now.toUTCString()} when using mode ${mode}, but is ${options.expiresOn?.toUTCString()}` - ); - } - options.expiresOn = options.expiresOn?.toUTCString(); - } - - const adaptedOptions = { ...options, expiresOn: options.expiresOn as string }; - return await this.blobContext.setExpiry(mode, { - ...adaptedOptions, - tracingOptions: { ...options.tracingOptions, spanOptions } - }); - } catch (e) { - span.setStatus({ - code: CanonicalCode.UNKNOWN, - message: e.message - }); - throw e; - } finally { - span.end(); - } - } - /** * Sets user-defined metadata for the specified blob as one or more name-value pairs. * diff --git a/sdk/storage/storage-blob/src/generatedModels.ts b/sdk/storage/storage-blob/src/generatedModels.ts index 89802fb13742..309d24270976 100644 --- a/sdk/storage/storage-blob/src/generatedModels.ts +++ b/sdk/storage/storage-blob/src/generatedModels.ts @@ -142,8 +142,5 @@ export { UserDelegationKey as UserDelegationKeyModel, ContainerEncryptionScope, ServiceFilterBlobsResponse as ServiceFindBlobsByTagsSegmentResponse, - FilterBlobItem, - BlobSetExpiryResponse, - BlobExpiryOptions as BlobExpiryMode, - BlobSetExpiryHeaders + FilterBlobItem } from "./generated/src/models"; diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json index 724bd061601f..65d4f909e2da 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__absolute.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239957549208271", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:36 GMT", - "etag": "\"0x8D811DE5A580C93\"", - "last-modified": "Tue, 16 Jun 2020 10:16:36 GMT", + "date": "Wed, 17 Jun 2020 13:12:55 GMT", + "etag": "\"0x8D812C02659726A\"", + "last-modified": "Wed, 17 Jun 2020 13:12:55 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "81f88cf6-310b-4baf-9759-952abbe4db60", - "x-ms-request-id": "e5fc48ee-401e-0052-3bc7-435941000000", + "x-ms-client-request-id": "d113ba6d-389a-4183-93a9-b524be8c9ddd", + "x-ms-request-id": "6ba7aa3f-e01e-0029-46a9-441bdd000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:36 GMT", - "etag": "\"0x8D811DE5AB05A11\"", - "last-modified": "Tue, 16 Jun 2020 10:16:37 GMT", + "date": "Wed, 17 Jun 2020 13:12:55 GMT", + "etag": "\"0x8D812C026B2FFFF\"", + "last-modified": "Wed, 17 Jun 2020 13:12:56 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "5a3a281c-ccd9-4d1c-b34f-6ae0fc31096c", - "x-ms-request-id": "3bbf9f6d-601f-0018-5bc7-43face000000", + "x-ms-client-request-id": "b08de4a7-8bd2-448f-99e7-208ce3fd9781", + "x-ms-request-id": "f3d5a328-101f-0002-31a9-449b11000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:37 GMT", + "date": "Wed, 17 Jun 2020 13:12:56 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "29607469-ac51-4e8a-a6d4-09fb018f3e9d", - "x-ms-request-id": "3bbf9f71-601f-0018-5fc7-43face000000", + "x-ms-client-request-id": "be015a43-db81-4565-9efb-ae805883c497", + "x-ms-request-id": "f3d5a32a-101f-0002-33a9-449b11000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:37 GMT", - "etag": "\"0x8D811DE5B5CCDCC\"", - "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "date": "Wed, 17 Jun 2020 13:12:56 GMT", + "etag": "\"0x8D812C02766EFF0\"", + "last-modified": "Wed, 17 Jun 2020 13:12:57 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "93ef5651-70e7-4c02-889c-f02ea20e0ca5", - "x-ms-request-id": "3bbf9f73-601f-0018-61c7-43face000000", + "x-ms-client-request-id": "c3fc78ff-d8c7-42d7-9cd4-c3165d322c87", + "x-ms-request-id": "f3d5a32e-101f-0002-37a9-449b11000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:38 GMT", - "etag": "\"0x8D811DE5B5CCDCC\"", - "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "date": "Wed, 17 Jun 2020 13:12:57 GMT", + "etag": "\"0x8D812C02766EFF0\"", + "last-modified": "Wed, 17 Jun 2020 13:12:57 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "048426e3-9c9d-492d-9ea4-31a8662a490d", - "x-ms-request-id": "e5fc49c1-401e-0052-7ac7-435941000000", + "x-ms-client-request-id": "ba0c89c7-29b3-4560-9b09-ccecd898f9bd", + "x-ms-request-id": "6ba7ab58-e01e-0029-40a9-441bdd000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": {}, "requestBody": null, "status": 200, @@ -113,43 +113,43 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Tue, 16 Jun 2020 10:16:38 GMT", - "etag": "\"0x8D811DE5B5CCDCC\"", - "last-modified": "Tue, 16 Jun 2020 10:16:38 GMT", + "date": "Wed, 17 Jun 2020 13:12:58 GMT", + "etag": "\"0x8D812C02766EFF0\"", + "last-modified": "Wed, 17 Jun 2020 13:12:57 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "44bb5640-21b8-4519-b9f6-a8fd7cfd57d7", - "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:37 GMT", - "x-ms-expiry-time": "Tue, 16 Jun 2020 10:16:43 GMT", + "x-ms-client-request-id": "7fd74207-670a-4f31-b6b4-fae4f90f128b", + "x-ms-creation-time": "Wed, 17 Jun 2020 13:12:56 GMT", + "x-ms-expiry-time": "Wed, 17 Jun 2020 13:13:02 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "e5fc49e6-401e-0052-17c7-435941000000", + "x-ms-request-id": "6ba7ab83-e01e-0029-67a9-441bdd000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500/file159230259717705171", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239957549208271/file159239957607304880", "query": {}, "requestBody": null, "status": 404, "response": "", "responseHeaders": { - "date": "Tue, 16 Jun 2020 10:16:44 GMT", + "date": "Wed, 17 Jun 2020 13:13:04 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "x-ms-client-request-id": "75cc2c4c-8fe9-461d-812c-4e95d4a50725", + "x-ms-client-request-id": "9938eeef-13d7-4aae-84c0-6b6363bfc623", "x-ms-error-code": "BlobNotFound", - "x-ms-request-id": "e5fc4b7e-401e-0052-78c7-435941000000", + "x-ms-request-id": "fc7e7cd6-201e-0044-41a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259660502500", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239957549208271", "query": { "restype": "container" }, @@ -158,22 +158,22 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:45 GMT", + "date": "Wed, 17 Jun 2020 13:13:05 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "c3b64267-6eaa-4a20-97e9-b695d7dcdd2e", - "x-ms-request-id": "e5fc4bb3-401e-0052-23c7-435941000000", + "x-ms-client-request-id": "9674e2eb-72e8-4731-ba82-cd1317169c85", + "x-ms-request-id": "fc7e7cf1-201e-0044-54a9-44af96000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159230259660502500", - "file": "file159230259717705171" + "filesystem": "filesystem159239957549208271", + "file": "file159239957607304880" }, "newDate": { - "now": "2020-06-16T10:16:38.876Z" + "now": "2020-06-17T13:12:57.832Z" } }, - "hash": "e789caba0e4e0fb5e34f6e82577a0979" + "hash": "b0e53f88c4a0a0813ccba008a92d426d" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json index 5bc158b0190f..1568edbf97b8 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__neverexpire.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239956833708016", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:31 GMT", - "etag": "\"0x8D811DE5758F60E\"", - "last-modified": "Tue, 16 Jun 2020 10:16:31 GMT", + "date": "Wed, 17 Jun 2020 13:12:49 GMT", + "etag": "\"0x8D812C022C2586D\"", + "last-modified": "Wed, 17 Jun 2020 13:12:49 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "00ce46f6-acb6-4da2-8cdf-df2b8d530995", - "x-ms-request-id": "e5fc4784-401e-0052-03c7-435941000000", + "x-ms-client-request-id": "838e0ace-c89c-4548-891b-af02661fd427", + "x-ms-request-id": "21918a50-c01e-0063-1ba9-44b852000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239956833708016/file159239957007507452", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:32 GMT", - "etag": "\"0x8D811DE584B99C0\"", - "last-modified": "Tue, 16 Jun 2020 10:16:33 GMT", + "date": "Wed, 17 Jun 2020 13:12:50 GMT", + "etag": "\"0x8D812C023B4A8A3\"", + "last-modified": "Wed, 17 Jun 2020 13:12:51 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "f4a7dd5e-4e5e-4c8d-8729-a06a4ad56164", - "x-ms-request-id": "3bbf9f63-601f-0018-54c7-43face000000", + "x-ms-client-request-id": "bc8508df-4d74-4161-bafc-08b70fc4b15c", + "x-ms-request-id": "f3d5a31e-101f-0002-2ba9-449b11000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239956833708016/file159239957007507452", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:33 GMT", + "date": "Wed, 17 Jun 2020 13:12:51 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "e4d5446b-8f9d-4c11-a4db-fb4b1fe3c3f0", - "x-ms-request-id": "3bbf9f65-601f-0018-56c7-43face000000", + "x-ms-client-request-id": "a652f82a-6d78-4328-a6fe-94e7da120872", + "x-ms-request-id": "f3d5a320-101f-0002-2da9-449b11000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230259056205555/file159230259216907212", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239956833708016/file159239957007507452", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:33 GMT", - "etag": "\"0x8D811DE58F8BFEB\"", - "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "date": "Wed, 17 Jun 2020 13:12:51 GMT", + "etag": "\"0x8D812C02465CAE5\"", + "last-modified": "Wed, 17 Jun 2020 13:12:52 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "eabd8382-a2b2-47cb-8678-45b3787d46c4", - "x-ms-request-id": "3bbf9f69-601f-0018-58c7-43face000000", + "x-ms-client-request-id": "07a6fc49-5fad-464f-bcf6-b0f279bb0a88", + "x-ms-request-id": "f3d5a322-101f-0002-2fa9-449b11000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555/file159230259216907212", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239956833708016/file159239957007507452", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:34 GMT", - "etag": "\"0x8D811DE58F8BFEB\"", - "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "date": "Wed, 17 Jun 2020 13:12:53 GMT", + "etag": "\"0x8D812C02465CAE5\"", + "last-modified": "Wed, 17 Jun 2020 13:12:52 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "bc52799d-1fbf-4060-893d-fc7779645743", - "x-ms-request-id": "e5fc4870-401e-0052-4ac7-435941000000", + "x-ms-client-request-id": "c2bf3445-ae98-470c-a10c-beb27c18bafb", + "x-ms-request-id": "6ba7a955-e01e-0029-01a9-441bdd000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555/file159230259216907212", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239956833708016/file159239957007507452", "query": {}, "requestBody": null, "status": 200, @@ -113,25 +113,25 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Tue, 16 Jun 2020 10:16:34 GMT", - "etag": "\"0x8D811DE58F8BFEB\"", - "last-modified": "Tue, 16 Jun 2020 10:16:34 GMT", + "date": "Wed, 17 Jun 2020 13:12:54 GMT", + "etag": "\"0x8D812C02465CAE5\"", + "last-modified": "Wed, 17 Jun 2020 13:12:52 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "3ffaa511-21a5-448d-912a-3d4a4dcb9af5", - "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:33 GMT", + "x-ms-client-request-id": "eac4a0aa-32e8-4edb-bce8-9ab7027e82a8", + "x-ms-creation-time": "Wed, 17 Jun 2020 13:12:51 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "e5fc4897-401e-0052-6cc7-435941000000", + "x-ms-request-id": "6ba7a99d-e01e-0029-3ba9-441bdd000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230259056205555", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239956833708016", "query": { "restype": "container" }, @@ -140,20 +140,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:35 GMT", + "date": "Wed, 17 Jun 2020 13:12:54 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "d9b2be7f-a95d-477f-81ad-2d5eaca7d2bd", - "x-ms-request-id": "e5fc48be-401e-0052-11c7-435941000000", + "x-ms-client-request-id": "1114e467-b86f-4ab6-bde1-9eb2acb1dd4d", + "x-ms-request-id": "6ba7aa08-e01e-0029-18a9-441bdd000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159230259056205555", - "file": "file159230259216907212" + "filesystem": "filesystem159239956833708016", + "file": "file159239957007507452" }, "newDate": {} }, - "hash": "853f7f287f9eb69e7b12aee489e5d061" + "hash": "c6d159241838e22eddeb2accb80cf720" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json index 2c82cb68e98b..b36066b032d4 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:54 GMT", - "etag": "\"0x8D811DE65771E44\"", - "last-modified": "Tue, 16 Jun 2020 10:16:55 GMT", + "date": "Wed, 17 Jun 2020 13:13:16 GMT", + "etag": "\"0x8D812C032E4FF38\"", + "last-modified": "Wed, 17 Jun 2020 13:13:16 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "207b0e8d-0879-4c71-8cfb-b027e8016462", - "x-ms-request-id": "e5fc4ea8-401e-0052-23c7-435941000000", + "x-ms-client-request-id": "63865c37-6e43-4bcf-abd0-3da07ffbf6f1", + "x-ms-request-id": "fc7e7ec7-201e-0044-3ba9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:55 GMT", - "etag": "\"0x8D811DE65CF8FC7\"", - "last-modified": "Tue, 16 Jun 2020 10:16:56 GMT", + "date": "Wed, 17 Jun 2020 13:13:16 GMT", + "etag": "\"0x8D812C033456F50\"", + "last-modified": "Wed, 17 Jun 2020 13:13:17 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "96e437bc-dfe6-41e8-91bb-7c3cd450dc83", - "x-ms-request-id": "3bbf9f96-601f-0018-75c7-43face000000", + "x-ms-client-request-id": "a1f8bf62-d0b4-4510-8192-67b1e779412c", + "x-ms-request-id": "e91cdaac-401f-0052-58a9-445941000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:55 GMT", + "date": "Wed, 17 Jun 2020 13:13:17 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "a7dc949e-965d-4303-9bf0-6aeeb501a3c5", - "x-ms-request-id": "3bbf9f98-601f-0018-77c7-43face000000", + "x-ms-client-request-id": "79192352-af79-46fc-ba4a-84d89a884d66", + "x-ms-request-id": "e91cdaae-401f-0052-5aa9-445941000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:56 GMT", - "etag": "\"0x8D811DE667B4FA1\"", - "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "date": "Wed, 17 Jun 2020 13:13:18 GMT", + "etag": "\"0x8D812C033F9661C\"", + "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "b0a6e0b0-e655-4475-b452-f7b44eac5cf7", - "x-ms-request-id": "3bbf9f9a-601f-0018-79c7-43face000000", + "x-ms-client-request-id": "7a346a72-c623-4b2d-829e-a964e38a5d52", + "x-ms-request-id": "e91cdab0-401f-0052-5ca9-445941000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:56 GMT", - "etag": "\"0x8D811DE667B4FA1\"", - "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "date": "Wed, 17 Jun 2020 13:13:18 GMT", + "etag": "\"0x8D812C033F9661C\"", + "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "a1c6e077-dc3e-46d9-8d96-451bed057908", - "x-ms-request-id": "e5fc4f3c-401e-0052-29c7-435941000000", + "x-ms-client-request-id": "e141d29a-8f8c-4470-a61c-955999e250aa", + "x-ms-request-id": "fc7e7f33-201e-0044-15a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": {}, "requestBody": null, "status": 200, @@ -113,26 +113,26 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Tue, 16 Jun 2020 10:16:57 GMT", - "etag": "\"0x8D811DE667B4FA1\"", - "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "date": "Wed, 17 Jun 2020 13:13:19 GMT", + "etag": "\"0x8D812C033F9661C\"", + "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "2b2501aa-4855-4637-93fd-a69f35e36bd4", - "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:56 GMT", - "x-ms-expiry-time": "Tue, 16 Jun 2020 11:16:56 GMT", + "x-ms-client-request-id": "3215d2c3-3656-4439-907c-b084c01cef69", + "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:17 GMT", + "x-ms-expiry-time": "Wed, 17 Jun 2020 14:13:17 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "e5fc4f66-401e-0052-4dc7-435941000000", + "x-ms-request-id": "fc7e7f51-201e-0044-2ea9-44af96000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": { "comp": "expiry" }, @@ -141,18 +141,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:57 GMT", - "etag": "\"0x8D811DE667B4FA1\"", - "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "date": "Wed, 17 Jun 2020 13:13:19 GMT", + "etag": "\"0x8D812C033F9661C\"", + "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "38319128-052a-47eb-91e9-d66eacd01eeb", - "x-ms-request-id": "e5fc4f80-401e-0052-60c7-435941000000", + "x-ms-client-request-id": "ed30b924-a595-403d-9e5e-83077c87efd8", + "x-ms-request-id": "fc7e7f67-201e-0044-41a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547/file159230261583407272", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", "query": {}, "requestBody": null, "status": 200, @@ -161,25 +161,25 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Tue, 16 Jun 2020 10:16:59 GMT", - "etag": "\"0x8D811DE667B4FA1\"", - "last-modified": "Tue, 16 Jun 2020 10:16:57 GMT", + "date": "Wed, 17 Jun 2020 13:13:20 GMT", + "etag": "\"0x8D812C033F9661C\"", + "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "abe1a1c8-36de-4a0a-b48a-dbfd6974c0fb", - "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:56 GMT", + "x-ms-client-request-id": "98dd8832-eec4-4c11-ab80-8f9e788a8d04", + "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:17 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "e5fc4fa9-401e-0052-07c7-435941000000", + "x-ms-request-id": "fc7e7f77-201e-0044-4ea9-44af96000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261526309547", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841", "query": { "restype": "container" }, @@ -188,20 +188,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:59 GMT", + "date": "Wed, 17 Jun 2020 13:13:20 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "6873d43a-992a-4f55-9d27-8959f1c7a223", - "x-ms-request-id": "e5fc4fd8-401e-0052-31c7-435941000000", + "x-ms-client-request-id": "5c21b861-1762-4aea-9f29-581cd8cc80e0", + "x-ms-request-id": "fc7e7f94-201e-0044-67a9-44af96000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159230261526309547", - "file": "file159230261583407272" + "filesystem": "filesystem159239959650105841", + "file": "file159239959711904136" }, "newDate": {} }, - "hash": "aedfa3555fb2b440c743c84d0d097173" + "hash": "7e403158f9065969210a628f4457e9a4" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json index 9ed953425712..a4f1c64d5e52 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:50 GMT", - "etag": "\"0x8D811DE6312F92F\"", - "last-modified": "Tue, 16 Jun 2020 10:16:51 GMT", + "date": "Wed, 17 Jun 2020 13:13:12 GMT", + "etag": "\"0x8D812C03069601B\"", + "last-modified": "Wed, 17 Jun 2020 13:13:12 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "00d5e9d9-07a7-483b-96ce-4d57bcac84c6", - "x-ms-request-id": "e5fc4d5d-401e-0052-05c7-435941000000", + "x-ms-client-request-id": "2baea5ba-04eb-44d1-a1bf-670a375f8736", + "x-ms-request-id": "fc7e7df2-201e-0044-18a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:51 GMT", - "etag": "\"0x8D811DE636B26E8\"", - "last-modified": "Tue, 16 Jun 2020 10:16:52 GMT", + "date": "Wed, 17 Jun 2020 13:13:12 GMT", + "etag": "\"0x8D812C030C1560E\"", + "last-modified": "Wed, 17 Jun 2020 13:13:13 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "25423b02-b1d8-410c-99d0-60e9f3041f5c", - "x-ms-request-id": "3bbf9f8c-601f-0018-6cc7-43face000000", + "x-ms-client-request-id": "f1bad4b7-187b-418f-89d3-18185ec269f9", + "x-ms-request-id": "e91cdaa1-401f-0052-4fa9-445941000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:51 GMT", + "date": "Wed, 17 Jun 2020 13:13:13 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "d4fd5929-0cac-4981-b306-d38740a6b090", - "x-ms-request-id": "3bbf9f8e-601f-0018-6ec7-43face000000", + "x-ms-client-request-id": "13c896dd-21ab-4582-9b71-c7ac0f8864a5", + "x-ms-request-id": "e91cdaa4-401f-0052-51a9-445941000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230261124904905/file159230261182204515", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:52 GMT", - "etag": "\"0x8D811DE64174145\"", - "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "date": "Wed, 17 Jun 2020 13:13:13 GMT", + "etag": "\"0x8D812C031725DB8\"", + "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "023b1f1a-f597-4edf-8506-1f5732eb8108", - "x-ms-request-id": "3bbf9f91-601f-0018-71c7-43face000000", + "x-ms-client-request-id": "c1ed9151-3291-4583-a080-83bb0be51979", + "x-ms-request-id": "e91cdaa8-401f-0052-55a9-445941000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905/file159230261182204515", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575/file159239959294600831", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:52 GMT", - "etag": "\"0x8D811DE64174145\"", - "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "date": "Wed, 17 Jun 2020 13:13:14 GMT", + "etag": "\"0x8D812C031725DB8\"", + "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "ac459147-9bd5-47d6-af78-d10de8952a59", - "x-ms-request-id": "e5fc4e0b-401e-0052-21c7-435941000000", + "x-ms-client-request-id": "b2a31fa1-cda1-4a48-a4ef-d9439324d744", + "x-ms-request-id": "fc7e7e6f-201e-0044-76a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905/file159230261182204515", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575/file159239959294600831", "query": {}, "requestBody": null, "status": 200, @@ -113,26 +113,26 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Tue, 16 Jun 2020 10:16:53 GMT", - "etag": "\"0x8D811DE64174145\"", - "last-modified": "Tue, 16 Jun 2020 10:16:53 GMT", + "date": "Wed, 17 Jun 2020 13:13:14 GMT", + "etag": "\"0x8D812C031725DB8\"", + "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "ff1871d4-7287-4304-ae4a-abb9b789db1d", - "x-ms-creation-time": "Tue, 16 Jun 2020 10:16:52 GMT", - "x-ms-expiry-time": "Tue, 16 Jun 2020 11:16:52 GMT", + "x-ms-client-request-id": "f6eca054-facf-4fe2-ba5c-3e03822a6de1", + "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:13 GMT", + "x-ms-expiry-time": "Wed, 17 Jun 2020 14:13:13 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "e5fc4e37-401e-0052-46c7-435941000000", + "x-ms-request-id": "fc7e7e88-201e-0044-0ba9-44af96000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230261124904905", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575", "query": { "restype": "container" }, @@ -141,20 +141,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:53 GMT", + "date": "Wed, 17 Jun 2020 13:13:15 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "ac841798-2187-461b-b3d3-266cea7b4b55", - "x-ms-request-id": "e5fc4e68-401e-0052-70c7-435941000000", + "x-ms-client-request-id": "5e1ce747-3cc3-4ee7-b920-6eef40fef260", + "x-ms-request-id": "fc7e7ea1-201e-0044-22a9-44af96000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159230261124904905", - "file": "file159230261182204515" + "filesystem": "filesystem159239959236506575", + "file": "file159239959294600831" }, "newDate": {} }, - "hash": "79893de2c7ad9f366eab9107bef0e14a" + "hash": "67efeafeea1ce73a505450e79e3fd351" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json index 9c4784c46bc3..015b8b6e00d5 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:45 GMT", - "etag": "\"0x8D811DE60196041\"", - "last-modified": "Tue, 16 Jun 2020 10:16:46 GMT", + "date": "Wed, 17 Jun 2020 13:13:05 GMT", + "etag": "\"0x8D812C02CC105EA\"", + "last-modified": "Wed, 17 Jun 2020 13:13:06 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "496bd9f4-b23b-4243-911a-9c4badf7250f", - "x-ms-request-id": "e5fc4bd9-401e-0052-45c7-435941000000", + "x-ms-client-request-id": "3a708218-77bf-4af3-ae0a-3abba30537be", + "x-ms-request-id": "fc7e7d15-201e-0044-6fa9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:46 GMT", - "etag": "\"0x8D811DE60731DB6\"", - "last-modified": "Tue, 16 Jun 2020 10:16:47 GMT", + "date": "Wed, 17 Jun 2020 13:13:07 GMT", + "etag": "\"0x8D812C02DB1AA35\"", + "last-modified": "Wed, 17 Jun 2020 13:13:08 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "3c6591b8-33f3-41fd-b933-3915c78874f1", - "x-ms-request-id": "3bbf9f7c-601f-0018-66c7-43face000000", + "x-ms-client-request-id": "ae962c29-0eba-4d47-b861-bfa0622d0ea9", + "x-ms-request-id": "e91cda9a-401f-0052-49a9-445941000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:46 GMT", + "date": "Wed, 17 Jun 2020 13:13:08 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "15ebd83c-1220-47e2-8c0b-9da55175f4fb", - "x-ms-request-id": "3bbf9f7e-601f-0018-68c7-43face000000", + "x-ms-client-request-id": "a8d1ef61-a08b-4c49-afe2-407ca3f7670d", + "x-ms-request-id": "e91cda9c-401f-0052-4ba9-445941000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159230260625109312/file159230260683203663", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:47 GMT", - "etag": "\"0x8D811DE611EE162\"", - "last-modified": "Tue, 16 Jun 2020 10:16:48 GMT", + "date": "Wed, 17 Jun 2020 13:13:08 GMT", + "etag": "\"0x8D812C02E6271FE\"", + "last-modified": "Wed, 17 Jun 2020 13:13:09 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "81347dab-0763-42a2-86fc-7d5e257b2115", - "x-ms-request-id": "3bbf9f80-601f-0018-6ac7-43face000000", + "x-ms-client-request-id": "92454174-913a-48cc-8fa7-0970857608f2", + "x-ms-request-id": "e91cda9e-401f-0052-4da9-445941000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312/file159230260683203663", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330/file159239958682502424", "query": { "comp": "expiry" }, @@ -93,35 +93,35 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:47 GMT", - "etag": "\"0x8D811DE611EE162\"", - "last-modified": "Tue, 16 Jun 2020 10:16:48 GMT", + "date": "Wed, 17 Jun 2020 13:13:09 GMT", + "etag": "\"0x8D812C02E6271FE\"", + "last-modified": "Wed, 17 Jun 2020 13:13:09 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "fd78da4d-9285-48a4-8f80-eef60a02a287", - "x-ms-request-id": "e5fc4c99-401e-0052-60c7-435941000000", + "x-ms-client-request-id": "2fd1f0d8-efff-4fed-9c45-b3e9401624ba", + "x-ms-request-id": "fc7e7d86-201e-0044-43a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312/file159230260683203663", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330/file159239958682502424", "query": {}, "requestBody": null, "status": 404, "response": "", "responseHeaders": { - "date": "Tue, 16 Jun 2020 10:16:49 GMT", + "date": "Wed, 17 Jun 2020 13:13:10 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "x-ms-client-request-id": "3bc8b2d4-4fda-45e4-a7e1-1fa3d3173f87", + "x-ms-client-request-id": "cacbfa98-bf5a-4df2-9842-5130a7bee86b", "x-ms-error-code": "BlobNotFound", - "x-ms-request-id": "e5fc4d01-401e-0052-39c7-435941000000", + "x-ms-request-id": "fc7e7dcb-201e-0044-79a9-44af96000000", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159230260625109312", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330", "query": { "restype": "container" }, @@ -130,20 +130,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Tue, 16 Jun 2020 10:16:50 GMT", + "date": "Wed, 17 Jun 2020 13:13:11 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "be797657-0367-4dd2-8216-ac902a720740", - "x-ms-request-id": "e5fc4d29-401e-0052-5cc7-435941000000", + "x-ms-client-request-id": "ca84a9e4-4617-45e2-ab9a-263cceaad66e", + "x-ms-request-id": "fc7e7de0-201e-0044-08a9-44af96000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159230260625109312", - "file": "file159230260683203663" + "filesystem": "filesystem159239958619209330", + "file": "file159239958682502424" }, "newDate": {} }, - "hash": "223ed683e7510fa28446a368ffa6cd3c" + "hash": "f9b31212c77fd9db1d2728b76a7ca4b4" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js index c32c83d5346d..369b3c507158 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__absolute.js @@ -1,144 +1,154 @@ let nock = require('nock'); -module.exports.hash = "b1249eef1fa1409ab21b6b727de24370"; +module.exports.hash = "8a1b0b455a3a37375eb859d0bb25954e"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230252342904735","file":"file159230252372302428"},"newDate":{"now":"2020-06-16T10:15:24.591Z"}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239944055201355","file":"file159239944181407133"},"newDate":{"now":"2020-06-17T13:10:45.623Z"}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230252342904735') + .put('/filesystem159239944055201355') .query(true) .reply(201, "", [ - 'Content-Length', + 'content-length', '0', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:23 GMT', - 'ETag', - '"0x8D811DE2E920360"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:41 GMT', + 'etag', + '"0x8D812BFD6512130"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363630c-001e-000e-59c7-430c19000000', + 'd9dce062-401e-0020-77a8-445e0e000000', 'x-ms-client-request-id', - '84fc3c08-348d-4a0a-a1cd-82b3078b6c9b', + '27a0dbd3-f1cb-4426-92d3-0de7f27ea9a4', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:23 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:41 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230252342904735/file159230252372302428') + .put('/filesystem159239944055201355/file159239944181407133') .query(true) .reply(201, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:23 GMT', - 'ETag', - '"0x8D811DE2EBE3E66"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:42 GMT', + 'etag', + '"0x8D812BFD71556C0"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '386419d6-101f-005f-3cc7-439195000000', + '453afe2f-901f-0041-4ca8-447d4d000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'cbca7993-6c7c-43e4-9add-6f8a29bff846', - 'Date', - 'Tue, 16 Jun 2020 10:15:23 GMT', - 'Content-Length', + '06d3f1ca-8245-4728-9597-ea2b89f84dbf', + 'date', + 'Wed, 17 Jun 2020 13:10:42 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230252342904735/file159230252372302428', "Hello World") + .patch('/filesystem159239944055201355/file159239944181407133', "Hello World") .query(true) .reply(202, "", [ - 'Server', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '386419d8-101f-005f-3ec7-439195000000', + 'f1adc691-a01f-0007-45a8-4449ca000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '201cf66a-7bd2-43e5-ad55-677c53d4306e', - 'Date', - 'Tue, 16 Jun 2020 10:15:23 GMT', - 'Content-Length', + '53534a54-ece4-4ae8-a466-7e91a46acedb', + 'date', + 'Wed, 17 Jun 2020 13:10:43 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230252342904735/file159230252372302428') + .patch('/filesystem159239944055201355/file159239944181407133') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:24 GMT', - 'ETag', - '"0x8D811DE2F160E79"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:45 GMT', + 'etag', + '"0x8D812BFD89A13E4"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '386419d9-101f-005f-3fc7-439195000000', + 'b452f2ea-801f-003f-25a8-44ed0a000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'b71be4ca-2a5a-4475-a6e0-b5174f9b9ae4', - 'Date', - 'Tue, 16 Jun 2020 10:15:24 GMT', - 'Content-Length', + '57abdffc-9254-4c5e-81b3-4f7b627599fb', + 'date', + 'Wed, 17 Jun 2020 13:10:45 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230252342904735/file159230252372302428') + .put('/filesystem159239944055201355/file159239944181407133') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:24 GMT', - 'ETag', - '"0x8D811DE2F160E79"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:45 GMT', + 'etag', + '"0x8D812BFD89A13E4"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636354-001e-000e-16c7-430c19000000', + 'c75f9e58-f01e-0068-3aa8-444339000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'afdb0735-cbf1-4b15-bad9-427ef711d151', - 'Date', - 'Tue, 16 Jun 2020 10:15:24 GMT', - 'Content-Length', + '8570dc7e-9b60-4f6c-82e4-377ab1f8890a', + 'date', + 'Wed, 17 Jun 2020 13:10:46 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230252342904735/file159230252372302428') + .head('/filesystem159239944055201355/file159239944181407133') .reply(200, "", [ - 'Content-Length', + 'content-length', '11', - 'Content-Type', + 'content-type', 'application/octet-stream', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:24 GMT', - 'Accept-Ranges', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:45 GMT', + 'accept-ranges', 'bytes', - 'ETag', - '"0x8D811DE2F160E79"', - 'Server', + 'etag', + '"0x8D812BFD89A13E4"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636369-001e-000e-29c7-430c19000000', + '8938495e-c01e-0011-14a8-44bf1d000000', 'x-ms-client-request-id', - 'b3a39079-d0d7-4e45-b271-e2cd44389460', + '0f678ca8-58d9-4c29-a33b-f334b9fae6d0', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Tue, 16 Jun 2020 10:15:23 GMT', + 'Wed, 17 Jun 2020 13:10:42 GMT', 'x-ms-expiry-time', - 'Tue, 16 Jun 2020 10:15:29 GMT', + 'Wed, 17 Jun 2020 13:10:50 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -151,51 +161,57 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:24 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:47 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230252342904735/file159230252372302428') + .head('/filesystem159239944055201355/file159239944181407133') .reply(404, "", [ - 'Transfer-Encoding', + 'transfer-encoding', 'chunked', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636531-001e-000e-34c7-430c19000000', + 'caa13950-b01e-0046-7ea8-44112e000000', 'x-ms-client-request-id', - '4d20cd43-67a7-4c74-a316-99cb37e75f69', + '9b445a9e-b65c-43fd-982f-84f71e349ee8', 'x-ms-version', '2019-12-12', 'x-ms-error-code', 'BlobNotFound', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-error-code,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:29 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:53 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159230252342904735') + .delete('/filesystem159239944055201355') .query(true) .reply(202, "", [ - 'Content-Length', + 'content-length', '0', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363655d-001e-000e-5fc7-430c19000000', + 'c9c782f0-f01e-0025-3ba8-448cd5000000', 'x-ms-client-request-id', - '8f4f42db-52f6-4415-a74d-c3fd0e735ade', + '26dd64d7-58b7-4487-b6b8-28ea539710cb', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:30 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:55 GMT', + 'connection', + 'close' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js index f92dc9b22727..d07bfc57eb8d 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__neverexpire.js @@ -1,142 +1,152 @@ let nock = require('nock'); -module.exports.hash = "33a08e805863b09bea0c58f4b6a9ff0e"; +module.exports.hash = "4a4fed79044d292913f1861b636c5f4a"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230251915106669","file":"file159230252048904381"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239943150501028","file":"file159239943296504342"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230251915106669') + .put('/filesystem159239943150501028') .query(true) .reply(201, "", [ - 'Content-Length', + 'content-length', '0', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:20 GMT', - 'ETag', - '"0x8D811DE2CA0DEBB"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:32 GMT', + 'etag', + '"0x8D812BFD107142D"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636232-001e-000e-24c7-430c19000000', + '4a588ac5-c01e-005c-4ea8-4470f1000000', 'x-ms-client-request-id', - '065023e5-4a0b-4c25-982b-8a073b52b17a', + '944452a5-b237-40bf-8b1c-7d2cbc4608e8', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:19 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:31 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230251915106669/file159230252048904381') + .put('/filesystem159239943150501028/file159239943296504342') .query(true) .reply(201, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:21 GMT', - 'ETag', - '"0x8D811DE2D71C09D"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:34 GMT', + 'etag', + '"0x8D812BFD1D625F7"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '386419d2-101f-005f-39c7-439195000000', + '727808fc-701f-0004-11a8-44a8ae000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'f476c69d-f3eb-4c55-8b20-f8816636eaee', - 'Date', - 'Tue, 16 Jun 2020 10:15:21 GMT', - 'Content-Length', + '057a4301-1bb1-464c-b546-923313169e84', + 'date', + 'Wed, 17 Jun 2020 13:10:33 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230251915106669/file159230252048904381', "Hello World") + .patch('/filesystem159239943150501028/file159239943296504342', "Hello World") .query(true) .reply(202, "", [ - 'Server', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '386419d3-101f-005f-3ac7-439195000000', + '23bb3cc3-801f-0010-42a8-44e0c1000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '7f1e8ba3-1b4c-4ab9-a536-4d66a64d9a15', - 'Date', - 'Tue, 16 Jun 2020 10:15:21 GMT', - 'Content-Length', + '702a8037-ec33-46b3-a726-b7d7609cf734', + 'date', + 'Wed, 17 Jun 2020 13:10:35 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230251915106669/file159230252048904381') + .patch('/filesystem159239943150501028/file159239943296504342') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:22 GMT', - 'ETag', - '"0x8D811DE2DDC2F0C"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:36 GMT', + 'etag', + '"0x8D812BFD351E306"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '386419d4-101f-005f-3bc7-439195000000', + '326cc5a0-601f-0045-34a8-44f04a000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'd0d3832b-194a-4ee2-af22-b3c05cfc3f7a', - 'Date', - 'Tue, 16 Jun 2020 10:15:21 GMT', - 'Content-Length', + '92cb20a5-bf65-4dfb-b06d-6c5eb91bf2ba', + 'date', + 'Wed, 17 Jun 2020 13:10:35 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230251915106669/file159230252048904381') + .put('/filesystem159239943150501028/file159239943296504342') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:22 GMT', - 'ETag', - '"0x8D811DE2DDC2F0C"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:36 GMT', + 'etag', + '"0x8D812BFD351E306"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236362c2-001e-000e-1ac7-430c19000000', + 'b997c7b7-501e-003c-54a8-440c6e000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '1d23345b-3215-454d-8d74-b152770aca8a', - 'Date', - 'Tue, 16 Jun 2020 10:15:22 GMT', - 'Content-Length', + '3565e493-9d75-488b-a896-2b0b7dd28a4e', + 'date', + 'Wed, 17 Jun 2020 13:10:37 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230251915106669/file159230252048904381') + .head('/filesystem159239943150501028/file159239943296504342') .reply(200, "", [ - 'Content-Length', + 'content-length', '11', - 'Content-Type', + 'content-type', 'application/octet-stream', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:22 GMT', - 'Accept-Ranges', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:36 GMT', + 'accept-ranges', 'bytes', - 'ETag', - '"0x8D811DE2DDC2F0C"', - 'Server', + 'etag', + '"0x8D812BFD351E306"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236362e6-001e-000e-36c7-430c19000000', + 'a4226320-801e-003f-7aa8-44ed0a000000', 'x-ms-client-request-id', - '318ee89c-e723-4467-b235-452a89f1f2fb', + '3b1fdbb9-6c0a-47dc-ab91-8c247c686aca', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Tue, 16 Jun 2020 10:15:21 GMT', + 'Wed, 17 Jun 2020 13:10:34 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -149,28 +159,32 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:22 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:38 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159230251915106669') + .delete('/filesystem159239943150501028') .query(true) .reply(202, "", [ - 'Content-Length', + 'content-length', '0', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236362f8-001e-000e-47c7-430c19000000', + 'a0ab7cbe-201e-0036-08a8-44a8d9000000', 'x-ms-client-request-id', - '34e0af94-268c-42cc-afa9-26c1696501c2', + '9663c928-6d37-42f5-aeb4-8188214cb0da', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:22 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:39 GMT', + 'connection', + 'close' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js index 1ab37bf92a8a..b026029c1bca 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js @@ -1,144 +1,154 @@ let nock = require('nock'); -module.exports.hash = "42d8a1eca14d1c1e1994260e2a4470a2"; +module.exports.hash = "9e3b260e7df4a9174c1da8a9044e8d70"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253581308327","file":"file159230253610604414"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239947469006848","file":"file159239947598004671"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253581308327') + .put('/filesystem159239947469006848') .query(true) .reply(201, "", [ - 'Content-Length', + 'content-length', '0', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:35 GMT', - 'ETag', - '"0x8D811DE35F39D82"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:15 GMT', + 'etag', + '"0x8D812BFEAAF3375"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363672f-001e-000e-74c7-430c19000000', + '61b42c75-f01e-0035-2da8-4449bd000000', 'x-ms-client-request-id', - '343391cc-8295-4a8b-9543-590e310a179f', + '0c6041d0-270b-4753-8479-f2391a849f38', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:35 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:15 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253581308327/file159230253610604414') + .put('/filesystem159239947469006848/file159239947598004671') .query(true) .reply(201, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'ETag', - '"0x8D811DE361F51F4"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:17 GMT', + 'etag', + '"0x8D812BFEB705946"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '386419f0-101f-005f-49c7-439195000000', + '9b219c82-401f-0020-6ba8-445e0e000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '75efe0eb-0e57-4d0e-afbb-dc06561768b9', - 'Date', - 'Tue, 16 Jun 2020 10:15:35 GMT', - 'Content-Length', + '00ed3760-44c5-4bda-8668-ae880ef4949f', + 'date', + 'Wed, 17 Jun 2020 13:11:16 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253581308327/file159230253610604414', "Hello World") + .patch('/filesystem159239947469006848/file159239947598004671', "Hello World") .query(true) .reply(202, "", [ - 'Server', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '386419f1-101f-005f-4ac7-439195000000', + 'eb6e36ea-d01f-0032-2fa8-4425de000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '68bb9321-3070-4ef4-b985-701b4ec2efec', - 'Date', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'Content-Length', + '6ef64840-595d-4422-bf50-39a697aff01b', + 'date', + 'Wed, 17 Jun 2020 13:11:18 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253581308327/file159230253610604414') + .patch('/filesystem159239947469006848/file159239947598004671') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'ETag', - '"0x8D811DE3676F29D"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'etag', + '"0x8D812BFECFB0E93"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '386419f2-101f-005f-4bc7-439195000000', + '9230a040-e01f-0039-65a8-44deb5000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '795305b1-a7ce-42d7-92aa-e231caec9f67', - 'Date', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'Content-Length', + '577e7594-b4c6-432b-9401-1882432c51b0', + 'date', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253581308327/file159230253610604414') + .put('/filesystem159239947469006848/file159239947598004671') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'ETag', - '"0x8D811DE3676F29D"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'etag', + '"0x8D812BFECFB0E93"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236367a4-001e-000e-58c7-430c19000000', + '0a1a63ab-801e-0062-7da8-44e78e000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '0ada7442-83e6-4843-ae2f-06ee5591295b', - 'Date', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'Content-Length', + 'eb09f11a-5e1a-4374-88d6-2175f99c7d22', + 'date', + 'Wed, 17 Jun 2020 13:11:20 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230253581308327/file159230253610604414') + .head('/filesystem159239947469006848/file159239947598004671') .reply(200, "", [ - 'Content-Length', + 'content-length', '11', - 'Content-Type', + 'content-type', 'application/octet-stream', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'Accept-Ranges', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'accept-ranges', 'bytes', - 'ETag', - '"0x8D811DE3676F29D"', - 'Server', + 'etag', + '"0x8D812BFECFB0E93"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236367c3-001e-000e-70c7-430c19000000', + 'ad19712e-d01e-008b-0aa8-4421c4000000', 'x-ms-client-request-id', - 'f6fb06f1-9141-4a5d-8cb5-0a76aad9725d', + 'bfb47a24-43e7-4c86-b053-4a1d2ccebcb3', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Wed, 17 Jun 2020 13:11:17 GMT', 'x-ms-expiry-time', - 'Tue, 16 Jun 2020 11:15:36 GMT', + 'Wed, 17 Jun 2020 14:11:17 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -151,59 +161,63 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:37 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:21 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253581308327/file159230253610604414') + .put('/filesystem159239947469006848/file159239947598004671') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'ETag', - '"0x8D811DE3676F29D"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'etag', + '"0x8D812BFECFB0E93"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236367d4-001e-000e-7dc7-430c19000000', + 'cb0b208b-201e-0019-58a8-44a512000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'c65fb85a-e5ca-4904-a837-81c85b70e9c3', - 'Date', - 'Tue, 16 Jun 2020 10:15:37 GMT', - 'Content-Length', + '021eaa43-f690-46d0-949b-77fe93762f8f', + 'date', + 'Wed, 17 Jun 2020 13:11:23 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230253581308327/file159230253610604414') + .head('/filesystem159239947469006848/file159239947598004671') .reply(200, "", [ - 'Content-Length', + 'content-length', '11', - 'Content-Type', + 'content-type', 'application/octet-stream', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:36 GMT', - 'Accept-Ranges', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:19 GMT', + 'accept-ranges', 'bytes', - 'ETag', - '"0x8D811DE3676F29D"', - 'Server', + 'etag', + '"0x8D812BFECFB0E93"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236367e2-001e-000e-09c7-430c19000000', + 'b3b64056-101e-002d-04a8-4496da000000', 'x-ms-client-request-id', - '9fb848f2-09c8-4422-9e18-79ecb31d6e1c', + '54775051-f6f6-42d6-8a08-801848b0411a', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Tue, 16 Jun 2020 10:15:36 GMT', + 'Wed, 17 Jun 2020 13:11:17 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -216,28 +230,32 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:37 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:24 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159230253581308327') + .delete('/filesystem159239947469006848') .query(true) .reply(202, "", [ - 'Content-Length', + 'content-length', '0', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236367f5-001e-000e-1ac7-430c19000000', + '2da6fa85-301e-0083-3aa8-443bcb000000', 'x-ms-client-request-id', - '5987a26d-8e0f-4748-a01b-800aef01d5ef', + '26460164-771d-4e28-8667-80ba49f98a83', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:37 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:26 GMT', + 'connection', + 'close' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js index 91b89798c2a8..2b873e0bb6a4 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js @@ -1,144 +1,154 @@ let nock = require('nock'); -module.exports.hash = "4f32566919e5d600e90893cd6a3c2650"; +module.exports.hash = "4ea21591aad45730b803cf3e30322ea2"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253377906386","file":"file159230253407400656"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239946558107837","file":"file159239946683709872"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253377906386') + .put('/filesystem159239946558107837') .query(true) .reply(201, "", [ - 'Content-Length', + 'content-length', '0', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:33 GMT', - 'ETag', - '"0x8D811DE34BD963C"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:06 GMT', + 'etag', + '"0x8D812BFE53A6C86"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363664a-001e-000e-24c7-430c19000000', + '672edc3f-301e-0048-30a8-44389e000000', 'x-ms-client-request-id', - '7fdb477a-a076-43eb-b462-e5a4bf091608', + 'a8d70e45-b673-4c0a-a032-3b094a5d749a', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:33 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:06 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253377906386/file159230253407400656') + .put('/filesystem159239946558107837/file159239946683709872') .query(true) .reply(201, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'ETag', - '"0x8D811DE34E9F65E"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:08 GMT', + 'etag', + '"0x8D812BFE61038DC"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '386419ed-101f-005f-46c7-439195000000', + '3d73a47f-201f-0044-4aa8-44af96000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '1a390f63-ab5f-47e4-8c4b-33b3958b8b88', - 'Date', - 'Tue, 16 Jun 2020 10:15:33 GMT', - 'Content-Length', + '2ae1d363-3d63-4508-bac6-4e1f2adcb36b', + 'date', + 'Wed, 17 Jun 2020 13:11:07 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253377906386/file159230253407400656', "Hello World") + .patch('/filesystem159239946558107837/file159239946683709872', "Hello World") .query(true) .reply(202, "", [ - 'Server', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '386419ee-101f-005f-47c7-439195000000', + '7278091e-701f-0004-25a8-44a8ae000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '723e59de-576d-446a-ba0a-04e722a1aa09', - 'Date', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'Content-Length', + '99395d15-e952-4793-be50-22dc56c9ca5b', + 'date', + 'Wed, 17 Jun 2020 13:11:09 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253377906386/file159230253407400656') + .patch('/filesystem159239946558107837/file159239946683709872') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'ETag', - '"0x8D811DE354288D0"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:10 GMT', + 'etag', + '"0x8D812BFE797F4EA"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '386419ef-101f-005f-48c7-439195000000', + 'c56765d4-e01f-0029-79a8-441bdd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'bd42659c-4953-4b94-99f8-7bf07e17f364', - 'Date', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'Content-Length', + '5b33c296-2120-4d2f-98b5-e00a34437300', + 'date', + 'Wed, 17 Jun 2020 13:11:10 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253377906386/file159230253407400656') + .put('/filesystem159239946558107837/file159239946683709872') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'ETag', - '"0x8D811DE354288D0"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:10 GMT', + 'etag', + '"0x8D812BFE797F4EA"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236366ca-001e-000e-1dc7-430c19000000', + '53de0ecb-301e-0005-17a8-44f772000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '08fb4ef2-a164-48ee-81a0-898a1aed8dc7', - 'Date', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'Content-Length', + '7e066314-036f-437c-bcec-9446f120ca40', + 'date', + 'Wed, 17 Jun 2020 13:11:11 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230253377906386/file159230253407400656') + .head('/filesystem159239946558107837/file159239946683709872') .reply(200, "", [ - 'Content-Length', + 'content-length', '11', - 'Content-Type', + 'content-type', 'application/octet-stream', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:34 GMT', - 'Accept-Ranges', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:10 GMT', + 'accept-ranges', 'bytes', - 'ETag', - '"0x8D811DE354288D0"', - 'Server', + 'etag', + '"0x8D812BFE797F4EA"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636703-001e-000e-4dc7-430c19000000', + '29b7e378-501e-004e-2da8-440b21000000', 'x-ms-client-request-id', - 'e6abc96f-c172-4f0e-abcf-f12321ae83a7', + '1df599f3-5c9e-4506-9476-4969cc386f77', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Tue, 16 Jun 2020 10:15:34 GMT', + 'Wed, 17 Jun 2020 13:11:08 GMT', 'x-ms-expiry-time', - 'Tue, 16 Jun 2020 11:15:34 GMT', + 'Wed, 17 Jun 2020 14:11:08 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -151,28 +161,32 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:35 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:12 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159230253377906386') + .delete('/filesystem159239946558107837') .query(true) .reply(202, "", [ - 'Content-Length', + 'content-length', '0', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363671d-001e-000e-64c7-430c19000000', + '810737a5-201e-006b-0fa8-44a25d000000', 'x-ms-client-request-id', - '7d33cda0-da93-4c30-85a0-1b987e9a5f4e', + 'e6b19092-8fb7-4726-b14f-b8e3625b48d0', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:35 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:13 GMT', + 'connection', + 'close' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js index cde37074f3e8..4f6508e80ba0 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js @@ -1,156 +1,170 @@ let nock = require('nock'); -module.exports.hash = "aa31142aac524d8a8eb54f92c1ecb113"; +module.exports.hash = "467b8949d463ba1672545a960ddb55f6"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159230253075403698","file":"file159230253105003427"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239945575909565","file":"file159239945703903977"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253075403698') + .put('/filesystem159239945575909565') .query(true) .reply(201, "", [ - 'Content-Length', + 'content-length', '0', - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:30 GMT', - 'ETag', - '"0x8D811DE32EFF9B6"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:56 GMT', + 'etag', + '"0x8D812BFDF61261F"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636568-001e-000e-6ac7-430c19000000', + 'aa7be809-801e-0086-5ea8-44e910000000', 'x-ms-client-request-id', - '1e68953f-b938-4e39-8231-8fb2589e8cf4', + '73a305bb-2423-4a0e-82d9-9b5a6e923c9a', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:30 GMT' + 'date', + 'Wed, 17 Jun 2020 13:10:56 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253075403698/file159230253105003427') + .put('/filesystem159239945575909565/file159239945703903977') .query(true) .reply(201, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:31 GMT', - 'ETag', - '"0x8D811DE331C0AB0"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:10:58 GMT', + 'etag', + '"0x8D812BFE025413F"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '386419e5-101f-005f-42c7-439195000000', + '17388a44-b01f-0024-05a8-44d309000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '683ad088-f1fc-4db6-912c-d33840538525', - 'Date', - 'Tue, 16 Jun 2020 10:15:30 GMT', - 'Content-Length', + '431da46e-4d53-445e-96bc-bd9e72097660', + 'date', + 'Wed, 17 Jun 2020 13:10:57 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253075403698/file159230253105003427', "Hello World") + .patch('/filesystem159239945575909565/file159239945703903977', "Hello World") .query(true) .reply(202, "", [ - 'Server', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '386419e6-101f-005f-43c7-439195000000', + '6537fd99-101f-0060-72a8-445936000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '040db930-b254-498a-a34b-b4bc59a3e714', - 'Date', - 'Tue, 16 Jun 2020 10:15:30 GMT', - 'Content-Length', + '464c3c5a-5c81-44ec-837d-d70d2fb3d0b6', + 'date', + 'Wed, 17 Jun 2020 13:10:59 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159230253075403698/file159230253105003427') + .patch('/filesystem159239945575909565/file159239945703903977') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:31 GMT', - 'ETag', - '"0x8D811DE3373AF8C"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:00 GMT', + 'etag', + '"0x8D812BFE1A11618"', + 'server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '386419e7-101f-005f-44c7-439195000000', + 'c56765cc-e01f-0029-74a8-441bdd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '6fe4f10c-6202-452f-bdfc-b51defaa88eb', - 'Date', - 'Tue, 16 Jun 2020 10:15:31 GMT', - 'Content-Length', + '12df6492-2972-462b-8ff9-60e9da609576', + 'date', + 'Wed, 17 Jun 2020 13:11:00 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159230253075403698/file159230253105003427') + .put('/filesystem159239945575909565/file159239945703903977') .query(true) .reply(200, "", [ - 'Last-Modified', - 'Tue, 16 Jun 2020 10:15:31 GMT', - 'ETag', - '"0x8D811DE3373AF8C"', - 'Server', + 'last-modified', + 'Wed, 17 Jun 2020 13:11:00 GMT', + 'etag', + '"0x8D812BFE1A11618"', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '236365b7-001e-000e-28c7-430c19000000', + '81073540-201e-006b-31a8-44a25d000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '5d84bbb2-2b0c-413e-a4f8-0a6b5ccfe3c1', - 'Date', - 'Tue, 16 Jun 2020 10:15:31 GMT', - 'Content-Length', + '7da99d40-d104-4c9b-a015-35459916c145', + 'date', + 'Wed, 17 Jun 2020 13:11:01 GMT', + 'connection', + 'close', + 'content-length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159230253075403698/file159230253105003427') + .head('/filesystem159239945575909565/file159239945703903977') .reply(404, "", [ - 'Transfer-Encoding', + 'transfer-encoding', 'chunked', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '23636610-001e-000e-6dc7-430c19000000', + '4a5898ed-c01e-005c-0da8-4470f1000000', 'x-ms-client-request-id', - '3501caeb-9111-4366-93f2-f32ab87629cd', + '3d373b58-5883-40d4-a760-11f376c471a5', 'x-ms-version', '2019-12-12', 'x-ms-error-code', 'BlobNotFound', - 'Access-Control-Expose-Headers', + 'access-control-expose-headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-error-code,Content-Length,Date,Transfer-Encoding', - 'Access-Control-Allow-Origin', + 'access-control-allow-origin', '*', - 'Date', - 'Tue, 16 Jun 2020 10:15:32 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:04 GMT', + 'connection', + 'close' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159230253075403698') + .delete('/filesystem159239945575909565') .query(true) .reply(202, "", [ - 'Content-Length', + 'content-length', '0', - 'Server', + 'server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2363662c-001e-000e-08c7-430c19000000', + '0e472747-001e-0053-1ba8-44069d000000', 'x-ms-client-request-id', - 'fef97ac3-3944-497c-9866-a0257b6c8810', + '4781be70-a006-42ea-8c66-eacef2b25831', 'x-ms-version', '2019-12-12', - 'Date', - 'Tue, 16 Jun 2020 10:15:33 GMT' + 'date', + 'Wed, 17 Jun 2020 13:11:05 GMT', + 'connection', + 'close' ]); diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index f6ebf61e7440..fc091cd1cc21 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -9,9 +9,6 @@ import { BaseRequestPolicy } from '@azure/core-http'; import { BlobLeaseClient } from '@azure/storage-blob'; import * as coreHttp from '@azure/core-http'; import { deserializationPolicy } from '@azure/core-http'; -import { BlobExpiryMode as FileExpiryMode } from '@azure/storage-blob'; -import { BlobSetExpiryOptions as FileSetExpiryOptions } from '@azure/storage-blob'; -import { BlobSetExpiryResponse as FileSetExpiryResponse } from '@azure/storage-blob'; import { HttpHeaders } from '@azure/core-http'; import { HttpOperationResponse } from '@azure/core-http'; import { HttpRequestBody } from '@azure/core-http'; @@ -299,7 +296,17 @@ export interface FileCreateOptions extends PathCreateOptions { export interface FileCreateResponse extends PathCreateResponse { } -export { FileExpiryMode } +// @public +export enum FileExpiryMode { + // (undocumented) + Absolute = "Absolute", + // (undocumented) + NeverExpire = "NeverExpire", + // (undocumented) + RelativeToCreation = "RelativeToCreation", + // (undocumented) + RelativeToNow = "RelativeToNow" +} // @public (undocumented) export interface FileFlushOptions extends CommonOptions { @@ -427,9 +434,30 @@ export interface FileReadToBufferOptions extends CommonOptions { onProgress?: (progress: TransferProgressEvent) => void; } -export { FileSetExpiryOptions } +// @public +export interface FileSetExpiryHeaders { + clientRequestId?: string; + date?: Date; + // (undocumented) + errorCode?: string; + etag?: string; + lastModified?: Date; + requestId?: string; + version?: string; +} + +// @public +export interface FileSetExpiryOptions extends CommonOptions { + abortSignal?: AbortSignalLike; + expiresOn?: string | Date; +} -export { FileSetExpiryResponse } +// @public +export type FileSetExpiryResponse = FileSetExpiryHeaders & { + _response: coreHttp.HttpResponse & { + parsedHeaders: FileSetExpiryHeaders; + }; +}; // @public (undocumented) export interface FileSystemCreateHeaders { diff --git a/sdk/storage/storage-file-datalake/src/StorageClient.ts b/sdk/storage/storage-file-datalake/src/StorageClient.ts index a1d557ebb0e7..0f7478a7acc8 100644 --- a/sdk/storage/storage-file-datalake/src/StorageClient.ts +++ b/sdk/storage/storage-file-datalake/src/StorageClient.ts @@ -63,6 +63,7 @@ export abstract class StorageClient { * @memberof StorageClient */ protected readonly pipeline: Pipeline; + /** * Such as AnonymousCredential, StorageSharedKeyCredential or any credential from the @azure/identity package to authenticate requests to the service. You can also provide an object that implements the TokenCredential interface. If not specified, AnonymousCredential is used. * @@ -70,6 +71,7 @@ export abstract class StorageClient { * @memberof StorageClient */ public readonly credential: StorageSharedKeyCredential | AnonymousCredential | TokenCredential; + /** * StorageClient is a reference to protocol layer operations entry, which is * generated by AutoRest generator. @@ -79,6 +81,17 @@ export abstract class StorageClient { * @memberof StorageClient */ protected readonly storageClientContext: StorageClientContext; + + /** + * storageClientContextWithBlobEndpoint is a reference to protocol layer operations entry, which is + * generated by AutoRest generator, with its url pointing to the Blob endpoint. + * + * @protected + * @type {StorageClientContext} + * @memberof StorageClient + */ + protected readonly storageClientContextToBlobEndpoint: StorageClientContext; + /** * @protected * @type {boolean} @@ -103,6 +116,10 @@ export abstract class StorageClient { this.dfsEndpointUrl, pipeline.toServiceClientOptions() ); + this.storageClientContextToBlobEndpoint = new StorageClientContext( + this.blobEndpointUrl, + pipeline.toServiceClientOptions() + ); this.isHttps = iEqual(getURLScheme(this.url) || "", "https"); @@ -120,5 +137,7 @@ export abstract class StorageClient { // Override protocol layer's default content-type const storageClientContext = this.storageClientContext as any; storageClientContext.requestContentType = undefined; + const storageClientContextWithBlobEndpoint = this.storageClientContextToBlobEndpoint as any; + storageClientContextWithBlobEndpoint.requestContentType = undefined; } } diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index f19b37d1bd91..4165313a6feb 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -759,6 +759,15 @@ export class DataLakeFileClient extends DataLakePathClient { */ private pathContextInternal: PathOperations; + /** + * pathContextInternal provided by protocol layer, with its url pointing to the Blob endpoint. + * + * @private + * @type {PathOperations} + * @memberof DataLakeFileClient + */ + private pathContextInternalToBlobEndpoint: PathOperations; + /** * blobClientInternal provided by @azure/storage-blob package. * @@ -820,6 +829,9 @@ export class DataLakeFileClient extends DataLakePathClient { } this.pathContextInternal = new PathOperations(this.storageClientContext); + this.pathContextInternalToBlobEndpoint = new PathOperations( + this.storageClientContextToBlobEndpoint + ); this.blobClientInternal = new BlobClient(this.blobEndpointUrl, this.pipeline); } @@ -1530,8 +1542,39 @@ export class DataLakeFileClient extends DataLakePathClient { options.tracingOptions ); try { - return await this.blobClientInternal.setExpiry(mode, { - ...options, + if (mode === "NeverExpire" && options.expiresOn) { + throw new Error(`Shouldn't specify options.expiresOn when using mode ${mode}`); + } + if (!options.expiresOn && mode !== "NeverExpire") { + throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); + } + if (mode === "RelativeToNow" || mode === "RelativeToCreation") { + const regexp = /^\d+$/; + if (typeof options.expiresOn !== "string" || !regexp.test(options.expiresOn!)) { + throw new Error( + `options.expiresOn should be the number of milliseconds elapsed from the relative time in decimal string when using mode ${mode}, but is ${options.expiresOn}` + ); + } + // MINOR: need check against <= 2**64, but JS number has the precision problem. + } + if (mode === "Absolute") { + if (typeof options.expiresOn === "string") { + throw new Error( + `options.expiresOn should be a valid time when using mode ${mode}, but is ${options.expiresOn}` + ); + } + const now = new Date(); + if (options.expiresOn!.getTime() <= now.getTime()) { + throw new Error( + `options.expiresOn should be later than now: ${now.toUTCString()} when using mode ${mode}, but is ${options.expiresOn?.toUTCString()}` + ); + } + options.expiresOn = options.expiresOn?.toUTCString(); + } + + const adaptedOptions = { ...options, expiresOn: options.expiresOn as string }; + return await this.pathContextInternalToBlobEndpoint.setExpiry(mode, { + ...adaptedOptions, tracingOptions: { ...options.tracingOptions, spanOptions } }); } catch (e) { diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index afa1ac998ad7..eed11513a326 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -22,10 +22,7 @@ export { ServiceListContainersSegmentResponse, Lease, LeaseOperationOptions, - LeaseOperationResponse, - BlobExpiryMode as FileExpiryMode, - BlobSetExpiryResponse as FileSetExpiryResponse, - BlobSetExpiryOptions as FileSetExpiryOptions + LeaseOperationResponse } from "@azure/storage-blob"; export { @@ -48,7 +45,10 @@ export { PathFlushDataResponse as FileFlushResponse, PathFlushDataResponse as FileUploadResponse, PathGetPropertiesAction, - PathRenameMode + PathRenameMode, + PathExpiryOptions as FileExpiryMode, + PathSetExpiryResponse as FileSetExpiryResponse, + PathSetExpiryHeaders as FileSetExpiryHeaders } from "./generated/src/models"; export { PathCreateResponse }; @@ -866,6 +866,37 @@ export interface FileReadToBufferOptions extends CommonOptions { concurrency?: number; } +/** + * Option interface for the {@link DataLakeFileClient.setExpiry} operation. + * + * @export + * @interface FileSetExpiryOptions + */ +export interface FileSetExpiryOptions extends CommonOptions { + /** + * An implementation of the `AbortSignalLike` interface to signal the request to cancel the operation. + * For example, use the @azure/abort-controller to create an `AbortSignal`. + * + * @type {AbortSignalLike} + * @memberof FileSetExpiryOptions + */ + abortSignal?: AbortSignalLike; + + /** + * The time to set the file to expiry, used in combination with {@link FileExpiryMode}. + * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time, in decimal string. + * when using 'Absolute', should be a valid time. And milliseconds will be dropped. + * When using 'NeverExpire', it shouldn't be provided. + * + * When specifying the number, it should be no greater than the maximum value of UINT64. + * When specifying time, an expiry time in the past is not allowed. + * + * @type {string | Date} + * @memberof FileSetExpiryOptions + */ + expiresOn?: string | Date; +} + /***********************************************************/ /** DataLakeLeaseClient option and response related models */ /***********************************************************/ diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index b9b1666085dc..47a25ceaa15a 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -5,7 +5,7 @@ import { record } from "@azure/test-utils-recorder"; import * as assert from "assert"; import * as dotenv from "dotenv"; -import { DataLakeFileClient, DataLakeFileSystemClient } from "../src"; +import { DataLakeFileClient, DataLakeFileSystemClient, FileExpiryMode } from "../src"; import { toPermissionsString } from "../src/transforms"; import { bodyToString, getDataLakeServiceClient, recorderEnvSetup } from "./utils"; @@ -334,7 +334,7 @@ describe("DataLakePathClient", () => { }); it("set expiry - NeverExpire", async () => { - await fileClient.setExpiry("NeverExpire"); + await fileClient.setExpiry(FileExpiryMode.NeverExpire); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn, undefined); }); @@ -342,12 +342,12 @@ describe("DataLakePathClient", () => { it("set expiry - Absolute", async () => { const now = recorder.newDate("now"); const delta = 5 * 1000; - const later = new Date(now.getTime() + delta); - const expiresOn = later.toUTCString(); - await fileClient.setExpiry("Absolute", { expiresOn }); + const expiresOn = new Date(now.getTime() + delta); + await fileClient.setExpiry(FileExpiryMode.Absolute, { expiresOn }); const getRes = await fileClient.getProperties(); - assert.equal(getRes.expiresOn?.getTime(), new Date(expiresOn).getTime()); // milliseconds dropped + expiresOn.setMilliseconds(0); // milliseconds dropped + assert.equal(getRes.expiresOn?.getTime(), expiresOn.getTime()); await delay(delta); assert.ok(!(await fileClient.exists())); @@ -355,7 +355,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToNow", async () => { const delta = 1000; - await fileClient.setExpiry("RelativeToNow", { expiresOn: delta.toString() }); + await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { expiresOn: delta.toString() }); await delay(delta); assert.ok(!(await fileClient.exists())); @@ -363,7 +363,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToCreation", async () => { const delta = 1000 * 3600; - await fileClient.setExpiry("RelativeToCreation", { expiresOn: delta.toString() }); + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta.toString() }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); @@ -371,12 +371,12 @@ describe("DataLakePathClient", () => { it("set expiry - override", async () => { const delta = 1000 * 3600; - await fileClient.setExpiry("RelativeToCreation", { expiresOn: delta.toString() }); + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta.toString() }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); - await fileClient.setExpiry("NeverExpire"); + await fileClient.setExpiry(FileExpiryMode.NeverExpire); const getRes2 = await fileClient.getProperties(); assert.equal(getRes2.expiresOn, undefined); }); From 2c208c1a201aae4e63e6b083770e28f47613bab1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 18 Jun 2020 11:01:07 +0800 Subject: [PATCH 05/10] undo evenhub package.json --- sdk/eventhub/eventhubs-checkpointstore-blob/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json index 324463e05afa..427a4f1c9da9 100644 --- a/sdk/eventhub/eventhubs-checkpointstore-blob/package.json +++ b/sdk/eventhub/eventhubs-checkpointstore-blob/package.json @@ -61,7 +61,7 @@ "dependencies": { "@azure/event-hubs": "^5.0.0", "@azure/logger": "^1.0.0", - "@azure/storage-blob": "^12.2.0-preview.1", + "@azure/storage-blob": "^12.1.2", "events": "^3.0.0", "tslib": "^2.0.0" }, From ca3106eadc83df07b4f2d73c49a9b347316f9fc3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 24 Jun 2020 16:09:43 +0800 Subject: [PATCH 06/10] add alternative version and use number instead of decimal string for expiresOn relative --- common/config/rush/common-versions.json | 4 +- .../recording_set_expiry__override.json | 112 ++++----- ...ording_set_expiry__relativetocreation.json | 86 +++---- .../recording_set_expiry__relativetonow.json | 78 +++--- .../recording_set_expiry__override.js | 226 ++++++++---------- ...ecording_set_expiry__relativetocreation.js | 168 ++++++------- .../recording_set_expiry__relativetonow.js | 152 ++++++------ .../review/storage-file-datalake.api.md | 2 +- .../storage-file-datalake/src/clients.ts | 19 +- .../storage-file-datalake/src/models.ts | 11 +- .../test/pathclient.spec.ts | 10 +- 11 files changed, 411 insertions(+), 457 deletions(-) diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index bc7873115603..f81e3123223d 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -52,6 +52,8 @@ // Following is required to allow for backward compatibility with Event Processor Host Track 1 "@azure/event-hubs": ["^2.1.4"], // Allow packages to continue to use old eslint-plugin-azure-sdk until they can adapt to 3.0.0 - "@azure/eslint-plugin-azure-sdk": ["^2.0.1"] + "@azure/eslint-plugin-azure-sdk": ["^2.0.1"], + // Allow storage-blob-changefeed and storage-file-datalake to use the preview version of storage-blob. + "@azure/storage-blob": ["^12.2.0-preview.1"] } } diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json index b36066b032d4..3a31a8908534 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__override.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:16 GMT", - "etag": "\"0x8D812C032E4FF38\"", - "last-modified": "Wed, 17 Jun 2020 13:13:16 GMT", + "date": "Wed, 24 Jun 2020 10:00:26 GMT", + "etag": "\"0x8D818256BA3F6B3\"", + "last-modified": "Wed, 24 Jun 2020 10:00:27 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "63865c37-6e43-4bcf-abd0-3da07ffbf6f1", - "x-ms-request-id": "fc7e7ec7-201e-0044-3ba9-44af96000000", + "x-ms-client-request-id": "284e6770-2358-4c68-8b14-10791c5794a9", + "x-ms-request-id": "7b699a1f-501e-0013-5a0e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:16 GMT", - "etag": "\"0x8D812C033456F50\"", - "last-modified": "Wed, 17 Jun 2020 13:13:17 GMT", + "date": "Wed, 24 Jun 2020 10:00:26 GMT", + "etag": "\"0x8D818256BFD652E\"", + "last-modified": "Wed, 24 Jun 2020 10:00:27 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "a1f8bf62-d0b4-4510-8192-67b1e779412c", - "x-ms-request-id": "e91cdaac-401f-0052-58a9-445941000000", + "x-ms-client-request-id": "80c2d50c-3c97-47d7-ac7d-0948e02d9392", + "x-ms-request-id": "2a2870f9-b01f-0034-210e-4a1661000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:17 GMT", + "date": "Wed, 24 Jun 2020 10:00:27 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "79192352-af79-46fc-ba4a-84d89a884d66", - "x-ms-request-id": "e91cdaae-401f-0052-5aa9-445941000000", + "x-ms-client-request-id": "51a4f743-9bdc-47e8-ac64-15459a2bcffb", + "x-ms-request-id": "2a2870fe-b01f-0034-250e-4a1661000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:18 GMT", - "etag": "\"0x8D812C033F9661C\"", - "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", + "date": "Wed, 24 Jun 2020 10:00:28 GMT", + "etag": "\"0x8D818256CAC30A7\"", + "last-modified": "Wed, 24 Jun 2020 10:00:28 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "7a346a72-c623-4b2d-829e-a964e38a5d52", - "x-ms-request-id": "e91cdab0-401f-0052-5ca9-445941000000", + "x-ms-client-request-id": "79b7e151-9ac2-423c-b1de-1752aafc999c", + "x-ms-request-id": "2a287101-b01f-0034-280e-4a1661000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:18 GMT", - "etag": "\"0x8D812C033F9661C\"", - "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", + "date": "Wed, 24 Jun 2020 10:00:28 GMT", + "etag": "\"0x8D818256CAC30A7\"", + "last-modified": "Wed, 24 Jun 2020 10:00:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "e141d29a-8f8c-4470-a61c-955999e250aa", - "x-ms-request-id": "fc7e7f33-201e-0044-15a9-44af96000000", + "x-ms-client-request-id": "b479d931-6e13-430d-9be6-60ff9f42b9ea", + "x-ms-request-id": "7b699a4d-501e-0013-7f0e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": {}, "requestBody": null, "status": 200, @@ -113,26 +113,26 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Wed, 17 Jun 2020 13:13:19 GMT", - "etag": "\"0x8D812C033F9661C\"", - "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", + "date": "Wed, 24 Jun 2020 10:00:29 GMT", + "etag": "\"0x8D818256CAC30A7\"", + "last-modified": "Wed, 24 Jun 2020 10:00:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "3215d2c3-3656-4439-907c-b084c01cef69", - "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:17 GMT", - "x-ms-expiry-time": "Wed, 17 Jun 2020 14:13:17 GMT", + "x-ms-client-request-id": "e477113f-0b4c-4b86-8e5d-96ce34c3cf2b", + "x-ms-creation-time": "Wed, 24 Jun 2020 10:00:27 GMT", + "x-ms-expiry-time": "Wed, 24 Jun 2020 11:00:27 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "fc7e7f51-201e-0044-2ea9-44af96000000", + "x-ms-request-id": "7b699a5d-501e-0013-070e-4a01a5000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": { "comp": "expiry" }, @@ -141,18 +141,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:19 GMT", - "etag": "\"0x8D812C033F9661C\"", - "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", + "date": "Wed, 24 Jun 2020 10:00:29 GMT", + "etag": "\"0x8D818256CAC30A7\"", + "last-modified": "Wed, 24 Jun 2020 10:00:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "ed30b924-a595-403d-9e5e-83077c87efd8", - "x-ms-request-id": "fc7e7f67-201e-0044-41a9-44af96000000", + "x-ms-client-request-id": "79f76f62-d229-4e84-87d3-7ea8fe925080", + "x-ms-request-id": "7b699a6d-501e-0013-120e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841/file159239959711904136", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611/file159299282745900163", "query": {}, "requestBody": null, "status": 200, @@ -161,25 +161,25 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Wed, 17 Jun 2020 13:13:20 GMT", - "etag": "\"0x8D812C033F9661C\"", - "last-modified": "Wed, 17 Jun 2020 13:13:18 GMT", + "date": "Wed, 24 Jun 2020 10:00:29 GMT", + "etag": "\"0x8D818256CAC30A7\"", + "last-modified": "Wed, 24 Jun 2020 10:00:28 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "98dd8832-eec4-4c11-ab80-8f9e788a8d04", - "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:17 GMT", + "x-ms-client-request-id": "cabc72df-422f-4bdb-b375-9ef1f1d9ae09", + "x-ms-creation-time": "Wed, 24 Jun 2020 10:00:27 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "fc7e7f77-201e-0044-4ea9-44af96000000", + "x-ms-request-id": "7b699a91-501e-0013-320e-4a01a5000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959650105841", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282687904611", "query": { "restype": "container" }, @@ -188,20 +188,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:20 GMT", + "date": "Wed, 24 Jun 2020 10:00:30 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "5c21b861-1762-4aea-9f29-581cd8cc80e0", - "x-ms-request-id": "fc7e7f94-201e-0044-67a9-44af96000000", + "x-ms-client-request-id": "18720132-86c0-4183-921f-f21725174dd5", + "x-ms-request-id": "7b699aa6-501e-0013-430e-4a01a5000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159239959650105841", - "file": "file159239959711904136" + "filesystem": "filesystem159299282687904611", + "file": "file159299282745900163" }, "newDate": {} }, - "hash": "7e403158f9065969210a628f4457e9a4" + "hash": "481cec3f9359747a3e79454241767795" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json index a4f1c64d5e52..84519eaf02cb 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetocreation.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282283600351", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:12 GMT", - "etag": "\"0x8D812C03069601B\"", - "last-modified": "Wed, 17 Jun 2020 13:13:12 GMT", + "date": "Wed, 24 Jun 2020 10:00:22 GMT", + "etag": "\"0x8D81825693B674E\"", + "last-modified": "Wed, 24 Jun 2020 10:00:23 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "2baea5ba-04eb-44d1-a1bf-670a375f8736", - "x-ms-request-id": "fc7e7df2-201e-0044-18a9-44af96000000", + "x-ms-client-request-id": "1738b4fc-5a96-4118-b22e-599bddc02274", + "x-ms-request-id": "7b69993c-501e-0013-140e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282283600351/file159299282341904059", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:12 GMT", - "etag": "\"0x8D812C030C1560E\"", - "last-modified": "Wed, 17 Jun 2020 13:13:13 GMT", + "date": "Wed, 24 Jun 2020 10:00:22 GMT", + "etag": "\"0x8D818256994D24E\"", + "last-modified": "Wed, 24 Jun 2020 10:00:23 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "f1bad4b7-187b-418f-89d3-18185ec269f9", - "x-ms-request-id": "e91cdaa1-401f-0052-4fa9-445941000000", + "x-ms-client-request-id": "267684a6-91ca-4e19-9971-483d58ae73f8", + "x-ms-request-id": "2a2870c3-b01f-0034-6d0e-4a1661000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282283600351/file159299282341904059", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:13 GMT", + "date": "Wed, 24 Jun 2020 10:00:23 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "13c896dd-21ab-4582-9b71-c7ac0f8864a5", - "x-ms-request-id": "e91cdaa4-401f-0052-51a9-445941000000", + "x-ms-client-request-id": "9379f59d-1d90-4138-9068-13e12aab467c", + "x-ms-request-id": "2a2870c5-b01f-0034-6f0e-4a1661000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239959236506575/file159239959294600831", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299282283600351/file159299282341904059", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:13 GMT", - "etag": "\"0x8D812C031725DB8\"", - "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", + "date": "Wed, 24 Jun 2020 10:00:23 GMT", + "etag": "\"0x8D818256A41F7EB\"", + "last-modified": "Wed, 24 Jun 2020 10:00:24 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "c1ed9151-3291-4583-a080-83bb0be51979", - "x-ms-request-id": "e91cdaa8-401f-0052-55a9-445941000000", + "x-ms-client-request-id": "d4ec5275-19ce-40d0-9fa1-9f4b1e041184", + "x-ms-request-id": "2a2870e3-b01f-0034-0d0e-4a1661000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575/file159239959294600831", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282283600351/file159299282341904059", "query": { "comp": "expiry" }, @@ -93,18 +93,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:14 GMT", - "etag": "\"0x8D812C031725DB8\"", - "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", + "date": "Wed, 24 Jun 2020 10:00:24 GMT", + "etag": "\"0x8D818256A41F7EB\"", + "last-modified": "Wed, 24 Jun 2020 10:00:24 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "b2a31fa1-cda1-4a48-a4ef-d9439324d744", - "x-ms-request-id": "fc7e7e6f-201e-0044-76a9-44af96000000", + "x-ms-client-request-id": "1e8b9979-d442-4abc-8e68-457d76762fcc", + "x-ms-request-id": "7b6999bb-501e-0013-7e0e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575/file159239959294600831", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282283600351/file159299282341904059", "query": {}, "requestBody": null, "status": 200, @@ -113,26 +113,26 @@ "accept-ranges": "bytes", "content-length": "11", "content-type": "text/plain;charset=UTF-8", - "date": "Wed, 17 Jun 2020 13:13:14 GMT", - "etag": "\"0x8D812C031725DB8\"", - "last-modified": "Wed, 17 Jun 2020 13:13:14 GMT", + "date": "Wed, 24 Jun 2020 10:00:25 GMT", + "etag": "\"0x8D818256A41F7EB\"", + "last-modified": "Wed, 24 Jun 2020 10:00:24 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "x-ms-access-tier": "Hot", "x-ms-access-tier-inferred": "true", "x-ms-blob-type": "BlockBlob", - "x-ms-client-request-id": "f6eca054-facf-4fe2-ba5c-3e03822a6de1", - "x-ms-creation-time": "Wed, 17 Jun 2020 13:13:13 GMT", - "x-ms-expiry-time": "Wed, 17 Jun 2020 14:13:13 GMT", + "x-ms-client-request-id": "5cec842e-89ae-4692-9479-aa07735aab1f", + "x-ms-creation-time": "Wed, 24 Jun 2020 10:00:23 GMT", + "x-ms-expiry-time": "Wed, 24 Jun 2020 11:00:23 GMT", "x-ms-lease-state": "available", "x-ms-lease-status": "unlocked", - "x-ms-request-id": "fc7e7e88-201e-0044-0ba9-44af96000000", + "x-ms-request-id": "7b6999de-501e-0013-1e0e-4a01a5000000", "x-ms-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239959236506575", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299282283600351", "query": { "restype": "container" }, @@ -141,20 +141,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:15 GMT", + "date": "Wed, 24 Jun 2020 10:00:25 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "5e1ce747-3cc3-4ee7-b920-6eef40fef260", - "x-ms-request-id": "fc7e7ea1-201e-0044-22a9-44af96000000", + "x-ms-client-request-id": "534826a1-815c-4e23-9c06-63eb04787cb3", + "x-ms-request-id": "7b699a01-501e-0013-3e0e-4a01a5000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159239959236506575", - "file": "file159239959294600831" + "filesystem": "filesystem159299282283600351", + "file": "file159299282341904059" }, "newDate": {} }, - "hash": "67efeafeea1ce73a505450e79e3fd351" + "hash": "201798d7335e3eb29b47567fb4b9c17c" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json index 015b8b6e00d5..792bb767fb1b 100644 --- a/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json +++ b/sdk/storage/storage-file-datalake/recordings/browsers/datalakepathclient/recording_set_expiry__relativetonow.json @@ -2,7 +2,7 @@ "recordings": [ { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299281555203886", "query": { "restype": "container" }, @@ -11,18 +11,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:05 GMT", - "etag": "\"0x8D812C02CC105EA\"", - "last-modified": "Wed, 17 Jun 2020 13:13:06 GMT", + "date": "Wed, 24 Jun 2020 10:00:16 GMT", + "etag": "\"0x8D81825658CF317\"", + "last-modified": "Wed, 24 Jun 2020 10:00:16 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "3a708218-77bf-4af3-ae0a-3abba30537be", - "x-ms-request-id": "fc7e7d15-201e-0044-6fa9-44af96000000", + "x-ms-client-request-id": "aef775b7-7512-4c5d-b230-181d79ac815b", + "x-ms-request-id": "7b699848-501e-0013-420e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299281555203886/file159299281729603669", "query": { "resource": "file" }, @@ -31,18 +31,18 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:07 GMT", - "etag": "\"0x8D812C02DB1AA35\"", - "last-modified": "Wed, 17 Jun 2020 13:13:08 GMT", + "date": "Wed, 24 Jun 2020 10:00:17 GMT", + "etag": "\"0x8D8182566872C7E\"", + "last-modified": "Wed, 24 Jun 2020 10:00:18 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "ae962c29-0eba-4d47-b861-bfa0622d0ea9", - "x-ms-request-id": "e91cda9a-401f-0052-49a9-445941000000", + "x-ms-client-request-id": "89d244c1-145b-4006-b1f0-45fdaa0751c5", + "x-ms-request-id": "2a28708a-b01f-0034-350e-4a1661000000", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299281555203886/file159299281729603669", "query": { "position": "0", "action": "append" @@ -52,17 +52,17 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:08 GMT", + "date": "Wed, 24 Jun 2020 10:00:18 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "a8d1ef61-a08b-4c49-afe2-407ca3f7670d", - "x-ms-request-id": "e91cda9c-401f-0052-4ba9-445941000000", + "x-ms-client-request-id": "ee4d1524-bd5a-46e7-8152-57b887eab692", + "x-ms-request-id": "2a28708e-b01f-0034-390e-4a1661000000", "x-ms-request-server-encrypted": "true", "x-ms-version": "2019-12-12" } }, { "method": "PATCH", - "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159239958619209330/file159239958682502424", + "url": "https://fakestorageaccount.dfs.core.windows.net/filesystem159299281555203886/file159299281729603669", "query": { "position": "11", "action": "flush" @@ -72,19 +72,19 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:08 GMT", - "etag": "\"0x8D812C02E6271FE\"", - "last-modified": "Wed, 17 Jun 2020 13:13:09 GMT", + "date": "Wed, 24 Jun 2020 10:00:18 GMT", + "etag": "\"0x8D818256736A9F3\"", + "last-modified": "Wed, 24 Jun 2020 10:00:19 GMT", "server": "Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "92454174-913a-48cc-8fa7-0970857608f2", - "x-ms-request-id": "e91cda9e-401f-0052-4da9-445941000000", + "x-ms-client-request-id": "9b2f0792-defb-4ba0-8087-af4c1fcdf6aa", + "x-ms-request-id": "2a287091-b01f-0034-3c0e-4a1661000000", "x-ms-request-server-encrypted": "false", "x-ms-version": "2019-12-12" } }, { "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330/file159239958682502424", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299281555203886/file159299281729603669", "query": { "comp": "expiry" }, @@ -93,35 +93,35 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:09 GMT", - "etag": "\"0x8D812C02E6271FE\"", - "last-modified": "Wed, 17 Jun 2020 13:13:09 GMT", + "date": "Wed, 24 Jun 2020 10:00:19 GMT", + "etag": "\"0x8D818256736A9F3\"", + "last-modified": "Wed, 24 Jun 2020 10:00:19 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "2fd1f0d8-efff-4fed-9c45-b3e9401624ba", - "x-ms-request-id": "fc7e7d86-201e-0044-43a9-44af96000000", + "x-ms-client-request-id": "a590a4c7-7459-4da1-bebb-67c7b4e7508a", + "x-ms-request-id": "7b6998b7-501e-0013-1c0e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "HEAD", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330/file159239958682502424", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299281555203886/file159299281729603669", "query": {}, "requestBody": null, "status": 404, "response": "", "responseHeaders": { - "date": "Wed, 17 Jun 2020 13:13:10 GMT", + "date": "Wed, 24 Jun 2020 10:00:21 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", "transfer-encoding": "chunked", - "x-ms-client-request-id": "cacbfa98-bf5a-4df2-9842-5130a7bee86b", + "x-ms-client-request-id": "af0a4934-6669-49d6-ac52-a77af454a844", "x-ms-error-code": "BlobNotFound", - "x-ms-request-id": "fc7e7dcb-201e-0044-79a9-44af96000000", + "x-ms-request-id": "7b6998f5-501e-0013-570e-4a01a5000000", "x-ms-version": "2019-12-12" } }, { "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159239958619209330", + "url": "https://fakestorageaccount.blob.core.windows.net/filesystem159299281555203886", "query": { "restype": "container" }, @@ -130,20 +130,20 @@ "response": "", "responseHeaders": { "content-length": "0", - "date": "Wed, 17 Jun 2020 13:13:11 GMT", + "date": "Wed, 24 Jun 2020 10:00:21 GMT", "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "ca84a9e4-4617-45e2-ab9a-263cceaad66e", - "x-ms-request-id": "fc7e7de0-201e-0044-08a9-44af96000000", + "x-ms-client-request-id": "58a23de7-6823-457c-8aa6-1538b80b3749", + "x-ms-request-id": "7b699919-501e-0013-750e-4a01a5000000", "x-ms-version": "2019-12-12" } } ], "uniqueTestInfo": { "uniqueName": { - "filesystem": "filesystem159239958619209330", - "file": "file159239958682502424" + "filesystem": "filesystem159299281555203886", + "file": "file159299281729603669" }, "newDate": {} }, - "hash": "f9b31212c77fd9db1d2728b76a7ca4b4" + "hash": "c0da3264e322f03bf5b03f643ca889cf" } \ No newline at end of file diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js index b026029c1bca..e380cd71bac1 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__override.js @@ -1,154 +1,144 @@ let nock = require('nock'); -module.exports.hash = "9e3b260e7df4a9174c1da8a9044e8d70"; +module.exports.hash = "49ae201267dbd16bc5c2949dfdee3daa"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239947469006848","file":"file159239947598004671"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159299255423504608","file":"file159299255462704152"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239947469006848') + .put('/filesystem159299255423504608') .query(true) .reply(201, "", [ - 'content-length', + 'Content-Length', '0', - 'last-modified', - 'Wed, 17 Jun 2020 13:11:15 GMT', - 'etag', - '"0x8D812BFEAAF3375"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:54 GMT', + 'ETag', + '"0x8D81824C8FC84C9"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '61b42c75-f01e-0035-2da8-4449bd000000', + '00e03b8d-a01e-0007-7a0d-4a49ca000000', 'x-ms-client-request-id', - '0c6041d0-270b-4753-8479-f2391a849f38', + '8399bc23-b69d-46ad-b4ff-5b656ec741d2', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:11:15 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:53 GMT' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239947469006848/file159239947598004671') + .put('/filesystem159299255423504608/file159299255462704152') .query(true) .reply(201, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:17 GMT', - 'etag', - '"0x8D812BFEB705946"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:54 GMT', + 'ETag', + '"0x8D81824C93ABDDE"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '9b219c82-401f-0020-6ba8-445e0e000000', + '6f8e5650-501f-0003-790d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '00ed3760-44c5-4bda-8668-ae880ef4949f', - 'date', - 'Wed, 17 Jun 2020 13:11:16 GMT', - 'connection', - 'close', - 'content-length', + 'adcc7919-125e-40d9-9909-47bdc889e0f7', + 'Date', + 'Wed, 24 Jun 2020 09:55:53 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239947469006848/file159239947598004671', "Hello World") + .patch('/filesystem159299255423504608/file159299255462704152', "Hello World") .query(true) .reply(202, "", [ - 'server', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - 'eb6e36ea-d01f-0032-2fa8-4425de000000', + '6f8e565e-501f-0003-070d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '6ef64840-595d-4422-bf50-39a697aff01b', - 'date', - 'Wed, 17 Jun 2020 13:11:18 GMT', - 'connection', - 'close', - 'content-length', + 'e01417a4-e8a8-404c-9d3a-89b44b517fc8', + 'Date', + 'Wed, 24 Jun 2020 09:55:54 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239947469006848/file159239947598004671') + .patch('/filesystem159299255423504608/file159299255462704152') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'etag', - '"0x8D812BFECFB0E93"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'ETag', + '"0x8D81824C9C67EF8"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - '9230a040-e01f-0039-65a8-44deb5000000', + '6f8e566c-501f-0003-130d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '577e7594-b4c6-432b-9401-1882432c51b0', - 'date', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'connection', - 'close', - 'content-length', + 'dd4bb946-c11c-4652-b9ca-1dc2a54f644f', + 'Date', + 'Wed, 24 Jun 2020 09:55:54 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239947469006848/file159239947598004671') + .put('/filesystem159299255423504608/file159299255462704152') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'etag', - '"0x8D812BFECFB0E93"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'ETag', + '"0x8D81824C9C67EF8"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '0a1a63ab-801e-0062-7da8-44e78e000000', + '00e03c15-a01e-0007-6a0d-4a49ca000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'eb09f11a-5e1a-4374-88d6-2175f99c7d22', - 'date', - 'Wed, 17 Jun 2020 13:11:20 GMT', - 'connection', - 'close', - 'content-length', + 'fd6a7cd3-2b10-43ff-9f3d-d1240d306701', + 'Date', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159239947469006848/file159239947598004671') + .head('/filesystem159299255423504608/file159299255462704152') .reply(200, "", [ - 'content-length', + 'Content-Length', '11', - 'content-type', + 'Content-Type', 'application/octet-stream', - 'last-modified', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'accept-ranges', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'Accept-Ranges', 'bytes', - 'etag', - '"0x8D812BFECFB0E93"', - 'server', + 'ETag', + '"0x8D81824C9C67EF8"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'ad19712e-d01e-008b-0aa8-4421c4000000', + '00e03c41-a01e-0007-110d-4a49ca000000', 'x-ms-client-request-id', - 'bfb47a24-43e7-4c86-b053-4a1d2ccebcb3', + '5ea0a817-c9e0-4207-89d5-a3c6cda5de44', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Wed, 17 Jun 2020 13:11:17 GMT', + 'Wed, 24 Jun 2020 09:55:54 GMT', 'x-ms-expiry-time', - 'Wed, 17 Jun 2020 14:11:17 GMT', + 'Wed, 24 Jun 2020 10:55:54 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -161,63 +151,59 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'access-control-expose-headers', + 'Access-Control-Expose-Headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'access-control-allow-origin', + 'Access-Control-Allow-Origin', '*', - 'date', - 'Wed, 17 Jun 2020 13:11:21 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:56 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239947469006848/file159239947598004671') + .put('/filesystem159299255423504608/file159299255462704152') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'etag', - '"0x8D812BFECFB0E93"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'ETag', + '"0x8D81824C9C67EF8"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'cb0b208b-201e-0019-58a8-44a512000000', + '00e03c79-a01e-0007-450d-4a49ca000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '021eaa43-f690-46d0-949b-77fe93762f8f', - 'date', - 'Wed, 17 Jun 2020 13:11:23 GMT', - 'connection', - 'close', - 'content-length', + '9e2e5751-679d-438b-8385-ca4642b86e2c', + 'Date', + 'Wed, 24 Jun 2020 09:55:56 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159239947469006848/file159239947598004671') + .head('/filesystem159299255423504608/file159299255462704152') .reply(200, "", [ - 'content-length', + 'Content-Length', '11', - 'content-type', + 'Content-Type', 'application/octet-stream', - 'last-modified', - 'Wed, 17 Jun 2020 13:11:19 GMT', - 'accept-ranges', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:55 GMT', + 'Accept-Ranges', 'bytes', - 'etag', - '"0x8D812BFECFB0E93"', - 'server', + 'ETag', + '"0x8D81824C9C67EF8"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'b3b64056-101e-002d-04a8-4496da000000', + '00e03c96-a01e-0007-590d-4a49ca000000', 'x-ms-client-request-id', - '54775051-f6f6-42d6-8a08-801848b0411a', + 'a07246d0-d412-4b73-b304-c966648ecb76', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Wed, 17 Jun 2020 13:11:17 GMT', + 'Wed, 24 Jun 2020 09:55:54 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -230,32 +216,28 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'access-control-expose-headers', + 'Access-Control-Expose-Headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'access-control-allow-origin', + 'Access-Control-Allow-Origin', '*', - 'date', - 'Wed, 17 Jun 2020 13:11:24 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:57 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159239947469006848') + .delete('/filesystem159299255423504608') .query(true) .reply(202, "", [ - 'content-length', + 'Content-Length', '0', - 'server', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '2da6fa85-301e-0083-3aa8-443bcb000000', + '00e03cc6-a01e-0007-040d-4a49ca000000', 'x-ms-client-request-id', - '26460164-771d-4e28-8667-80ba49f98a83', + '2a8fb699-f327-427d-9825-d807836519b8', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:11:26 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:57 GMT' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js index 2b873e0bb6a4..e865460d650f 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetocreation.js @@ -1,154 +1,144 @@ let nock = require('nock'); -module.exports.hash = "4ea21591aad45730b803cf3e30322ea2"; +module.exports.hash = "1b61a967d608c729ba89903bf69e5ff8"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239946558107837","file":"file159239946683709872"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159299255097900923","file":"file159299255140603883"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239946558107837') + .put('/filesystem159299255097900923') .query(true) .reply(201, "", [ - 'content-length', + 'Content-Length', '0', - 'last-modified', - 'Wed, 17 Jun 2020 13:11:06 GMT', - 'etag', - '"0x8D812BFE53A6C86"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:50 GMT', + 'ETag', + '"0x8D81824C70679AD"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '672edc3f-301e-0048-30a8-44389e000000', + '00e03a72-a01e-0007-1c0d-4a49ca000000', 'x-ms-client-request-id', - 'a8d70e45-b673-4c0a-a032-3b094a5d749a', + '87942801-834d-4d1f-8168-6b7e993594f0', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:11:06 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:50 GMT' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239946558107837/file159239946683709872') + .put('/filesystem159299255097900923/file159299255140603883') .query(true) .reply(201, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:08 GMT', - 'etag', - '"0x8D812BFE61038DC"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:51 GMT', + 'ETag', + '"0x8D81824C75D6C43"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '3d73a47f-201f-0044-4aa8-44af96000000', + '6f8e5601-501f-0003-2b0d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '2ae1d363-3d63-4508-bac6-4e1f2adcb36b', - 'date', - 'Wed, 17 Jun 2020 13:11:07 GMT', - 'connection', - 'close', - 'content-length', + 'caee113c-8d02-4cc7-833c-c4cbbf67e0ec', + 'Date', + 'Wed, 24 Jun 2020 09:55:50 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239946558107837/file159239946683709872', "Hello World") + .patch('/filesystem159299255097900923/file159299255140603883', "Hello World") .query(true) .reply(202, "", [ - 'server', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '7278091e-701f-0004-25a8-44a8ae000000', + '6f8e5602-501f-0003-2c0d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '99395d15-e952-4793-be50-22dc56c9ca5b', - 'date', - 'Wed, 17 Jun 2020 13:11:09 GMT', - 'connection', - 'close', - 'content-length', + '0a5cbc12-2ae2-4560-94b9-4719100e4629', + 'Date', + 'Wed, 24 Jun 2020 09:55:51 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239946558107837/file159239946683709872') + .patch('/filesystem159299255097900923/file159299255140603883') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:10 GMT', - 'etag', - '"0x8D812BFE797F4EA"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:52 GMT', + 'ETag', + '"0x8D81824C7DF53B3"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - 'c56765d4-e01f-0029-79a8-441bdd000000', + '6f8e5603-501f-0003-2d0d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '5b33c296-2120-4d2f-98b5-e00a34437300', - 'date', - 'Wed, 17 Jun 2020 13:11:10 GMT', - 'connection', - 'close', - 'content-length', + 'ce07f92e-cc8f-438e-a833-a236bf4e6884', + 'Date', + 'Wed, 24 Jun 2020 09:55:51 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239946558107837/file159239946683709872') + .put('/filesystem159299255097900923/file159299255140603883') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:10 GMT', - 'etag', - '"0x8D812BFE797F4EA"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:52 GMT', + 'ETag', + '"0x8D81824C7DF53B3"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '53de0ecb-301e-0005-17a8-44f772000000', + '00e03b36-a01e-0007-2e0d-4a49ca000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '7e066314-036f-437c-bcec-9446f120ca40', - 'date', - 'Wed, 17 Jun 2020 13:11:11 GMT', - 'connection', - 'close', - 'content-length', + '51df929b-5e32-437d-9527-01dc9348ed23', + 'Date', + 'Wed, 24 Jun 2020 09:55:52 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159239946558107837/file159239946683709872') + .head('/filesystem159299255097900923/file159299255140603883') .reply(200, "", [ - 'content-length', + 'Content-Length', '11', - 'content-type', + 'Content-Type', 'application/octet-stream', - 'last-modified', - 'Wed, 17 Jun 2020 13:11:10 GMT', - 'accept-ranges', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:52 GMT', + 'Accept-Ranges', 'bytes', - 'etag', - '"0x8D812BFE797F4EA"', - 'server', + 'ETag', + '"0x8D81824C7DF53B3"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '29b7e378-501e-004e-2da8-440b21000000', + '00e03b52-a01e-0007-460d-4a49ca000000', 'x-ms-client-request-id', - '1df599f3-5c9e-4506-9476-4969cc386f77', + '9b880212-c59d-4477-81f8-0d942e429cc9', 'x-ms-version', '2019-12-12', 'x-ms-creation-time', - 'Wed, 17 Jun 2020 13:11:08 GMT', + 'Wed, 24 Jun 2020 09:55:51 GMT', 'x-ms-expiry-time', - 'Wed, 17 Jun 2020 14:11:08 GMT', + 'Wed, 24 Jun 2020 10:55:51 GMT', 'x-ms-lease-status', 'unlocked', 'x-ms-lease-state', @@ -161,32 +151,28 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Hot', 'x-ms-access-tier-inferred', 'true', - 'access-control-expose-headers', + 'Access-Control-Expose-Headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,Content-Type,Last-Modified,ETag,x-ms-creation-time,x-ms-expiry-time,x-ms-lease-status,x-ms-lease-state,x-ms-blob-type,x-ms-server-encrypted,x-ms-access-tier,x-ms-access-tier-inferred,Accept-Ranges,Content-Length,Date,Transfer-Encoding', - 'access-control-allow-origin', + 'Access-Control-Allow-Origin', '*', - 'date', - 'Wed, 17 Jun 2020 13:11:12 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:52 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159239946558107837') + .delete('/filesystem159299255097900923') .query(true) .reply(202, "", [ - 'content-length', + 'Content-Length', '0', - 'server', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '810737a5-201e-006b-0fa8-44a25d000000', + '00e03b74-a01e-0007-640d-4a49ca000000', 'x-ms-client-request-id', - 'e6b19092-8fb7-4726-b14f-b8e3625b48d0', + 'c5ae678f-e7d5-4063-9dcb-ac65af589cdc', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:11:13 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:53 GMT' ]); diff --git a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js index 4f6508e80ba0..cb1edc154d60 100644 --- a/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js +++ b/sdk/storage/storage-file-datalake/recordings/node/datalakepathclient/recording_set_expiry__relativetonow.js @@ -1,170 +1,156 @@ let nock = require('nock'); -module.exports.hash = "467b8949d463ba1672545a960ddb55f6"; +module.exports.hash = "de1ed5242bebc0c085f969ddc1486386"; -module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159239945575909565","file":"file159239945703903977"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"filesystem":"filesystem159299254439403398","file":"file159299254594100472"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239945575909565') + .put('/filesystem159299254439403398') .query(true) .reply(201, "", [ - 'content-length', + 'Content-Length', '0', - 'last-modified', - 'Wed, 17 Jun 2020 13:10:56 GMT', - 'etag', - '"0x8D812BFDF61261F"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:45 GMT', + 'ETag', + '"0x8D81824C3C7C8D7"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'aa7be809-801e-0086-5ea8-44e910000000', + '00e038c9-a01e-0007-490d-4a49ca000000', 'x-ms-client-request-id', - '73a305bb-2423-4a0e-82d9-9b5a6e923c9a', + 'd5ee2979-c506-412f-93ae-75c0e7cf0024', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:10:56 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:45 GMT' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239945575909565/file159239945703903977') + .put('/filesystem159299254439403398/file159299254594100472') .query(true) .reply(201, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:10:58 GMT', - 'etag', - '"0x8D812BFE025413F"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:47 GMT', + 'ETag', + '"0x8D81824C4B7A0DF"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '17388a44-b01f-0024-05a8-44d309000000', + '6f8e55b5-501f-0003-690d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '431da46e-4d53-445e-96bc-bd9e72097660', - 'date', - 'Wed, 17 Jun 2020 13:10:57 GMT', - 'connection', - 'close', - 'content-length', + '8ede6eeb-edc0-416e-a9c9-c7460d70a766', + 'Date', + 'Wed, 24 Jun 2020 09:55:46 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239945575909565/file159239945703903977', "Hello World") + .patch('/filesystem159299254439403398/file159299254594100472', "Hello World") .query(true) .reply(202, "", [ - 'server', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'true', 'x-ms-request-id', - '6537fd99-101f-0060-72a8-445936000000', + '6f8e55bb-501f-0003-6f0d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '464c3c5a-5c81-44ec-837d-d70d2fb3d0b6', - 'date', - 'Wed, 17 Jun 2020 13:10:59 GMT', - 'connection', - 'close', - 'content-length', + '9c370921-6e24-4587-93bb-9fe701baa41e', + 'Date', + 'Wed, 24 Jun 2020 09:55:46 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.dfs.core.windows.net:443', {"encodedQueryParams":true}) - .patch('/filesystem159239945575909565/file159239945703903977') + .patch('/filesystem159299254439403398/file159299254594100472') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:00 GMT', - 'etag', - '"0x8D812BFE1A11618"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:48 GMT', + 'ETag', + '"0x8D81824C5576AFC"', + 'Server', 'Windows-Azure-HDFS/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-server-encrypted', 'false', 'x-ms-request-id', - 'c56765cc-e01f-0029-74a8-441bdd000000', + '6f8e55c3-501f-0003-700d-4ac4cd000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '12df6492-2972-462b-8ff9-60e9da609576', - 'date', - 'Wed, 17 Jun 2020 13:11:00 GMT', - 'connection', - 'close', - 'content-length', + '7d6cab88-2231-487b-b040-b512fa3c0e7c', + 'Date', + 'Wed, 24 Jun 2020 09:55:47 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/filesystem159239945575909565/file159239945703903977') + .put('/filesystem159299254439403398/file159299254594100472') .query(true) .reply(200, "", [ - 'last-modified', - 'Wed, 17 Jun 2020 13:11:00 GMT', - 'etag', - '"0x8D812BFE1A11618"', - 'server', + 'Last-Modified', + 'Wed, 24 Jun 2020 09:55:48 GMT', + 'ETag', + '"0x8D81824C5576AFC"', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '81073540-201e-006b-31a8-44a25d000000', + '00e039d8-a01e-0007-1f0d-4a49ca000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - '7da99d40-d104-4c9b-a015-35459916c145', - 'date', - 'Wed, 17 Jun 2020 13:11:01 GMT', - 'connection', - 'close', - 'content-length', + 'a9331e1b-818a-41c7-b8cb-1f2e6355e02e', + 'Date', + 'Wed, 24 Jun 2020 09:55:48 GMT', + 'Content-Length', '0' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .head('/filesystem159239945575909565/file159239945703903977') + .head('/filesystem159299254439403398/file159299254594100472') .reply(404, "", [ - 'transfer-encoding', + 'Transfer-Encoding', 'chunked', - 'server', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '4a5898ed-c01e-005c-0da8-4470f1000000', + '00e03a3a-a01e-0007-6f0d-4a49ca000000', 'x-ms-client-request-id', - '3d373b58-5883-40d4-a760-11f376c471a5', + 'bd867b0d-504a-4d8f-bac4-6acf493f478a', 'x-ms-version', '2019-12-12', 'x-ms-error-code', 'BlobNotFound', - 'access-control-expose-headers', + 'Access-Control-Expose-Headers', 'x-ms-request-id,x-ms-client-request-id,Server,x-ms-version,x-ms-error-code,Content-Length,Date,Transfer-Encoding', - 'access-control-allow-origin', + 'Access-Control-Allow-Origin', '*', - 'date', - 'Wed, 17 Jun 2020 13:11:04 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:49 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/filesystem159239945575909565') + .delete('/filesystem159299254439403398') .query(true) .reply(202, "", [ - 'content-length', + 'Content-Length', '0', - 'server', + 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - '0e472747-001e-0053-1ba8-44069d000000', + '00e03a5e-a01e-0007-0b0d-4a49ca000000', 'x-ms-client-request-id', - '4781be70-a006-42ea-8c66-eacef2b25831', + 'f953a6a0-8863-4f31-823c-4cd1328dfa90', 'x-ms-version', '2019-12-12', - 'date', - 'Wed, 17 Jun 2020 13:11:05 GMT', - 'connection', - 'close' + 'Date', + 'Wed, 24 Jun 2020 09:55:50 GMT' ]); diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index fc091cd1cc21..cfa970295ed8 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -449,7 +449,7 @@ export interface FileSetExpiryHeaders { // @public export interface FileSetExpiryOptions extends CommonOptions { abortSignal?: AbortSignalLike; - expiresOn?: string | Date; + expiresOn?: number | Date; } // @public diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index 4165313a6feb..bbe2db176dae 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -1548,31 +1548,32 @@ export class DataLakeFileClient extends DataLakePathClient { if (!options.expiresOn && mode !== "NeverExpire") { throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); } + + let expiresOn: string | undefined = undefined; if (mode === "RelativeToNow" || mode === "RelativeToCreation") { - const regexp = /^\d+$/; - if (typeof options.expiresOn !== "string" || !regexp.test(options.expiresOn!)) { + if (typeof options.expiresOn !== "number" || options.expiresOn < 0) { throw new Error( - `options.expiresOn should be the number of milliseconds elapsed from the relative time in decimal string when using mode ${mode}, but is ${options.expiresOn}` + `options.expiresOn should be the number of milliseconds elapsed from the relative time when using mode ${mode}, but is ${options.expiresOn}` ); } // MINOR: need check against <= 2**64, but JS number has the precision problem. - } - if (mode === "Absolute") { - if (typeof options.expiresOn === "string") { + expiresOn = Math.round(options.expiresOn).toString(); + } else if (mode === "Absolute") { + if (typeof options.expiresOn === "number") { throw new Error( `options.expiresOn should be a valid time when using mode ${mode}, but is ${options.expiresOn}` ); } const now = new Date(); - if (options.expiresOn!.getTime() <= now.getTime()) { + if (!(options.expiresOn!.getTime() > now.getTime())) { throw new Error( `options.expiresOn should be later than now: ${now.toUTCString()} when using mode ${mode}, but is ${options.expiresOn?.toUTCString()}` ); } - options.expiresOn = options.expiresOn?.toUTCString(); + expiresOn = options.expiresOn!.toUTCString(); } - const adaptedOptions = { ...options, expiresOn: options.expiresOn as string }; + const adaptedOptions = { ...options, expiresOn }; return await this.pathContextInternalToBlobEndpoint.setExpiry(mode, { ...adaptedOptions, tracingOptions: { ...options.tracingOptions, spanOptions } diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index eed11513a326..ab3def2043f3 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -884,17 +884,14 @@ export interface FileSetExpiryOptions extends CommonOptions { /** * The time to set the file to expiry, used in combination with {@link FileExpiryMode}. - * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time, in decimal string. - * when using 'Absolute', should be a valid time. And milliseconds will be dropped. + * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time. + * when using 'Absolute', should be a valid time. A time in the past is not allowed and milliseconds will be dropped. * When using 'NeverExpire', it shouldn't be provided. * - * When specifying the number, it should be no greater than the maximum value of UINT64. - * When specifying time, an expiry time in the past is not allowed. - * - * @type {string | Date} + * @type {number | Date} * @memberof FileSetExpiryOptions */ - expiresOn?: string | Date; + expiresOn?: number | Date; } /***********************************************************/ diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index 47a25ceaa15a..865f837ba8ee 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -355,23 +355,23 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToNow", async () => { const delta = 1000; - await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { expiresOn: delta.toString() }); + await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { expiresOn: delta }); await delay(delta); assert.ok(!(await fileClient.exists())); }); it("set expiry - RelativeToCreation", async () => { - const delta = 1000 * 3600; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta.toString() }); + const delta = 1000 * 3600 + 0.12; + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta }); const getRes = await fileClient.getProperties(); - assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); + assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + Math.round(delta)); }); it("set expiry - override", async () => { const delta = 1000 * 3600; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta.toString() }); + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); From 992f7a56bad2262e5d88378dfb193d855d1e6f31 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 29 Jun 2020 20:26:05 +0800 Subject: [PATCH 07/10] add timeToExpireInMs to option --- .../review/storage-file-datalake.api.md | 3 ++- .../storage-file-datalake/src/clients.ts | 25 ++++++------------- .../storage-file-datalake/src/models.ts | 18 ++++++++----- .../test/pathclient.spec.ts | 6 ++--- 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index cfa970295ed8..a2453a408b6a 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -449,7 +449,8 @@ export interface FileSetExpiryHeaders { // @public export interface FileSetExpiryOptions extends CommonOptions { abortSignal?: AbortSignalLike; - expiresOn?: number | Date; + expiresOn?: Date; + timeToExpireInMs?: number; } // @public diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index bbe2db176dae..1262dabf61a8 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -1542,27 +1542,18 @@ export class DataLakeFileClient extends DataLakePathClient { options.tracingOptions ); try { - if (mode === "NeverExpire" && options.expiresOn) { - throw new Error(`Shouldn't specify options.expiresOn when using mode ${mode}`); - } - if (!options.expiresOn && mode !== "NeverExpire") { - throw new Error(`Must specify options.expiresOn when using modes other than ${mode}`); - } - let expiresOn: string | undefined = undefined; if (mode === "RelativeToNow" || mode === "RelativeToCreation") { - if (typeof options.expiresOn !== "number" || options.expiresOn < 0) { - throw new Error( - `options.expiresOn should be the number of milliseconds elapsed from the relative time when using mode ${mode}, but is ${options.expiresOn}` - ); + if (!options.timeToExpireInMs) { + throw new Error(`Should specify options.timeToExpireInMs when using mode ${mode}.`); } // MINOR: need check against <= 2**64, but JS number has the precision problem. - expiresOn = Math.round(options.expiresOn).toString(); - } else if (mode === "Absolute") { - if (typeof options.expiresOn === "number") { - throw new Error( - `options.expiresOn should be a valid time when using mode ${mode}, but is ${options.expiresOn}` - ); + expiresOn = Math.round(options.timeToExpireInMs).toString(); + } + + if (mode === "Absolute") { + if (!options.expiresOn) { + throw new Error(`Should specify options.expiresOn when using mode ${mode}.`); } const now = new Date(); if (!(options.expiresOn!.getTime() > now.getTime())) { diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index ab3def2043f3..7338423c755d 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -883,15 +883,21 @@ export interface FileSetExpiryOptions extends CommonOptions { abortSignal?: AbortSignalLike; /** - * The time to set the file to expiry, used in combination with {@link FileExpiryMode}. - * When using 'RelativeToCreation' or 'RelativeToNow' mode, should be the number of milliseconds elapsed from the relative time. - * when using 'Absolute', should be a valid time. A time in the past is not allowed and milliseconds will be dropped. - * When using 'NeverExpire', it shouldn't be provided. + * The time to set the file to expire on, used in combination with the "Absolute" {@link FileExpiryMode}. + * A time in the past is not allowed and milliseconds will be dropped. * - * @type {number | Date} + * @type {Date} * @memberof FileSetExpiryOptions */ - expiresOn?: number | Date; + expiresOn?: Date; + + /** + * The number of milliseconds to elapse before the file expires, used in combination with the "RelativeToCreation" or "RelativeToNow" {@link FileExpiryMode}. + * + * @type {number} + * @memberof FileSetExpiryOptions + */ + timeToExpireInMs?: number; } /***********************************************************/ diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index 865f837ba8ee..553517a3e80d 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -355,7 +355,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToNow", async () => { const delta = 1000; - await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { expiresOn: delta }); + await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { timeToExpireInMs: delta }); await delay(delta); assert.ok(!(await fileClient.exists())); @@ -363,7 +363,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToCreation", async () => { const delta = 1000 * 3600 + 0.12; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta }); + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { timeToExpireInMs: delta }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + Math.round(delta)); @@ -371,7 +371,7 @@ describe("DataLakePathClient", () => { it("set expiry - override", async () => { const delta = 1000 * 3600; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { expiresOn: delta }); + await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { timeToExpireInMs: delta }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); From 9c0e00b77c3431fe3ec0bd8de270db69ea6dcb67 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 29 Jun 2020 20:44:28 +0800 Subject: [PATCH 08/10] use string literals instead of enum --- .../review/storage-file-datalake.api.md | 32 ++------------ .../storage-file-datalake/src/clients.ts | 22 +++++----- .../src/generated/src/models/index.ts | 44 +++---------------- .../storage-file-datalake/swagger/README.md | 1 - .../test/pathclient.spec.ts | 14 +++--- 5 files changed, 28 insertions(+), 85 deletions(-) diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index a2453a408b6a..16fa0312aff6 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -297,16 +297,7 @@ export interface FileCreateResponse extends PathCreateResponse { } // @public -export enum FileExpiryMode { - // (undocumented) - Absolute = "Absolute", - // (undocumented) - NeverExpire = "NeverExpire", - // (undocumented) - RelativeToCreation = "RelativeToCreation", - // (undocumented) - RelativeToNow = "RelativeToNow" -} +export type FileExpiryMode = 'NeverExpire' | 'RelativeToCreation' | 'RelativeToNow' | 'Absolute'; // @public (undocumented) export interface FileFlushOptions extends CommonOptions { @@ -1011,12 +1002,7 @@ export type PathGetAccessControlResponse = PathAccessControl & PathGetAccessCont }; // @public -export enum PathGetPropertiesAction { - // (undocumented) - GetAccessControl = "getAccessControl", - // (undocumented) - GetStatus = "getStatus" -} +export type PathGetPropertiesAction = 'getAccessControl' | 'getStatus'; // @public (undocumented) export interface PathGetPropertiesHeaders { @@ -1228,20 +1214,10 @@ export interface PathRemoveHeaders { } // @public -export enum PathRenameMode { - // (undocumented) - Legacy = "legacy", - // (undocumented) - Posix = "posix" -} +export type PathRenameMode = 'legacy' | 'posix'; // @public -export enum PathResourceType { - // (undocumented) - Directory = "directory", - // (undocumented) - File = "file" -} +export type PathResourceType = 'directory' | 'file'; // @public export interface PathSetAccessControlHeaders { diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index 1262dabf61a8..246ecf88b99b 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -31,14 +31,12 @@ import { PathExistsOptions, PathGetAccessControlOptions, PathGetAccessControlResponse, - PathGetPropertiesAction, PathGetPropertiesOptions, PathGetPropertiesResponse, PathHttpHeaders, PathMoveOptions, PathMoveResponse, PathPermissions, - PathRenameMode, PathResourceType, PathSetAccessControlOptions, PathSetAccessControlResponse, @@ -338,7 +336,7 @@ export class DataLakePathClient extends StorageClient { ); try { const response = await this.pathContext.getProperties({ - action: PathGetPropertiesAction.GetAccessControl, + action: "getAccessControl", upn: options.userPrincipalName, leaseAccessConditions: options.conditions, modifiedAccessConditions: options.conditions, @@ -614,7 +612,7 @@ export class DataLakePathClient extends StorageClient { try { return await destPathClient.pathContext.create({ - mode: PathRenameMode.Legacy, // By default + mode: "legacy", // By default renameSource, sourceLeaseId: options.conditions.leaseId, leaseAccessConditions: options.destinationConditions, @@ -678,13 +676,13 @@ export class DataLakeDirectoryClient extends DataLakePathClient { resourceTypeOrOptions?: PathResourceType | PathCreateOptions, options: PathCreateOptions = {} ): Promise { - if (resourceTypeOrOptions === PathResourceType.Directory) { + if (resourceTypeOrOptions === "directory") { return super.create(resourceTypeOrOptions as PathResourceType, options); } - if (resourceTypeOrOptions === PathResourceType.File) { + if (resourceTypeOrOptions === "file") { throw TypeError( - `DataLakeDirectoryClient:create() resourceType cannot be ${PathResourceType.File}. Refer to DataLakeFileClient for file creation.` + `DataLakeDirectoryClient:create() resourceType cannot be ${resourceTypeOrOptions}. Refer to DataLakeFileClient for file creation.` ); } @@ -695,7 +693,7 @@ export class DataLakeDirectoryClient extends DataLakePathClient { options.tracingOptions ); try { - return await super.create(PathResourceType.Directory, { + return await super.create("directory", { ...options, tracingOptions: { ...options.tracingOptions, @@ -865,13 +863,13 @@ export class DataLakeFileClient extends DataLakePathClient { resourceTypeOrOptions?: PathResourceType | PathCreateOptions, options: PathCreateOptions = {} ): Promise { - if (resourceTypeOrOptions === PathResourceType.File) { + if (resourceTypeOrOptions === "file") { return super.create(resourceTypeOrOptions as PathResourceType, options); } - if (resourceTypeOrOptions === PathResourceType.Directory) { + if (resourceTypeOrOptions === "directory") { throw TypeError( - `DataLakeFileClient:create() resourceType cannot be ${PathResourceType.Directory}. Refer to DataLakeDirectoryClient for directory creation.` + `DataLakeFileClient:create() resourceType cannot be ${resourceTypeOrOptions}. Refer to DataLakeDirectoryClient for directory creation.` ); } @@ -879,7 +877,7 @@ export class DataLakeFileClient extends DataLakePathClient { options.conditions = options.conditions || {}; const { span, spanOptions } = createSpan("DataLakeFileClient-create", options.tracingOptions); try { - return await super.create(PathResourceType.File, { + return await super.create("file", { ...options, tracingOptions: { ...options.tracingOptions, diff --git a/sdk/storage/storage-file-datalake/src/generated/src/models/index.ts b/sdk/storage/storage-file-datalake/src/generated/src/models/index.ts index 5befeea12216..c61a8ed49e58 100644 --- a/sdk/storage/storage-file-datalake/src/generated/src/models/index.ts +++ b/sdk/storage/storage-file-datalake/src/generated/src/models/index.ts @@ -1714,11 +1714,7 @@ export interface PathSetExpiryHeaders { * @readonly * @enum {string} */ -export enum PathSetAccessControlRecursiveMode { - Set = 'set', - Modify = 'modify', - Remove = 'remove', -} +export type PathSetAccessControlRecursiveMode = 'set' | 'modify' | 'remove'; /** * Defines values for PathExpiryOptions. @@ -1726,12 +1722,7 @@ export enum PathSetAccessControlRecursiveMode { * @readonly * @enum {string} */ -export enum PathExpiryOptions { - NeverExpire = 'NeverExpire', - RelativeToCreation = 'RelativeToCreation', - RelativeToNow = 'RelativeToNow', - Absolute = 'Absolute', -} +export type PathExpiryOptions = 'NeverExpire' | 'RelativeToCreation' | 'RelativeToNow' | 'Absolute'; /** * Defines values for PathResourceType. @@ -1739,10 +1730,7 @@ export enum PathExpiryOptions { * @readonly * @enum {string} */ -export enum PathResourceType { - Directory = 'directory', - File = 'file', -} +export type PathResourceType = 'directory' | 'file'; /** * Defines values for PathRenameMode. @@ -1750,10 +1738,7 @@ export enum PathResourceType { * @readonly * @enum {string} */ -export enum PathRenameMode { - Legacy = 'legacy', - Posix = 'posix', -} +export type PathRenameMode = 'legacy' | 'posix'; /** * Defines values for PathUpdateAction. @@ -1762,13 +1747,7 @@ export enum PathRenameMode { * @readonly * @enum {string} */ -export enum PathUpdateAction { - Append = 'append', - Flush = 'flush', - SetProperties = 'setProperties', - SetAccessControl = 'setAccessControl', - SetAccessControlRecursive = 'setAccessControlRecursive', -} +export type PathUpdateAction = 'append' | 'flush' | 'setProperties' | 'setAccessControl' | 'setAccessControlRecursive'; /** * Defines values for PathLeaseAction. @@ -1776,13 +1755,7 @@ export enum PathUpdateAction { * @readonly * @enum {string} */ -export enum PathLeaseAction { - Acquire = 'acquire', - Break = 'break', - Change = 'change', - Renew = 'renew', - Release = 'release', -} +export type PathLeaseAction = 'acquire' | 'break' | 'change' | 'renew' | 'release'; /** * Defines values for PathGetPropertiesAction. @@ -1790,10 +1763,7 @@ export enum PathLeaseAction { * @readonly * @enum {string} */ -export enum PathGetPropertiesAction { - GetAccessControl = 'getAccessControl', - GetStatus = 'getStatus', -} +export type PathGetPropertiesAction = 'getAccessControl' | 'getStatus'; /** * Contains response data for the listFileSystems operation. diff --git a/sdk/storage/storage-file-datalake/swagger/README.md b/sdk/storage/storage-file-datalake/swagger/README.md index 61c6cc200ddf..d185aa6bf4f9 100644 --- a/sdk/storage/storage-file-datalake/swagger/README.md +++ b/sdk/storage/storage-file-datalake/swagger/README.md @@ -15,7 +15,6 @@ output-folder: ../src/generated input-file: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/storage-dataplane-preview/specification/storage/data-plane/Microsoft.StorageDataLake/stable/2019-12-12/DataLakeStorage.json model-date-time-as-string: true optional-response-headers: true -enum-types: true ``` ## Customizations for Track 2 Generator diff --git a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts index 553517a3e80d..68d5ecc0c046 100644 --- a/sdk/storage/storage-file-datalake/test/pathclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/pathclient.spec.ts @@ -5,7 +5,7 @@ import { record } from "@azure/test-utils-recorder"; import * as assert from "assert"; import * as dotenv from "dotenv"; -import { DataLakeFileClient, DataLakeFileSystemClient, FileExpiryMode } from "../src"; +import { DataLakeFileClient, DataLakeFileSystemClient } from "../src"; import { toPermissionsString } from "../src/transforms"; import { bodyToString, getDataLakeServiceClient, recorderEnvSetup } from "./utils"; @@ -334,7 +334,7 @@ describe("DataLakePathClient", () => { }); it("set expiry - NeverExpire", async () => { - await fileClient.setExpiry(FileExpiryMode.NeverExpire); + await fileClient.setExpiry("NeverExpire"); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn, undefined); }); @@ -343,7 +343,7 @@ describe("DataLakePathClient", () => { const now = recorder.newDate("now"); const delta = 5 * 1000; const expiresOn = new Date(now.getTime() + delta); - await fileClient.setExpiry(FileExpiryMode.Absolute, { expiresOn }); + await fileClient.setExpiry("Absolute", { expiresOn }); const getRes = await fileClient.getProperties(); expiresOn.setMilliseconds(0); // milliseconds dropped @@ -355,7 +355,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToNow", async () => { const delta = 1000; - await fileClient.setExpiry(FileExpiryMode.RelativeToNow, { timeToExpireInMs: delta }); + await fileClient.setExpiry("RelativeToNow", { timeToExpireInMs: delta }); await delay(delta); assert.ok(!(await fileClient.exists())); @@ -363,7 +363,7 @@ describe("DataLakePathClient", () => { it("set expiry - RelativeToCreation", async () => { const delta = 1000 * 3600 + 0.12; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { timeToExpireInMs: delta }); + await fileClient.setExpiry("RelativeToCreation", { timeToExpireInMs: delta }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + Math.round(delta)); @@ -371,12 +371,12 @@ describe("DataLakePathClient", () => { it("set expiry - override", async () => { const delta = 1000 * 3600; - await fileClient.setExpiry(FileExpiryMode.RelativeToCreation, { timeToExpireInMs: delta }); + await fileClient.setExpiry("RelativeToCreation", { timeToExpireInMs: delta }); const getRes = await fileClient.getProperties(); assert.equal(getRes.expiresOn?.getTime(), getRes.createdOn!.getTime() + delta); - await fileClient.setExpiry(FileExpiryMode.NeverExpire); + await fileClient.setExpiry("NeverExpire"); const getRes2 = await fileClient.getProperties(); assert.equal(getRes2.expiresOn, undefined); }); From 2323aa9a1dd93f5f10c3f53030df8a3cadb89e21 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 30 Jun 2020 11:16:52 +0800 Subject: [PATCH 09/10] keep old enum for backward compatibility --- .../review/storage-file-datalake.api.md | 36 +++++++++++++++---- .../storage-file-datalake/src/clients.ts | 22 ++++++------ .../storage-file-datalake/src/models.ts | 22 ++++++++++-- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index 16fa0312aff6..d769289a088b 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -131,7 +131,7 @@ export type CredentialPolicyCreator = (nextPolicy: RequestPolicy, options: Reque // @public export class DataLakeDirectoryClient extends DataLakePathClient { - create(resourceType: PathResourceType, options?: PathCreateOptions): Promise; + create(resourceType: PathResourceTypeModel, options?: PathCreateOptions): Promise; create(options?: DirectoryCreateOptions): Promise; getFileClient(fileName: string): DataLakeFileClient; getSubdirectoryClient(subdirectoryName: string): DataLakeDirectoryClient; @@ -142,7 +142,7 @@ export class DataLakeFileClient extends DataLakePathClient { constructor(url: string, credential?: StorageSharedKeyCredential | AnonymousCredential | TokenCredential, options?: StoragePipelineOptions); constructor(url: string, pipeline: Pipeline); append(body: HttpRequestBody, offset: number, length: number, options?: FileAppendOptions): Promise; - create(resourceType: PathResourceType, options?: PathCreateOptions): Promise; + create(resourceType: PathResourceTypeModel, options?: PathCreateOptions): Promise; create(options?: FileCreateOptions): Promise; flush(position: number, options?: FileFlushOptions): Promise; read(offset?: number, count?: number, options?: FileReadOptions): Promise; @@ -198,7 +198,7 @@ export class DataLakeLeaseClient { export class DataLakePathClient extends StorageClient { constructor(url: string, credential?: StorageSharedKeyCredential | AnonymousCredential | TokenCredential, options?: StoragePipelineOptions); constructor(url: string, pipeline: Pipeline); - create(resourceType: PathResourceType, options?: PathCreateOptions): Promise; + create(resourceType: PathResourceTypeModel, options?: PathCreateOptions): Promise; delete(recursive?: boolean, options?: PathDeleteOptions): Promise; exists(options?: PathExistsOptions): Promise; get fileSystemName(): string; @@ -1001,8 +1001,16 @@ export type PathGetAccessControlResponse = PathAccessControl & PathGetAccessCont }; }; +// @public (undocumented) +export enum PathGetPropertiesAction { + // (undocumented) + GetAccessControl = "getAccessControl", + // (undocumented) + GetStatus = "getStatus" +} + // @public -export type PathGetPropertiesAction = 'getAccessControl' | 'getStatus'; +export type PathGetPropertiesActionModel = 'getAccessControl' | 'getStatus'; // @public (undocumented) export interface PathGetPropertiesHeaders { @@ -1213,11 +1221,27 @@ export interface PathRemoveHeaders { version?: string; } +// @public (undocumented) +export enum PathRenameMode { + // (undocumented) + Legacy = "legacy", + // (undocumented) + Posix = "posix" +} + // @public -export type PathRenameMode = 'legacy' | 'posix'; +export type PathRenameModeModel = 'legacy' | 'posix'; + +// @public (undocumented) +export enum PathResourceType { + // (undocumented) + Directory = "directory", + // (undocumented) + File = "file" +} // @public -export type PathResourceType = 'directory' | 'file'; +export type PathResourceTypeModel = 'directory' | 'file'; // @public export interface PathSetAccessControlHeaders { diff --git a/sdk/storage/storage-file-datalake/src/clients.ts b/sdk/storage/storage-file-datalake/src/clients.ts index 246ecf88b99b..47e4fc7d159f 100644 --- a/sdk/storage/storage-file-datalake/src/clients.ts +++ b/sdk/storage/storage-file-datalake/src/clients.ts @@ -37,7 +37,7 @@ import { PathMoveOptions, PathMoveResponse, PathPermissions, - PathResourceType, + PathResourceTypeModel, PathSetAccessControlOptions, PathSetAccessControlResponse, PathSetHttpHeadersOptions, @@ -213,13 +213,13 @@ export class DataLakePathClient extends StorageClient { * * @see https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create * - * @param {PathResourceType} resourceType Resource type, "directory" or "file". + * @param {PathResourceTypeModel} resourceType Resource type, "directory" or "file". * @param {PathCreateOptions} [options={}] Optional. Options when creating path. * @returns {Promise} * @memberof DataLakePathClient */ public async create( - resourceType: PathResourceType, + resourceType: PathResourceTypeModel, options: PathCreateOptions = {} ): Promise { options.conditions = options.conditions || {}; @@ -651,13 +651,13 @@ export class DataLakeDirectoryClient extends DataLakePathClient { * * @see https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create * - * @param {PathResourceType} resourceType Resource type, must be "directory" for DataLakeDirectoryClient. + * @param {PathResourceTypeModel} resourceType Resource type, must be "directory" for DataLakeDirectoryClient. * @param {PathCreateOptions} [options] Optional. Options when creating directory. * @returns {Promise} * @memberof DataLakeDirectoryClient */ public async create( - resourceType: PathResourceType, + resourceType: PathResourceTypeModel, options?: PathCreateOptions ): Promise; @@ -673,11 +673,11 @@ export class DataLakeDirectoryClient extends DataLakePathClient { public async create(options?: DirectoryCreateOptions): Promise; public async create( - resourceTypeOrOptions?: PathResourceType | PathCreateOptions, + resourceTypeOrOptions?: PathResourceTypeModel | PathCreateOptions, options: PathCreateOptions = {} ): Promise { if (resourceTypeOrOptions === "directory") { - return super.create(resourceTypeOrOptions as PathResourceType, options); + return super.create(resourceTypeOrOptions as PathResourceTypeModel, options); } if (resourceTypeOrOptions === "file") { @@ -838,13 +838,13 @@ export class DataLakeFileClient extends DataLakePathClient { * * @see https://docs.microsoft.com/en-us/rest/api/storageservices/datalakestoragegen2/path/create * - * @param {PathResourceType} resourceType Resource type, must be "file" for DataLakeFileClient. + * @param {PathResourceTypeModel} resourceType Resource type, must be "file" for DataLakeFileClient. * @param {PathCreateOptions} [options] Optional. Options when creating file. * @returns {Promise} * @memberof DataLakeFileClient */ public async create( - resourceType: PathResourceType, + resourceType: PathResourceTypeModel, options?: PathCreateOptions ): Promise; @@ -860,11 +860,11 @@ export class DataLakeFileClient extends DataLakePathClient { public async create(options?: FileCreateOptions): Promise; public async create( - resourceTypeOrOptions?: PathResourceType | PathCreateOptions, + resourceTypeOrOptions?: PathResourceTypeModel | PathCreateOptions, options: PathCreateOptions = {} ): Promise { if (resourceTypeOrOptions === "file") { - return super.create(resourceTypeOrOptions as PathResourceType, options); + return super.create(resourceTypeOrOptions as PathResourceTypeModel, options); } if (resourceTypeOrOptions === "directory") { diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index 7338423c755d..06de05cbfee6 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -37,15 +37,15 @@ export { PathSetAccessControlHeaders, PathSetAccessControlResponse, PathSetAccessControlResponse as PathSetPermissionsResponse, - PathResourceType, + PathResourceType as PathResourceTypeModel, PathUpdateHeaders, PathAppendDataHeaders, PathFlushDataHeaders, PathAppendDataResponse as FileAppendResponse, PathFlushDataResponse as FileFlushResponse, PathFlushDataResponse as FileUploadResponse, - PathGetPropertiesAction, - PathRenameMode, + PathGetPropertiesAction as PathGetPropertiesActionModel, + PathRenameMode as PathRenameModeModel, PathExpiryOptions as FileExpiryMode, PathSetExpiryResponse as FileSetExpiryResponse, PathSetExpiryHeaders as FileSetExpiryHeaders @@ -597,6 +597,22 @@ export interface PathExistsOptions extends CommonOptions { // customerProvidedKey?: CpkInfo; not supported yet } +// Keeping these for backward compatibility when we changed to use string unions. +export enum PathGetPropertiesAction { + GetAccessControl = "getAccessControl", + GetStatus = "getStatus" +} + +export enum PathRenameMode { + Legacy = "legacy", + Posix = "posix" +} + +export enum PathResourceType { + Directory = "directory", + File = "file" +} + /****************************************************************/ /** DataLakeDirectoryClient option and response related models **/ /****************************************************************/ From 5a9e1891c1de9d575c0d089d13613e69e24f8c08 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 30 Jun 2020 11:26:47 +0800 Subject: [PATCH 10/10] nit --- .../review/storage-file-datalake.api.md | 6 +++--- .../storage-file-datalake/src/models.ts | 20 +++++++++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index d769289a088b..9083828ef2e5 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -1001,7 +1001,7 @@ export type PathGetAccessControlResponse = PathAccessControl & PathGetAccessCont }; }; -// @public (undocumented) +// @public export enum PathGetPropertiesAction { // (undocumented) GetAccessControl = "getAccessControl", @@ -1221,7 +1221,7 @@ export interface PathRemoveHeaders { version?: string; } -// @public (undocumented) +// @public export enum PathRenameMode { // (undocumented) Legacy = "legacy", @@ -1232,7 +1232,7 @@ export enum PathRenameMode { // @public export type PathRenameModeModel = 'legacy' | 'posix'; -// @public (undocumented) +// @public export enum PathResourceType { // (undocumented) Directory = "directory", diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index 06de05cbfee6..49c1a179c003 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -598,16 +598,32 @@ export interface PathExistsOptions extends CommonOptions { } // Keeping these for backward compatibility when we changed to use string unions. +/** + * Defines values for PathGetPropertiesAction. + * Possible values include: 'getAccessControl', 'getStatus' + * @readonly + * @enum {string} + */ export enum PathGetPropertiesAction { GetAccessControl = "getAccessControl", GetStatus = "getStatus" } - +/** + * Defines values for PathRenameMode. + * Possible values include: 'legacy', 'posix' + * @readonly + * @enum {string} + */ export enum PathRenameMode { Legacy = "legacy", Posix = "posix" } - +/** + * Defines values for PathResourceType. + * Possible values include: 'directory', 'file' + * @readonly + * @enum {string} + */ export enum PathResourceType { Directory = "directory", File = "file"