Skip to content

Commit 2ea2211

Browse files
authored
Swagger change for mtls and runningState (#23767)
* 1. Add mtls properties for managed ManagedEnvironment 2. Add running state for Revision * fix
1 parent dbd7b63 commit 2ea2211

File tree

6 files changed

+65
-5
lines changed

6 files changed

+65
-5
lines changed

custom-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,8 @@ MSLISTSTATUS
13561356
MSMCAZR
13571357
msrp
13581358
MSTI
1359+
Mtls
1360+
mtls
13591361
mucho
13601362
multiapi
13611363
Multiclass

specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ContainerAppsRevisions.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,23 @@
476476
"name": "RevisionProvisioningState",
477477
"modelAsString": true
478478
}
479+
},
480+
"runningState": {
481+
"description": "Current running state of the revision",
482+
"enum": [
483+
"Running",
484+
"Processing",
485+
"Stopped",
486+
"Degraded",
487+
"Failed",
488+
"Unknown"
489+
],
490+
"type": "string",
491+
"readOnly": true,
492+
"x-ms-enum": {
493+
"name": "RevisionRunningState",
494+
"modelAsString": true
495+
}
479496
}
480497
},
481498
"x-ms-client-flatten": true

specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/ManagedEnvironments.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,16 @@
11261126
}
11271127
}
11281128
},
1129+
"Mtls": {
1130+
"type": "object",
1131+
"description": "Configuration properties for mutual TLS authentication",
1132+
"properties": {
1133+
"enabled": {
1134+
"type": "boolean",
1135+
"description": "Boolean indicating whether the mutual TLS authentication is enabled"
1136+
}
1137+
}
1138+
},
11291139
"ManagedEnvironment": {
11301140
"description": "An environment for hosting container apps",
11311141
"type": "object",
@@ -1239,6 +1249,16 @@
12391249
"create",
12401250
"read"
12411251
]
1252+
},
1253+
"peerAuthentication": {
1254+
"description": "Peer authentication settings for the Managed Environment",
1255+
"type": "object",
1256+
"properties": {
1257+
"mtls": {
1258+
"description": "Mutual TLS authentication settings for the Managed Environment",
1259+
"$ref": "#/definitions/Mtls"
1260+
}
1261+
}
12421262
}
12431263
},
12441264
"x-ms-client-flatten": true

specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/ManagedEnvironments_CreateOrUpdate.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@
4646
"name": "My-consumption-01",
4747
"workloadProfileType": "Consumption"
4848
}
49-
]
49+
],
50+
"peerAuthentication": {
51+
"mtls": {
52+
"enabled": true
53+
}
54+
}
5055
}
5156
}
5257
},
@@ -103,7 +108,12 @@
103108
"workloadProfileType": "Consumption"
104109
}
105110
],
106-
"infrastructureResourceGroup": "capp-svc-testcontainerenv-eastus"
111+
"infrastructureResourceGroup": "capp-svc-testcontainerenv-eastus",
112+
"peerAuthentication": {
113+
"mtls": {
114+
"enabled": true
115+
}
116+
}
107117
}
108118
}
109119
},
@@ -159,7 +169,12 @@
159169
"workloadProfileType": "Consumption"
160170
}
161171
],
162-
"infrastructureResourceGroup": "capp-svc-testcontainerenv-eastus"
172+
"infrastructureResourceGroup": "capp-svc-testcontainerenv-eastus",
173+
"peerAuthentication": {
174+
"mtls": {
175+
"enabled": true
176+
}
177+
}
163178
}
164179
}
165180
}

specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/ManagedEnvironments_Get.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@
6060
"daprConfiguration": {
6161
"version": "1.9"
6262
},
63-
"infrastructureResourceGroup": "capp-svc-jlaw-demo1-northcentralus"
63+
"infrastructureResourceGroup": "capp-svc-jlaw-demo1-northcentralus",
64+
"peerAuthentication": {
65+
"mtls": {
66+
"enabled": true
67+
}
68+
}
6469
}
6570
}
6671
}

specification/app/resource-manager/Microsoft.App/preview/2023-04-01-preview/examples/Revisions_Get.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
},
4646
"trafficWeight": 80,
4747
"active": true,
48-
"replicas": 1
48+
"replicas": 1,
49+
"runningState": "Running"
4950
}
5051
}
5152
}

0 commit comments

Comments
 (0)