Skip to content

Commit 2326ef3

Browse files
najianNan Jiang
authored and
anandanthony
committed
[fix S360] add missing property to REVISIONS/REPLICAS/ (Azure#21037)
* [fix S360] add missing property to REVISIONS/REPLICAS/ fix s360 https://portal.azure-devex-tools.com/amekpis/correctness/detail?errorId=6F43822E-1FAA-4D7C-BCFE-9B8816F67241 * add 200 response for patch action to fix s360 * add example of patch200 * Update ManagedEnvironments_GetAuthToken.json Co-authored-by: Nan Jiang <[email protected]>
1 parent 209a982 commit 2326ef3

File tree

10 files changed

+329
-2
lines changed

10 files changed

+329
-2
lines changed

‎specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ContainerApps.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,12 @@
293293
}
294294
],
295295
"responses": {
296+
"200": {
297+
"description": "Ok.",
298+
"schema": {
299+
"$ref": "#/definitions/ContainerApp"
300+
}
301+
},
296302
"202": {
297303
"description": "Patch operation is in progress."
298304
},

‎specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,12 @@
289289
}
290290
],
291291
"responses": {
292+
"200": {
293+
"description": "Ok",
294+
"schema": {
295+
"$ref": "#/definitions/ManagedEnvironment"
296+
}
297+
},
292298
"202": {
293299
"description": "Patch operation is in progress."
294300
},

‎specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ContainerApps_Patch.json

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,133 @@
114114
}
115115
},
116116
"responses": {
117+
"200": {
118+
"headers": {},
119+
"body": {
120+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
121+
"name": "testcontainerApp0",
122+
"type": "Microsoft.App/containerApps",
123+
"location": "East US",
124+
"properties": {
125+
"provisioningState": "Succeeded",
126+
"managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
127+
"workloadProfileType": "GeneralPurpose",
128+
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
129+
"configuration": {
130+
"ingress": {
131+
"fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
132+
"external": true,
133+
"targetPort": 3000,
134+
"transport": "auto",
135+
"customDomains": [
136+
{
137+
"name": "www.my-name.com",
138+
"bindingType": "SniEnabled",
139+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
140+
},
141+
{
142+
"name": "www.my-other-name.com",
143+
"bindingType": "SniEnabled",
144+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
145+
}
146+
],
147+
"traffic": [
148+
{
149+
"weight": 80,
150+
"revisionName": "testcontainerApp0-ab1234"
151+
},
152+
{
153+
"weight": 20,
154+
"revisionName": "testcontainerApp0-ab4321",
155+
"label": "staging"
156+
}
157+
],
158+
"ipSecurityRestrictions": [
159+
{
160+
"name": "Allow work IP A subnet",
161+
"description": "Allowing all IP's within the subnet below to access containerapp",
162+
"ipAddressRange": "192.168.1.1/32",
163+
"action": "Allow"
164+
},
165+
{
166+
"name": "Allow work IP B subnet",
167+
"description": "Allowing all IP's within the subnet below to access containerapp",
168+
"ipAddressRange": "192.168.1.1/8",
169+
"action": "Allow"
170+
}
171+
]
172+
},
173+
"dapr": {
174+
"enabled": true,
175+
"appPort": 3000,
176+
"appProtocol": "http",
177+
"httpReadBufferSize": 30
178+
}
179+
},
180+
"template": {
181+
"containers": [
182+
{
183+
"image": "repo/testcontainerApp0:v4",
184+
"name": "testcontainerApp0",
185+
"resources": {
186+
"cpu": 0.2,
187+
"memory": "100Mi"
188+
},
189+
"probes": [
190+
{
191+
"type": "Liveness",
192+
"httpGet": {
193+
"path": "/health",
194+
"port": 8080,
195+
"httpHeaders": [
196+
{
197+
"name": "Custom-Header",
198+
"value": "Awesome"
199+
}
200+
]
201+
},
202+
"initialDelaySeconds": 3,
203+
"periodSeconds": 3
204+
}
205+
]
206+
}
207+
],
208+
"initContainers": [
209+
{
210+
"image": "repo/testcontainerApp0:v4",
211+
"name": "testinitcontainerApp0",
212+
"resources": {
213+
"cpu": 0.2,
214+
"memory": "100Mi"
215+
},
216+
"command": [
217+
"/bin/sh"
218+
],
219+
"args": [
220+
"-c",
221+
"while true; do echo hello; sleep 10;done"
222+
]
223+
}
224+
],
225+
"scale": {
226+
"minReplicas": 1,
227+
"maxReplicas": 5,
228+
"rules": [
229+
{
230+
"name": "httpscalingrule",
231+
"http": {
232+
"metadata": {
233+
"concurrentRequests": "50"
234+
}
235+
}
236+
}
237+
]
238+
}
239+
},
240+
"eventStreamEndpoint": "testEndpoint"
241+
}
242+
}
243+
},
117244
"202": {
118245
"headers": {
119246
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/containerappOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-06-01-preview"

‎specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_GetAuthToken.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"expires": "2022-07-14T19:22:50.3080223Z"
1919
}
2020
}
21-
},
22-
"404": {}
21+
}
2322
}
2423
}

