From 1cb62eb6a9ed84bd1eadd4a8ad5551cadb8fa670 Mon Sep 17 00:00:00 2001
From: xiafu <xiafu@microsoft.com>
Date: Tue, 24 Sep 2019 15:28:38 -0700
Subject: [PATCH] =?UTF-8?q?[Fix]Addressing=20the=20Things=20Below=201.=09c?=
 =?UTF-8?q?reate=20of=20Page=20Blob=20is=20missing=20tier=20parameter.=202?=
 =?UTF-8?q?.=09For=20upload=5Fpages=5Ffrom=5Furl=20of=20Page=20Blob,=20the?=
 =?UTF-8?q?=20generated=20code=20doesn=E2=80=99t=20extract=20header=20encr?=
 =?UTF-8?q?yption-key-sha256=20from=20raw=20response,=20which=20resulted?=
 =?UTF-8?q?=20in=20the=20response=20to=20client=20doesn=E2=80=99t=20have?=
 =?UTF-8?q?=20encryption-key-sha256=20info.=203.=09For=20append=5Fblock=5F?=
 =?UTF-8?q?from=5Furl=20of=20Append=20Blob,=20currently=20the=20generated?=
 =?UTF-8?q?=20code=20is=20not=20extracting=20the=20response=20header=20req?=
 =?UTF-8?q?uest-server-encrypted=20from=20raw=20response(server=20returned?=
 =?UTF-8?q?=20response)=20which=20resulted=20in=20client=20doesn=E2=80=99t?=
 =?UTF-8?q?=20have=20request-server-encrypted=20info.=204.=09get=5Fpermiss?=
 =?UTF-8?q?ion=20of=20Storage=20File=20has=20file=5Fpermission=5Fkey=20par?=
 =?UTF-8?q?ameter=20which=20should=20be=20required=20instead=20of=20option?=
 =?UTF-8?q?al?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preview/2019-02-02/blob.json              | 41 ++++++++++++++++++-
 .../preview/2019-02-02/file.json              | 13 +++++-
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
index f50520e783d6..f4cd14898c52 100644
--- a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
+++ b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
@@ -3957,6 +3957,9 @@
           {
             "$ref": "#/parameters/ContentLength"
           },
+          {
+            "$ref": "#/parameters/PremiumPageBlobAccessTierOptional"
+          },
           {
             "$ref": "#/parameters/BlobContentType"
           },
@@ -6924,6 +6927,11 @@
                 "x-ms-client-name": "IsServerEncrypted",
                 "type": "boolean",
                 "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
+              },
+              "x-ms-encryption-key-sha256": {
+                "x-ms-client-name": "EncryptionKeySha256",
+                "type": "string",
+                "description": "The SHA-256 hash of the encryption key used to encrypt the blob. This header is only returned when the blob was encrypted with a customer-provided key."
               }
             }
           },
@@ -7813,6 +7821,11 @@
                 "x-ms-client-name": "EncryptionKeySha256",
                 "type": "string",
                 "description": "The SHA-256 hash of the encryption key used to encrypt the block. This header is only returned when the block was encrypted with a customer-provided key."
+              },
+              "x-ms-request-server-encrypted": {
+                "x-ms-client-name": "IsServerEncrypted",
+                "type": "boolean",
+                "description": "The value of this header is set to true if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise."
               }
             }
           },
@@ -9125,6 +9138,32 @@
       "x-ms-parameter-location": "method",
       "description": "Optional. Indicates the tier to be set on the blob."
     },
+    "PremiumPageBlobAccessTierOptional": {
+      "name": "x-ms-access-tier",
+      "x-ms-client-name": "tier",
+      "in": "header",
+      "required": false,
+      "type": "string",
+      "enum": [
+        "P4",
+        "P6",
+        "P10",
+        "P15",
+        "P20",
+        "P30",
+        "P40",
+        "P50",
+        "P60",
+        "P70",
+        "P80"
+      ],
+      "x-ms-enum": {
+        "name": "PremiumPageBlobAccessTier",
+        "modelAsString": true
+      },
+      "x-ms-parameter-location": "method",
+      "description": "Optional. Indicates the tier to be set on the page blob."
+    },
     "RehydratePriority": {
       "name": "x-ms-rehydrate-priority",
       "x-ms-client-name": "rehydratePriority",
@@ -10019,4 +10058,4 @@
       "description": "Content disposition for given resource"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/specification/storage/data-plane/Microsoft.FileStorage/preview/2019-02-02/file.json b/specification/storage/data-plane/Microsoft.FileStorage/preview/2019-02-02/file.json
index 8f7e1908ee1a..5c0af81825fb 100644
--- a/specification/storage/data-plane/Microsoft.FileStorage/preview/2019-02-02/file.json
+++ b/specification/storage/data-plane/Microsoft.FileStorage/preview/2019-02-02/file.json
@@ -579,7 +579,7 @@
                     "application/json"
                 ],
                 "parameters": [{
-                        "$ref": "#/parameters/FilePermissionKey"
+                        "$ref": "#/parameters/FilePermissionKeyRequired"
                     },
                     {
                         "$ref": "#/parameters/Timeout"
@@ -4192,6 +4192,15 @@
             "type": "string",
             "x-ms-parameter-location": "method"
         },
+        "FilePermissionKeyRequired": {
+          "name": "x-ms-file-permission-key",
+          "x-ms-client-name": "FilePermissionKey",
+          "in": "header",
+          "description": "Key of the permission to be set for the directory/file.",
+          "required": true,
+          "type": "string",
+          "x-ms-parameter-location": "method"
+        },
         "FileRangeWriteFromUrl": {
             "name": "x-ms-write",
             "x-ms-client-name": "fileRangeWriteFromUrl",
@@ -4441,4 +4450,4 @@
             "x-ms-parameter-location": "method"
         }
     }
-}
\ No newline at end of file
+}