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

Fix duplicate path in old Network API versions (Network January branch) #5003

Merged
merged 1 commit into from
Jan 9, 2019

Conversation

anton-evseev
Copy link
Contributor

Pick #4940 and #5002 from master into January branch

Latest improvements:

MSFT employees can try out our new experience at OpenAPI Hub - one location for using our validation tools and finding your workflow.

Contribution checklist:

  • I have reviewed the documentation for the workflow.
  • Validation tools were run on swagger spec(s) and have all been fixed in this PR.
  • The OpenAPI Hub was used for checking validation status and next steps.

ARM API Review Checklist

  • Service team MUST add the "WaitForARMFeedback" label if the management plane API changes fall into one of the below categories.
  • adding/removing APIs.
  • adding/removing properties.
  • adding/removing API-version.
  • adding a new service in Azure.

Failure to comply may result in delays for manifest application. Note this does not apply to data plane APIs.

  • If you are blocked on ARM review and want to get the PR merged urgently, please get the ARM oncall for reviews (RP Manifest Approvers team under Azure Resource Manager service) from IcM and reach out to them.
    Please follow the link to find more details on API review process.

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-js

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

Command: ['/usr/local/bin/autorest', '/tmp/tmpnqxxg6pa/rest/specification/network/resource-manager/readme.md', '--license-header=MICROSOFT_MIT_NO_VERSION', '--typescript', '--typescript-sdks-folder=/tmp/tmpnqxxg6pa/azure-sdk-for-js', '--use=@microsoft.azure/autorest.typescript@2.1.1']
Finished with return code 1
and output:

AutoRest code generation utility [version: 2.0.4283; node: v8.12.0]
(C) 2018 Microsoft Corporation.
https://aka.ms/autorest
   Loading AutoRest core      '/root/.autorest/@microsoft.azure_autorest-core@2.0.4289/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4289)
   Loading AutoRest extension '@microsoft.azure/autorest.typescript' (2.1.1->2.1.1)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.51->2.3.51)
FATAL: System.InvalidOperationException: Found incompatible property types Object, Object for property 'tags' in schema inheritance chain
   at AutoRest.Modeler.SchemaResolver.ExpandAllOf(Schema schema) in c:\publish\autorest.modeler\src\SchemaResolver.cs:line 157
   at AutoRest.Modeler.SchemaResolver.Unwrap(Schema schema) in c:\publish\autorest.modeler\src\SchemaResolver.cs:line 75
   at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in c:\publish\autorest.modeler\src\SchemaBuilder.cs:line 35
   at AutoRest.Modeler.SwaggerModeler.BuildCompositeTypes() in c:\publish\autorest.modeler\src\SwaggerModeler.cs:line 348
   at AutoRest.Modeler.SwaggerModeler.Build(ServiceDefinition serviceDefinition) in c:\publish\autorest.modeler\src\SwaggerModeler.cs:line 66
   at AutoRest.Modeler.Program.<ProcessInternal>d__2.MoveNext() in c:\publish\autorest.modeler\src\Program.cs:line 60
--- 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: typescript/imodeler1 - FAILED
FATAL: Error: Plugin imodeler1 reported failure.
Process() cancelled due to exception : Plugin imodeler1 reported failure.
  Error: Plugin imodeler1 reported failure.

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-ruby

A PR has been created for you:
Azure/azure-sdk-for-ruby#2132

@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-python

A PR has been created for you:
Azure/azure-sdk-for-python#4138

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-go

A PR has been created for you:
Azure/azure-sdk-for-go#3828

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-node

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

Command: ['/usr/local/bin/autorest', '/tmp/tmp_spahwpw/rest/specification/network/resource-manager/readme.md', '--license-header=MICROSOFT_MIT_NO_VERSION', '--node-sdks-folder=/tmp/tmp_spahwpw/azure-sdk-for-node', '--nodejs', '--use=@microsoft.azure/autorest.nodejs@2.1.121']
Finished with return code 1
and output:

AutoRest code generation utility [version: 2.0.4283; node: v8.12.0]
(C) 2018 Microsoft Corporation.
https://aka.ms/autorest
   Loading AutoRest core      '/root/.autorest/@microsoft.azure_autorest-core@2.0.4289/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4289)
   Loading AutoRest extension '@microsoft.azure/autorest.nodejs' (2.1.121->2.1.121)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.44->2.3.44)