‎specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ManagedEnvironments_Patch.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,60 @@
1313
}
1414
},
1515
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv",
19+
"name": "testcontainerenv",
20+
"type": "Microsoft.App/managedEnvironments",
21+
"location": "East US",
22+
"sku": {
23+
"name": "Premium"
24+
},
25+
"properties": {
26+
"provisioningState": "Succeeded",
27+
"deploymentErrors": null,
28+
"defaultDomain": "testcontainerenv.k4apps.io",
29+
"staticIp": "1.2.3.4",
30+
"appLogsConfiguration": {
31+
"logAnalyticsConfiguration": {
32+
"customerId": "string"
33+
}
34+
},
35+
"zoneRedundant": true,
36+
"vnetConfiguration": {
37+
"outboundSettings": {
38+
"outBoundType": "UserDefinedRouting",
39+
"virtualNetworkApplianceIp": "192.168.1.20"
40+
}
41+
},
42+
"customDomainConfiguration": {
43+
"customDomainVerificationId": "custom domain verification id",
44+
"dnsSuffix": "www.my-name.com",
45+
"subjectName": "CN=www.my-name.com",
46+
"expirationDate": "2022-11-06T04:00:00Z",
47+
"thumbprint": "CERTIFICATE_THUMBPRINT"
48+
},
49+
"eventStreamEndpoint": "testEndpoint",
50+
"workloadProfiles": [
51+
{
52+
"workloadProfileType": "GeneralPurpose",
53+
"minimumCount": 3,
54+
"maximumCount": 12
55+
},
56+
{
57+
"workloadProfileType": "MemoryOptimized",
58+
"minimumCount": 3,
59+
"maximumCount": 6
60+
},
61+
{
62+
"workloadProfileType": "ComputeOptimized",
63+
"minimumCount": 3,
64+
"maximumCount": 6
65+
}
66+
]
67+
}
68+
}
69+
},
1670
"202": {
1771
"headers": {
1872
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/managedEnvironmentOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-06-01-preview"

‎specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerApps.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,12 @@
290290
}
291291
],
292292
"responses": {
293+
"200": {
294+
"description": "Ok.",
295+
"schema": {
296+
"$ref": "#/definitions/ContainerApp"
297+
}
298+
},
293299
"202": {
294300
"description": "Patch operation is in progress."
295301
},

‎specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ContainerAppsRevisions.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,16 @@
571571
"format": "int32",
572572
"description": "The container restart count",
573573
"type": "integer"
574+
},
575+
"logStreamEndpoint": {
576+
"description": "Log Stream endpoint",
577+
"type": "string",
578+
"readOnly": true
579+
},
580+
"execEndpoint": {
581+
"description": "Container exec endpoint",
582+
"type": "string",
583+
"readOnly": true
574584
}
575585
}
576586
}

