Adding patch support for SQR API #3112

abversqr · 2018-05-21T17:27:34Z

This checklist is used to make sure that common issues in a pull request are addressed. This will expedite the process of getting your pull request merged and avoid extra work on your part to fix issues discovered during the review process.

PR information

The title of the PR is clear and informative.
There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For information on cleaning up the commits in your pull request, see this page.
Except for special cases involving multiple contributors, the PR is started from a fork of the main repository, not a branch.
If applicable, the PR references the bug/issue that it fixes.
Swagger files are correctly named (e.g. the api-version in the path should match the api-version in the spec).

Quality of Swagger

I have read the contribution guidelines.
My spec meets the review criteria:
- The spec conforms to the Swagger 2.0 specification.
- The spec follows the guidelines described in the Swagger checklist document.
- Validation tools were run on swagger spec(s) and have all been fixed in this PR.

Added GA API version for Scheduled Query Rule

Resolving Comments

…rmat Couple of changes - 1. Made SKU as top level proprty as mentioned here - https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md#put-resource 2. including generic error response format

1. Removed SKU - Billing Model is still under discussion, hence need not to be exposed to customers. 2. Enabled field ichanged to align with camel case. 3. 'throttleTillDate' in properties.action changed to 'throttlingInMin' to denote correct meaning and it’s data type changed to number instead of date. 4. 'status' to be removed in properties.action from examples. 5. 'severity' made a required field in properties.action. 6. Removed Examples from original spec json

Updated Example to reflect AI instances in tags and 'dataSourceId"

Restore Tags Description

Fixed errores reported by running command "oav validate-example"

Changes - 1. Added Default Response payload in all APIs 2. Made azNs description more clear

Updating descriptions + property name change

AutorestCI · 2018-05-21T17:29:46Z

Automation for azure-libraries-for-java

A PR has been created for you based on this PR content.

Once this PR will be merged, content will be added to your service PR:
AutorestCI/azure-libraries-for-java#31

AutorestCI · 2018-05-21T17:32:11Z

Automation for azure-sdk-for-python

Encountered a Subprocess error: (azure-sdk-for-python)

Command: ['/usr/local/bin/autorest', '/tmp/tmpr1jf1iyy/rest/specification/monitor/resource-manager/readme.md', '--multiapi', '--python', '--python-mode=update', '--python-sdks-folder=/tmp/tmpr1jf1iyy/sdk', '--use=@microsoft.azure/autorest.python@~3.0', '--version=preview']
Finished with return code 1
and output:

AutoRest code generation utility [version: 2.0.4262; node: v7.10.1]
(C) 2018 Microsoft Corporation.
https://aka.ms/autorest
   Loading AutoRest core      '/root/.autorest/@microsoft.azure_autorest-core@2.0.4279/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4279)
   Loading AutoRest extension '@microsoft.azure/autorest.python' (~3.0->3.0.51)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.44->2.3.44)

ERROR (Fatal/DuplicateModelCollsion): Duplicated model name with non-identical definitions
    - file:///tmp/tmpr1jf1iyy/rest/specification/monitor/resource-manager/microsoft.insights/stable/2018-04-16/scheduledQueryRule_API.json:618:4 ($.definitions.Action)
    - file:///tmp/tmpr1jf1iyy/rest/specification/monitor/resource-manager/microsoft.insights/stable/2018-03-01/metricAlert_API.json:600:4 ($.definitions.Action)
Process() cancelled due to exception : Cancellation requested.
  Cancellation requested.

AutorestCI · 2018-05-21T17:35:10Z

Automation for azure-sdk-for-node

The initial PR has been merged into your service PR:
Azure/azure-sdk-for-node#2602

AutorestCI · 2018-05-21T17:36:58Z

Automation for azure-sdk-for-go

The initial PR has been merged into your service PR:
Azure/azure-sdk-for-go#1968

annatisch · 2018-05-21T17:58:29Z

Thanks @abversqr - is this API already live/public?

annatisch · 2018-05-23T14:56:41Z

@abversqr - your github account is not currently in the Azure org - can you please add it?

Updated description for queryType

AutorestCI · 2018-05-24T08:17:03Z

Automation for azure-sdk-for-ruby

Encountered a Subprocess error: (azure-sdk-for-ruby)

Command: ['/usr/local/bin/autorest', '/tmp/tmp80auh2zu/rest/specification/monitor/resource-manager/readme.md', '--multiapi', '--ruby', '--ruby-sdks-folder=/tmp/tmp80auh2zu/sdk', '--use=@microsoft.azure/autorest.ruby@3.0.20', '--version=preview']
Finished with return code 1
and output:

AutoRest code generation utility [version: 2.0.4262; node: v7.10.1]
(C) 2018 Microsoft Corporation.
https://aka.ms/autorest
   Loading AutoRest core      '/root/.autorest/@microsoft.azure_autorest-core@2.0.4279/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4279)
   Loading AutoRest extension '@microsoft.azure/autorest.ruby' (3.0.20->3.0.20)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.1.22->2.1.22)
Processing batch task - {"tag":"package-2015-04-01-only"} .
Processing batch task - {"tag":"package-2016-03-01-only"} .
Processing batch task - {"tag":"package-2016-09-01-only"} .

ERROR (Fatal/DuplicateParameterCollision): Duplicated global non-identical parameter definitions
    - file:///tmp/tmp80auh2zu/rest/specification/monitor/resource-manager/microsoft.insights/stable/2016-09-01/serviceDiagnosticsSettings_API.json:395:4 ($.parameters.ResourceUriParameter)
    - file:///tmp/tmp80auh2zu/rest/specification/monitor/resource-manager/microsoft.insights/stable/2016-09-01/metrics_API.json:269:4 ($.parameters.ResourceUriParameter)
