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

Datr/live validation correctness #13189

Merged
merged 18 commits into from
Mar 11, 2021
Merged

Datr/live validation correctness #13189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e161e0d
kind and objectid
datr93 Feb 26, 2021
e927e1b
migration requets properties
datr93 Feb 26, 2021
eccd72f
readonly objectid and enum
datr93 Feb 26, 2021
c4c9585
cloudPcResource
datr93 Feb 26, 2021
d20a41a
operation fix
datr93 Feb 26, 2021
e35feac
fix comma
datr93 Feb 26, 2021
8bc5674
fix operation
datr93 Feb 26, 2021
adc6a64
unhide
datr93 Feb 26, 2021
0a8780f
serviceSpect try again
datr93 Feb 26, 2021
f5e1cda
try again operation
datr93 Feb 26, 2021
3c429bf
add objectId
datr93 Feb 26, 2021
548db7d
cloudPcResource example
datr93 Feb 27, 2021
702e62f
add migration example
datr93 Feb 27, 2021
a27e4b7
update doesn't have migration
datr93 Feb 27, 2021
86d2619
migration changes
datr93 Mar 1, 2021
a37c95d
make 2021-01-14-preview match 2021-02-01-preview
datr93 Mar 5, 2021
a42370f
custom word
datr93 Mar 5, 2021
25a1750
Merge branch 'master' into datr/LiveValidationCorrectness
datr93 Mar 5, 2021
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
1 change: 1 addition & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,7 @@ Checkfeature
lifecycles
backuptype
FSLogix
unhide
privatelinkservice
natgateway
defanged
434 changes: 403 additions & 31 deletions ...ger/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/desktopvirtualization.json
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 19 additions & 3 deletions ...ft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
},
Expand All @@ -30,11 +34,17 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false,
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
},
Expand All @@ -49,11 +59,17 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false,
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion ...ft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
},
"204": {}
Expand Down
4 changes: 3 additions & 1 deletion ...osoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...tualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
},
{
Expand All @@ -36,11 +38,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
}
]
Expand Down
8 changes: 6 additions & 2 deletions ...rtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
},
{
Expand All @@ -35,11 +37,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
}
]
Expand Down
4 changes: 3 additions & 1 deletion ...ft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1",
"workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1",
"applicationGroupType": "RemoteApp"
"applicationGroupType": "RemoteApp",
"cloudPcResource": false
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...crosoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand All @@ -47,6 +48,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand Down
1 change: 1 addition & 0 deletions ...crosoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand Down
1 change: 1 addition & 0 deletions .../Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand Down
2 changes: 2 additions & 0 deletions ...Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand All @@ -34,6 +35,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application2",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des2",
"friendlyName": "friendly",
"filePath": "path",
Expand Down
1 change: 1 addition & 0 deletions ...crosoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1",
"type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"filePath": "path",
Expand Down
1 change: 1 addition & 0 deletions ...ager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop",
"type": "Microsoft.DesktopVirtualization/applicationGroups/desktops",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc",
Expand Down
1 change: 1 addition & 0 deletions ...ger/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop",
"type": "Microsoft.DesktopVirtualization/applicationGroups/desktops",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc",
Expand Down
1 change: 1 addition & 0 deletions ...r/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/desktops/SessionDesktop",
"type": "Microsoft.DesktopVirtualization/applicationGroups/desktops",
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"description": "des1",
"friendlyName": "friendly",
"iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc",
Expand Down
22 changes: 19 additions & 3 deletions .../Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
},
Expand All @@ -44,6 +48,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -64,7 +69,12 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false,
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
},
Expand All @@ -79,6 +89,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -99,7 +110,12 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false,
"migrationRequest": {
"migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}",
"operation": "Start"
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion .../Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -36,7 +37,8 @@
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false
}
},
"204": {}
Expand Down
4 changes: 3 additions & 1 deletion ...ger/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -37,7 +38,8 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions ...er/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -37,7 +38,8 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false
}
},
{
Expand All @@ -50,6 +52,7 @@
"key2": "value2"
},
"properties": {
"objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325",
"friendlyName": "friendly",
"description": "des1",
"hostPoolType": "Pooled",
Expand All @@ -70,7 +73,8 @@
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
"ssoSecretType": "SharedKey",
"preferredAppGroupType": "Desktop",
"startVMOnConnect": false
"startVMOnConnect": false,
"cloudPcResource": false
}
}
]
Expand Down
Loading