Fixed blob swagger for CPK (#7045)

* Fixed blob swagger for CPK
Azure · Aug 27, 2019 · 325e210 · 325e210
1 parent b23bd37
commit 325e210
Showing 1 changed file with 35 additions and 13 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
@@ -522,7 +522,7 @@
       ]
     },
     "/?comp=batch": {
-      "get": {
+      "post": {
         "tags": [
           "service"
         ],
@@ -554,7 +554,7 @@
             "headers": {
               "Content-Type": {
                 "type": "string",
-                "description": "The media type of the body of the response. For batch requests, this is ' multipart/mixed; boundary=batchresponse_<GUID>'"
+                "description": "The media type of the body of the response. For batch requests, this is multipart/mixed; boundary=batchresponse_GUID"
               },
               "x-ms-request-id": {
                 "x-ms-client-name": "RequestId",
@@ -2586,7 +2586,7 @@
       ]
     },
     "/{filesystem}/{path}?action=getAccessControl&directory": {
-      "patch": {
+      "head": {
         "tags": [
           "directory"
         ],
@@ -3161,6 +3161,11 @@
                 "type": "boolean",
                 "description": "The value of this header is set to true if the blob data and application metadata are completely encrypted using the specified algorithm. Otherwise, the value is set to false (when the blob is unencrypted, or if only parts of the blob/application metadata are encrypted)."
               },
+              "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."
+              },
               "x-ms-blob-content-md5": {
                 "x-ms-client-name": "BlobContentMD5",
                 "type": "string",
@@ -3668,7 +3673,7 @@
       ]
     },
     "/{filesystem}/{path}?action=getAccessControl&blob": {
-      "patch": {
+      "head": {
         "tags": [
           "blob"
         ],
@@ -4673,7 +4678,7 @@
                 "type": "string",
                 "format": "date-time-rfc1123",
                 "description": "UTC date/time value generated by the service that indicates the time at which the response was initiated"
-	            },
+              },
               "x-ms-request-server-encrypted": {
                 "x-ms-client-name": "IsServerEncrypted",
                 "type": "boolean",
@@ -5381,11 +5386,6 @@
                 "x-ms-client-name": "IsServerEncrypted",
                 "type": "boolean",
                 "description": "True if the contents of the request are successfully encrypted using the specified algorithm, and false otherwise. For a snapshot request, this header is set to true when metadata was provided in the request and encrypted with a customer-provided key."
-              },
-              "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 source blob. This header is only returned when the blob was encrypted with a customer-provided key."
               }
             }
           },
@@ -6660,6 +6660,15 @@
           {
             "$ref": "#/parameters/LeaseIdOptional"
           },
+          {
+            "$ref": "#/parameters/EncryptionKey"
+          },
+          {
+            "$ref": "#/parameters/EncryptionKeySha256"
+          },
+          {
+            "$ref": "#/parameters/EncryptionAlgorithm"
+          },
           {
             "$ref": "#/parameters/IfSequenceNumberLessThanOrEqualTo"
           },
@@ -7197,6 +7206,15 @@
           {
             "$ref": "#/parameters/LeaseIdOptional"
           },
+          {
+            "$ref": "#/parameters/EncryptionKey"
+          },
+          {
+            "$ref": "#/parameters/EncryptionKeySha256"
+          },
+          {
+            "$ref": "#/parameters/EncryptionAlgorithm"
+          },
           {
             "$ref": "#/parameters/IfModifiedSince"
           },
@@ -9374,8 +9392,9 @@
     },
     "EncryptionKey": {
       "name": "x-ms-encryption-key",
+      "x-ms-client-name": "encryptionKey",
       "type": "string",
-      "in": "query",
+      "in": "header",
       "required": false,
       "x-ms-parameter-location": "method",
       "x-ms-parameter-grouping": {
@@ -9385,8 +9404,9 @@
     },
     "EncryptionKeySha256": {
       "name": "x-ms-encryption-key-sha256",
+      "x-ms-client-name": "encryptionKeySha256",
       "type": "string",
-      "in": "query",
+      "in": "header",
       "required": false,
       "x-ms-parameter-location": "method",
       "x-ms-parameter-grouping": {
@@ -9396,8 +9416,9 @@
     },
     "EncryptionAlgorithm": {
       "name": "x-ms-encryption-algorithm",
+      "x-ms-client-name": "encryptionAlgorithm",
       "type": "string",
-      "in": "query",
+      "in": "header",
       "required": false,
       "enum": [
         "AES256"
@@ -9636,6 +9657,7 @@
     },
     "Upn": {
       "name": "upn",
+      "x-ms-client-name": "upn",
       "in": "query",
       "description": "Optional. Valid only when Hierarchical Namespace is enabled for the account. If \"true\", the identity values returned in the x-ms-owner, x-ms-group, and x-ms-acl response headers will be transformed from Azure Active Directory Object IDs to User Principal Names.  If \"false\", the values will be returned as Azure Active Directory Object IDs. The default value is false.",
       "required": false,