Process() cancelled due to exception : Cancellation requested.
Failure during batch task - {"tag":"package-2016-09-01-only"} -- Cancellation requested..
  Cancellation requested.

abversqr · 2018-05-24T10:57:19Z

Thanks @abversqr - is this API already live/public?

@annatisch Yes, API is already public. This PR is just to add support of PATCH

msvijayn · 2018-05-29T06:54:00Z

Linked to issue #8760

annatisch · 2018-05-29T14:40:32Z

@abversqr - looks like the CI is broken:
Duplicated model name with non-identical definition

Though it seems to be unrelated to your last commits - are you able to take a look?

ravbhatnagar

Looks good!

annatisch · 2018-06-04T19:23:11Z

Hi @abversqr - The CI issue here is due to a bug fix in autorest core that was recently rolled out to prevent conflicting models in SDK generation (not Python only, it’s cross-language).

If two files that are in the same “tag” in the Readme defines the same model name Foo, both objects have to be exactly (at the comma level) the same, or they have to be a reference to an external common file.
This cannot be suppressed with a suppression, this is required to be fixed since it’s a critical bug.

The fix is simple, either make sure all models that are described in several files are exactly the same, or ref an external model.

Changes - 1. Renamed "MetricTrigger" to "LogMetricTrigger" 2. Aligned "Resources" to other specs

abversqr · 2018-06-05T11:27:49Z

Hi @annatisch , I have fixed model name issue. Please have a look

abversqr added 11 commits April 12, 2018 16:43

Added GA API version for Scheduled Query Rule

2e4c790

Added GA API version for Scheduled Query Rule

Resolving Comments

d183bad

Resolving Comments

Updated Example to reflect AI instances in tags and 'dataSourceId"

c39fa0c

Updated Example to reflect AI instances in tags and 'dataSourceId"

made 'tags' details more descriptive

5762ef5

Restore Tags Description

caabc1b

Restore Tags Description

Fixed Exmaple Validation

ef75786

Fixed errores reported by running command "oav validate-example"

Added Default Response payload in all APIs

fb180fb

Changes - 1. Added Default Response payload in all APIs 2. Made azNs description more clear

Updating descriptions + property name change

6fb4ce9

Updating descriptions + property name change

Patch Support for SQR API

de08b2e

azuresdkci assigned annatisch May 21, 2018

azuresdkci requested a review from annatisch May 21, 2018 17:28

AutorestCI mentioned this pull request May 21, 2018

[AutoPR monitor/resource-manager] Adding patch support for SQR API AutorestCI/azure-libraries-for-java#178

Open

Merge branch 'master' into patchsupport

f535268

AutorestCI mentioned this pull request May 21, 2018

[AutoPR monitor/resource-manager] Adding patch support for SQR API Azure/azure-sdk-for-python#2596

Merged

AutorestCI mentioned this pull request May 21, 2018

[AutoPR monitor/resource-manager] Adding patch support for SQR API Azure/azure-sdk-for-node#2886

Merged

AutorestCI mentioned this pull request May 21, 2018

[AutoPR monitor/resource-manager] Adding patch support for SQR API Azure/azure-sdk-for-go#1880

Closed

Updated description for queryType

0fa2c60

Updated description for queryType

Update scheduledQueryRule_API.json

987328f

annatisch added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label May 24, 2018

msvijayn mentioned this pull request May 25, 2018

Issue in Scheduled Query Rules REST schema - QueryType MicrosoftDocs/azure-docs#8760

Closed

ravbhatnagar approved these changes May 29, 2018

View reviewed changes

ravbhatnagar added ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review and removed WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required labels May 29, 2018

Resolving multiple model issue

b37d3ac

Changes - 1. Renamed "MetricTrigger" to "LogMetricTrigger" 2. Aligned "Resources" to other specs

AutorestCI mentioned this pull request Jun 5, 2018

[AutoPR monitor/resource-manager] Adding patch support for SQR API Azure/azure-sdk-for-go#1963

Merged

annatisch merged commit ad24378 into Azure:master Jun 5, 2018

abversqr deleted the patchsupport branch June 5, 2018 20:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding patch support for SQR API #3112

Adding patch support for SQR API #3112

abversqr commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

annatisch commented May 21, 2018

annatisch commented May 23, 2018

AutorestCI commented May 24, 2018 •

edited

abversqr commented May 24, 2018

msvijayn commented May 29, 2018

annatisch commented May 29, 2018 •

edited

ravbhatnagar left a comment

annatisch commented Jun 4, 2018

abversqr commented Jun 5, 2018

Adding patch support for SQR API #3112

Adding patch support for SQR API #3112

Conversation

abversqr commented May 21, 2018 • edited

PR information

Quality of Swagger

AutorestCI commented May 21, 2018 • edited

Automation for azure-libraries-for-java

AutorestCI commented May 21, 2018 • edited

Automation for azure-sdk-for-python

AutorestCI commented May 21, 2018 • edited

Automation for azure-sdk-for-node

AutorestCI commented May 21, 2018 • edited

Automation for azure-sdk-for-go

annatisch commented May 21, 2018

annatisch commented May 23, 2018

AutorestCI commented May 24, 2018 • edited

Automation for azure-sdk-for-ruby

abversqr commented May 24, 2018

msvijayn commented May 29, 2018

annatisch commented May 29, 2018 • edited

ravbhatnagar left a comment

Choose a reason for hiding this comment

annatisch commented Jun 4, 2018

abversqr commented Jun 5, 2018

abversqr commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 21, 2018 •

edited

AutorestCI commented May 24, 2018 •

edited

annatisch commented May 29, 2018 •

edited