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.

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

Refactoring Job Definitions #3116

Merged
merged 1 commit into from
May 30, 2018
Merged

Refactoring Job Definitions #3116

merged 1 commit into from
May 30, 2018

Conversation

vrdmr
Copy link
Member

@vrdmr vrdmr commented May 22, 2018

Refactoring Job Model Definitions to avoid the conflict between the two API versions when generating the SDK.

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

@AutorestCI
Copy link

AutorestCI commented May 22, 2018

Automation for azure-libraries-for-java

Nothing to generate for azure-libraries-for-java

@AutorestCI
Copy link

AutorestCI commented May 22, 2018

Automation for azure-sdk-for-python

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

Command: ['/usr/local/bin/autorest', '/tmp/tmppoa07gtr/rest/specification/automation/resource-manager/readme.md', '--multiapi', '--python', '--python-mode=update', '--python-sdks-folder=/tmp/tmppoa07gtr/sdk', '[email protected]/[email protected]', '--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/@[email protected]/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4279)
   Loading AutoRest extension '@microsoft.azure/autorest.python' (2.1.40->2.1.40)
   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/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/definitions.json:243:4 ($.definitions.JobStreamProperties)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json:1125:4 ($.definitions.JobStreamProperties)

ERROR (Fatal/DuplicateModelCollsion): Duplicated model name with non-identical definitions
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/definitions.json:243:4 ($.definitions.JobStreamProperties)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json:1125:4 ($.definitions.JobStreamProperties)

ERROR (Fatal/DuplicateModelCollsion): Duplicated model name with non-identical definitions
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNode.json:946:4 ($.definitions.AgentRegistrationRegenerateKeyParameter)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json:273:4 ($.definitions.AgentRegistrationRegenerateKeyParameter)

ERROR (Fatal/DuplicateModelCollsion): Duplicated model name with non-identical definitions
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscNode.json:966:4 ($.definitions.DscNodeUpdateParameters)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json:1585:4 ($.definitions.DscNodeUpdateParameters)

ERROR (Fatal/DuplicateModelCollsion): Duplicated model name with non-identical definitions
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2018-01-15/dscCompilationJob.json:546:4 ($.definitions.JobStreamProperties)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/definitions.json:243:4 ($.definitions.JobStreamProperties)
    - file:///tmp/tmppoa07gtr/rest/specification/automation/resource-manager/Microsoft.Automation/stable/2015-10-31/definitions.json:1125:4 ($.definitions.JobStreamProperties)
Process() cancelled due to exception : Cancellation requested.
  Cancellation requested.

@AutorestCI
Copy link

AutorestCI commented May 22, 2018

Automation for azure-sdk-for-node

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

@AutorestCI
Copy link

AutorestCI commented May 22, 2018

Automation for azure-sdk-for-go

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

Command: ['/usr/local/bin/autorest', '/tmp/tmpiwfnsbfb/rest/specification/automation/resource-manager/readme.md', '--go', '--go-sdk-folder=/tmp/tmpiwfnsbfb/src/github.com/Azure/azure-sdk-for-go', '--multiapi', '[email protected]/autorest.go@~2.1.98', '--use-onever', '--verbose']
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/@[email protected]/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4278)
   Loading AutoRest extension '@microsoft.azure/autorest.go' (~2.1.98->2.1.98)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.38->2.3.38)
Processing batch task - {"tag":"package-2015-10"} .
Processing batch task - {"tag":"package-2017-05-preview"} .
Processing batch task - {"tag":"package-2018-01-preview"} .
FATAL: System.ArgumentOutOfRangeException: Index was out of range. Must be non-negative and less than the size of the collection.
Parameter name: startIndex
   at System.String.LastIndexOf(Char value, Int32 startIndex, Int32 count)
   at AutoRest.Go.Model.CodeModelGo.PackageVerDir() in /opt/vsts/work/1/s/src/Model/CodeModelGo.cs:line 64
   at AutoRest.Go.Model.CodeModelGo.get_DefaultUserAgent() in /opt/vsts/work/1/s/src/Model/CodeModelGo.cs:line 83
   at AutoRest.Go.Model.CodeModelGo.get_UserAgent() in /opt/vsts/work/1/s/src/Model/CodeModelGo.cs:line 31
   at AutoRest.Go.Templates.VersionTemplate.<ExecuteAsync>d__1.MoveNext() in /opt/vsts/work/1/s/src/obj/Razor/Templates/VersionTemplate.cshtml:line 28
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at AutoRest.Core.CodeGenerator.<Write>d__12.MoveNext()
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at AutoRest.Go.CodeGeneratorGo.<Generate>d__6.MoveNext() in /opt/vsts/work/1/s/src/CodeGeneratorGo.cs:line 91
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at AutoRest.Go.Program.<ProcessInternal>d__3.MoveNext() in /opt/vsts/work/1/s/src/Program.cs:line 107
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)
   at NewPlugin.<Process>d__15.MoveNext()
