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.

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

[ReleasePR app] Move Dapr settings from template section to configuration section #2230

Merged
1 commit merged into from
Mar 4, 2022
Merged
Changes from all commits
Commits
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
87 changes: 11 additions & 76 deletions schemas/2022-01-01-preview/Microsoft.App.json
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,17 @@
],
"description": "ActiveRevisionsMode controls how active revisions are handled for the Container app:\n<list><item>Multiple: multiple revisions can be active. If no value if provided, this is the default</item><item>Single: Only one revision can be active at a time. Revision weights can not be used in this mode</item></list>."
},
"dapr": {
"oneOf": [
{
"$ref": "#/definitions/Dapr"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Container App Dapr configuration."
},
"ingress": {
"oneOf": [
{
Expand Down Expand Up @@ -1957,17 +1968,6 @@
],
"description": "The configuration settings of the Google provider."
},
"legacyMicrosoftAccount": {
"oneOf": [
{
"$ref": "#/definitions/LegacyMicrosoftAccount"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The configuration settings of the legacy Microsoft Account provider."
},
"twitter": {
"oneOf": [
{
Expand Down Expand Up @@ -2066,60 +2066,6 @@
},
"description": "Container App Ingress configuration."
},
"LegacyMicrosoftAccount": {
"type": "object",
"properties": {
"login": {
"oneOf": [
{
"$ref": "#/definitions/LoginScopes"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The configuration settings of the login flow, including the scopes that should be requested."
},
"registration": {
"oneOf": [
{
"$ref": "#/definitions/ClientRegistration"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The configuration settings of the app registration for providers that have client ids and client secrets"
},
"state": {
"oneOf": [
{
"type": "string",
"enum": [
"Enabled",
"Disabled"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "<code>Disabled</code> if the legacy Microsoft Account provider should not be enabled despite the set registration; otherwise, <code>Enabled</code>."
},
"validation": {
"oneOf": [
{
"$ref": "#/definitions/AllowedAudiencesValidation"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The configuration settings of the Allowed Audiences validation flow."
}
},
"description": "The configuration settings of the legacy Microsoft Account provider."
},
"LogAnalyticsConfiguration": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2754,17 +2700,6 @@
],
"description": "List of container definitions for the Container App."
},
"dapr": {
"oneOf": [
{
"$ref": "#/definitions/Dapr"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Container App Dapr configuration."
},
"revisionSuffix": {
"type": "string",
"description": "User friendly suffix that is appended to the revision name"
Expand Down