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

virtual wan/gateway disconnect vpn connections #7747

Merged
merged 14 commits into from
Nov 28, 2019
Merged

virtual wan/gateway disconnect vpn connections #7747

merged 14 commits into from
Nov 28, 2019

Conversation

ninweninwe
Copy link
Contributor

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.

@azuresdkci
Copy link
Contributor

Can one of the admins verify this patch?

@AutorestCI
Copy link

AutorestCI commented Nov 8, 2019

Automation for azure-sdk-for-python

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

Command: ['/usr/local/bin/autorest', '/tmp/tmp4iwwyfea/rest/specification/network/resource-manager/readme.md', '--keep-version-file', '--multiapi', '--no-async', '--python', '--python-mode=update', '--python-sdks-folder=/tmp/tmp4iwwyfea/sdk/sdk', '[email protected]/[email protected]', '--version=preview']
Finished with return code -6
and output:

AutoRest code generation utility [version: 2.0.4283; node: v10.15.3]
(C) 2018 Microsoft Corporation.
https://aka.ms/autorest

There is a new version of AutoRest available (2.0.4407).
 > You can install the newer version with with npm install -g autorest@latest

   Loading AutoRest core      '/root/.autorest/@[email protected]/node_modules/@microsoft.azure/autorest-core/dist' (2.0.4407)
   Loading AutoRest extension '@microsoft.azure/autorest.python' (4.0.70->4.0.70)
   Loading AutoRest extension '@microsoft.azure/autorest.modeler' (2.3.44->2.3.44)
Processing batch task - {"tag":"package-2019-09"} .

<--- Last few GCs --->

[70456:0x273ecc0]    64978 ms: Scavenge 1364.3 (1423.7) -> 1363.6 (1424.2) MB, 5.1 / 0.0 ms  (average mu = 0.198, current mu = 0.141) allocation failure
[70456:0x273ecc0]    64991 ms: Scavenge 1364.5 (1424.2) -> 1363.8 (1424.7) MB, 6.8 / 0.0 ms  (average mu = 0.198, current mu = 0.141) allocation failure
[70456:0x273ecc0]    65010 ms: Scavenge 1364.7 (1424.7) -> 1364.0 (1425.2) MB, 14.0 / 0.0 ms  (average mu = 0.198, current mu = 0.141) allocation failure


<--- JS stacktrace --->

==== JS stack trace =========================================

    0: ExitFrame [pc: 0x47977ddbe1d]
    1: StubFrame [pc: 0x47977dd389d]
Security context: 0x38946ae9e6e9 <JSObject>
    2: split [0x38946ae906c9](this=0x34f0fb41a4c9 <String[61]: definitions/ConnectivityInformation/properties/avgLatencyInMs>,0x34f0fb41a4f1 <JSRegExp <String[2]: \/>>)
    3: parsePointer [0x2801c0e157a1] [/node_modules/@microsoft.azure/datastore/dist/json-pointer.js:~222] [pc=0x47978315a26](this=0x2801c0e1b2c1 <Object ma...

FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory
 1: 0x8dc510 node::Abort() [node]
 2: 0x8dc55c  [node]
 3: 0xad9b5e v8::Utils::ReportOOMFailure(v8::internal::Isolate*, char const*, bool) [node]
 4: 0xad9d94 v8::internal::V8::FatalProcessOutOfMemory(v8::internal::Isolate*, char const*, bool) [node]
 5: 0xec7bf2  [node]
 6: 0xec7cf8 v8::internal::Heap::CheckIneffectiveMarkCompact(unsigned long, double) [node]
 7: 0xed3dd2 v8::internal::Heap::PerformGarbageCollection(v8::internal::GarbageCollector, v8::GCCallbackFlags) [node]
 8: 0xed4704 v8::internal::Heap::CollectGarbage(v8::internal::AllocationSpace, v8::internal::GarbageCollectionReason, v8::GCCallbackFlags) [node]
 9: 0xed7371 v8::internal::Heap::AllocateRawWithRetryOrFail(int, v8::internal::AllocationSpace, v8::internal::AllocationAlignment) [node]
10: 0xea07f4 v8::internal::Factory::NewFillerObject(int, bool, v8::internal::AllocationSpace) [node]
11: 0x114018e v8::internal::Runtime_AllocateInNewSpace(int, v8::internal::Object**, v8::internal::Isolate*) [node]
12: 0x47977ddbe1d

@AutorestCI
Copy link

AutorestCI commented Nov 8, 2019

Automation for azure-sdk-for-go

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

Copy link
Contributor

@anton-evseev anton-evseev left a comment

Choose a reason for hiding this comment

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

Please also resolve check errors
cc: @v-shhatt @solhaile

@anton-evseev anton-evseev added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Nov 8, 2019
@anton-evseev
Copy link
Contributor

@NullMDR LintDiff and BreakingChange are failing with

Error: (node:5502) UnhandledPromiseRejectionWarning: TypeError: volume[member].bind is not a function
    at patchFilesystem (/home/vsts/work/1/s/node_modules/autorest/dist/static-loader.js:277:43)
    at /home/vsts/work/1/s/node_modules/autorest/dist/static-loader.js:281:18
    at Object.global.staticloader.undo (/home/vsts/work/1/s/node_modules/autorest/dist/static-loader.js:163:7)
    at process.exit (/home/vsts/work/1/s/node_modules/autorest/dist/static-loader.js:170:27)
    at main (/home/vsts/.autorest/@[email protected]/node_modules/@microsoft.azure/autorest-core/dist/app.js:517:21)
(node:5502) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). (rejection id: 5)
(node:5502) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.

