Skip to content

[Fix]Addressing the Things Below #7304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiafu-msft merged 1 commit into from
Sep 25, 2019
Merged

[Fix]Addressing the Things Below #7304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3957,6 +3957,9 @@
{
"$ref": "#/parameters/ContentLength"
},
{
"$ref": "#/parameters/PremiumPageBlobAccessTierOptional"
},
{
"$ref": "#/parameters/BlobContentType"
},
Expand Down Expand Up @@ -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."
}
}
},
Expand Down Expand Up @@ -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."
}
}
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -10019,4 +10058,4 @@
"description": "Content disposition for given resource"
}
}
}
}
13 changes: 11 additions & 2 deletions specification/storage/data-plane/Microsoft.FileStorage/preview/2019-02-02/file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@
"application/json"
],
"parameters": [{
"$ref": "#/parameters/FilePermissionKey"
"$ref": "#/parameters/FilePermissionKeyRequired"
},
{
"$ref": "#/parameters/Timeout"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -4441,4 +4450,4 @@
"x-ms-parameter-location": "method"
}
}
}
}