Skip to content

[Application Insights] Resolve duplicated definition names to fix track2 SDK generation error #13951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kairu-ms merged 21 commits into from
Apr 26, 2021
Merged

[Application Insights] Resolve duplicated definition names to fix track2 SDK generation error #13951

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
45dc86d
Fix duplicate name
kairu-ms Apr 15, 2021
b8fa252
Update readme.md
kairu-ms Apr 15, 2021
3df90a9
Update readme.md
kairu-ms Apr 15, 2021
bc49a5a
Update and rename workbookOperations_API.json to aiOperations_API.json
kairu-ms Apr 15, 2021
4a70061
Update readme.md
kairu-ms Apr 15, 2021
07396d2
Update workbooks_API.json
kairu-ms Apr 15, 2021
16bc36c
Update readme.md
kairu-ms Apr 15, 2021
74222d7
Update readme.python.md
kairu-ms Apr 15, 2021
b23304b
Update readme.md
kairu-ms Apr 15, 2021
8e162b6
Update readme.md
kairu-ms Apr 15, 2021
fdac7c0
Update readme.md
kairu-ms Apr 15, 2021
a889375
Rename aiOperations_API.json to workbookOperations_API.json
kairu-ms Apr 15, 2021
096ab69
Update readme.md
kairu-ms Apr 15, 2021
5e8a136
Update readme.md
kairu-ms Apr 25, 2021
0e53a11
Update readme.md
kairu-ms Apr 25, 2021
9689544
Update readme.md
kairu-ms Apr 25, 2021
734e96c
Update readme.md
kairu-ms Apr 25, 2021
b27f822
Update readme.md
kairu-ms Apr 25, 2021
72e8081
Update specification/applicationinsights/resource-manager/readme.pyth…
kairu-ms Apr 25, 2021
685a32e
Update specification/applicationinsights/resource-manager/readme.pyth…
kairu-ms Apr 25, 2021
945bbc6
Update specification/applicationinsights/resource-manager/readme.pyth…
kairu-ms Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...cationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
"properties": {
"identity": {
"description": "Identity used for BYOS",
"$ref": "#/definitions/ManagedIdentity"
"$ref": "#/definitions/MyWorkbookManagedIdentity"
},
"id": {
"type": "string",
Expand Down Expand Up @@ -512,11 +512,11 @@
}
}
},
"ManagedIdentity": {
"MyWorkbookManagedIdentity": {
"description": "Customer Managed Identity",
"properties": {
"userAssignedIdentities": {
"$ref": "#/definitions/UserAssignedIdentities"
"$ref": "#/definitions/MyWorkbookUserAssignedIdentities"
},
"type": {
"type": "string",
Expand All @@ -528,7 +528,7 @@
}
}
},
"UserAssignedIdentities": {
"MyWorkbookUserAssignedIdentities": {
"description": "Customer Managed Identity",
"properties": {
"principalId": {
Expand Down
4 changes: 2 additions & 2 deletions ...nsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"swagger": "2.0",
"info": {
"title": "WorkbookClient",
"description": "Azure client for Workbook.",
"title": "ApplicationInsightsManagementClient",
"description": "Azure Application Insights client for web test based alerting.",
"version": "2020-10-20"
},
"host": "management.azure.com",
Expand Down
8 changes: 4 additions & 4 deletions ...licationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
"properties": {
"identity": {
"description": "Identity used for BYOS",
"$ref": "#/definitions/ManagedIdentity"
"$ref": "#/definitions/WorkbookManagedIdentity"
},
"id": {
"type": "string",
Expand Down Expand Up @@ -577,11 +577,11 @@
}
}
},
"ManagedIdentity": {
"WorkbookManagedIdentity": {
"description": "Customer Managed Identity",
"properties": {
"userAssignedIdentities": {
"$ref": "#/definitions/UserAssignedIdentities"
"$ref": "#/definitions/WorkbookUserAssignedIdentities"
},
"type": {
"type": "string",
Expand All @@ -593,7 +593,7 @@
}
}
},
"UserAssignedIdentities": {
"WorkbookUserAssignedIdentities": {
"description": "Customer Managed Identity",
"properties": {
"principalId": {
Expand Down
119 changes: 54 additions & 65 deletions specification/applicationinsights/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ These are the global settings for the ApplicationInsights API.
title: ApplicationInsightsManagementClient
description: Composite Swagger for Application Insights Management Client
openapi-type: arm
tag: package-preview-2020-10
tag: package-2020-10-20
```

### Suppression
Expand Down Expand Up @@ -216,26 +216,24 @@ These settings apply only when `--tag=package-preview-2021-03-only` is specified
input-file:
- Microsoft.Insights/preview/2021-03-03-preview/diagnosticServicesToken_API.json
```
### Tag: package-2020-02-12

These settings apply only when `--tag=package-2020-02-12` is specified on the command line.
### Tag: package-2020-10-only

``` yaml $(tag) == 'package-2020-02-12'
These settings apply only when `--tag=package-2020-10-only` is specified on the command line.

```yaml $(tag) == 'package-2020-10-only'
input-file:
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
- Microsoft.Insights/stable/2015-05-01/components_API.json
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
- Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json
- Microsoft.Insights/stable/2020-10-20/workbooks_API.json
- Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
```
Copy link
Member

@ArcturusZhang ArcturusZhang Apr 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove a tag from readme without noticing the corresponding service team? Does the service team know?
Go SDK always wants a tag that contains all functionalities in a RP to release, therefore if we are going to release appinsights for go SDK (currently no release request), we will have no candidates of tags to release.

Copy link
Contributor Author

@kairu-ms kairu-ms Apr 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove a tag from readme without noticing the corresponding service team? Does the service team know?
Go SDK always wants a tag that contains all functionalities in a RP to release, therefore if we are going to release appinsights for go SDK (currently no release request), we will have no candidates of tags to release.

Yes, you are right. I remove this tag because it's never used and will been replaced by tag package-2020-10-only.

Copy link
Contributor

@tonykslee tonykslee Apr 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, I added "package-2020-02-12" with all the same contents of package-2020-10-20 because we got an S360 error due to that api-version being used and not defined in swagger. https://msazure.visualstudio.com/One/_workitems/edit/9298254

Copy link
Contributor Author

@kairu-ms kairu-ms Apr 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's why I remove the tag "package-2020-02-12"


### Tag: package-preview-2020-10-only

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

```yaml $(tag) == 'package-preview-2020-10-only'
input-file:
- Microsoft.Insights/preview/2020-10-05-preview/webTests_API.json
```

### Tag: package-2020-10-20
Expand All @@ -260,15 +258,6 @@ input-file:
- Microsoft.Insights/stable/2020-10-20/workbookOperations_API.json
```

### Tag: package-preview-2020-10

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

```yaml $(tag) == 'package-preview-2020-10'
input-file:
- Microsoft.Insights/preview/2020-10-05-preview/webTests_API.json
```

### Tag: package-preview-2020-06-only

These settings apply only when `--tag=package-preview-2020-06-only` is specified on the command line.
Expand Down Expand Up @@ -302,54 +291,54 @@ input-file:
- Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json
```

### Tag: package-preview-2020-02

These settings apply only when `--tag=package-preview-2020-02` is specified on the command line.

``` yaml $(tag) == 'package-preview-2020-02'
input-file:
- Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
```

### Tag: package-2015-05
### Tag: package-2020-04

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

``` yaml $(tag) == 'package-2015-05'
``` yaml $(tag) == 'package-2020-04'
input-file:
- Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
- Microsoft.Insights/stable/2015-05-01/components_API.json
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
- Microsoft.Insights/stable/2015-05-01/workbooks_API.json
- Microsoft.Insights/stable/2015-05-01/myworkbooks_API.json
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
```

### Tag: package-2017-10
### Tag: package-2020-03-01-preview

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

``` yaml $(tag) == 'package-2017-10'
``` yaml $(tag) == 'package-2020-03-01-preview'
input-file:
- Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
- Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
```

### Tag: package-2018-06-17-preview
### Tag: package-preview-2020-02

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

``` yaml $(tag) == 'package-2018-06-17-preview'
``` yaml $(tag) == 'package-preview-2020-02'
input-file:
- Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
- Microsoft.Insights/preview/2020-02-10-preview/WebTestResults_API.json
```

### Tag: package-2020-02-02-preview

These settings apply only when `--tag=package-2020-02-02-preview` is specified on the command line.

``` yaml $(tag) == 'package-2020-02-02-preview'
input-file:
- Microsoft.Insights/preview/2020-02-02-preview/components_API.json
```

### Tag: package-2019-10-17-preview
Expand All @@ -361,55 +350,55 @@ input-file:
- Microsoft.Insights/preview/2019-10-17-preview/workbookTemplates_API.json
```

### Tag: package-2018-05-01-preview
### Tag: package-2018-06-17-preview

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

``` yaml $(tag) == 'package-2018-05-01-preview'
``` yaml $(tag) == 'package-2018-06-17-preview'
input-file:
- Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
- Microsoft.Insights/preview/2018-06-17-preview/workbooks_API.json
```

### Tag: package-2020-02-02-preview
### Tag: package-2018-05-01-preview

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

``` yaml $(tag) == 'package-2020-02-02-preview'
``` yaml $(tag) == 'package-2018-05-01-preview'
input-file:
- Microsoft.Insights/preview/2020-02-02-preview/components_API.json
- Microsoft.Insights/preview/2018-05-01-preview/componentProactiveDetection_API.json
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
```

### Tag: package-2020-03-01-preview
### Tag: package-2017-10

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

``` yaml $(tag) == 'package-2020-03-01-preview'
``` yaml $(tag) == 'package-2017-10'
input-file:
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
- Microsoft.Insights/preview/2017-10-01/eaSubscriptionMigration_API.json
- Microsoft.Insights/preview/2017-10-01/componentFeaturesAndPricing_API.json
```

### Tag: package-2020-04
### Tag: package-2015-05

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

``` yaml $(tag) == 'package-2020-04'
``` yaml $(tag) == 'package-2015-05'
input-file:
- Microsoft.Insights/stable/2015-05-01/aiOperations_API.json
- Microsoft.Insights/stable/2015-05-01/componentAnnotations_API.json
- Microsoft.Insights/stable/2015-05-01/componentApiKeys_API.json
- Microsoft.Insights/stable/2015-05-01/componentContinuousExport_API.json
- Microsoft.Insights/stable/2015-05-01/componentFeaturesAndPricing_API.json
- Microsoft.Insights/stable/2015-05-01/componentProactiveDetection_API.json
- Microsoft.Insights/stable/2015-05-01/components_API.json
- Microsoft.Insights/stable/2015-05-01/componentWorkItemConfigs_API.json
- Microsoft.Insights/stable/2015-05-01/favorites_API.json
- Microsoft.Insights/stable/2015-05-01/webTestLocations_API.json
- Microsoft.Insights/stable/2015-05-01/webTests_API.json
- Microsoft.Insights/stable/2015-05-01/analyticsItems_API.json
- Microsoft.Insights/stable/2015-05-01/workbooks_API.json
- Microsoft.Insights/stable/2015-05-01/myworkbooks_API.json
- Microsoft.Insights/preview/2018-05-01-preview/components_API.json
- Microsoft.Insights/preview/2020-03-01-preview/componentLinkedStorageAccounts_API.json
```

---
Expand Down
16 changes: 16 additions & 0 deletions specification/applicationinsights/resource-manager/readme.python.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ batch:
- tag: package-2020-02-02-preview
- tag: package-2020-03-01-preview
- tag: package-preview-2020-06-only
- tag: package-2020-10-only
```
``` yaml $(python) && $(multiapi) && $(track2)
batch:
Expand All @@ -46,6 +47,7 @@ batch:
- tag: package-2020-02-02-preview
- tag: package-2020-03-01-preview
- tag: package-preview-2020-06-only
- tag: package-2020-10-only
- multiapiscript: true
```

Expand Down Expand Up @@ -166,3 +168,17 @@ python:
namespace: azure.mgmt.applicationinsights.v2020_06_02_preview
output-folder: $(python-sdks-folder)/applicationinsights/azure-mgmt-applicationinsights/azure/mgmt/applicationinsights/v2020_06_02_preview
```

### Tag: package-2020-10-only and python

These settings apply only when `--tag=package-2020-10-only --python` is specified on the command line.

``` yaml $(tag) == 'package-2020-10-only' && $(python) && !$(track2)
python:
namespace: azure.mgmt.applicationinsights.v2020_10_20
output-folder: $(python-sdks-folder)/applicationinsights/azure-mgmt-applicationinsights/azure/mgmt/applicationinsights/v2020_10_20
```
``` yaml $(tag) == 'package-2020-10-only' && $(python) && $(track2)
namespace: azure.mgmt.applicationinsights.v2020_10_20
output-folder: $(python-sdks-folder)/applicationinsights/azure-mgmt-applicationinsights/azure/mgmt/applicationinsights/v2020_10_20
```