I think this is related to Azure/autorest#3279. Could you please take a look?

@PhoenixHe-NV
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@PhoenixHe-NV
Copy link
Contributor

@number123 This bug was recently fixed on latest master, please update your network-december-release branch.

@ninweninwe
Copy link
Contributor Author

@number123 This bug was recently fixed on latest master, please update your network-december-release branch.

merge with the master of azure rest api specs

@anton-evseev
Copy link
Contributor

@ninweninwe I've opened separate PR to sync master and release branch: #7764
Otherwise yours would be hard to review

@ninweninwe
Copy link
Contributor Author

Looks good, but could you please resolve PrettierCheck? You need to run JSON prettifier on your files. You can do that with npm run-script prettier-fix (but it will run against all spec files, so please modify package.json so the fix would target only network directory to save time)

npm run-script prettier-fix. But got this error. Any idea?
[error] Unable to expand glob patterns: specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/*.json !/node_modules/ !./node_modules/** !/.{git,svn,hg}/ !./.{git,svn,hg}/**
[error] Cannot find module 'E:\az-github\azure-rest-api-specs\scripts\prettier-swagger-plugin' from 'E:\az-github\azure-rest-api-specs'

@ninweninwe
Copy link
Contributor Author

Looks good, but could you please resolve PrettierCheck? You need to run JSON prettifier on your files. You can do that with npm run-script prettier-fix (but it will run against all spec files, so please modify package.json so the fix would target only network directory to save time)

is there a way to know where the style issue is? I could not make prettier working in windows.

@PhoenixHe-NV
Copy link
Contributor

@ninweninwe Please run npm install; npm run prettier -- --write "specification/network/**/*.json"

@ninweninwe
Copy link
Contributor Author

@ninweninwe Please run npm install; npm run prettier -- --write "specification/network/**/*.json"

I have prettier installed. It does not work.

[E:\az-github\azure-rest-api-specs\specification\network\resource-manager\Microsoft.Network\stable\2019-11-01]npm run prettier --write "virtualWan.json"

[email protected] prettier E:\az-github\azure-rest-api-specs
prettier "virtualWan.json"

[error] No matching files. Patterns tried: virtualWan.json !/node_modules/ !./node_modules/** !/.{git,svn,hg}/ !./.{git,svn,hg}/**
npm ERR! code ELIFECYCLE
npm ERR! errno 2
npm ERR! [email protected] prettier: prettier "virtualWan.json"
npm ERR! Exit status 2
npm ERR!
npm ERR! Failed at the [email protected] prettier script.
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.

npm ERR! A complete log of this run can be found in:
npm ERR! C:\Users\ninwe\AppData\Roaming\npm-cache_logs\2019-11-14T17_23_25_482Z-debug.log

@ninweninwe
Copy link
Contributor Author

ninweninwe commented Nov 14, 2019 via email

@ninweninwe
Copy link
Contributor Author

@ninweninwe Please run npm install; npm run prettier -- --write "specification/network/**/*.json"

