Skip to content

Commit ad5f229

Browse files
authored
[Application Insights] Resolve duplicated definition names to fix track2 SDK generation error (#13951)
* Fix duplicate name * Update readme.md * Update readme.md * Update and rename workbookOperations_API.json to aiOperations_API.json * Update readme.md * Update workbooks_API.json * Update readme.md * Update readme.python.md * Update readme.md * Update readme.md * Update readme.md * Rename aiOperations_API.json to workbookOperations_API.json * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update specification/applicationinsights/resource-manager/readme.python.md * Update specification/applicationinsights/resource-manager/readme.python.md * Update specification/applicationinsights/resource-manager/readme.python.md
1 parent 6387dd9 commit ad5f229

File tree

4 files changed

+66
-90
lines changed

4 files changed

+66
-90
lines changed

specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
"properties": {
323323
"identity": {
324324
"description": "Identity used for BYOS",
325-
"$ref": "#/definitions/ManagedIdentity"
325+
"$ref": "#/definitions/MyWorkbookManagedIdentity"
326326
},
327327
"id": {
328328
"type": "string",
@@ -512,11 +512,11 @@
512512
}
513513
}
514514
},
515-
"ManagedIdentity": {
515+
"MyWorkbookManagedIdentity": {
516516
"description": "Customer Managed Identity",
517517
"properties": {
518518
"userAssignedIdentities": {
519-
"$ref": "#/definitions/UserAssignedIdentities"
519+
"$ref": "#/definitions/MyWorkbookUserAssignedIdentities"
520520
},
521521
"type": {
522522
"type": "string",
@@ -528,7 +528,7 @@
528528
}
529529
}
530530
},
531-
"UserAssignedIdentities": {
531+
"MyWorkbookUserAssignedIdentities": {
532532
"description": "Customer Managed Identity",
533533
"properties": {
534534
"principalId": {

specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"swagger": "2.0",
33
"info": {
4-
"title": "WorkbookClient",
5-
"description": "Azure client for Workbook.",
4+
"title": "ApplicationInsightsManagementClient",
5+
"description": "Azure Application Insights client for web test based alerting.",
66
"version": "2020-10-20"
77
},
88
"host": "management.azure.com",

specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"properties": {
335335
"identity": {
336336
"description": "Identity used for BYOS",
337-
"$ref": "#/definitions/ManagedIdentity"
337+
"$ref": "#/definitions/WorkbookManagedIdentity"
338338
},
339339
"id": {
340340
"type": "string",
@@ -577,11 +577,11 @@
577577
}
578578
}
579579
},
580-
"ManagedIdentity": {
580+
"WorkbookManagedIdentity": {
581581
"description": "Customer Managed Identity",
582582
"properties": {
583583
"userAssignedIdentities": {
584-
"$ref": "#/definitions/UserAssignedIdentities"
584+
"$ref": "#/definitions/WorkbookUserAssignedIdentities"
585585
},
586586
"type": {
587587
"type": "string",
@@ -593,7 +593,7 @@
593593
}
594594
}
595595
},
596-
"UserAssignedIdentities": {
596+
"WorkbookUserAssignedIdentities": {
597597
"description": "Customer Managed Identity",
598598
"properties": {
599599
"principalId": {

specification/applicationinsights/resource-manager/readme.md

Lines changed: 56 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ These are the global settings for the ApplicationInsights API.
2828
title: ApplicationInsightsManagementClient
2929
description: Composite Swagger for Application Insights Management Client
3030
openapi-type: arm
31-
tag: package-preview-2020-10
31+
tag: package-preview-2020-06
3232
```
3333
3434
### Suppression
@@ -206,6 +206,14 @@ directive:
206206
where:
207207
- $.definitions.DiagnosticServicesTokenResponse.properties.token
208208
reason: 'Secrets are OK to return in a POST response.'
209+
- suppress: DefaultErrorResponseSchema
210+
from: aiOperations_API
211+
reason: 'consistent with existing default error response | owned by another team'
212+
- suppress: OperationsApiResponseSchema
213+
from: aiOperations_API
214+
reason: 'consistent with existing response schema | owned by another team'
215+
- suppress: RequiredReadOnlySystemData
216+
209217
```
210218
211219
### Tag: package-preview-2021-03-only
@@ -216,55 +224,23 @@ These settings apply only when `--tag=package-preview-2021-03-only` is specified
216224
input-file:
217225
- Microsoft.Insights/preview/2021-03-03-preview/diagnosticServicesToken_API.json
218226
```
219-
### Tag: package-2020-02-12
220-
221-
These settings apply only when `--tag=package-2020-02-12` is specified on the command line.
222-
223-
``` yaml $(tag) == 'package-2020-02-12'
224-
input-file:
225-
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
226-
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
227-
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
228-
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
229-
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
230-
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
231-
- Microsoft.Insights/stable/2015-05-01/components_API.json
232-
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
233-
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
234-
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
235-
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
236-
- Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
237-
- Microsoft.Insights/stable/2020-10-20/workbooks_API.json
238-
- Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
239-
```
240227

241-
### Tag: package-2020-10-20
228+
### Tag: package-2020-10-only
242229

243-
These settings apply only when `--tag=package-2020-10-20` is specified on the command line.
230+
These settings apply only when `--tag=package-2020-10-only` is specified on the command line.
244231

245-
``` yaml $(tag) == 'package-2020-10-20'
232+
```yaml $(tag) == 'package-2020-10-only'
246233
input-file:
247-
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
248-
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
249-
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
250-
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
251-
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
252-
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
253-
- Microsoft.Insights/stable/2015-05-01/components_API.json
254-
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
255-
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
256-
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
257-
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
234+
- Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
258235
- Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
259236
- Microsoft.Insights/stable/2020-10-20/workbooks_API.json
260-
- Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
261237
```
262238

263-
### Tag: package-preview-2020-10
239+
### Tag: package-preview-2020-10-only
264240

265-
These settings apply only when `--tag=package-preview-2020-10` is specified on the command line.
241+
These settings apply only when `--tag=package-preview-2020-10-only` is specified on the command line.
266242

267-
```yaml $(tag) == 'package-preview-2020-10'
243+
```yaml $(tag) == 'package-preview-2020-10-only'
268244
input-file:
269245
- Microsoft.Insights/preview/2020-10-05-preview/webTests_API.json
270246
```
@@ -302,54 +278,54 @@ input-file:
302278
- Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json
303279
```
304280

305-
### Tag: package-preview-2020-02
306-
307-
These settings apply only when `--tag=package-preview-2020-02` is specified on the command line.
308-
309-
``` yaml $(tag) == 'package-preview-2020-02'
310-
input-file:
311-
- Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
312-
```
313-
314-
### Tag: package-2015-05
281+
### Tag: package-2020-04
315282

316-
These settings apply only when `--tag=package-2015-05` is specified on the command line.
283+
These settings apply only when `--tag=package-2020-04` is specified on the command line. For Dotnet SDK generation.
317284

318-
``` yaml $(tag) == 'package-2015-05'
285+
``` yaml $(tag) == 'package-2020-04'
319286
input-file:
320287
- Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
321288
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
322289
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
323290
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
324291
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
325292
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
326-
- Microsoft.Insights/stable/2015-05-01/components_API.json
327293
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
328294
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
329295
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
330296
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
331297
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
332298
- Microsoft.Insights/stable/2015-05-01/workbooks_API.json
333299
- Microsoft.Insights/stable/2015-05-01/myworkbooks_API.json
300+
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
301+
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
334302
```
335303

336-
### Tag: package-2017-10
304+
### Tag: package-2020-03-01-preview
337305

338-
These settings apply only when `--tag=package-2017-10` is specified on the command line.
306+
These settings apply only when `--tag=package-2020-03-01-preview` is specified on the command line.
339307

340-
``` yaml $(tag) == 'package-2017-10'
308+
``` yaml $(tag) == 'package-2020-03-01-preview'
341309
input-file:
342-
- Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
343-
- Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
310+
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
344311
```
345312

346-
### Tag: package-2018-06-17-preview
313+
### Tag: package-preview-2020-02
347314

348-
These settings apply only when `--tag=package-2018-06-17-preview` is specified on the command line.
315+
These settings apply only when `--tag=package-preview-2020-02` is specified on the command line.
349316

350-
``` yaml $(tag) == 'package-2018-06-17-preview'
317+
``` yaml $(tag) == 'package-preview-2020-02'
351318
input-file:
352-
- Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
319+
- Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
320+
```
321+
322+
### Tag: package-2020-02-02-preview
323+
324+
These settings apply only when `--tag=package-2020-02-02-preview` is specified on the command line.
325+
326+
``` yaml $(tag) == 'package-2020-02-02-preview'
327+
input-file:
328+
- Microsoft.Insights/preview/2020-02-02-preview/components_API.json
353329
```
354330

355331
### Tag: package-2019-10-17-preview
@@ -361,55 +337,55 @@ input-file:
361337
- Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
362338
```
363339

364-
### Tag: package-2018-05-01-preview
340+
### Tag: package-2018-06-17-preview
365341

366-
These settings apply only when `--tag=package-2018-05-01-preview` is specified on the command line.
342+
These settings apply only when `--tag=package-2018-06-17-preview` is specified on the command line.
367343

368-
``` yaml $(tag) == 'package-2018-05-01-preview'
344+
``` yaml $(tag) == 'package-2018-06-17-preview'
369345
input-file:
370-
- Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
371-
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
346+
- Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
372347
```
373348

374-
### Tag: package-2020-02-02-preview
349+
### Tag: package-2018-05-01-preview
375350

376-
These settings apply only when `--tag=package-2020-02-02-preview` is specified on the command line.
351+
These settings apply only when `--tag=package-2018-05-01-preview` is specified on the command line.
377352

378-
``` yaml $(tag) == 'package-2020-02-02-preview'
353+
``` yaml $(tag) == 'package-2018-05-01-preview'
379354
input-file:
380-
- Microsoft.Insights/preview/2020-02-02-preview/components_API.json
355+
- Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
356+
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
381357
```
382358

383-
### Tag: package-2020-03-01-preview
359+
### Tag: package-2017-10
384360

385-
These settings apply only when `--tag=package-2020-03-01-preview` is specified on the command line.
361+
These settings apply only when `--tag=package-2017-10` is specified on the command line.
386362

387-
``` yaml $(tag) == 'package-2020-03-01-preview'
363+
``` yaml $(tag) == 'package-2017-10'
388364
input-file:
389-
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
365+
- Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
366+
- Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
390367
```
391368

392-
### Tag: package-2020-04
369+
### Tag: package-2015-05
393370

394-
These settings apply only when `--tag=package-2020-04` is specified on the command line. For Dotnet SDK generation.
371+
These settings apply only when `--tag=package-2015-05` is specified on the command line.
395372

396-
``` yaml $(tag) == 'package-2020-04'
373+
``` yaml $(tag) == 'package-2015-05'
397374
input-file:
398375
- Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
399376
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
400377
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
401378
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
402379
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
403380
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
381+
- Microsoft.Insights/stable/2015-05-01/components_API.json
404382
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
405383
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
406384
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
407385
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
408386
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
409387
- Microsoft.Insights/stable/2015-05-01/workbooks_API.json
410388
- Microsoft.Insights/stable/2015-05-01/myworkbooks_API.json
411-
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
412-
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
413389
```
414390

415391
---

0 commit comments

Comments
 (0)