Skip to content

Commit 4d46745

Browse files
author
SDKAuto
committed
CodeGen from PR 13951 in Azure/azure-rest-api-specs
Merge 945bbc673a28c374116df89c4113b5fea742566b into 66d52ece127b50b17f21ceba984b975f2f095fb0
1 parent 6f183ef commit 4d46745

File tree

2 files changed

+107
-39
lines changed

2 files changed

+107
-39
lines changed

schemas/2015-05-01/Microsoft.Insights.Application.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,23 @@
154154
],
155155
"description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
156156
},
157+
"Type": {
158+
"oneOf": [
159+
{
160+
"type": "string",
161+
"enum": [
162+
"query",
163+
"function",
164+
"folder",
165+
"recent"
166+
]
167+
},
168+
{
169+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
170+
}
171+
],
172+
"description": "Enum indicating the type of the Analytics item."
173+
},
157174
"type": {
158175
"type": "string",
159176
"enum": [
@@ -435,6 +452,23 @@
435452
],
436453
"description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
437454
},
455+
"Type": {
456+
"oneOf": [
457+
{
458+
"type": "string",
459+
"enum": [
460+
"query",
461+
"function",
462+
"folder",
463+
"recent"
464+
]
465+
},
466+
{
467+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
468+
}
469+
],
470+
"description": "Enum indicating the type of the Analytics item."
471+
},
438472
"type": {
439473
"type": "string",
440474
"enum": [
@@ -1053,6 +1087,23 @@
10531087
],
10541088
"description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
10551089
},
1090+
"Type": {
1091+
"oneOf": [
1092+
{
1093+
"type": "string",
1094+
"enum": [
1095+
"query",
1096+
"function",
1097+
"folder",
1098+
"recent"
1099+
]
1100+
},
1101+
{
1102+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1103+
}
1104+
],
1105+
"description": "Enum indicating the type of the Analytics item."
1106+
},
10561107
"type": {
10571108
"type": "string",
10581109
"enum": [
@@ -1378,6 +1429,23 @@
13781429
],
13791430
"description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
13801431
},
1432+
"Type": {
1433+
"oneOf": [
1434+
{
1435+
"type": "string",
1436+
"enum": [
1437+
"query",
1438+
"function",
1439+
"folder",
1440+
"recent"
1441+
]
1442+
},
1443+
{
1444+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1445+
}
1446+
],
1447+
"description": "Enum indicating the type of the Analytics item."
1448+
},
13811449
"type": {
13821450
"type": "string",
13831451
"enum": [

schemas/2020-10-20/Microsoft.Insights.Application.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"identity": {
3636
"oneOf": [
3737
{
38-
"$ref": "#/definitions/ManagedIdentity"
38+
"$ref": "#/definitions/MyWorkbookManagedIdentity"
3939
},
4040
{
4141
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -138,7 +138,7 @@
138138
"identity": {
139139
"oneOf": [
140140
{
141-
"$ref": "#/definitions/ManagedIdentityModel"
141+
"$ref": "#/definitions/WorkbookManagedIdentity"
142142
},
143143
{
144144
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -212,7 +212,7 @@
212212
}
213213
},
214214
"definitions": {
215-
"ManagedIdentity": {
215+
"MyWorkbookManagedIdentity": {
216216
"type": "object",
217217
"properties": {
218218
"type": {
@@ -233,39 +233,7 @@
233233
"userAssignedIdentities": {
234234
"oneOf": [
235235
{
236-
"$ref": "#/definitions/UserAssignedIdentities"
237-
},
238-
{
239-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
240-
}
241-
],
242-
"description": "Customer Managed Identity"
243-
}
244-
},
245-
"description": "Customer Managed Identity"
246-
},
247-
"ManagedIdentityModel": {
248-
"type": "object",
249-
"properties": {
250-
"type": {
251-
"oneOf": [
252-
{
253-
"type": "string",
254-
"enum": [
255-
"UserAssigned",
256-
"None"
257-
]
258-
},
259-
{
260-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
261-
}
262-
],
263-
"description": "The identity type."
264-
},
265-
"userAssignedIdentities": {
266-
"oneOf": [
267-
{
268-
"$ref": "#/definitions/UserAssignedIdentitiesModel"
236+
"$ref": "#/definitions/MyWorkbookUserAssignedIdentities"
269237
},
270238
{
271239
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -325,14 +293,41 @@
325293
],
326294
"description": "Properties that contain a private workbook."
327295
},
328-
"UserAssignedIdentities": {
296+
"MyWorkbookUserAssignedIdentities": {
329297
"type": "object",
330298
"properties": {},
331299
"description": "Customer Managed Identity"
332300
},
333-
"UserAssignedIdentitiesModel": {
301+
"WorkbookManagedIdentity": {
334302
"type": "object",
335-
"properties": {},
303+
"properties": {
304+
"type": {
305+
"oneOf": [
306+
{
307+
"type": "string",
308+
"enum": [
309+
"UserAssigned",
310+
"None"
311+
]
312+
},
313+
{
314+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
315+
}
316+
],
317+
"description": "The identity type."
318+
},
319+
"userAssignedIdentities": {
320+
"oneOf": [
321+
{
322+
"$ref": "#/definitions/WorkbookUserAssignedIdentities"
323+
},
324+
{
325+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
326+
}
327+
],
328+
"description": "Customer Managed Identity"
329+
}
330+
},
336331
"description": "Customer Managed Identity"
337332
},
338333
"WorkbookProperties": {
@@ -383,6 +378,11 @@
383378
"serializedData"
384379
],
385380
"description": "Properties that contain a workbook."
381+
},
382+
"WorkbookUserAssignedIdentities": {
383+
"type": "object",
384+
"properties": {},
385+
"description": "Customer Managed Identity"
386386
}
387387
}
388388
}

0 commit comments

Comments
 (0)