Skip to content
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

Fixing few properties for DiskRP Api Version 2020-05-01 #9937

Merged
merged 3 commits into from
Jun 30, 2020
Merged

Fixing few properties for DiskRP Api Version 2020-05-01 #9937

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b784883
adding 1 property and fixing enums
chetmaddula Jun 23, 2020
b56b310
fixing enum name
chetmaddula Jun 23, 2020
36678c0
revert breaking changes and add a comment
chetmaddula Jun 24, 2020
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
27 changes: 26 additions & 1 deletion specification/compute/resource-manager/Microsoft.Compute/stable/2020-05-01/disk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,7 @@
"EncryptionSetProperties": {
"properties": {
"encryptionType": {
"$ref": "#/definitions/EncryptionType"
"$ref": "#/definitions/DiskEncryptionSetEncryptionType"
chetmaddula marked this conversation as resolved.
Show resolved Hide resolved
},
"activeKey": {
"$ref": "#/definitions/KeyVaultAndKeyReference",
Expand Down Expand Up @@ -1862,6 +1862,28 @@
]
}
},
"DiskEncryptionSetEncryptionType": {
"type": "string",
"description": "The type of key used to encrypt the data of resources associated with a disk encryption set.",
"enum": [
"EncryptionAtRestWithCustomerKey",
"EncryptionAtRestWithPlatformAndCustomerKeys"
],
"x-ms-enum": {
"name": "EncryptionType",
chetmaddula marked this conversation as resolved.
Show resolved Hide resolved
"modelAsString": true,
"values": [
{
"value": "EncryptionAtRestWithCustomerKey",
"description": "Resources associated with disk encryption set are encrypted at rest with Customer managed key that can be changed and revoked by a customer."
},
{
"value": "EncryptionAtRestWithPlatformAndCustomerKeys",
"description": "Resources associated with disk encryption set are encrypted at rest with 2 layers of encryption. One of the keys is Customer managed and the other key is Platform managed."
}
]
}
},
"Encryption": {
"properties": {
"diskEncryptionSetId": {
Expand Down Expand Up @@ -2002,6 +2024,9 @@
},
"DiskEncryptionSetUpdateProperties": {
"properties": {
"encryptionType": {
yungezz marked this conversation as resolved.
Show resolved Hide resolved
"$ref": "#/definitions/DiskEncryptionSetEncryptionType"
},
"activeKey": {
"$ref": "#/definitions/KeyVaultAndKeyReference"
}
Expand Down