Skip to content

Commit a33bd39

Browse files
ruslanyvusausetombuildsstuff
authored
Cherry pick for the parameter name fixes for the 2022-03-01 and making the same fixes in 2022-05-01 (#19048)
* Correct Probe enums (#18839) * fix probe enums * Fix revision mode enum * Fix patch example * Fix the casing of enums in the latest api version * Change the parameter names to unblock Terraform release (#19005) * contianerapps: fixing swagger inconsistencies in 2022-01-01-preview * containerapps: fixing inconsistencies in the 2022-03-01 swagger * containerapps: updating the examples for 2022-01-01-preview * containerapps: updating the examples to account for the updated parameter names * containerapps: fixing linting * fix probe enums * Fix revision mode enum * Fix the policheck error * Revert "containerapps: fixing linting" This reverts commit 3c4872f. * Revert "containerapps: updating the examples for 2022-01-01-preview" This reverts commit 9b81fbd. * Revert "contianerapps: fixing swagger inconsistencies in 2022-01-01-preview" This reverts commit 553fc55. * Undo changes to 2022-01-01-preview * Fix one issue * fix remaining inconsistency * fix authConfig and sourceControl names Co-authored-by: tombuildsstuff <[email protected]> Co-authored-by: Mike Vu <[email protected]> * Change param names * Fix examples * Fix CI errors Co-authored-by: Mike Vu <[email protected]> Co-authored-by: tombuildsstuff <[email protected]>
1 parent 7077134 commit a33bd39

File tree

93 files changed

+277
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+277
-253
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,15 @@
172172
},
173173
"scheme": {
174174
"description": "Scheme to use for connecting to the host. Defaults to HTTP.",
175-
"type": "string"
175+
"enum": [
176+
"HTTP",
177+
"HTTPS"
178+
],
179+
"type": "string",
180+
"x-ms-enum": {
181+
"name": "Scheme",
182+
"modelAsString": true
183+
}
176184
}
177185
}
178186
},
@@ -222,9 +230,9 @@
222230
"type": {
223231
"description": "The type of probe.",
224232
"enum": [
225-
"liveness",
226-
"readiness",
227-
"startup"
233+
"Liveness",
234+
"Readiness",
235+
"Startup"
228236
],
229237
"type": "string",
230238
"x-ms-enum": {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@
427427
"activeRevisionsMode": {
428428
"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>",
429429
"enum": [
430-
"multiple",
431-
"single"
430+
"Multiple",
431+
"Single"
432432
],
433433
"type": "string",
434434
"x-ms-enum": {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"name": "testcontainerApp0",
3939
"probes": [
4040
{
41-
"type": "liveness",
41+
"type": "Liveness",
4242
"httpGet": {
4343
"path": "/health",
4444
"port": 8080,
@@ -122,7 +122,7 @@
122122
},
123123
"probes": [
124124
{
125-
"type": "liveness",
125+
"type": "Liveness",
126126
"httpGet": {
127127
"path": "/health",
128128
"port": 8080,
@@ -192,7 +192,7 @@
192192
},
193193
"probes": [
194194
{
195-
"type": "liveness",
195+
"type": "Liveness",
196196
"httpGet": {
197197
"path": "/health",
198198
"port": 8080,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
}
6565
}
6666
},
67-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{name}": {
67+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/authConfigs/{authConfigName}": {
6868
"get": {
6969
"tags": [
7070
"ContainerAppsAuthConfigs"
@@ -86,7 +86,7 @@
8686
"type": "string"
8787
},
8888
{
89-
"name": "name",
89+
"name": "authConfigName",
9090
"in": "path",
9191
"description": "Name of the Container App AuthConfig.",
9292
"required": true,
@@ -138,7 +138,7 @@
138138
"type": "string"
139139
},
140140
{
141-
"name": "name",
141+
"name": "authConfigName",
142142
"in": "path",
143143
"description": "Name of the Container App AuthConfig.",
144144
"required": true,
@@ -199,7 +199,7 @@
199199
"type": "string"
200200
},
201201
{
202-
"name": "name",
202+
"name": "authConfigName",
203203
"in": "path",
204204
"description": "Name of the Container App AuthConfig.",
205205
"required": true,

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,15 @@
172172
},
173173
"scheme": {
174174
"description": "Scheme to use for connecting to the host. Defaults to HTTP.",
175-
"type": "string"
175+
"enum": [
176+
"HTTP",
177+
"HTTPS"
178+
],
179+
"type": "string",
180+
"x-ms-enum": {
181+
"name": "Scheme",
182+
"modelAsString": true
183+
}
176184
}
177185
}
178186
},
@@ -222,9 +230,9 @@
222230
"type": {
223231
"description": "The type of probe.",
224232
"enum": [
225-
"liveness",
226-
"readiness",
227-
"startup"
233+
"Liveness",
234+
"Readiness",
235+
"Startup"
228236
],
229237
"type": "string",
230238
"x-ms-enum": {

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
}
9797
}
9898
},
99-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}": {
99+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}": {
100100
"get": {
101101
"tags": [
102102
"ContainerApps"
@@ -111,7 +111,7 @@
111111
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
112112
},
113113
{
114-
"name": "name",
114+
"name": "containerAppName",
115115
"in": "path",
116116
"description": "Name of the Container App.",
117117
"required": true,
@@ -160,7 +160,7 @@
160160
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
161161
},
162162
{
163-
"name": "name",
163+
"name": "containerAppName",
164164
"in": "path",
165165
"description": "Name of the Container App.",
166166
"required": true,
@@ -221,7 +221,7 @@
221221
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
222222
},
223223
{
224-
"name": "name",
224+
"name": "containerAppName",
225225
"in": "path",
226226
"description": "Name of the Container App.",
227227
"required": true,
@@ -270,7 +270,7 @@
270270
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
271271
},
272272
{
273-
"name": "name",
273+
"name": "containerAppName",
274274
"in": "path",
275275
"description": "Name of the Container App.",
276276
"required": true,
@@ -360,7 +360,7 @@
360360
}
361361
}
362362
},
363-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{name}/listSecrets": {
363+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/listSecrets": {
364364
"post": {
365365
"tags": [
366366
"ContainerApps"
@@ -378,7 +378,7 @@
378378
"$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter"
379379
},
380380
{
381-
"name": "name",
381+
"name": "containerAppName",
382382
"in": "path",
383383
"description": "Name of the Container App.",
384384
"required": true,
@@ -425,8 +425,8 @@
425425
"activeRevisionsMode": {
426426
"description": "ActiveRevisionsMode controls how active revisions are handled for the Container app:\n<list><item>Multiple: multiple revisions can be active.</item><item>Single: Only one revision can be active at a time. Revision weights can not be used in this mode. If no value if provided, this is the default.</item></list>",
427427
"enum": [
428-
"multiple",
429-
"single"
428+
"Multiple",
429+
"Single"
430430
],
431431
"type": "string",
432432
"x-ms-enum": {

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"x-ms-odata": "#/definitions/Revision"
7373
}
7474
},
75-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}": {
75+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}": {
7676
"get": {
7777
"tags": [
7878
"ContainerAppsRevisions"
@@ -94,7 +94,7 @@
9494
"type": "string"
9595
},
9696
{
97-
"name": "name",
97+
"name": "revisionName",
9898
"in": "path",
9999
"description": "Name of the Container App Revision.",
100100
"required": true,
@@ -125,7 +125,7 @@
125125
}
126126
}
127127
},
128-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/activate": {
128+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/activate": {
129129
"post": {
130130
"tags": [
131131
"ContainerAppsRevisions"
@@ -147,7 +147,7 @@
147147
"type": "string"
148148
},
149149
{
150-
"name": "name",
150+
"name": "revisionName",
151151
"in": "path",
152152
"description": "Name of the Container App Revision.",
153153
"required": true,
@@ -175,7 +175,7 @@
175175
}
176176
}
177177
},
178-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/deactivate": {
178+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/deactivate": {
179179
"post": {
180180
"tags": [
181181
"ContainerAppsRevisions"
@@ -197,7 +197,7 @@
197197
"type": "string"
198198
},
199199
{
200-
"name": "name",
200+
"name": "revisionName",
201201
"in": "path",
202202
"description": "Name of the Container App Revision.",
203203
"required": true,
@@ -225,7 +225,7 @@
225225
}
226226
}
227227
},
228-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{name}": {
228+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/replicas/{replicaName}": {
229229
"get": {
230230
"tags": [
231231
"ContainerAppsRevisionReplicas"
@@ -254,7 +254,7 @@
254254
"type": "string"
255255
},
256256
{
257-
"name": "name",
257+
"name": "replicaName",
258258
"in": "path",
259259
"description": "Name of the Container App Revision Replica.",
260260
"required": true,
@@ -338,7 +338,7 @@
338338
}
339339
}
340340
},
341-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{name}/restart": {
341+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}/revisions/{revisionName}/restart": {
342342
"post": {
343343
"tags": [
344344
"ContainerAppsRevisions"
@@ -360,7 +360,7 @@
360360
"type": "string"
361361
},
362362
{
363-
"name": "name",
363+
"name": "revisionName",
364364
"in": "path",
365365
"description": "Name of the Container App Revision.",
366366
"required": true,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
}
6565
}
6666
},
67-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}": {
67+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}": {
6868
"get": {
6969
"tags": [
7070
"DaprComponents"
@@ -86,7 +86,7 @@
8686
"type": "string"
8787
},
8888
{
89-
"name": "name",
89+
"name": "componentName",
9090
"in": "path",
9191
"description": "Name of the Dapr Component.",
9292
"required": true,
@@ -138,7 +138,7 @@
138138
"type": "string"
139139
},
140140
{
141-
"name": "name",
141+
"name": "componentName",
142142
"in": "path",
143143
"description": "Name of the Dapr Component.",
144144
"required": true,
@@ -200,7 +200,7 @@
200200
"type": "string"
201201
},
202202
{
203-
"name": "name",
203+
"name": "componentName",
204204
"in": "path",
205205
"description": "Name of the Dapr Component.",
206206
"required": true,
@@ -232,7 +232,7 @@
232232
"x-ms-long-running-operation": false
233233
}
234234
},
235-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{name}/listSecrets": {
235+
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/managedEnvironments/{environmentName}/daprComponents/{componentName}/listSecrets": {
236236
"post": {
237237
"tags": [
238238
"DaprComponents"
@@ -254,7 +254,7 @@
254254
"type": "string"
255255
},
256256
{
257-
"name": "name",
257+
"name": "componentName",
258258
"in": "path",
259259
"description": "Name of the Dapr Component.",
260260
"required": true,

0 commit comments

Comments
 (0)