Skip to content

Datr/remove unusedsso contextfriendly name #12440

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

Merged
merged 4 commits into from
Jan 20, 2021
Merged

Datr/remove unusedsso contextfriendly name #12440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e4b09a
top level name can be 64 char long
datr93 Nov 16, 2020
ca28ca0
Merge remote-tracking branch 'upstream/master'
datr93 Jan 14, 2021
0d8e059
remove ssoContext, startMenuItems friendly name and fix operation exa…
datr93 Jan 14, 2021
29b1ded
readme fixes
datr93 Jan 20, 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
12 changes: 0 additions & 12 deletions ...ger/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/desktopvirtualization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
3 changes: 0 additions & 3 deletions .../Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down Expand Up @@ -60,7 +59,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down Expand Up @@ -96,7 +94,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
1 change: 0 additions & 1 deletion .../Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Delete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
1 change: 0 additions & 1 deletion ...ger/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
2 changes: 0 additions & 2 deletions ...er/Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down Expand Up @@ -66,7 +65,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
2 changes: 0 additions & 2 deletions ...sktopVirtualization/preview/2020-11-10-preview/examples/HostPool_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down Expand Up @@ -67,7 +66,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
2 changes: 0 additions & 2 deletions .../Microsoft.DesktopVirtualization/preview/2020-11-10-preview/examples/HostPool_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down Expand Up @@ -57,7 +56,6 @@
"registrationTokenOperation": "Update"
},
"vmTemplate": "{json:json}",
"ssoContext": "KeyVaultPath",
"ssoadfsAuthority": "https://adfs",
"ssoClientId": "client",
"ssoClientSecretKeyVaultPath": "https://keyvault/secret",
Expand Down
12 changes: 8 additions & 4 deletions ....DesktopVirtualization/preview/2020-11-10-preview/examples/OperationDescription_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
2 changes: 0 additions & 2 deletions ...crosoft.DesktopVirtualization/preview/2020-11-10-preview/examples/StartMenuItem_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"type": "Microsoft.DesktopVirtualization/applicationGroups/startMenuItems",
"properties": {
"appAlias": "word",
"friendlyName": "friendly",
"filePath": "/path/to/file",
"commandLineArguments": "arguments",
"iconPath": "/path/to/icon",
Expand All @@ -28,7 +27,6 @@
"type": "Microsoft.DesktopVirtualization/applicationGroups/startMenuItems",
"properties": {
"appAlias": "excel",
"friendlyName": "friendly",
"filePath": "/path/to/file",
"commandLineArguments": "arguments",
"iconPath": "/path/to/icon",
Expand Down
11 changes: 10 additions & 1 deletion specification/desktopvirtualization/resource-manager/readme.azureresourceschema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path to the root directory of your azure-resource-manager-schemas clone>`.

### 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)
Expand Down
11 changes: 11 additions & 0 deletions specification/desktopvirtualization/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path to the root directory of your azure-sdk-for-go clone>`.

``` 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.
Expand Down
15 changes: 15 additions & 0 deletions specification/desktopvirtualization/resource-manager/readme.java.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=<path to the root directory of your azure-sdk-for-java clone>`.

``` 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.
Expand Down