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

Update swagger #7510

Merged
merged 20 commits into from
Oct 16, 2019
Merged

Update swagger #7510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
83662bf
Copy compute.json and runCommands.json from 2019-03-01 to 2019-07-01
hyonholee Sep 10, 2019
1307bde
changes to add publicIpAddressVersion field (#7173)
sm947 Sep 10, 2019
1e62782
Add diskEncryptionSet in swagger compute-2019-07
laurawu19 Sep 20, 2019
6e5808f
Merge branch 'compute-2019-07' into private-temp
laurawu19 Sep 26, 2019
30bf868
resolve semantic conflicts
laurawu19 Sep 26, 2019
ada7872
Fix model conflicts
laurawu19 Sep 26, 2019
c132cdf
Resolve readme
laurawu19 Sep 26, 2019
97303d4
Resolve readme
laurawu19 Sep 26, 2019
df22e20
Merge branch 'private-temp' of https://github.com/laurawu19/azure-res…
laurawu19 Sep 26, 2019
9b34c90
Resolve description conflicts
laurawu19 Sep 26, 2019
f37ce4f
Improve description
laurawu19 Sep 27, 2019
e14df44
Fix spell error
laurawu19 Sep 27, 2019
3af773b
Add some examples.
laurawu19 Sep 27, 2019
d82e457
fix model error
laurawu19 Sep 27, 2019
3032b7e
Update examples
laurawu19 Oct 8, 2019
3d74d05
Merge branch 'compute-2019-07' into private-temp
laurawu19 Oct 8, 2019
8e9ad09
Remove uniqueId in swagger
laurawu19 Oct 10, 2019
cbef264
Remove required for diskEncryptionSetId
laurawu19 Oct 10, 2019
26d4e19
Update principalId and tenantId to be readonly
laurawu19 Oct 16, 2019
2d7036a
small space fix
laurawu19 Oct 16, 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
12 changes: 4 additions & 8 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 @@ -1331,11 +1331,6 @@
"readOnly": true,
"type": "string",
"description": "The disk encryption set provisioning state."
},
"uniqueId": {
"type": "string",
"readOnly": true,
"description": "Unique Guid identifying the resource."
}
}
},
Expand Down Expand Up @@ -1448,7 +1443,6 @@
}
},
"required": [
"diskEncryptionSetId",
"type"
],
"description": "Encryption at rest settings for disk or snapshot"
Expand Down Expand Up @@ -1732,12 +1726,14 @@
"description": "The type of Managed Identity used by the DiskEncryptionSet. Only SystemAssigned is supported."
},
"principalId": {
"readOnly": true,
"type": "string",
"description": "The object id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT request if the resource has a systemAssigned(implicit) identity"
"description": "The object id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-identity-principal-id header in the PUT request if the resource has a systemAssigned(implicit) identity"
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "The tenant id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-identity-principal-id header in the PUT request if the resource has a systemAssigned(implicit) identity"
"description": "The tenant id of the Managed Identity Resource. This will be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT request if the resource has a systemAssigned(implicit) identity"
}
},
"description": "The managed identity for the disk encryption set. It should be given permission on the key vault before it can be used to encrypt disks."
Expand Down
3 changes: 3 additions & 0 deletions ...manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutAManagedDisk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:35.079872+00:00",
"provisioningState": "Succeeded"
},
Expand Down
3 changes: 3 additions & 0 deletions ...ce-manager/Microsoft.Compute/stable/2019-07-01/examples/GetInformationAboutASnapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:35.079872+00:00",
"provisioningState": "Succeeded"
},
Expand Down
15 changes: 12 additions & 3 deletions ...anager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInAResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:35.9278721+00:00",
"provisioningState": "Succeeded"
},
Expand All @@ -45,7 +48,7 @@
"project": "ManagedDisks"
},
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
"name": "myManagedDisk"
"name": "myManagedDisk1"
},
{
"properties": {
Expand All @@ -54,13 +57,16 @@
"createOption": "Empty"
},
"diskSizeGB": 10,
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:36.872242+00:00",
"provisioningState": "Succeeded"
},
"type": "Microsoft.Compute/disks",
"location": "westus",
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
"name": "myManagedDisk"
"name": "myManagedDisk2"
},
{
"properties": {
Expand Down Expand Up @@ -91,6 +97,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:36.3973934+00:00",
"provisioningState": "Succeeded"
},
Expand All @@ -101,7 +110,7 @@
"project": "ManagedDisks"
},
"id": "/subscriptions/{subscriptionId}/resourceGroups/myResourceGroup/providers/Microsoft.Compute/disks/myManagedDisk",
"name": "myManagedDisk"
"name": "myManagedDisk3"
}
],
"nextLink": "http://disksvchost:99/subscriptions/{subscriptionId}/providers/Microsoft.Compute/disks?$skiptoken={token}/Subscriptions/{subscriptionId}/ResourceGroups/myResourceGroup/Disks/myManagedDisk"
Expand Down
9 changes: 9 additions & 0 deletions ...manager/Microsoft.Compute/stable/2019-07-01/examples/ListManagedDisksInASubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:35.9278721+00:00",
"provisioningState": "Succeeded"
},
Expand All @@ -53,6 +56,9 @@
"createOption": "Empty"
},
"diskSizeGB": 10,
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:36.872242+00:00",
"provisioningState": "Succeeded"
},
Expand Down Expand Up @@ -90,6 +96,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:36.3973934+00:00",
"provisioningState": "Succeeded"
},
Expand Down
3 changes: 3 additions & 0 deletions ...e-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInAResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:41:35.9278721+00:00",
"provisioningState": "Succeeded"
},
Expand Down
6 changes: 6 additions & 0 deletions ...ce-manager/Microsoft.Compute/stable/2019-07-01/examples/ListSnapshotsInASubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:47:30.6630569+00:00",
"provisioningState": "Succeeded"
},
Expand Down Expand Up @@ -74,6 +77,9 @@
}
]
},
"encryption": {
"type": "EncryptionAtRestWithPlatformKey"
},
"timeCreated": "2016-12-28T04:47:30.3247198+00:00",
"provisioningState": "Succeeded"
},
Expand Down