193968 2019-01-29 10:49:31 -0800 [ews-build] Configure buildbot to send events to ews-app 2019-01-29 12:42:33 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193928 https://bugs.webkit.org/show_bug.cgi?id=193973 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap ews-watchlist kocsen_chung lforschler webkit-bug-importer oldest_to_newest 1499595 0 aakash_jain 2019-01-29 10:49:31 -0800 ews-build Buildbot should send build and step start/stop events to ews-app, so that ews-app can process them appropriately and generate status-bubbles. 1499605 1 360477 aakash_jain 2019-01-29 11:00:32 -0800 Created attachment 360477 Proposed patch 1499606 2 ews-watchlist 2019-01-29 11:03:26 -0800 Attachment 360477 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/events.py:28: No name 'python' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:29: No name 'internet' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:30: No name 'internet' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:31: No name 'web' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:32: No name 'web' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:33: No name 'web' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:35: No name 'internet' in module 'twisted' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:36: No name 'service' in module 'buildbot.util' [pylint/E0611] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:111: [Events.buildStarted] Instance of 'Events' has no 'master' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:132: [Events.buildFinished] Instance of 'Events' has no 'master' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:134: [Events.buildFinished] Instance of 'Events' has no 'master' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/events.py:185: [Events.startService] Instance of 'Events' has no 'master' member [pylint/E1101] [5] Total errors found: 12 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1499649 3 360477 lforschler 2019-01-29 12:25:47 -0800 Comment on attachment 360477 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=360477&action=review lgtm with a couple comments. > Tools/BuildSlaveSupport/ews-build/events.py:37 > + I forget our sorting policy when using 'from', but TextMate sorts these: from buildbot.util import service from twisted.internet import defer from twisted.internet import reactor from twisted.internet.defer import succeed from twisted.python import log from twisted.web.client import Agent from twisted.web.http_headers import Headers from twisted.web.iweb import IBodyProducer from zope.interface import implements > Tools/BuildSlaveSupport/ews-build/events.py:77 > + def __init__(self, type_prefix="", name='Events'): mixing "" and '' here. > Tools/BuildSlaveSupport/ews-build/events.py:102 > + def getPatchid(self, build): maybe consider getPatch_id ? disregard if we are trying to stay consistent with other uses. 1499652 4 aakash_jain 2019-01-29 12:37:59 -0800 > I forget our sorting policy when using 'from', but TextMate sorts these: Done > mixing "" and '' here. Fixed > maybe consider getPatch_id ? renamed to getPatchID 1499654 5 aakash_jain 2019-01-29 12:41:38 -0800 Committed r240671: <https://trac.webkit.org/changeset/240671> 1499655 6 webkit-bug-importer 2019-01-29 12:42:33 -0800 <rdar://problem/47642094> 360477 2019-01-29 11:00:32 -0800 2019-01-29 12:25:47 -0800 Proposed patch ews-build-events.patch text/plain 9064 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0MDY2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE5LTAxLTI5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBDb25maWd1cmUgYnVpbGRib3QgdG8gc2VuZCBldmVu dHMgdG8gZXdzLWFwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkzOTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZXZlbnRzLnB5OiBBZGRlZC4KKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZzoKKwogMjAxOS0w MS0yOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKFBTT04pOiBUd2l0dGVyIGxpbmsgZ2V0cyBzdHVjayBhdCB0LmNvIGFmdGVyIG5hdmlnYXRp bmcgYmFjayBpbiB0YWIKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9l dmVudHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L2V2ZW50cy5weQkobm9uZXhpc3RlbnQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YnVpbGQvZXZlbnRzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMTk2IEBACisjIENvcHly aWdodCAoQykgMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1ldDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBz b3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisj IDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFi b3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMg VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJyBBTkQKKyMgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJ TkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFS RQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUgorIyBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMCisjIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSCisjIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksCisjIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBkYXRldGltZQoraW1wb3J0 IGpzb24KK2ltcG9ydCB0aW1lCisKK2Zyb20gem9wZS5pbnRlcmZhY2UgaW1wb3J0IGltcGxlbWVu dHMKK2Zyb20gdHdpc3RlZC5weXRob24gaW1wb3J0IGxvZworZnJvbSB0d2lzdGVkLmludGVybmV0 IGltcG9ydCByZWFjdG9yCitmcm9tIHR3aXN0ZWQuaW50ZXJuZXQuZGVmZXIgaW1wb3J0IHN1Y2Nl ZWQKK2Zyb20gdHdpc3RlZC53ZWIuY2xpZW50IGltcG9ydCBBZ2VudAorZnJvbSB0d2lzdGVkLndl Yi5odHRwX2hlYWRlcnMgaW1wb3J0IEhlYWRlcnMKK2Zyb20gdHdpc3RlZC53ZWIuaXdlYiBpbXBv cnQgSUJvZHlQcm9kdWNlcgorCitmcm9tIHR3aXN0ZWQuaW50ZXJuZXQgaW1wb3J0IGRlZmVyCitm cm9tIGJ1aWxkYm90LnV0aWwgaW1wb3J0IHNlcnZpY2UKKworCitjbGFzcyBKU09OUHJvZHVjZXIo b2JqZWN0KToKKyAgICAiIiIKKyAgICBQZXJmb3JtIEpTT04gYXN5bmNocm9ub3VzbHkgYXMgdG8g bm90IGxvY2sgdGhlIGJ1aWxkYm90IG1haW4gZXZlbnQgbG9vcAorICAgICIiIgorICAgIGltcGxl bWVudHMoSUJvZHlQcm9kdWNlcikKKworICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkYXRhKToKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5ib2R5ID0ganNvbi5kdW1wcyhkYXRhLCBkZWZh dWx0PXNlbGYuanNvbl9zZXJpYWxpemVfZGF0ZXRpbWUpCisgICAgICAgIGV4Y2VwdCBUeXBlRXJy b3I6CisgICAgICAgICAgICBzZWxmLmJvZHkgPSAnJworICAgICAgICBzZWxmLmxlbmd0aCA9IGxl bihzZWxmLmJvZHkpCisKKyAgICBkZWYgc3RhcnRQcm9kdWNpbmcoc2VsZiwgY29uc3VtZXIpOgor ICAgICAgICBpZiBzZWxmLmJvZHk6CisgICAgICAgICAgICBjb25zdW1lci53cml0ZShzZWxmLmJv ZHkpCisgICAgICAgIHJldHVybiBzdWNjZWVkKE5vbmUpCisKKyAgICBkZWYgcGF1c2VQcm9kdWNp bmcoc2VsZik6CisgICAgICAgIHBhc3MKKworICAgIGRlZiBzdG9wUHJvZHVjaW5nKHNlbGYpOgor ICAgICAgICBwYXNzCisKKyAgICBkZWYganNvbl9zZXJpYWxpemVfZGF0ZXRpbWUoc2VsZiwgb2Jq KToKKyAgICAgICAgIiIiCisgICAgICAgIFNlcmlhbGl6aW5nIGJ1aWxkYm90IGRhdGVzIGludG8g VU5JWCBlcG9jaCB0aW1lc3RhbXBzLgorICAgICAgICAiIiIKKyAgICAgICAgaWYgaXNpbnN0YW5j ZShvYmosIGRhdGV0aW1lLmRhdGV0aW1lKToKKyAgICAgICAgICAgIHJldHVybiBpbnQodGltZS5t a3RpbWUob2JqLnRpbWV0dXBsZSgpKSkKKworICAgICAgICByYWlzZSBUeXBlRXJyb3IoIlR5cGUg JXMgbm90IHNlcmlhbGl6YWJsZSIgJSB0eXBlKG9iaikpCisKKworY2xhc3MgRXZlbnRzKHNlcnZp Y2UuQnVpbGRib3RTZXJ2aWNlKToKKworICAgIEVWRU5UX1NFUlZFUl9FTkRQT0lOVCA9ICdodHRw Oi8vZXdzLndlYmtpdC11YXQub3JnL3Jlc3VsdHMvJworCisgICAgZGVmIF9faW5pdF9fKHNlbGYs IHR5cGVfcHJlZml4PSIiLCBuYW1lPSdFdmVudHMnKToKKyAgICAgICAgIiIiCisgICAgICAgIElu aXRpYWxpemUgdGhlIEV2ZW50cyBQbHVnaW4uIFNlbmRzIGRhdGEgdG8gZXZlbnQgc2VydmVyIG9u IHNwZWNpZmljIGJ1aWxkYm90IGV2ZW50cy4KKyAgICAgICAgOnBhcmFtIHR5cGVfcHJlZml4OiBb b3B0aW9uYWxdIHByZWZpeCB3ZSB3YW50IHRvIGFkZCB0byB0aGUgJ3R5cGUnIGZpZWxkIG9uIHRo ZSBqc29uIHdlIHNlbmQKKyAgICAgICAgIHRvIGV2ZW50IHNlcnZlci4gKGkuZS4gZXdzLWJ1aWxk LCB3aGVyZSAnZXdzLScgaXMgdGhlIHByZWZpeC4KKyAgICAgICAgOnJldHVybjogRXZlbnRzIE9i amVjdAorICAgICAgICAiIiIKKyAgICAgICAgc2VydmljZS5CdWlsZGJvdFNlcnZpY2UuX19pbml0 X18oc2VsZiwgbmFtZT1uYW1lKQorCisgICAgICAgIGlmIHR5cGVfcHJlZml4IGFuZCBub3QgdHlw ZV9wcmVmaXguZW5kc3dpdGgoIi0iKToKKyAgICAgICAgICAgIHR5cGVfcHJlZml4ICs9ICItIgor ICAgICAgICBzZWxmLnR5cGVfcHJlZml4ID0gdHlwZV9wcmVmaXgKKworICAgIGRlZiBzZW5kRGF0 YShzZWxmLCBkYXRhKToKKyAgICAgICAgYWdlbnQgPSBBZ2VudChyZWFjdG9yKQorICAgICAgICBi b2R5ID0gSlNPTlByb2R1Y2VyKGRhdGEpCisKKyAgICAgICAgYWdlbnQucmVxdWVzdCgnUE9TVCcs IHNlbGYuRVZFTlRfU0VSVkVSX0VORFBPSU5ULCBIZWFkZXJzKHsnQ29udGVudC1UeXBlJzogWydh cHBsaWNhdGlvbi9qc29uJ119KSwgYm9keSkKKworICAgIGRlZiBnZXRCdWlsZGVyTmFtZShzZWxm LCBidWlsZCk6CisgICAgICAgIGlmIG5vdCAoYnVpbGQgYW5kICdwcm9wZXJ0aWVzJyBpbiBidWls ZCk6CisgICAgICAgICAgICByZXR1cm4gJycKKworICAgICAgICByZXR1cm4gYnVpbGQuZ2V0KCdw cm9wZXJ0aWVzJykuZ2V0KCdidWlsZGVybmFtZScpWzBdCisKKyAgICBkZWYgZ2V0UGF0Y2hpZChz ZWxmLCBidWlsZCk6CisgICAgICAgIGlmIG5vdCAoYnVpbGQgYW5kICdwcm9wZXJ0aWVzJyBpbiBi dWlsZCk6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAgIHJldHVybiBidWlsZC5n ZXQoJ3Byb3BlcnRpZXMnKS5nZXQoJ3BhdGNoX2lkJylbMF0KKworICAgIEBkZWZlci5pbmxpbmVD YWxsYmFja3MKKyAgICBkZWYgYnVpbGRTdGFydGVkKHNlbGYsIGtleSwgYnVpbGQpOgorICAgICAg ICBpZiBub3QgYnVpbGQuZ2V0KCdwcm9wZXJ0aWVzJyk6CisgICAgICAgICAgICBidWlsZFsncHJv cGVydGllcyddID0geWllbGQgc2VsZi5tYXN0ZXIuZGIuYnVpbGRzLmdldEJ1aWxkUHJvcGVydGll cyhidWlsZC5nZXQoJ2J1aWxkaWQnKSkKKworICAgICAgICBkYXRhID0geworICAgICAgICAgICAg InR5cGUiOiBzZWxmLnR5cGVfcHJlZml4ICsgImJ1aWxkIiwKKyAgICAgICAgICAgICJzdGF0dXMi OiAic3RhcnRlZCIsCisgICAgICAgICAgICAicGF0Y2hfaWQiOiBzZWxmLmdldFBhdGNoaWQoYnVp bGQpLAorICAgICAgICAgICAgImJ1aWxkX2lkIjogYnVpbGQuZ2V0KCdidWlsZGlkJyksCisgICAg ICAgICAgICAiYnVpbGRlcl9pZCI6IGJ1aWxkLmdldCgnYnVpbGRlcmlkJyksCisgICAgICAgICAg ICAibnVtYmVyIjogYnVpbGQuZ2V0KCdudW1iZXInKSwKKyAgICAgICAgICAgICJyZXN1bHQiOiBi dWlsZC5nZXQoJ3Jlc3VsdHMnKSwKKyAgICAgICAgICAgICJzdGFydGVkX2F0IjogYnVpbGQuZ2V0 KCdzdGFydGVkX2F0JyksCisgICAgICAgICAgICAiY29tcGxldGVfYXQiOiBidWlsZC5nZXQoJ2Nv bXBsZXRlX2F0JyksCisgICAgICAgICAgICAic3RhdGVfc3RyaW5nIjogYnVpbGQuZ2V0KCdzdGF0 ZV9zdHJpbmcnKSwKKyAgICAgICAgICAgICJidWlsZGVybmFtZSI6IHNlbGYuZ2V0QnVpbGRlck5h bWUoYnVpbGQpLAorICAgICAgICB9CisKKyAgICAgICAgc2VsZi5zZW5kRGF0YShkYXRhKQorCisg ICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcworICAgIGRlZiBidWlsZEZpbmlzaGVkKHNlbGYsIGtl eSwgYnVpbGQpOgorICAgICAgICBpZiBub3QgYnVpbGQuZ2V0KCdwcm9wZXJ0aWVzJyk6CisgICAg ICAgICAgICBidWlsZFsncHJvcGVydGllcyddID0geWllbGQgc2VsZi5tYXN0ZXIuZGIuYnVpbGRz LmdldEJ1aWxkUHJvcGVydGllcyhidWlsZC5nZXQoJ2J1aWxkaWQnKSkKKyAgICAgICAgaWYgbm90 IGJ1aWxkLmdldCgnc3RlcHMnKToKKyAgICAgICAgICAgIGJ1aWxkWydzdGVwcyddID0geWllbGQg c2VsZi5tYXN0ZXIuZGIuc3RlcHMuZ2V0U3RlcHMoYnVpbGQuZ2V0KCdidWlsZGlkJykpCisKKyAg ICAgICAgZGF0YSA9IHsKKyAgICAgICAgICAgICJ0eXBlIjogc2VsZi50eXBlX3ByZWZpeCArICJi dWlsZCIsCisgICAgICAgICAgICAic3RhdHVzIjogImZpbmlzaGVkIiwKKyAgICAgICAgICAgICJw YXRjaF9pZCI6IHNlbGYuZ2V0UGF0Y2hpZChidWlsZCksCisgICAgICAgICAgICAiYnVpbGRfaWQi OiBidWlsZC5nZXQoJ2J1aWxkaWQnKSwKKyAgICAgICAgICAgICJidWlsZGVyX2lkIjogYnVpbGQu Z2V0KCdidWlsZGVyaWQnKSwKKyAgICAgICAgICAgICJudW1iZXIiOiBidWlsZC5nZXQoJ251bWJl cicpLAorICAgICAgICAgICAgInJlc3VsdCI6IGJ1aWxkLmdldCgncmVzdWx0cycpLAorICAgICAg ICAgICAgInN0YXJ0ZWRfYXQiOiBidWlsZC5nZXQoJ3N0YXJ0ZWRfYXQnKSwKKyAgICAgICAgICAg ICJjb21wbGV0ZV9hdCI6IGJ1aWxkLmdldCgnY29tcGxldGVfYXQnKSwKKyAgICAgICAgICAgICJz dGF0ZV9zdHJpbmciOiBidWlsZC5nZXQoJ3N0YXRlX3N0cmluZycpLAorICAgICAgICAgICAgImJ1 aWxkZXJuYW1lIjogc2VsZi5nZXRCdWlsZGVyTmFtZShidWlsZCksCisgICAgICAgICAgICAic3Rl cHMiOiBidWlsZC5nZXQoJ3N0ZXBzJyksCisgICAgICAgIH0KKworICAgICAgICBzZWxmLnNlbmRE YXRhKGRhdGEpCisKKyAgICBkZWYgc3RlcFN0YXJ0ZWQoc2VsZiwga2V5LCBzdGVwKToKKyAgICAg ICAgZGF0YSA9IHsKKyAgICAgICAgICAgICJ0eXBlIjogc2VsZi50eXBlX3ByZWZpeCArICJzdGVw IiwKKyAgICAgICAgICAgICJzdGF0dXMiOiAic3RhcnRlZCIsCisgICAgICAgICAgICAic3RlcF9p ZCI6IHN0ZXAuZ2V0KCdzdGVwaWQnKSwKKyAgICAgICAgICAgICJidWlsZF9pZCI6IHN0ZXAuZ2V0 KCdidWlsZGlkJyksCisgICAgICAgICAgICAicmVzdWx0Ijogc3RlcC5nZXQoJ3Jlc3VsdHMnKSwK KyAgICAgICAgICAgICJzdGF0ZV9zdHJpbmciOiBzdGVwLmdldCgnc3RhdGVfc3RyaW5nJyksCisg ICAgICAgICAgICAic3RhcnRlZF9hdCI6IHN0ZXAuZ2V0KCdzdGFydGVkX2F0JyksCisgICAgICAg ICAgICAiY29tcGxldGVfYXQiOiBzdGVwLmdldCgnY29tcGxldGVfYXQnKSwKKyAgICAgICAgfQor CisgICAgICAgIHNlbGYuc2VuZERhdGEoZGF0YSkKKworICAgIGRlZiBzdGVwRmluaXNoZWQoc2Vs Ziwga2V5LCBzdGVwKToKKyAgICAgICAgZGF0YSA9IHsKKyAgICAgICAgICAgICJ0eXBlIjogc2Vs Zi50eXBlX3ByZWZpeCArICJzdGVwIiwKKyAgICAgICAgICAgICJzdGF0dXMiOiAiZmluaXNoZWQi LAorICAgICAgICAgICAgInN0ZXBfaWQiOiBzdGVwLmdldCgnc3RlcGlkJyksCisgICAgICAgICAg ICAiYnVpbGRfaWQiOiBzdGVwLmdldCgnYnVpbGRpZCcpLAorICAgICAgICAgICAgInJlc3VsdCI6 IHN0ZXAuZ2V0KCdyZXN1bHRzJyksCisgICAgICAgICAgICAic3RhdGVfc3RyaW5nIjogc3RlcC5n ZXQoJ3N0YXRlX3N0cmluZycpLAorICAgICAgICAgICAgInN0YXJ0ZWRfYXQiOiBzdGVwLmdldCgn c3RhcnRlZF9hdCcpLAorICAgICAgICAgICAgImNvbXBsZXRlX2F0Ijogc3RlcC5nZXQoJ2NvbXBs ZXRlX2F0JyksCisgICAgICAgIH0KKworICAgICAgICBzZWxmLnNlbmREYXRhKGRhdGEpCisKKyAg ICBAZGVmZXIuaW5saW5lQ2FsbGJhY2tzCisgICAgZGVmIHN0YXJ0U2VydmljZShzZWxmKToKKyAg ICAgICAgeWllbGQgc2VydmljZS5CdWlsZGJvdFNlcnZpY2Uuc3RhcnRTZXJ2aWNlKHNlbGYpCisK KyAgICAgICAgc3RhcnRDb25zdW1pbmcgPSBzZWxmLm1hc3Rlci5tcS5zdGFydENvbnN1bWluZwor CisgICAgICAgIHNlbGYuX2J1aWxkU3RhcnRlZENvbnN1bWVyID0geWllbGQgc3RhcnRDb25zdW1p bmcoc2VsZi5idWlsZFN0YXJ0ZWQsICgnYnVpbGRzJywgTm9uZSwgJ25ldycpKQorICAgICAgICBz ZWxmLl9idWlsZENvbXBsZXRlQ29uc3VtZXIgPSB5aWVsZCBzdGFydENvbnN1bWluZyhzZWxmLmJ1 aWxkRmluaXNoZWQsICgnYnVpbGRzJywgTm9uZSwgJ2ZpbmlzaGVkJykpCisgICAgICAgIHNlbGYu X3N0ZXBTdGFydGVkQ29uc3VtZXIgPSB5aWVsZCBzdGFydENvbnN1bWluZyhzZWxmLnN0ZXBTdGFy dGVkLCAoJ3N0ZXBzJywgTm9uZSwgJ3N0YXJ0ZWQnKSkKKyAgICAgICAgc2VsZi5fc3RlcEZpbmlz aGVkQ29uc3VtZXIgPSB5aWVsZCBzdGFydENvbnN1bWluZyhzZWxmLnN0ZXBGaW5pc2hlZCwgKCdz dGVwcycsIE5vbmUsICdmaW5pc2hlZCcpKQorCisgICAgZGVmIHN0b3BTZXJ2aWNlKHNlbGYpOgor ICAgICAgICBzZWxmLl9idWlsZFN0YXJ0ZWRDb25zdW1lci5zdG9wQ29uc3VtaW5nKCkKKyAgICAg ICAgc2VsZi5fYnVpbGRDb21wbGV0ZUNvbnN1bWVyLnN0b3BDb25zdW1pbmcoKQorICAgICAgICBz ZWxmLl9zdGVwU3RhcnRlZENvbnN1bWVyLnN0b3BDb25zdW1pbmcoKQorICAgICAgICBzZWxmLl9z dGVwRmluaXNoZWRDb25zdW1lci5zdG9wQ29uc3VtaW5nKCkKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9tYXN0ZXIuY2ZnCShyZXZpc2lvbiAyNDA2NjMpCisrKyBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvbWFzdGVyLmNmZwkod29ya2luZyBjb3B5 KQpAQCAtMSw3ICsxLDcgQEAKIGltcG9ydCBvcwogCiBpbXBvcnQgbG9hZENvbmZpZwotCitmcm9t IGV2ZW50cyBpbXBvcnQgRXZlbnRzCiAKIGlzX3Rlc3RfbW9kZV9lbmFibGVkID0gb3MuZ2V0ZW52 KCdCVUlMREJPVF9URVNUSU5HJykgaXMgbm90IE5vbmUKIApAQCAtMjUsMyArMjUsNiBAQCBjWydi dWlsZGJvdFVSTCddID0gJ2h0dHBzOi8vZXdzLWJ1aWxkLndlCiBjWydidWlsZGJvdE5ldFVzYWdl RGF0YSddID0gTm9uZQogCiBsb2FkQ29uZmlnLmxvYWRCdWlsZGVyQ29uZmlnKGMsIHVzZV9sb2Nh bGhvc3Rfd29ya2VyPWlzX3Rlc3RfbW9kZV9lbmFibGVkKQorCitldmVudF9yZXBvcnRlciA9IEV2 ZW50cyh0eXBlX3ByZWZpeD0nZXdzJykKK2NbJ3NlcnZpY2VzJ10gPSBbZXZlbnRfcmVwb3J0ZXJd Cg==