Skip to content

Commit bf03746

Browse files
[AutoSync] db0c25231 Merged PR 8381862: update manifest (#25034)
Co-authored-by: swagger-automation <[email protected]>
1 parent c992976 commit bf03746

File tree

26 files changed

+306
-162
lines changed

26 files changed

+306
-162
lines changed

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2841,7 +2841,7 @@
28412841
"readOnly": true
28422842
},
28432843
"serviceId": {
2844-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
2844+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
28452845
"type": "string",
28462846
"readOnly": true
28472847
}

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-06-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,7 @@
28502850
"readOnly": true
28512851
},
28522852
"serviceId": {
2853-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
2853+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
28542854
"type": "string",
28552855
"readOnly": true
28562856
}

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3345,7 +3345,7 @@
33453345
"readOnly": true
33463346
},
33473347
"serviceId": {
3348-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
3348+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
33493349
"type": "string",
33503350
"readOnly": true
33513351
},

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-01-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6313,7 +6313,7 @@
63136313
"readOnly": true
63146314
},
63156315
"serviceId": {
6316-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
6316+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
63176317
"type": "string",
63186318
"readOnly": true
63196319
},

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-03-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6313,7 +6313,7 @@
63136313
"readOnly": true
63146314
},
63156315
"serviceId": {
6316-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
6316+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
63176317
"type": "string",
63186318
"readOnly": true
63196319
},

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-05-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6179,7 +6179,7 @@
61796179
"readOnly": true
61806180
},
61816181
"serviceId": {
6182-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
6182+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
61836183
"type": "string",
61846184
"readOnly": true
61856185
},

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-09-01-preview/appplatform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6394,7 +6394,7 @@
63946394
"readOnly": true
63956395
},
63966396
"serviceId": {
6397-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
6397+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
63986398
"type": "string",
63996399
"readOnly": true
64006400
},

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-11-01-preview/appplatform.json

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7489,7 +7489,7 @@
74897489
"readOnly": true
74907490
},
74917491
"serviceId": {
7492-
"description": "ServiceInstanceEntity GUID which uniquely identifies a created resource",
7492+
"description": "ServiceInstanceEntity Id which uniquely identifies a created resource",
74937493
"type": "string",
74947494
"readOnly": true
74957495
},
@@ -8579,17 +8579,15 @@
85798579
"modelAsString": true
85808580
}
85818581
},
8582-
"resourceRequests": {
8583-
"$ref": "#/definitions/DevToolPortalResourceRequests",
8584-
"description": "The requested resource quantity for required CPU and Memory."
8585-
},
8586-
"instances": {
8587-
"description": "Collection of instances belong to Dev Tool Portal.",
8582+
"components": {
8583+
"description": "Collection of components belong to Dev Tool Portal.",
85888584
"uniqueItems": false,
85898585
"type": "array",
8590-
"x-ms-identifiers": [],
8586+
"x-ms-identifiers": [
8587+
"name"
8588+
],
85918589
"items": {
8592-
"$ref": "#/definitions/DevToolPortalInstance"
8590+
"$ref": "#/definitions/DevToolPortalComponent"
85938591
},
85948592
"readOnly": true
85958593
},
@@ -8613,6 +8611,29 @@
86138611
}
86148612
}
86158613
},
8614+
"DevToolPortalComponent": {
8615+
"type": "object",
8616+
"properties": {
8617+
"name": {
8618+
"type": "string",
8619+
"readOnly": true
8620+
},
8621+
"resourceRequests": {
8622+
"$ref": "#/definitions/DevToolPortalResourceRequests",
8623+
"description": "The requested resource quantity for required CPU and Memory."
8624+
},
8625+
"instances": {
8626+
"description": "Collection of instances belong to Dev Tool Portal.",
8627+
"uniqueItems": false,
8628+
"type": "array",
8629+
"x-ms-identifiers": [],
8630+
"items": {
8631+
"$ref": "#/definitions/DevToolPortalInstance"
8632+
},
8633+
"readOnly": true
8634+
}
8635+
}
8636+
},
86168637
"DevToolPortalSsoProperties": {
86178638
"description": "Single sign-on related configuration",
86188639
"type": "object",

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-11-01-preview/examples/DevToolPortals_CreateOrUpdate.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"openid"
1515
],
1616
"clientSecret": "xxxxx",
17-
"metadataUrl": "https://login.microsoft.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
17+
"metadataUrl": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
1818
},
1919
"features": {
2020
"applicationAccelerator": {
@@ -37,7 +37,7 @@
3737
"scopes": [
3838
"openid"
3939
],
40-
"metadataUrl": "https://login.microsoft.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
40+
"metadataUrl": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
4141
},
4242
"features": {
4343
"applicationAccelerator": {
@@ -51,15 +51,20 @@
5151
},
5252
"url": "aaa.com",
5353
"provisioningState": "Succeeded",
54-
"resourceRequests": {
55-
"cpu": "1",
56-
"memory": "1Gi",
57-
"instanceCount": 1
58-
},
59-
"instances": [
54+
"components": [
6055
{
61-
"name": "app-live-view-server-name",
62-
"status": "Running"
56+
"name": "server",
57+
"resourceRequests": {
58+
"cpu": "1",
59+
"memory": "1Gi",
60+
"instanceCount": 1
61+
},
62+
"instances": [
63+
{
64+
"name": "dev-tool-portal-server-name",
65+
"status": "Running"
66+
}
67+
]
6368
}
6469
]
6570
},
@@ -85,7 +90,7 @@
8590
"scopes": [
8691
"openid"
8792
],
88-
"metadataUrl": "https://login.microsoft.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
93+
"metadataUrl": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
8994
},
9095
"features": {
9196
"applicationAccelerator": {

specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2022-11-01-preview/examples/DevToolPortals_Get.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"scopes": [
1717
"openid"
1818
],
19-
"metadataUrl": "https://login.microsoft.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
19+
"metadataUrl": "https://login.microsoftonline.com/00000000-0000-0000-0000-000000000000/v2.0/.well-known/openid-configuration"
2020
},
2121
"features": {
2222
"applicationAccelerator": {
@@ -30,15 +30,20 @@
3030
},
3131
"url": "aaa.com",
3232
"provisioningState": "Succeeded",
33-
"resourceRequests": {
34-
"cpu": "1",
35-
"memory": "1Gi",
36-
"instanceCount": 1
37-
},
38-
"instances": [
33+
"components": [
3934
{
40-
"name": "app-live-view-server-name",
41-
"status": "Running"
35+
"name": "server",
36+
"resourceRequests": {
37+
"cpu": "1",
38+
"memory": "1Gi",
39+
"instanceCount": 1
40+
},
41+
"instances": [
42+
{
43+
"name": "dev-tool-portal-server-name",
44+
"status": "Running"
45+
}
46+
]
4247
}
4348
]
4449
},

0 commit comments

Comments
 (0)