Prepare for STG79 features preview release. (#18569)

Azure · Nov 9, 2021 · 38585d2 · 38585d2
1 parent 50db5df
commit 38585d2
Show file tree

Hide file tree

Showing 22 changed files with 186 additions and 78 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/sdk/storage/perf-tests/storage-blob/package.json b/sdk/storage/perf-tests/storage-blob/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@azure/core-http": "^2.0.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure/storage-blob": "^12.8.0",
+    "@azure/storage-blob": "^12.9.0-beta.1",
     "@azure/test-utils-perf": "^1.0.0",
     "dotenv": "^8.2.0",
     "uuid": "^8.3.0"

diff --git a/sdk/storage/perf-tests/storage-file-share/package.json b/sdk/storage/perf-tests/storage-file-share/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@azure/storage-file-share": "^12.8.1",
+    "@azure/storage-file-share": "^12.9.0-beta.1",
     "@azure/test-utils-perf": "^1.0.0",
     "dotenv": "^8.2.0",
     "uuid": "^8.3.0"

diff --git a/sdk/storage/storage-blob/CHANGELOG.md b/sdk/storage/storage-blob/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 12.9.0-beta.1 (Unreleased)
+## 12.9.0-beta.1 (2021-11-09)
 
 ### Features Added
 

diff --git a/sdk/storage/storage-file-datalake/CHANGELOG.md b/sdk/storage/storage-file-datalake/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 12.8.0-beta.1 (Unreleased)
+## 12.8.0-beta.1 (2021-11-09)
 
 ### Features Added
 

diff --git a/sdk/storage/storage-file-share/CHANGELOG.md b/sdk/storage/storage-file-share/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.8.1 (Unreleased)
+## 12.9.0-beta.1 (2021-11-09)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added support for service version 2020-12-06.
 
 ## 12.8.0 (2021-09-10)
 

diff --git a/sdk/storage/storage-file-share/package.json b/sdk/storage/storage-file-share/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/storage-file-share",
   "sdk-type": "client",
-  "version": "12.8.1",
+  "version": "12.9.0-beta.1",
   "description": "Microsoft Azure Storage SDK for JavaScript - File",
   "main": "./dist/index.js",
   "module": "./dist-esm/src/index.js",
@@ -122,7 +122,7 @@
     "tslib": "^2.2.0"
   },
   "devDependencies": {
-    "@azure/storage-blob": "^12.8.0",
+    "@azure/storage-blob": "^12.9.0-beta.1",
     "@azure/dev-tool": "^1.0.0",
     "@azure/eslint-plugin-azure-sdk": "^3.0.0",
     "@azure/test-utils": "^1.0.0",

diff --git a/sdk/storage/storage-file-share/src/AccountSASSignatureValues.ts b/sdk/storage/storage-file-share/src/AccountSASSignatureValues.ts
@@ -96,20 +96,40 @@ export function generateAccountSASQueryParameters(
     accountSASSignatureValues.resourceTypes
   ).toString();
 
-  const stringToSign = [
-    sharedKeyCredential.accountName,
-    parsedPermissions,
-    parsedServices,
-    parsedResourceTypes,
-    accountSASSignatureValues.startsOn
-      ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
-      : "",
-    truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
-    accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
-    accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
-    version,
-    "" // Account SAS requires an additional newline character
-  ].join("\n");
+  let stringToSign: string;
+
+  if (version >= "2020-12-06") {
+    stringToSign = [
+      sharedKeyCredential.accountName,
+      parsedPermissions,
+      parsedServices,
+      parsedResourceTypes,
+      accountSASSignatureValues.startsOn
+        ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
+        : "",
+      truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
+      accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
+      accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
+      version,
+      "", // Reserved for encryption scope
+      "" // Account SAS requires an additional newline character
+    ].join("\n");
+  } else {
+    stringToSign = [
+      sharedKeyCredential.accountName,
+      parsedPermissions,
+      parsedServices,
+      parsedResourceTypes,
+      accountSASSignatureValues.startsOn
+        ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
+        : "",
+      truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
+      accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
+      accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
+      version,
+      "" // Account SAS requires an additional newline character
+    ].join("\n");
+  }
 
   const signature: string = sharedKeyCredential.computeHMACSHA256(stringToSign);
 

diff --git a/sdk/storage/storage-file-share/src/generated/src/models/parameters.ts b/sdk/storage/storage-file-share/src/generated/src/models/parameters.ts
diff --git a/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts b/sdk/storage/storage-file-share/src/generated/src/storageClientContext.ts
diff --git a/sdk/storage/storage-file-share/src/utils/constants.ts b/sdk/storage/storage-file-share/src/utils/constants.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-export const SDK_VERSION: string = "12.8.1";
-export const SERVICE_VERSION: string = "2020-10-02";
+export const SDK_VERSION: string = "12.9.0-beta.1";
+export const SERVICE_VERSION: string = "2020-12-06";
 
 export const FILE_MAX_SIZE_BYTES: number = 4 * 1024 * 1024 * 1024 * 1024; // 4TB
 export const FILE_RANGE_MAX_SIZE_BYTES: number = 4 * 1024 * 1024; // 4MB

diff --git a/sdk/storage/storage-file-share/swagger/README.md b/sdk/storage/storage-file-share/swagger/README.md
@@ -20,7 +20,7 @@ disable-async-iterators: true
 add-credentials: false
 use-extension:
   "@autorest/typescript": "6.0.0-dev.20210218.1"
-package-version: 12.8.1
+package-version: 12.9.0-beta.1
 ```
 
 ## Customizations for Track 2 Generator

diff --git a/sdk/storage/storage-queue/CHANGELOG.md b/sdk/storage/storage-queue/CHANGELOG.md
@@ -1,14 +1,10 @@
 # Release History
 
-## 12.7.1 (Unreleased)
+## 12.8.0-beta.1 (2021-11-09)
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added support for service version 2020-12-06.
 
 ## 12.7.0 (2021-09-10)
 

diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/storage-queue",
   "sdk-type": "client",
-  "version": "12.7.1",
+  "version": "12.8.0-beta.1",
   "description": "Microsoft Azure Storage SDK for JavaScript - Queue",
   "main": "./dist/index.js",
   "module": "./dist-esm/src/index.js",

diff --git a/...s_generation_nodejs_only/recording_queueserviceclientgenerateaccountsasurl_should_work.js b/...s_generation_nodejs_only/recording_queueserviceclientgenerateaccountsasurl_should_work.js
diff --git a/...ly/recording_queueserviceclientgenerateaccountsasurl_with_previous_version_should_work.js b/...ly/recording_queueserviceclientgenerateaccountsasurl_with_previous_version_should_work.js
diff --git a/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts b/sdk/storage/storage-queue/src/AccountSASSignatureValues.ts
@@ -97,20 +97,40 @@ export function generateAccountSASQueryParameters(
     accountSASSignatureValues.resourceTypes
   ).toString();
 
-  const stringToSign = [
-    sharedKeyCredential.accountName,
-    parsedPermissions,
-    parsedServices,
-    parsedResourceTypes,
-    accountSASSignatureValues.startsOn
-      ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
-      : "",
-    truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
-    accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
-    accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
-    version,
-    "" // Account SAS requires an additional newline character
-  ].join("\n");
+  let stringToSign: string;
+
+  if (version >= "2020-12-06") {
+    stringToSign = [
+      sharedKeyCredential.accountName,
+      parsedPermissions,
+      parsedServices,
+      parsedResourceTypes,
+      accountSASSignatureValues.startsOn
+        ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
+        : "",
+      truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
+      accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
+      accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
+      version,
+      "", // Reserved for encryption scope
+      "" // Account SAS requires an additional newline character
+    ].join("\n");
+  } else {
+    stringToSign = [
+      sharedKeyCredential.accountName,
+      parsedPermissions,
+      parsedServices,
+      parsedResourceTypes,
+      accountSASSignatureValues.startsOn
+        ? truncatedISO8061Date(accountSASSignatureValues.startsOn, false)
+        : "",
+      truncatedISO8061Date(accountSASSignatureValues.expiresOn, false),
+      accountSASSignatureValues.ipRange ? ipRangeToString(accountSASSignatureValues.ipRange) : "",
+      accountSASSignatureValues.protocol ? accountSASSignatureValues.protocol : "",
+      version,
+      "" // Account SAS requires an additional newline character
+    ].join("\n");
+  }
 
   const signature: string = sharedKeyCredential.computeHMACSHA256(stringToSign);