actually, I tried other json prettier tool and could not tell any difference of the current files.

@ninweninwe
Copy link
Contributor Author

ninweninwe commented Nov 14, 2019 via email

@ninweninwe
Copy link
Contributor Author

The PR failed on The job running on agent Azure Pipelines 27 ran longer than the maximum time of 180 minutes. That prettier check can be ignored. Can anyone trigger another build? @number213

@PhoenixHe-NV
Copy link
Contributor

@ninweninwe You should use npm run prettier -- --write "specification/network/**/*/virtualWan.json" even if you are in some sub folder.

@PhoenixHe-NV
Copy link
Contributor

And for the java sdk timeout issue I suggest to remove unused tags in batch section in readme.java.md to speedup generation

@ninweninwe
Copy link
Contributor Author

@ninweninwe You should use npm run prettier -- --write "specification/network/**/*/virtualWan.json" even if you are in some sub folder.

[email protected] prettier E:\az-github\azure-rest-api-specs
prettier "--write" "specification/network/**/*/virtualWan.json"

[error] No matching files. Patterns tried: "--write" "specification/network//*/virtualWan.json" !/node_modules/** !./node_modules/** !/.{git,svn,hg}/ !./.{git,svn,hg}/**
npm ERR! code ELIFECYCLE
npm ERR! errno 2

still not working

@ninweninwe
Copy link
Contributor Author

And for the java sdk timeout issue I suggest to remove unused tags in batch section in readme.java.md to speedup generation

can you give me more details? you mean this? why does it not have 2019-11 tag?

batch:
  - tag: package-2019-09

@ninweninwe ninweninwe requested a review from v-shhatt as a code owner November 18, 2019 23:23
@anton-evseev
Copy link
Contributor

The issues with prettier was that you ran it against virtualWan.json but the issue was with example files.

I ran the command and pushed prettified files as it's taking too much time to resolve.

npm run prettier -- --write "specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/*.json"

@ninweninwe
Copy link
Contributor Author

The issues with prettier was that you ran it against virtualWan.json but the issue was with example files.
I ran the command and pushed prettified files as it's taking too much time to resolve.
npm run prettier -- --write "specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/*.json"

[error] No matching files. Patterns tried: "--write" "specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/*.json" !/node_modules/ !./node_modules/** !/.{git,svn,hg}/ !./.{git,svn,hg}/**
npm ERR! code ELIFECYCLE
npm ERR! errno 2

I ran the same cmd. But in my machine, it could not even run. what else is missing? do I need to setup anything? I am using windows and installed prettier already.

@anton-evseev
Copy link
Contributor

@ninweninwe I ran the command from repo's root (C:\git\azure-rest-api-specs for me). Not sure what else might be the reason

@ninweninwe
Copy link
Contributor Author

@ninweninwe I ran the command from repo's root (C:\git\azure-rest-api-specs for me). Not sure what else might be the reason

I did the same under the repo's root. here is the log. what is the version of node, npm and prettier on your box?

0 info it worked if it ends with ok
1 verbose cli [ 'C:\Program Files\nodejs\node.exe',
1 verbose cli 'C:\Users\ninwe\AppData\Roaming\npm\node_modules\npm\bin\npm-cli.js',
1 verbose cli 'run',
1 verbose cli 'prettier',
1 verbose cli '--',
1 verbose cli '--write',
1 verbose cli 'specification\network\resource-manager\Microsoft.Network\stable\2019-11-01\examples\.json' ]
2 info using [email protected]
3 info using [email protected]
4 verbose run-script [ 'prettier' ]
5 info lifecycle [email protected]prettier: [email protected]
6 verbose lifecycle [email protected]
prettier: unsafe-perm in lifecycle true
7 verbose lifecycle [email protected]prettier: PATH: C:\Users\ninwe\AppData\Roaming\npm\node_modules\npm\node_modules\npm-lifecycle\node-gyp-bin;E:\az-github\azure-rest-api-specs\node_modules.bin;C:\Program Files\ConEmu\ConEmu\Scripts;C:\Program Files\ConEmu;C:\Program Files\ConEmu\ConEmu;C:\Program Files\Common Files\Microsoft Shared\Microsoft Online Services;C:\Program Files (x86)\Common Files\Microsoft Shared\Microsoft Online Services;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\Program Files\dotnet;C:\Program Files\Microsoft\Web Platform Installer;C:\ProgramData\chocolatey\bin;C:\WINDOWS\System32\OpenSSH;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;d:\Toolbox\LLVM\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Windows Kits\10\Microsoft Application Virtualization\Sequencer;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files\Microsoft Network Monitor 3;C:\Program Files\PowerShell\6;C:\Program Files (x86)\dotnet;C:\Users\ninwe\AppData\Local\CloudBuild;C:\Users\ninwe\AppData\Local\Microsoft\WindowsApps;C:\Users\ninwe\AppData\Local\Dbg\UI;C:\Toolbox\Microsoft VS Code\bin;D:\msys64\usr\bin;;d:\toolbox\Fiddler;C:\Users\ninwe\AppData\Roaming\npm;C:\Users\ninwe.dotnet\tools;%USERPROFILE%\AppData\Local\Microsoft\WindowsApps
8 verbose lifecycle [email protected]
prettier: CWD: E:\az-github\azure-rest-api-specs
9 silly lifecycle [email protected]~prettier: Args: [ '-c',
9 silly lifecycle 'prettier "--write" "specification\network\resource-manager\Microsoft.Network\stable\2019-11-01\examples\
.json"' ]
10 silly lifecycle [email protected]prettier: Returned: code: 2 signal: null
11 info lifecycle [email protected]
prettier: Failed to exec prettier script
12 verbose stack Error: [email protected] prettier: prettier "--write" "specification\network\resource-manager\Microsoft.Network\stable\2019-11-01\examples\*.json"
12 verbose stack Exit status 2
12 verbose stack at EventEmitter. (C:\Users\ninwe\AppData\Roaming\npm\node_modules\npm\node_modules\npm-lifecycle\index.js:332:16)
12 verbose stack at EventEmitter.emit (events.js:189:13)
12 verbose stack at ChildProcess. (C:\Users\ninwe\AppData\Roaming\npm\node_modules\npm\node_modules\npm-lifecycle\lib\spawn.js:55:14)
12 verbose stack at ChildProcess.emit (events.js:189:13)
12 verbose stack at maybeClose (internal/child_process.js:970:16)
12 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:259:5)
13 verbose pkgid [email protected]
14 verbose cwd E:\az-github\azure-rest-api-specs
15 verbose Windows_NT 10.0.18363
16 verbose argv "C:\Program Files\nodejs\node.exe" "C:\Users\ninwe\AppData\Roaming\npm\node_modules\npm\bin\npm-cli.js" "run" "prettier" "--" "--write" "specification\network\resource-manager\Microsoft.Network\stable\2019-11-01\examples\*.json"
17 verbose node v10.15.1
18 verbose npm v6.13.0
19 error code ELIFECYCLE
20 error errno 2
21 error [email protected] prettier: prettier "--write" "specification\network\resource-manager\Microsoft.Network\stable\2019-11-01\examples\*.json"
21 error Exit status 2
22 error Failed at the [email protected] prettier script.
22 error This is probably not a problem with npm. There is likely additional logging output above.
23 verbose exit [ 2, true ]

@PhoenixHe-NV
Copy link
Contributor

/azp run public.rest-api-specs

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@anton-evseev
Copy link
Contributor

/azp run public.rest-api-specs

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@anton-evseev
Copy link
Contributor

Good to go, @zikalino please merge

@zikalino zikalino merged commit 653134d into Azure:network-december-release Nov 28, 2019
akning-ms pushed a commit that referenced this pull request Jan 15, 2020
* Adds base for updating Microsoft.Network from version stable/2019-09-01 to version 2019-11-01

* Updates readme

* Updates API version in new specs and examples

* Add missing spec reference in readme.md (#7726)

* added username (#7779)

* adding alisas to code owners file (#7786)

* Committing changes to Fix Swagger descriptions to use "Reference to" … (#7787)

* Committing changes to Fix Swagger descriptions to use "Reference to" instead of "Reference of"

* upgrade rest-api-specs-scripts version (#7712)

* bump avocado version to support $(this-folder) (#7743)

* regenerate package-lock.json (#7756)

* Committing changes with formatted descriptions

* Committing changes to remove verbs from Swagger descriptions (#7788)

* Committing changes to remove verbs from Swagger descriptions

* upgrade rest-api-specs-scripts version (#7712)

* bump avocado version to support $(this-folder) (#7743)

* regenerate package-lock.json (#7756)

* Committing changes as per review comments

* committing changes to fix java sdk timeout issue (#7802)

* IpGroups reference in AzureFirewall (#7807)

* IpGroups reference in AzureFirewall

* Fixed examples

* Committing changes to remove verbs from Swagger descriptions (#7788)

* Committing changes to remove verbs from Swagger descriptions

* upgrade rest-api-specs-scripts version (#7712)

* bump avocado version to support $(this-folder) (#7743)

* regenerate package-lock.json (#7756)

* Committing changes as per review comments

* committing changes to fix java sdk timeout issue (#7802)

* IpGroups reference in AzureFirewall

* Fixed examples

* prettier fix

* prettier  --write

* virtual wan/gateway disconnect vpn connections (#7747)

* virtual wan/gateway disconnect vpn connections

* fix the PR comments

* fix the PR

* upgrade rest-api-specs-scripts version (#7712)

* bump avocado version to support $(this-folder) (#7743)

* regenerate package-lock.json (#7756)

* fix build error

* match class name with p2svpnconnectionrequest in nrp

* address the PR comments

* address the PR comments

* Prettify Network examples

* fix format of json

* Adding management IP configuration for Azure Firewall (#7851)

* Adding management IP configuration to firewall

* Changing description wording back

* Adding type property to AzureFirewallIpConfiguration

* Bumping API version in example files

* Fixing style issues

* Missed period at end of description

* Added connection monitor to networkWatcher swagger (#7881)

* Added connection monitor to networkWatcher swagger

* Added tests for connection monitor

* Added NetworkWatcherConnectionMonitorUpdateTags test

* Removed reference on connectionMOnitorV1 in readme.md

* Suppressed DefinitionsPropertiesNamesCamelCase error

* Fixed warnings and added example cor connectionMonitorV2 creation

* Fixed formatting in NetworkWatcherConnectionMonitorV2Create test

* Added connectionMonitorType property to connectionMonitorResult

* Fixed networkWatcher swagger based on CR. Run prettier check

* Minor changes

* Run prettier check for networkWatcher

* Adding note about API (#8104)

being in Preview

* Reverted express route changes brought in by a44f306#diff-2f0aa6e57d2b97956e1fb54558cf4cdeR1714

* Reverted changes made by commit a44f306#diff-2f0aa6e57d2b97956e1fb54558cf4cdeR1714

* Adding the structure of urlConfiguration in rewriteRuleActionSet (#7905)

* Url Configuration swagger changes for Url Rewrite feature of Application Gateway

* prettier fix

* DDOS protected IP flag for public IP (#8042)

* DDOS protected IP flag for public IP

* Protected IP property in ddos setting

* fixing build errors

* Retriggering the build

* Added flowLog to NetworkWatcher swagger + examples (#8025)

* Added flowLog ro NetworkWatcher swagger + examples

* Cleaned up required properties for trafficAnalytics flow log

* Fixes based on CR

Co-authored-by: solhaile <[email protected]>
Co-authored-by: Ranjani Hatti <[email protected]>
Co-authored-by: ssripadham <[email protected]>
Co-authored-by: Ning Wei <[email protected]>
Co-authored-by: iatodoro <[email protected]>
Co-authored-by: irrogozh <[email protected]>
Co-authored-by: Dalan Mendonca <[email protected]>
Co-authored-by: amwate <[email protected]>
Co-authored-by: Abhinav Jain <[email protected]>
Co-authored-by: manchit <[email protected]>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants