From 5e4b09af24251d550e17b4df216acb9ffe7551f5 Mon Sep 17 00:00:00 2001 From: David Tran Date: Mon, 16 Nov 2020 11:37:42 -0800 Subject: [PATCH 1/3] top level name can be 64 char long --- .../preview/2020-11-02-preview/desktopvirtualization.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-02-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-02-preview/desktopvirtualization.json index d6ac5160e575..d9ea37635a86 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-02-preview/desktopvirtualization.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-02-preview/desktopvirtualization.json @@ -3700,7 +3700,7 @@ "required": true, "type": "string", "description": "The name of the host pool within the specified resource group", - "maxLength": 24, + "maxLength": 64, "minLength": 3, "x-ms-parameter-location": "method" }, @@ -3720,7 +3720,7 @@ "required": true, "type": "string", "description": "The name of the application group", - "maxLength": 24, + "maxLength": 64, "minLength": 3, "x-ms-parameter-location": "method" }, @@ -3750,7 +3750,7 @@ "required": true, "type": "string", "description": "The name of the workspace", - "maxLength": 24, + "maxLength": 64, "minLength": 3, "x-ms-parameter-location": "method" }, From 0d8e059a1c71cb9cf87bafb0c45524cd193fb078 Mon Sep 17 00:00:00 2001 From: David Tran Date: Thu, 14 Jan 2021 14:39:24 -0800 Subject: [PATCH 2/3] remove ssoContext, startMenuItems friendly name and fix operation example --- .../2020-11-10-preview/desktopvirtualization.json | 12 ------------ .../2020-11-10-preview/examples/HostPool_Create.json | 3 --- .../2020-11-10-preview/examples/HostPool_Delete.json | 1 - .../2020-11-10-preview/examples/HostPool_Get.json | 1 - .../2020-11-10-preview/examples/HostPool_List.json | 2 -- .../examples/HostPool_ListByResourceGroup.json | 2 -- .../2020-11-10-preview/examples/HostPool_Update.json | 2 -- .../examples/OperationDescription_List.json | 12 ++++++++---- .../examples/StartMenuItem_List.json | 2 -- 9 files changed, 8 insertions(+), 29 deletions(-) diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json index 799f9a28c92a..a6409f6627cb 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json @@ -2791,10 +2791,6 @@ "type": "string" } }, - "ssoContext": { - "type": "string", - "description": "Path to keyvault containing ssoContext secret." - }, "ssoadfsAuthority": { "type": "string", "description": "URL to customer ADFS server for signing WVD SSO certificates." @@ -2926,10 +2922,6 @@ "type": "string", "description": "VM template for sessionhosts configuration within hostpool." }, - "ssoContext": { - "type": "string", - "description": "Path to keyvault containing ssoContext secret." - }, "ssoadfsAuthority": { "type": "string", "description": "URL to customer ADFS server for signing WVD SSO certificates." @@ -3586,10 +3578,6 @@ "type": "string", "description": "Alias of StartMenuItem." }, - "friendlyName": { - "type": "string", - "description": "Friendly name of StartMenuItem." - }, "filePath": { "type": "string", "description": "Path to the file of StartMenuItem." diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Create.json index b0264628b0a6..b45f82c16a5a 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Create.json @@ -23,7 +23,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", @@ -60,7 +59,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", @@ -96,7 +94,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Delete.json index e35a738126f9..a8f0fff07448 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Delete.json @@ -32,7 +32,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Get.json index 41784c13c795..bef10467f8c3 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Get.json @@ -32,7 +32,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_List.json index 7c35020df8ac..561dc4aec298 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_List.json @@ -32,7 +32,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", @@ -66,7 +65,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_ListByResourceGroup.json index 6f29f28ac195..2f4371c40b58 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_ListByResourceGroup.json @@ -33,7 +33,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", @@ -67,7 +66,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Update.json index 28366e7e22d6..2afcbf529bc0 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Update.json @@ -21,7 +21,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", @@ -57,7 +56,6 @@ "registrationTokenOperation": "Update" }, "vmTemplate": "{json:json}", - "ssoContext": "KeyVaultPath", "ssoadfsAuthority": "https://adfs", "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/OperationDescription_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/OperationDescription_List.json index 1c031f24c5c4..388d58548c04 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/OperationDescription_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/OperationDescription_List.json @@ -7,17 +7,21 @@ "body": { "value": [ { - "name": "Microsoft.DesktopVirtualization/ssocontext/read", + "name": "Microsoft.DesktopVirtualization/hostpools/read", "display": { "provider": "Microsoft.DesktopVirtualization", - "resource": "ssocontext" + "resource": "hostpools", + "operation": "Read log definitions", + "description": "Gets the available logs" } }, { - "name": "Microsoft.DesktopVirtualization/ssocontext/write", + "name": "Microsoft.DesktopVirtualization/hostpool/write", "display": { "provider": "Microsoft.DesktopVirtualization", - "resource": "ssocontext" + "resource": "hostpools", + "operation": "Write hostpools", + "description": "Write hostpools" } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/StartMenuItem_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/StartMenuItem_List.json index 647120b7b847..0cc3588604ff 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/StartMenuItem_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/StartMenuItem_List.json @@ -15,7 +15,6 @@ "type": "Microsoft.DesktopVirtualization/applicationGroups/startMenuItems", "properties": { "appAlias": "word", - "friendlyName": "friendly", "filePath": "/path/to/file", "commandLineArguments": "arguments", "iconPath": "/path/to/icon", @@ -28,7 +27,6 @@ "type": "Microsoft.DesktopVirtualization/applicationGroups/startMenuItems", "properties": { "appAlias": "excel", - "friendlyName": "friendly", "filePath": "/path/to/file", "commandLineArguments": "arguments", "iconPath": "/path/to/icon", From 29b1ded48092179a12fdcd3ba77b77e2b24fe80d Mon Sep 17 00:00:00 2001 From: David Tran Date: Tue, 19 Jan 2021 16:46:56 -0800 Subject: [PATCH 3/3] readme fixes --- .../readme.azureresourceschema.md | 11 ++++++++++- .../resource-manager/readme.go.md | 11 +++++++++++ .../resource-manager/readme.java.md | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md b/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md index 2ffaccd67ad1..4dd432e8f43c 100644 --- a/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md +++ b/specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md @@ -12,11 +12,20 @@ batch: - tag: schema-desktopvirtualization-2020-09-21-preview - tag: schema-desktopvirtualization-2020-10-19-preview - tag: schema-desktopvirtualization-2020-11-02-preview - + - tag: schema-desktopvirtualization-2020-11-10-preview ``` Please also specify `--azureresourceschema-folder=`. +### Tag: schema-desktopvirtualization-2020-11-10-preview and azureresourceschema + +``` yaml $(tag) == 'schema-desktopvirtualization-2020-11-10-preview' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas +# all the input files in this apiVersion +input-file: + - Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json +``` + ### Tag: schema-desktopvirtualization-2020-11-02-preview and azureresourceschema ``` yaml $(tag) == 'schema-desktopvirtualization-2020-11-02-preview' && $(azureresourceschema) diff --git a/specification/desktopvirtualization/resource-manager/readme.go.md b/specification/desktopvirtualization/resource-manager/readme.go.md index 1d47b9f234ba..83ca9569b725 100644 --- a/specification/desktopvirtualization/resource-manager/readme.go.md +++ b/specification/desktopvirtualization/resource-manager/readme.go.md @@ -18,7 +18,18 @@ batch: - tag: package-2020-09-21-preview - tag: package-2020-10-19-preview - tag: package-2020-11-02-preview + - tag: package-2020-11-10-preview ``` + +### Tag: package-2020-11-10-preview and go + +These settings apply only when `--tag=package-2020-11-10-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-11-10-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-11-10-preview/$(namespace) +``` + ### Tag: package-2020-11-02-preview and go These settings apply only when `--tag=package-2020-11-02-preview --go` is specified on the command line. diff --git a/specification/desktopvirtualization/resource-manager/readme.java.md b/specification/desktopvirtualization/resource-manager/readme.java.md index b1188bf3be4e..36723635d05c 100644 --- a/specification/desktopvirtualization/resource-manager/readme.java.md +++ b/specification/desktopvirtualization/resource-manager/readme.java.md @@ -18,7 +18,22 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-desktopvirtualizati batch: - tag: package-2020-10-19-preview - tag: package-2020-11-02-preview + - tag: package-2020-11-10-preview ``` + +### Tag: package-2020-11-10-preview and java + +These settings apply only when `--tag=package-2020-11-10-preview --java` is specified on the command line. +Please also specify `--azure-libraries-for-java=`. + +``` yaml $(tag) == 'package-2020-11-10-preview' && $(java) && $(multiapi) +java: + namespace: com.microsoft.azure.management.desktopvirtualization.v2020_11-10-preview + output-folder: $(azure-libraries-for-java-folder)/sdk/desktopvirtualization/mgmt-v2020_11-10-preview +regenerate-manager: true +generate-interface: true +``` + ### Tag: package-2020-11-02-preview and java These settings apply only when `--tag=package-2020-11-02-preview --java` is specified on the command line.