FATAL: System.InvalidOperationException: Found incompatible property types Object, Object for property 'tags' in schema inheritance chain
   at AutoRest.Modeler.SchemaResolver.ExpandAllOf(Schema schema) in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\SchemaResolver.cs:line 157
   at AutoRest.Modeler.SchemaResolver.Unwrap(Schema schema) in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\SchemaResolver.cs:line 75
   at AutoRest.Modeler.SchemaBuilder.BuildServiceType(String serviceTypeName, Boolean required) in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\SchemaBuilder.cs:line 35
   at AutoRest.Modeler.SwaggerModeler.BuildCompositeTypes() in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\SwaggerModeler.cs:line 310
   at AutoRest.Modeler.SwaggerModeler.Build(ServiceDefinition serviceDefinition) in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\SwaggerModeler.cs:line 66
   at AutoRest.Modeler.Program.<ProcessInternal>d__2.MoveNext() in C:\Users\ci\AppData\Local\Temp\PUBLISHu1dw1\44_20171214T003644\autorest.modeler\src\Program.cs:line 60
--- 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: nodejs/imodeler1 - FAILED
FATAL: Error: Plugin imodeler1 reported failure.
Process() cancelled due to exception : Plugin imodeler1 reported failure.
  Error: Plugin imodeler1 reported failure.

@anton-evseev
Copy link
Contributor Author

Travis fails with OOM exception

v8::Utils::ReportOOMFailure(char const*, bool) [node]\n 4: v8::internal::V8::FatalProcessOutOfMemory(char const*, bool)

I tried linter on my local machine and had the same error. Managed to bypass it by using --max_old_space_size=8192.

@dsgouda @jianghaolu could you please take a look?

@AutorestCI
Copy link

AutorestCI commented Jan 8, 2019

Automation for azure-sdk-for-java

Nothing to generate for azure-sdk-for-java

Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

Looks fine apart from the comment.

@@ -437,45 +437,6 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey": {
Copy link
Contributor

Choose a reason for hiding this comment

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

@number213 can you explain how you are fixing duplicate nw paths here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are two duplicate paths in old API versions

  • GET /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey
  • PUT /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey

I moved them under one entry, like it's done in newer API versions

@anton-evseev
Copy link
Contributor Author

CI failures are related to this issue #5008

Copy link
Contributor

@dsgouda dsgouda left a comment

Choose a reason for hiding this comment

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

LGTM

@dsgouda dsgouda merged commit 7da6f1d into Azure:network-january-release Jan 9, 2019
@anton-evseev anton-evseev deleted the vpngw-fix-jan branch January 10, 2019 05:23
sergey-shandar pushed a commit that referenced this pull request Feb 13, 2019
* Adds base for updating Microsoft.Network from version stable/2018-11-01 to version 2018-12-01

* Updates readme

* Updates API version in new specs and examples

* fixing invalid paths in frontdoor (#4991)

* add max bound for application gateway autoscale config (#4996)

* fixing location in network samples (#4992)

* Fix duplicate path in old Network API versions (#5003)

* missing location in route tables (#5024)

* removed confusing readonly parameters from example (#5022)

* Fix errors in ddosCustomPolicy.json (#5013)

* Add ddosCustomPolicy.json to readme.md and fix spec errors (#5008)

* Update ddosCustomPolicy.json in 2018-12-01

* Pick AppGw changes from 2018-11-01 (#5044)

* Adding the structure of ruleSequence and conditions in rewriteRuleSets under applicationGatewayProperties (#5009)

* Added Prepare action for subnet (#5058)

* Added Prepare action documentation

* Took carte of the errors from the validation tool

* Error fixes from validation tool

* Adding a typo and a missing property

* updated the destination address description to also include service tags (#5112)

* Update for Get Application Gateway Server Variables APIs (#5113)

* Changes in the existing APIs result format.

* adding proxyresource to server variables APIs result

* Updating applicationgateway.json

* Update applicationGateway.json

* add Go SDK build for 2018-12-01

* changes to pythonand ruby readme files

* Update readme.ruby.md

* adding jave readme changes

* Minor Fix in spacing

* Creating a new tag for 2018-12 version

* Update readme.python.md

* Update applicationGateway.json

* fixing examples

* examples

* Fixed issue: #4721 (#5087)

* Fixed issue: #4721

* Reverted fixes in networkWatcher in previous versions. Left only fix in 2018-12-01

* Threat Intel changes for Azure Firewall (#5143)

* Threat Intel changes for Azure Firewall

* Move the property to the end of the list

* Fix typos in Network 2018-12-01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants