Skip to content

Commit 3ee8632

Browse files
author
msftbot[bot]
authored
[ReleasePR app] Move Dapr settings from template section to configuration section (#2230)
Create to sync Azure/azure-rest-api-specs#18091 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...AzureSDKAutomation:sdkAuto/app?expand=1)
2 parents 24a2d8f + 6568466 commit 3ee8632

File tree

1 file changed

+11
-76
lines changed

1 file changed

+11
-76
lines changed

schemas/2022-01-01-preview/Microsoft.App.json

Lines changed: 11 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,17 @@
846846
],
847847
"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>."
848848
},
849+
"dapr": {
850+
"oneOf": [
851+
{
852+
"$ref": "#/definitions/Dapr"
853+
},
854+
{
855+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
856+
}
857+
],
858+
"description": "Container App Dapr configuration."
859+
},
849860
"ingress": {
850861
"oneOf": [
851862
{
@@ -1957,17 +1968,6 @@
19571968
],
19581969
"description": "The configuration settings of the Google provider."
19591970
},
1960-
"legacyMicrosoftAccount": {
1961-
"oneOf": [
1962-
{
1963-
"$ref": "#/definitions/LegacyMicrosoftAccount"
1964-
},
1965-
{
1966-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1967-
}
1968-
],
1969-
"description": "The configuration settings of the legacy Microsoft Account provider."
1970-
},
19711971
"twitter": {
19721972
"oneOf": [
19731973
{
@@ -2066,60 +2066,6 @@
20662066
},
20672067
"description": "Container App Ingress configuration."
20682068
},
2069-
"LegacyMicrosoftAccount": {
2070-
"type": "object",
2071-
"properties": {
2072-
"login": {
2073-
"oneOf": [
2074-
{
2075-
"$ref": "#/definitions/LoginScopes"
2076-
},
2077-
{
2078-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2079-
}
2080-
],
2081-
"description": "The configuration settings of the login flow, including the scopes that should be requested."
2082-
},
2083-
"registration": {
2084-
"oneOf": [
2085-
{
2086-
"$ref": "#/definitions/ClientRegistration"
2087-
},
2088-
{
2089-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2090-
}
2091-
],
2092-
"description": "The configuration settings of the app registration for providers that have client ids and client secrets"
2093-
},
2094-
"state": {
2095-
"oneOf": [
2096-
{
2097-
"type": "string",
2098-
"enum": [
2099-
"Enabled",
2100-
"Disabled"
2101-
]
2102-
},
2103-
{
2104-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2105-
}
2106-
],
2107-
"description": "<code>Disabled</code> if the legacy Microsoft Account provider should not be enabled despite the set registration; otherwise, <code>Enabled</code>."
2108-
},
2109-
"validation": {
2110-
"oneOf": [
2111-
{
2112-
"$ref": "#/definitions/AllowedAudiencesValidation"
2113-
},
2114-
{
2115-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2116-
}
2117-
],
2118-
"description": "The configuration settings of the Allowed Audiences validation flow."
2119-
}
2120-
},
2121-
"description": "The configuration settings of the legacy Microsoft Account provider."
2122-
},
21232069
"LogAnalyticsConfiguration": {
21242070
"type": "object",
21252071
"properties": {
@@ -2754,17 +2700,6 @@
27542700
],
27552701
"description": "List of container definitions for the Container App."
27562702
},
2757-
"dapr": {
2758-
"oneOf": [
2759-
{
2760-
"$ref": "#/definitions/Dapr"
2761-
},
2762-
{
2763-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2764-
}
2765-
],
2766-
"description": "Container App Dapr configuration."
2767-
},
27682703
"revisionSuffix": {
27692704
"type": "string",
27702705
"description": "User friendly suffix that is appended to the revision name"

0 commit comments

Comments
 (0)