FATAL: go/generate - FAILED
FATAL: Error: Plugin go reported failure.
Process() cancelled due to exception : Plugin go reported failure.
Failure during batch task - {"tag":"package-2018-01-preview"} -- Error: Plugin go reported failure..
  Error: Plugin go reported failure.

@sergey-shandar sergey-shandar added potential-sdk-breaking-change WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required labels May 22, 2018
@sergey-shandar
Copy link
Contributor

@ravbhatnagar changes in existing API. It looks like, they are only minor changes which have no effect on Rest API but may introduce breaking changes in SDKs.

@vrdmr
Copy link
Member Author

vrdmr commented May 22, 2018

Hi @sergey-shandar - The new Job resource is in the 2017-05-15-preview version and we are using that definition in our new SDK. Just that our (Automation's) SDK is still preview and we are trying to fix our specification before making our SDK stable.

@ravbhatnagar
Copy link
Contributor

looks like existing APIs, dont comply to ARM resource structure. signing off!

@ravbhatnagar 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
@AutorestCI
Copy link

AutorestCI commented May 30, 2018

Automation for azure-sdk-for-ruby

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:
Azure/azure-sdk-for-ruby#1323

bashahee pushed a commit that referenced this pull request Jun 3, 2018
hovsepm pushed a commit that referenced this pull request Jun 8, 2018
* One file for server and db apis

Make one file which is blobAuditing.json that contains both server & db apis + update readme.md and add operations.json

* Add extended server auditing settings API

* Fixed operation id.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.
In addition, existing related APIs swaggers were unified under same Public API name.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.
In addition, existing related APIs swaggers were unified under same Public API name.

* Fixing examples of existing APIs and modifying blobAuditing Swagger file

storageAccountAccessKey was removed from requests response, and examples were modified accordingly.

* Remove description of predicateExpression related exceptions from old APIs description.

Fixing a small issue for client readability.
AuditingSettings and ExtendedAuditingSettings APIs have a mutual exceptions description. Description which mentions predicateExpression parameter in all APIs.
After this fix, predicateExpression related exceptions will not be mentioned on old APIs.

* Moving files to preview/stable as appropriate.

* Modifying swagger and examples of 2017 BlobAuditing APIs (#421)

* 2017 Blob Auditing APIs - Swagger and examples.

Modifying swagger and examples of 2017 blob auditing APIs.

* Resetting examples of DatabaseBlobAuditing API to 2017

Resetting examples of DatabaseBlobAuditing API to 2017

* Fixing follwing comments

Fixing follwing comments

* Fixing build errors

Fixing build errors

* Fix build errors

Fix build errors

* Fixing comments

fixing comments

* Removed 2017 database API

Removed 2017 database API

* Revert "Fixing comments"

This reverts commit c09f9f6.

* Modifying description of APIs

Modifying description of APIs after generating new swagger.

* Modifying readme.md.

Modifying readme.md.

* Updating blobAuditing Json files.

Updating blobAuditing Json files.

* Temp change

Temp change

* Final commit

Final commit

* Fix Duplicated model name with non-identical definitions build error

Fix Duplicated model name with non-identical definitions

* Fix Duplicated model name with non-identical definitions build error

This reverts commit 616851d and commits fixes.

* Fix Automation Duplicated model name with non-identical definitions

Fix Automation Duplicated model name with non-identical definitions

* One file for server and db apis

Make one file which is blobAuditing.json that contains both server & db apis + update readme.md and add operations.json

* Add extended server auditing settings API

* Fixed operation id.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.
In addition, existing related APIs swaggers were unified under same Public API name.

* Enable Database Auditing Filtiring With a Predicate Expression

New API which enables database auditing filtering by a where clause.
In addition, existing related APIs swaggers were unified under same Public API name.

* Fixing examples of existing APIs and modifying blobAuditing Swagger file

storageAccountAccessKey was removed from requests response, and examples were modified accordingly.

* Remove description of predicateExpression related exceptions from old APIs description.

Fixing a small issue for client readability.
AuditingSettings and ExtendedAuditingSettings APIs have a mutual exceptions description. Description which mentions predicateExpression parameter in all APIs.
After this fix, predicateExpression related exceptions will not be mentioned on old APIs.

* Moving files to preview/stable as appropriate.

* Modifying swagger and examples of 2017 BlobAuditing APIs (#421)

* 2017 Blob Auditing APIs - Swagger and examples.

Modifying swagger and examples of 2017 blob auditing APIs.

* Resetting examples of DatabaseBlobAuditing API to 2017

Resetting examples of DatabaseBlobAuditing API to 2017

* Fixing follwing comments

Fixing follwing comments

* Fixing build errors

Fixing build errors

* Fixing comments

fixing comments

* Removed 2017 database API

Removed 2017 database API

* Revert "Fixing comments"

This reverts commit c09f9f6.

* Modifying description of APIs

Modifying description of APIs after generating new swagger.

* Modifying readme.md.

Modifying readme.md.

* Updating blobAuditing Json files.

Updating blobAuditing Json files.

* Temp change

Temp change

* Final commit

Final commit

* Fix Python conf of servermanager (#3140)

* Fix ServerManager Py Conf (#3141)

* Plug SwaggerToSdk to LogAnalyticsMgmt (#3142)

* [Storage] Support Management policy on new api version 2018-03-01-preview (#3137)

* [Storage] Add new API version 2018-03-01-preview

* [Storage] Update rest version 2018-03-01-preview

* [Storage] Support Management Policy

* [Storage] Update since code review comments

* Add Python conf

* [Storage] Add managment policy doc link to policy description.

* [Storage] modify as review comments

* RSA key size examples, ECC descriptions (#3136)

* RSA key size examples, ECC descriptions

* remove preview changes for now

* Added GroupType property in HybridWorkerGroup (#3132)

* Watcher resource swagger specs. For more details on the Usage of the resource: https://docs.microsoft.com/en-us/azure/automation/automation-watchers-tutorial (#3102)

* Watcher specs

* using the same model for get/put input and output.

* Fix storage Python conf (#3148)

* Fix for Azure Networking swagger 2018-04-01 version (#3146)

* Adding swagger for new api-version consumption 2018-05-31, introducing new Forecast api swagger (#3114)

* Forecast Api swagger

* consumption readme file update for the new swagger version

* addressing review comment on adding nextLink

* fixing build error

* Addressed feedback on enum and fixed a typo

* Stop using unobscured credentials

* Fix Duplicated model name with non-identical definitions build error

Fix Duplicated model name with non-identical definitions

* Fix go tag for storage management plane 2018-03-02 api version (#3156)

* Refactoring Job Definitions (#3116)

* MySQL/PostgreSQL VNET with API Version 2017-12-01 for Public Preview. (#3138)

* Fix Python conf

* Adding the VNET Rest APIs to 2017-12-01 version.

Adding the VNET Rest APIs to 2017-12-01 version.

* Add specs for machine learning services provider (#3135)

* Add specs for machine learning services provider

* Added python config to readme

* Added repo generation for Python

* Addressed feedback

* Address more comments

* Adding Security RP API swagger (#3144)

* Reverted methods in vpn gateways. (#3163)

* Fix Duplicated model name with non-identical definitions build error

This reverts commit 616851d and commits fixes.

* Fix Automation Duplicated model name with non-identical definitions

Fix Automation Duplicated model name with non-identical definitions

* Revert "Fix Duplicated model name with non-identical definitions build error"

This reverts commit d1c40f7.

* Revert "Fix Duplicated model name with non-identical definitions build error"

This reverts commit 2c1261e.

* Update readme.md file

Update readme.md file
mccleanp pushed a commit that referenced this pull request Mar 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review potential-sdk-breaking-change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants