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

Add encryption in DiskUpdateProperties and SnapshotUpdateProperties #7913

Merged
merged 3 commits into from
Dec 13, 2019
Merged

Add encryption in DiskUpdateProperties and SnapshotUpdateProperties #7913

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41580d1
Update ResourceIdentity to EncryptionSetIdentity
laurawu19 Oct 24, 2019
0ab0451
Merge branch 'master' into private
laurawu19 Dec 6, 2019
0be3e7d
Add encryption in DiskUpdateProperties and SnapshotUpdateProperties
laurawu19 Dec 6, 2019
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
8 changes: 8 additions & 0 deletions specification/compute/resource-manager/Microsoft.Compute/stable/2019-07-01/disk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,10 @@
"type": "integer",
"format": "int32",
"description": "The bandwidth allowed for this disk; only settable for UltraSSD disks. MBps means millions of bytes per second - MB here uses the ISO notation, of powers of 10."
},
"encryption": {
"$ref": "#/definitions/Encryption",
"description": "Encryption property can be used to encrypt data at rest with customer managed keys or platform managed keys."
}
},
"description": "Disk resource update properties."
Expand All @@ -1541,6 +1545,10 @@
"encryptionSettingsCollection": {
"$ref": "#/definitions/EncryptionSettingsCollection",
"description": "Encryption settings collection used be Azure Disk Encryption, can contain multiple encryption settings per disk or snapshot."
},
"encryption": {
"$ref": "#/definitions/Encryption",
"description": "Encryption property can be used to encrypt data at rest with customer managed keys or platform managed keys."
}
},
"description": "Snapshot resource update properties."
Expand Down