From 8e1bc620c1910f3d30d91a909b723f42b1e52e5b Mon Sep 17 00:00:00 2001 From: HarshaNalluru <10452642+HarshaNalluru@users.noreply.github.com> Date: Wed, 16 Oct 2019 23:50:05 -0700 Subject: [PATCH 1/2] BlobSASSignatureValues could use BlobSASPermissions type for permissions --- .../src/AccountSASSignatureValues.ts | 10 ++++----- .../src/BlobSASSignatureValues.ts | 22 ++++++++++++------- .../src/AccountSASSignatureValues.ts | 6 ++--- .../src/FileSASSignatureValues.ts | 10 +++++---- .../src/AccountSASSignatureValues.ts | 6 ++--- .../src/QueueSASSignatureValues.ts | 8 ++++--- 6 files changed, 36 insertions(+), 26 deletions(-) diff --git a/sdk/storage/storage-blob/src/AccountSASSignatureValues.ts b/sdk/storage/storage-blob/src/AccountSASSignatureValues.ts index 5ae610730c6f..f00db160013e 100644 --- a/sdk/storage/storage-blob/src/AccountSASSignatureValues.ts +++ b/sdk/storage/storage-blob/src/AccountSASSignatureValues.ts @@ -65,10 +65,10 @@ export interface AccountSASSignatureValues { * Specifies which operations the SAS user may perform. Please refer to {@link AccountSASPermissions} for help * constructing the permissions string. * - * @type {string} + * @type {AccountSASPermissions} * @memberof AccountSASSignatureValues */ - permissions: string; + permissions: AccountSASPermissions; /** * Optional. IP range allowed. @@ -118,8 +118,8 @@ export function generateAccountSASQueryParameters( : SERVICE_VERSION; const parsedPermissions = AccountSASPermissions.parse( - accountSASSignatureValues.permissions - ).toString(); + accountSASSignatureValues.permissions.toString() + ); const parsedServices = AccountSASServices.parse(accountSASSignatureValues.services).toString(); const parsedResourceTypes = AccountSASResourceTypes.parse( accountSASSignatureValues.resourceTypes @@ -145,7 +145,7 @@ export function generateAccountSASQueryParameters( return new SASQueryParameters( version, signature, - parsedPermissions, + parsedPermissions.toString(), parsedServices, parsedResourceTypes, accountSASSignatureValues.protocol, diff --git a/sdk/storage/storage-blob/src/BlobSASSignatureValues.ts b/sdk/storage/storage-blob/src/BlobSASSignatureValues.ts index 8b53041f280e..eab93b0fad86 100644 --- a/sdk/storage/storage-blob/src/BlobSASSignatureValues.ts +++ b/sdk/storage/storage-blob/src/BlobSASSignatureValues.ts @@ -59,10 +59,10 @@ export interface BlobSASSignatureValues { * Please refer to either {@link ContainerSASPermissions} or {@link BlobSASPermissions} depending on the resource * being accessed for help constructing the permissions string. * - * @type {string} + * @type {BlobSASPermissions} * @memberof BlobSASSignatureValues */ - permissions?: string; + permissions?: BlobSASPermissions; /** * Optional. IP ranges allowed in this SAS. @@ -359,11 +359,13 @@ function generateBlobSASQueryParameters20150405( // Calling parse and toString guarantees the proper ordering and throws on invalid characters. if (blobSASSignatureValues.permissions) { if (blobSASSignatureValues.blobName) { - verifiedPermissions = BlobSASPermissions.parse(blobSASSignatureValues.permissions).toString(); + verifiedPermissions = BlobSASPermissions.parse( + blobSASSignatureValues.permissions.toString() + ).toString(); resource = "b"; } else { verifiedPermissions = ContainerSASPermissions.parse( - blobSASSignatureValues.permissions + blobSASSignatureValues.permissions.toString() ).toString(); } } @@ -456,14 +458,16 @@ function generateBlobSASQueryParameters20181109( // Calling parse and toString guarantees the proper ordering and throws on invalid characters. if (blobSASSignatureValues.permissions) { if (blobSASSignatureValues.blobName) { - verifiedPermissions = BlobSASPermissions.parse(blobSASSignatureValues.permissions).toString(); + verifiedPermissions = BlobSASPermissions.parse( + blobSASSignatureValues.permissions.toString() + ).toString(); resource = "b"; if (blobSASSignatureValues.snapshotTime) { resource = "bs"; } } else { verifiedPermissions = ContainerSASPermissions.parse( - blobSASSignatureValues.permissions + blobSASSignatureValues.permissions.toString() ).toString(); } } @@ -553,14 +557,16 @@ function generateBlobSASQueryParametersUDK20181109( // Calling parse and toString guarantees the proper ordering and throws on invalid characters. if (blobSASSignatureValues.permissions) { if (blobSASSignatureValues.blobName) { - verifiedPermissions = BlobSASPermissions.parse(blobSASSignatureValues.permissions).toString(); + verifiedPermissions = BlobSASPermissions.parse( + blobSASSignatureValues.permissions.toString() + ).toString(); resource = "b"; if (blobSASSignatureValues.snapshotTime) { resource = "bs"; } } else { verifiedPermissions = ContainerSASPermissions.parse( - blobSASSignatureValues.permissions + blobSASSignatureValues.permissions.toString() ).toString(); } } diff --git a/sdk/storage/storage-file/src/AccountSASSignatureValues.ts b/sdk/storage/storage-file/src/AccountSASSignatureValues.ts index e13a493da8b5..82b24f2efb70 100644 --- a/sdk/storage/storage-file/src/AccountSASSignatureValues.ts +++ b/sdk/storage/storage-file/src/AccountSASSignatureValues.ts @@ -65,10 +65,10 @@ export interface AccountSASSignatureValues { * Specifies which operations the SAS user may perform. Please refer to {@link AccountSASPermissions} for help * constructing the permissions string. * - * @type {string} + * @type {AccountSASPermissions} * @memberof AccountSASSignatureValues */ - permissions: string; + permissions: AccountSASPermissions; /** * Optional. IP range allowed. @@ -118,7 +118,7 @@ export function generateAccountSASQueryParameters( : SERVICE_VERSION; const parsedPermissions = AccountSASPermissions.parse( - accountSASSignatureValues.permissions + accountSASSignatureValues.permissions.toString() ).toString(); const parsedServices = AccountSASServices.parse(accountSASSignatureValues.services).toString(); const parsedResourceTypes = AccountSASResourceTypes.parse( diff --git a/sdk/storage/storage-file/src/FileSASSignatureValues.ts b/sdk/storage/storage-file/src/FileSASSignatureValues.ts index 6dc76e02507c..8d94476a652a 100644 --- a/sdk/storage/storage-file/src/FileSASSignatureValues.ts +++ b/sdk/storage/storage-file/src/FileSASSignatureValues.ts @@ -57,10 +57,10 @@ export interface FileSASSignatureValues { * Please refer to either {@link ShareSASPermissions} or {@link FileSASPermissions} depending on the resource * being accessed for help constructing the permissions string. * - * @type {string} + * @type {FileSASPermissions} * @memberof FileSASSignatureValues */ - permissions?: string; + permissions?: FileSASPermissions; /** * Optional. IP ranges allowed in this SAS. @@ -174,11 +174,13 @@ export function generateFileSASQueryParameters( // Calling parse and toString guarantees the proper ordering and throws on invalid characters. if (fileSASSignatureValues.permissions) { if (fileSASSignatureValues.filePath) { - verifiedPermissions = FileSASPermissions.parse(fileSASSignatureValues.permissions).toString(); + verifiedPermissions = FileSASPermissions.parse( + fileSASSignatureValues.permissions.toString() + ).toString(); resource = "f"; } else { verifiedPermissions = ShareSASPermissions.parse( - fileSASSignatureValues.permissions + fileSASSignatureValues.permissions.toString() ).toString(); } } diff --git a/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts b/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts index f409f02f5b82..f0db5a29e4cd 100644 --- a/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts +++ b/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts @@ -65,10 +65,10 @@ export interface AccountSASSignatureValues { * Specifies which operations the SAS user may perform. Please refer to {@link AccountSASPermissions} for help * constructing the permissions string. * - * @type {string} + * @type {AccountSASPermissions} * @memberof AccountSASSignatureValues */ - permissions: string; + permissions: AccountSASPermissions; /** * Optional. IP range allowed. @@ -118,7 +118,7 @@ export function generateAccountSASQueryParameters( : SERVICE_VERSION; const parsedPermissions = AccountSASPermissions.parse( - accountSASSignatureValues.permissions + accountSASSignatureValues.permissions.toString() ).toString(); const parsedServices = AccountSASServices.parse(accountSASSignatureValues.services).toString(); const parsedResourceTypes = AccountSASResourceTypes.parse( diff --git a/sdk/storage/storage-queue/src/QueueSASSignatureValues.ts b/sdk/storage/storage-queue/src/QueueSASSignatureValues.ts index b761917beb53..490a8fedae28 100644 --- a/sdk/storage/storage-queue/src/QueueSASSignatureValues.ts +++ b/sdk/storage/storage-queue/src/QueueSASSignatureValues.ts @@ -56,10 +56,10 @@ export interface QueueSASSignatureValues { * Please refer to {@link QueueSASPermissions} * being accessed for help constructing the permissions string. * - * @type {string} + * @type {QueueSASPermissions} * @memberof QueueSASSignatureValues */ - permissions?: string; + permissions?: QueueSASPermissions; /** * Optional. IP ranges allowed in this SAS. @@ -125,7 +125,9 @@ export function generateQueueSASQueryParameters( // Calling parse and toString guarantees the proper ordering and throws on invalid characters. if (queueSASSignatureValues.permissions) { - verifiedPermissions = QueueSASPermissions.parse(queueSASSignatureValues.permissions).toString(); + verifiedPermissions = QueueSASPermissions.parse( + queueSASSignatureValues.permissions.toString() + ).toString(); } // Signature is generated on the un-url-encoded values. From 80ccdbd8d0c3e34cf4d4f4b26fb0520145132681 Mon Sep 17 00:00:00 2001 From: HarshaNalluru <10452642+HarshaNalluru@users.noreply.github.com> Date: Wed, 16 Oct 2019 23:50:16 -0700 Subject: [PATCH 2/2] updating the tests --- .../test/node/appendblobclient.spec.ts | 4 +-- .../storage-blob/test/node/blobclient.spec.ts | 2 +- .../test/node/containerclient.spec.ts | 11 +++++--- .../test/node/pageblobclient.spec.ts | 4 +-- .../storage-blob/test/node/sas.spec.ts | 26 +++++++++---------- sdk/storage/storage-blob/test/utils/index.ts | 2 +- .../storage-file/test/node/fileclient.spec.ts | 2 +- .../storage-file/test/node/sas.spec.ts | 12 ++++----- sdk/storage/storage-file/test/utils/index.ts | 2 +- .../storage-queue/test/node/sas.spec.ts | 12 ++++----- sdk/storage/storage-queue/test/utils/index.ts | 2 +- 11 files changed, 42 insertions(+), 37 deletions(-) diff --git a/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts b/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts index aea97b4204be..839794fe712b 100644 --- a/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/appendblobclient.spec.ts @@ -128,7 +128,7 @@ describe("AppendBlobClient Node.js only", () => { expiryTime, containerName, blobName: blockBlobName, - permissions: BlobSASPermissions.parse("r").toString() + permissions: BlobSASPermissions.parse("r") }, credential ); @@ -162,7 +162,7 @@ describe("AppendBlobClient Node.js only", () => { expiryTime, containerName, blobName: blockBlobName, - permissions: BlobSASPermissions.parse("r").toString() + permissions: BlobSASPermissions.parse("r") }, credential ); diff --git a/sdk/storage/storage-blob/test/node/blobclient.spec.ts b/sdk/storage/storage-blob/test/node/blobclient.spec.ts index 191ed221d2f1..361ea513241d 100644 --- a/sdk/storage/storage-blob/test/node/blobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/blobclient.spec.ts @@ -236,7 +236,7 @@ describe("BlobClient Node.js only", () => { const sas = generateBlobSASQueryParameters( { expiryTime, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), containerName, blobName }, diff --git a/sdk/storage/storage-blob/test/node/containerclient.spec.ts b/sdk/storage/storage-blob/test/node/containerclient.spec.ts index a31713c4fc26..3d3a5b1c8d98 100644 --- a/sdk/storage/storage-blob/test/node/containerclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/containerclient.spec.ts @@ -2,7 +2,12 @@ import * as assert from "assert"; import { getBSU, getConnectionStringFromEnvironment } from "../utils"; import { PublicAccessType } from "../../src/generated/src/models/index"; -import { ContainerClient, newPipeline, SharedKeyCredential } from "../../src"; +import { + ContainerClient, + newPipeline, + SharedKeyCredential, + ContainerSASPermissions +} from "../../src"; import { TokenCredential } from "@azure/core-http"; import { assertClientUsesTokenCredential } from "../utils/assert"; import { record } from "../utils/recorder"; @@ -41,7 +46,7 @@ describe("ContainerClient Node.js only", () => { { accessPolicy: { expiry: new Date("2018-12-31T11:22:33.4567890Z"), - permissions: "rwd", + permissions: ContainerSASPermissions.parse("rwd").toString(), start: new Date("2017-12-31T11:22:33.4567890Z") }, id: "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" @@ -59,7 +64,7 @@ describe("ContainerClient Node.js only", () => { const containerAcl = [ { accessPolicy: { - permissions: "rwd" + permissions: ContainerSASPermissions.parse("rwd").toString() }, id: "MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" } diff --git a/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts b/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts index 23f15f6017b1..c57848f178e7 100644 --- a/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts +++ b/sdk/storage/storage-blob/test/node/pageblobclient.spec.ts @@ -138,7 +138,7 @@ describe("PageBlobClient Node.js only", () => { expiryTime, containerName, blobName: blockBlobName, - permissions: BlobSASPermissions.parse("r").toString() + permissions: BlobSASPermissions.parse("r") }, sharedKeyCredential as SharedKeyCredential ); @@ -259,7 +259,7 @@ describe("PageBlobClient Node.js only", () => { expiryTime, containerName, blobName: blockBlobName, - permissions: BlobSASPermissions.parse("r").toString() + permissions: BlobSASPermissions.parse("r") }, credential ); diff --git a/sdk/storage/storage-blob/test/node/sas.spec.ts b/sdk/storage/storage-blob/test/node/sas.spec.ts index 21b3ab11c807..266e07d59436 100644 --- a/sdk/storage/storage-blob/test/node/sas.spec.ts +++ b/sdk/storage/storage-blob/test/node/sas.spec.ts @@ -47,7 +47,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HttpsAndHttp, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -77,7 +77,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("wdlcup").toString(), + permissions: AccountSASPermissions.parse("wdlcup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString() }, @@ -111,7 +111,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("tqf").toString() }, @@ -146,7 +146,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HttpsAndHttp, resourceTypes: AccountSASResourceTypes.parse("co").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -191,7 +191,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { containerName: containerClient.containerName, expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: ContainerSASPermissions.parse("racwdl").toString(), + permissions: ContainerSASPermissions.parse("racwdl"), protocol: SASProtocol.HttpsAndHttp, startTime: now, version: "2016-05-31" @@ -245,7 +245,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now, version: "2016-05-31" @@ -300,7 +300,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now }, @@ -356,7 +356,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now, snapshotTime: response.snapshot @@ -413,7 +413,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now, version: "2016-05-31" @@ -514,7 +514,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { containerName: containerClient.containerName, expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: ContainerSASPermissions.parse("racwdl").toString(), + permissions: ContainerSASPermissions.parse("racwdl"), protocol: SASProtocol.HttpsAndHttp, startTime: now, version: "2019-02-02" @@ -569,7 +569,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { containerName: containerClient.containerName, expiryTime: tmr, - permissions: ContainerSASPermissions.parse("racwdl").toString() + permissions: ContainerSASPermissions.parse("racwdl") }, userDelegationKey, accountName @@ -636,7 +636,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now }, @@ -707,7 +707,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { contentType: "content-type-override", expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: BlobSASPermissions.parse("racwd").toString(), + permissions: BlobSASPermissions.parse("racwd"), protocol: SASProtocol.HttpsAndHttp, startTime: now, snapshotTime: response.snapshot diff --git a/sdk/storage/storage-blob/test/utils/index.ts b/sdk/storage/storage-blob/test/utils/index.ts index 6b11a59238a4..10e908b7938b 100644 --- a/sdk/storage/storage-blob/test/utils/index.ts +++ b/sdk/storage/storage-blob/test/utils/index.ts @@ -190,7 +190,7 @@ export function getSASConnectionStringFromEnvironment(): string { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HttpsAndHttp, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(), diff --git a/sdk/storage/storage-file/test/node/fileclient.spec.ts b/sdk/storage/storage-file/test/node/fileclient.spec.ts index 40827f27467e..2b4bd9e5428c 100644 --- a/sdk/storage/storage-file/test/node/fileclient.spec.ts +++ b/sdk/storage/storage-file/test/node/fileclient.spec.ts @@ -166,7 +166,7 @@ describe("FileClient Node.js only", () => { expiryTime, shareName, filePath: `${dirName}/${fileName}`, - permissions: FileSASPermissions.parse("r").toString() + permissions: FileSASPermissions.parse("r") }, credential ); diff --git a/sdk/storage/storage-file/test/node/sas.spec.ts b/sdk/storage/storage-file/test/node/sas.spec.ts index f4747f943887..070a6241f8d9 100644 --- a/sdk/storage/storage-file/test/node/sas.spec.ts +++ b/sdk/storage/storage-file/test/node/sas.spec.ts @@ -47,7 +47,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -80,7 +80,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("wdlcup").toString(), + permissions: AccountSASPermissions.parse("wdlcup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString() }, @@ -114,7 +114,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btq").toString() }, @@ -146,7 +146,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("co").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -187,7 +187,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: ShareSASPermissions.parse("rcwdl").toString(), + permissions: ShareSASPermissions.parse("rcwdl"), protocol: SASProtocol.HTTPSandHTTP, shareName: shareClient.shareName, startTime: now, @@ -245,7 +245,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { expiryTime: tmr, filePath: fileClient.filePath, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: FileSASPermissions.parse("rcwd").toString(), + permissions: FileSASPermissions.parse("rcwd"), protocol: SASProtocol.HTTPSandHTTP, shareName: fileClient.shareName, startTime: now, diff --git a/sdk/storage/storage-file/test/utils/index.ts b/sdk/storage/storage-file/test/utils/index.ts index e6394d3489ff..86558bef5649 100644 --- a/sdk/storage/storage-file/test/utils/index.ts +++ b/sdk/storage/storage-file/test/utils/index.ts @@ -143,7 +143,7 @@ export function getSASConnectionStringFromEnvironment(): string { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(), diff --git a/sdk/storage/storage-queue/test/node/sas.spec.ts b/sdk/storage/storage-queue/test/node/sas.spec.ts index 4da81bf0c610..b0d6355ab700 100644 --- a/sdk/storage/storage-queue/test/node/sas.spec.ts +++ b/sdk/storage/storage-queue/test/node/sas.spec.ts @@ -45,7 +45,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -75,7 +75,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("wdlcup").toString(), + permissions: AccountSASPermissions.parse("wdlcup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString() }, @@ -109,7 +109,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { const sas = generateAccountSASQueryParameters( { expiryTime: tmr, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("b").toString() }, @@ -144,7 +144,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("co").toString(), services: AccountSASServices.parse("btqf").toString(), @@ -189,7 +189,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { queueName: queueClient.queueName, expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: QueueSASPermissions.parse("raup").toString(), + permissions: QueueSASPermissions.parse("raup"), protocol: SASProtocol.HTTPSandHTTP, startTime: now, version: "2016-05-31" @@ -224,7 +224,7 @@ describe("Shared Access Signature (SAS) generation Node.js only", () => { queueName: queueClient.queueName, expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: QueueSASPermissions.parse("raup").toString(), + permissions: QueueSASPermissions.parse("raup"), protocol: SASProtocol.HTTPSandHTTP, startTime: now, version: "2016-05-31" diff --git a/sdk/storage/storage-queue/test/utils/index.ts b/sdk/storage/storage-queue/test/utils/index.ts index baaa80c1d320..44b6ea3c87b1 100644 --- a/sdk/storage/storage-queue/test/utils/index.ts +++ b/sdk/storage/storage-queue/test/utils/index.ts @@ -84,7 +84,7 @@ export function getSASConnectionStringFromEnvironment(): string { { expiryTime: tmr, ipRange: { start: "0.0.0.0", end: "255.255.255.255" }, - permissions: AccountSASPermissions.parse("rwdlacup").toString(), + permissions: AccountSASPermissions.parse("rwdlacup"), protocol: SASProtocol.HTTPSandHTTP, resourceTypes: AccountSASResourceTypes.parse("sco").toString(), services: AccountSASServices.parse("btqf").toString(),