‎specification/app/resource-manager/Microsoft.App/stable/2022-03-01/ManagedEnvironments.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,12 @@
289289
}
290290
],
291291
"responses": {
292+
"200": {
293+
"description": "Ok.",
294+
"schema": {
295+
"$ref": "#/definitions/ManagedEnvironment"
296+
}
297+
},
292298
"202": {
293299
"description": "Patch operation is in progress."
294300
},

‎specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ContainerApps_Patch.json

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,99 @@
8989
"headers": {
9090
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/containerappOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-03-01"
9191
}
92+
},
93+
"200": {
94+
"headers": {},
95+
"body": {
96+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/containerApps/testcontainerApp0",
97+
"name": "testcontainerApp0",
98+
"type": "Microsoft.App/containerApps",
99+
"location": "East US",
100+
"properties": {
101+
"provisioningState": "Succeeded",
102+
"managedEnvironmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube",
103+
"latestRevisionFqdn": "testcontainerApp0-pjxhsye.demokube-t24clv0g.eastus.containerApps.k4apps.io",
104+
"configuration": {
105+
"ingress": {
106+
"fqdn": "testcontainerApp0.demokube-t24clv0g.eastus.containerApps.k4apps.io",
107+
"external": true,
108+
"targetPort": 3000,
109+
"transport": "auto",
110+
"customDomains": [
111+
{
112+
"name": "www.my-name.com",
113+
"bindingType": "SniEnabled",
114+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-name-dot-com"
115+
},
116+
{
117+
"name": "www.my-other-name.com",
118+
"bindingType": "SniEnabled",
119+
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
120+
}
121+
],
122+
"traffic": [
123+
{
124+
"weight": 80,
125+
"revisionName": "testcontainerApp0-ab1234"
126+
},
127+
{
128+
"weight": 20,
129+
"revisionName": "testcontainerApp0-ab4321",
130+
"label": "staging"
131+
}
132+
]
133+
},
134+
"dapr": {
135+
"enabled": true,
136+
"appPort": 3000,
137+
"appProtocol": "http"
138+
}
139+
},
140+
"template": {
141+
"containers": [
142+
{
143+
"image": "repo/testcontainerApp0:v4",
144+
"name": "testcontainerApp0",
145+
"resources": {
146+
"cpu": 0.2,
147+
"memory": "100Mi"
148+
},
149+
"probes": [
150+
{
151+
"type": "Liveness",
152+
"httpGet": {
153+
"path": "/health",
154+
"port": 8080,
155+
"httpHeaders": [
156+
{
157+
"name": "Custom-Header",
158+
"value": "Awesome"
159+
}
160+
]
161+
},
162+
"initialDelaySeconds": 3,
163+
"periodSeconds": 3
164+
}
165+
]
166+
}
167+
],
168+
"scale": {
169+
"minReplicas": 1,
170+
"maxReplicas": 5,
171+
"rules": [
172+
{
173+
"name": "httpscalingrule",
174+
"http": {
175+
"metadata": {
176+
"concurrentRequests": "50"
177+
}
178+
}
179+
}
180+
]
181+
}
182+
}
183+
}
184+
}
92185
}
93186
}
94187
}

‎specification/app/resource-manager/Microsoft.App/stable/2022-03-01/examples/ManagedEnvironments_Patch.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@
1313
}
1414
},
1515
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/examplerg/providers/Microsoft.App/managedEnvironments/testcontainerenv",
19+
"name": "testcontainerenv",
20+
"type": "Microsoft.App/managedEnvironments",
21+
"location": "East US",
22+
"properties": {
23+
"provisioningState": "Succeeded",
24+
"deploymentErrors": null,
25+
"defaultDomain": "testcontainerenv.k4apps.io",
26+
"staticIp": "1.2.3.4",
27+
"appLogsConfiguration": {
28+
"logAnalyticsConfiguration": {
29+
"customerId": "string"
30+
}
31+
},
32+
"zoneRedundant": true
33+
}
34+
}
35+
},
1636
"202": {
1737
"headers": {
1838
"azure-asyncoperation": "https://management.azure.com/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/providers/Microsoft.App/locations/eastus/managedEnvironmentOperationResults/62e4d893-d233-4005-988e-a428d9f77076?api-version=2022-03-01"

0 commit comments

Comments
 (0)