Skip to content
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

Fix TimeSeriesInsights swagger issues #12204

Merged
merged 5 commits into from
Feb 10, 2021
Merged

Fix TimeSeriesInsights swagger issues #12204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f79089
add polymorphism
kairu-ms Dec 14, 2020
bc38e13
fix polymorphy issues for enviroment update and event-source update
kairu-ms Dec 21, 2020
d5633eb
remove readme.az.md
kairu-ms Dec 22, 2020
321c76f
remove readme.cli.md
kairu-ms Dec 22, 2020
16f6833
add suppress for kind property in timeseriesinsights.json
kairu-ms Feb 9, 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
36 changes: 30 additions & 6 deletions ...s/resource-manager/Microsoft.TimeSeriesInsights/stable/2020-05-15/timeseriesinsights.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,7 +1406,21 @@
},
"EnvironmentUpdateParameters": {
"type": "object",
"discriminator": "kind",
riserrad marked this conversation as resolved.
Show resolved Hide resolved
"properties": {
"kind": {
"type": "string",
"readOnly": true,
riserrad marked this conversation as resolved.
Show resolved Hide resolved
"description": "The kind of the environment.",
"enum": [
"Gen1",
"Gen2"
],
"x-ms-enum": {
"name": "EnvironmentKind",
"modelAsString": true
}
},
"tags": {
"type": "object",
"additionalProperties": {
Expand All @@ -1419,6 +1433,7 @@
},
"Gen1EnvironmentUpdateParameters": {
"type": "object",
"x-ms-discriminator-value": "Gen1",
"properties": {
"sku": {
"$ref": "#/definitions/Sku",
Expand All @@ -1439,6 +1454,7 @@
},
"Gen2EnvironmentUpdateParameters": {
"type": "object",
"x-ms-discriminator-value": "Gen2",
"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand Down Expand Up @@ -1618,9 +1634,6 @@
},
{
"$ref": "#/definitions/EnvironmentResourceProperties"
},
{
"$ref": "#/definitions/ResourceProperties"
riserrad marked this conversation as resolved.
Show resolved Hide resolved
}
],
"required": [
Expand Down Expand Up @@ -1654,9 +1667,6 @@
"allOf": [
{
"$ref": "#/definitions/EnvironmentResourceProperties"
},
{
"$ref": "#/definitions/ResourceProperties"
}
],
"description": "Properties of the Gen2 environment."
Expand Down Expand Up @@ -1900,8 +1910,22 @@
"description": "Parameters supplied to the Create or Update Event Source operation for an IoTHub event source."
},
"EventSourceUpdateParameters": {
"discriminator": "kind",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add this to discriminate "EventHubEventSourceUpdateParameters" and "IoTHubEventSourceUpdateParameters".

"type": "object",
"properties": {
"kind": {
"type": "string",
"readOnly": true,
"description": "The kind of the event source.",
"enum": [
"Microsoft.EventHub",
"Microsoft.IoTHub"
],
"x-ms-enum": {
"name": "EventSourceKind",
"modelAsString": true
}
},
"tags": {
"type": "object",
"additionalProperties": {
Expand Down
9 changes: 9 additions & 0 deletions specification/timeseriesinsights/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ input-file:

``` yaml
directive:
- suppress: READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST
where:
- $.definitions.EnvironmentUpdateParameters.properties.kind
- $.definitions.EventSourceUpdateParameters.properties.kind
from: timeseriesinsights.json
reason: This property is the discriminator for polymorph, but it can not be in request body.
- suppress: OAV131 # DISCRIMINATOR_NOT_REQUIRED
from: timeseriesinsights.json
reason: kind is a non-settable property from the client in patch method.
- suppress: R3025 # Tracked resource 'XXX' must have a get operation
where:
- $.definitions.StandardEnvironmentResource
Expand Down