Skip to content

[S360 fix ]add default value to containerAPP model #20931

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 5 commits into from
Oct 10, 2022
Merged

[S360 fix ]add default value to containerAPP model #20931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab6e7fb
add default value to containerAPP model
Sep 29, 2022
e60d790
add default value for 2022-06-01-preview
Sep 29, 2022
a30325f
Merge branch 'Azure:main' into naji/addDefaultValue
najian Oct 8, 2022
93f2455
python fix
msyyc Oct 10, 2022
06266f0
python fix
msyyc Oct 10, 2022
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
3 changes: 2 additions & 1 deletion ...tion/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,8 @@
},
"ignoreErrors": {
"description": "Boolean describing if the component errors are ignores",
"type": "boolean"
"type": "boolean",
"default": false
},
"initTimeout": {
"description": "Initialization timeout",
Expand Down
15 changes: 10 additions & 5 deletions ...fication/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,8 @@
"x-ms-enum": {
"name": "ActiveRevisionsMode",
"modelAsString": true
}
},
"default": "Single"
},
"ingress": {
"$ref": "#/definitions/Ingress",
Expand Down Expand Up @@ -636,7 +637,8 @@
"properties": {
"enabled": {
"description": "Boolean indicating if the Dapr side car is enabled",
"type": "boolean"
"type": "boolean",
"default": false
},
"appId": {
"description": "Dapr application identifier",
Expand All @@ -652,7 +654,8 @@
"x-ms-enum": {
"name": "appProtocol",
"modelAsString": true
}
},
"default": "http"
},
"appPort": {
"format": "int32",
Expand Down Expand Up @@ -725,7 +728,8 @@
"x-ms-enum": {
"name": "IngressTransportMethod",
"modelAsString": true
}
},
"default": "auto"
},
"traffic": {
"description": "Traffic weights for app's revisions",
Expand All @@ -749,7 +753,8 @@
},
"allowInsecure": {
"description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections",
"type": "boolean"
"type": "boolean",
"default": "false"
},
"ipSecurityRestrictions": {
"description": "Rules to restrict incoming IP address.",
Expand Down
11 changes: 8 additions & 3 deletions specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@
"Single"
],
"type": "string",
"default": "Single",
"x-ms-enum": {
"name": "ActiveRevisionsMode",
"modelAsString": true
Expand Down Expand Up @@ -561,7 +562,8 @@
"properties": {
"enabled": {
"description": "Boolean indicating if the Dapr side car is enabled",
"type": "boolean"
"type": "boolean",
"default": false
},
"appId": {
"description": "Dapr application identifier",
Expand All @@ -574,6 +576,7 @@
"grpc"
],
"type": "string",
"default": "http",
"x-ms-enum": {
"name": "appProtocol",
"modelAsString": true
Expand Down Expand Up @@ -616,7 +619,8 @@
"x-ms-enum": {
"name": "IngressTransportMethod",
"modelAsString": true
}
},
"default": "auto"
},
"traffic": {
"description": "Traffic weights for app's revisions",
Expand All @@ -640,7 +644,8 @@
},
"allowInsecure": {
"description": "Bool indicating if HTTP connections to is allowed. If set to false HTTP connections are automatically redirected to HTTPS connections",
"type": "boolean"
"type": "boolean",
"default": "false"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions specification/app/resource-manager/Microsoft.App/stable/2022-03-01/DaprComponents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@
},
"ignoreErrors": {
"description": "Boolean describing if the component errors are ignores",
"default": false,
"type": "boolean"
},
"initTimeout": {
Expand Down
23 changes: 23 additions & 0 deletions specification/app/resource-manager/readme.python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,26 @@ clear-output-folder: true
no-namespace-folders: true
output-folder: $(python-sdks-folder)/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers
```

``` yaml $(python)
directive:
- from: CommonDefinitions.json
where: $.definitions.DaprComponent.properties.ignoreErrors
transform: $['default'] = 'False'

- from: ContainerApps.json
where: $.definitions.Dapr.properties.enabled
transform: $['default'] = 'False'

- from: ContainerApps.json
where: $.definitions.Ingress.properties.external
transform: $['default'] = 'False'

- from: ContainerApps.json
where: $.definitions.TrafficWeight.properties.latestRevision
transform: $['default'] = 'False'

- from: ContainerApps.json
where: $.definitions.Ingress.properties.allowInsecure
transform: $['default'] = 'False'
```