127265 2014-01-19 22:54:22 -0800 EWS should provide better information to Dashboard via JSON 2014-01-20 10:34:28 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 127006 1 ap ap commit-queue rniwa thorton timothy oldest_to_newest 969714 0 ap 2014-01-19 22:54:22 -0800 Right now, the dashboard only uses queue length, but I have a patch almost ready that adds a popover with latest status. Also, we don't need to perform costly operations until asked to, so this patch splits JSON handler in two. 969715 1 221617 ap 2014-01-19 23:01:09 -0800 Created attachment 221617 proposed patch 969716 2 commit-queue 2014-01-19 23:03:11 -0800 Attachment 221617 did not pass style-queue: ERROR: Tools/QueueStatusServer/handlers/queuestatusjson.py:59: trailing whitespace [pep8/W291] [5] ERROR: Tools/QueueStatusServer/handlers/queuestatusjson.py:58: [QueueStatusJSON._rows_for_work_items] Instance of 'QueueStatusJSON' has no 'request' member [pylint/E1101] [5] ERROR: Tools/QueueStatusServer/handlers/queuestatusjson.py:109: [QueueStatusJSON.get] Instance of 'QueueStatusJSON' has no 'request' member [pylint/E1101] [5] ERROR: Tools/QueueStatusServer/handlers/queuelengthjson.py:47: whitespace before '}' [pep8/E202] [5] ERROR: Tools/QueueStatusServer/handlers/queuelengthjson.py:36: [QueueLengthJSON.get] Instance of 'QueueLengthJSON' has no 'response' member [pylint/E1101] [5] ERROR: Tools/QueueStatusServer/handlers/queuelengthjson.py:41: [QueueLengthJSON.get] Instance of 'QueueLengthJSON' has no 'error' member [pylint/E1101] [5] ERROR: Tools/QueueStatusServer/handlers/queuelengthjson.py:44: [QueueLengthJSON.get] Instance of 'QueueLengthJSON' has no 'response' member [pylint/E1101] [5] ERROR: Tools/QueueStatusServer/handlers/queuelengthjson.py:49: [QueueLengthJSON.get] Instance of 'QueueLengthJSON' has no 'response' member [pylint/E1101] [5] Total errors found: 8 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 969719 3 221617 rniwa 2014-01-19 23:15:15 -0800 Comment on attachment 221617 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=221617&action=review > Tools/QueueStatusServer/app.yaml:2 > -version: 162287 # Bugzilla bug ID of last major change > +version: ap # Bugzilla bug ID of last major change This doesn't look right. > Tools/QueueStatusServer/handlers/queuestatusjson.py:59 > + Nit: Whitespaces. > Tools/QueueStatusServer/handlers/queuestatusjson.py:74 > def _bots(self, queue): > + # Collect all bots that ever served this queue. Why don't we rename the method instead of adding a comment like this? 969727 4 221617 ap 2014-01-19 23:30:56 -0800 Comment on attachment 221617 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=221617&action=review >> Tools/QueueStatusServer/app.yaml:2 >> +version: ap # Bugzilla bug ID of last major change > > This doesn't look right. Yeah, this is mentioned in ChangeLog. There really isn't anything that's right to put in diff here, I think. >> Tools/QueueStatusServer/handlers/queuestatusjson.py:59 >> + > > Nit: Whitespaces. Could you please elaborate? Is it bad to have this empty line? >> Tools/QueueStatusServer/handlers/queuestatusjson.py:74 >> + # Collect all bots that ever served this queue. > > Why don't we rename the method instead of adding a comment like this? This comment is about the line below, not about the method. 969911 5 ap 2014-01-20 10:34:28 -0800 Committed <http://trac.webkit.org/r162358>. > Could you please elaborate? Is it bad to have this empty line? I see, this was about trailing spaces in the empty line, not about the empty line itself. > This comment is about the line below, not about the method. Slightly reworded the comment to make it clearer. 221617 2014-01-19 23:01:09 -0800 2014-01-19 23:30:56 -0800 proposed patch EWSDashboard-server.txt text/plain 8914 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE2MjMwMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE0LTAxLTE5ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEVXUyBzaG91bGQgcHJvdmlkZSBiZXR0ZXIgaW5mb3JtYXRpb24gdG8gRGFz aGJvYXJkIHZpYSBKU09OCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjcyNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2FwcC55YW1sOiBVcGRhdGVkIHZlcnNpb24gKHdp bGwgdXBkYXRlIGFnYWluIHRvIGxpc3QgY3VycmVudAorICAgICAgICByZXZpc2lvbiB3aGVuIGxh bmRpbmcsIGFzIHVzdWFsKS4KKworICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL21haW4ucHk6 CisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvcXVldWVsZW5ndGhqc29uLnB5 OgorICAgICAgICBBZGRlZCBhIHdheSB0byBjaGVhcGx5IGdldCBvbmx5IHRoZSBxdWV1ZSBsZW5n dGgsIHdoaWNoIGlzIGFsbCB0aGUgZGFzaGJvYXJkCisgICAgICAgIG5lZWRzIHVubGVzcyBhIHBv cG92ZXIgaXMgb3BlbmVkLgorCisgICAgICAgICogUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMv cXVldWVzdGF0dXNqc29uLnB5OiBVcGRhdGVkIHRvIHJldHVybiBtb3JlIGluZm9ybWF0aW9uCisg ICAgICAgIHRoYXQgd2Ugd2lsbCBuZWVkLiBDaGFuZ2VkIHNvbWUgZmllbGQgbmFtZXMgdG8gYmUg bW9yZSBtZWFuaW5nZnVsLiBGaXhlZCBib3QgbGlzdGluZworICAgICAgICB0byB1bmRlcnN0YW5k IHRoYXQgYSBib3QgY2FuIGJlIHJlcHJ1cnBvc2VkIGFuZCB1c2VkIGluIGEgZGlmZmVyZW50IHF1 ZXVlLgorCiAyMDE0LTAxLTE5ICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBbRUZMXVtXSzFdIFJlbW92ZSBhbmQgcmVmYWN0b3IgdGhlIEFQSXMgd2hpY2gg dXNlIHNpbmdsZSBhbmQgYmFzZSBrZXl3b3JkCkluZGV4OiBUb29scy9RdWV1ZVN0YXR1c1NlcnZl ci9hcHAueWFtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9hcHAueWFt bAkocmV2aXNpb24gMTYyMjg5KQorKysgVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvYXBwLnlhbWwJ KHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiBhcHBsaWNhdGlvbjogd2Via2l0LXF1ZXVl cwotdmVyc2lvbjogMTYyMjg3ICMgQnVnemlsbGEgYnVnIElEIG9mIGxhc3QgbWFqb3IgY2hhbmdl Cit2ZXJzaW9uOiBhcCAjIEJ1Z3ppbGxhIGJ1ZyBJRCBvZiBsYXN0IG1ham9yIGNoYW5nZQogcnVu dGltZTogcHl0aG9uCiBhcGlfdmVyc2lvbjogMQogCkluZGV4OiBUb29scy9RdWV1ZVN0YXR1c1Nl cnZlci9tYWluLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4u cHkJKHJldmlzaW9uIDE2MjI4MSkKKysrIFRvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21haW4ucHkJ KHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAgZnJvbSBoYW5kbGVycy5uZXh0cGF0Y2gg aW1wb3J0IE5leHRQYXRjaAogZnJvbSBoYW5kbGVycy5wYXRjaCBpbXBvcnQgUGF0Y2gKIGZyb20g aGFuZGxlcnMucGF0Y2hzdGF0dXMgaW1wb3J0IFBhdGNoU3RhdHVzCiBmcm9tIGhhbmRsZXJzLnF1 ZXVlY2hhcnRzIGltcG9ydCBRdWV1ZUNoYXJ0cworZnJvbSBoYW5kbGVycy5xdWV1ZWxlbmd0aGpz b24gaW1wb3J0IFF1ZXVlTGVuZ3RoSlNPTgogZnJvbSBoYW5kbGVycy5xdWV1ZXN0YXR1cyBpbXBv cnQgUXVldWVTdGF0dXMKIGZyb20gaGFuZGxlcnMucXVldWVzdGF0dXNqc29uIGltcG9ydCBRdWV1 ZVN0YXR1c0pTT04KIGZyb20gaGFuZGxlcnMucmVjZW50c3RhdHVzIGltcG9ydCBRdWV1ZXNPdmVy dmlldwpAQCAtNjgsNiArNjksNyBAQCByb3V0ZXMgPSBbCiAgICAgKHInL3N0YXR1cy1idWJibGUv KC4qKScsIFN0YXR1c0J1YmJsZSksCiAgICAgKHInL3N2bi1yZXZpc2lvbi8oLiopJywgU1ZOUmV2 aXNpb24pLAogICAgIChyJy9xdWV1ZS1jaGFydHMvKC4qKScsIFF1ZXVlQ2hhcnRzKSwKKyAgICAo cicvcXVldWUtbGVuZ3RoLWpzb24vKC4qKScsIFF1ZXVlTGVuZ3RoSlNPTiksCiAgICAgKHInL3F1 ZXVlLXN0YXR1cy8oLiopL2JvdHMvKC4qKScsIFF1ZXVlU3RhdHVzKSwKICAgICAocicvcXVldWUt c3RhdHVzLyguKiknLCBRdWV1ZVN0YXR1cyksCiAgICAgKHInL3F1ZXVlLXN0YXR1cy1qc29uLygu KiknLCBRdWV1ZVN0YXR1c0pTT04pLApJbmRleDogVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFu ZGxlcnMvcXVldWVsZW5ndGhqc29uLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1F1ZXVlU3RhdHVz U2VydmVyL2hhbmRsZXJzL3F1ZXVlbGVuZ3RoanNvbi5weQkocmV2aXNpb24gMCkKKysrIFRvb2xz L1F1ZXVlU3RhdHVzU2VydmVyL2hhbmRsZXJzL3F1ZXVlbGVuZ3RoanNvbi5weQkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDQ5IEBACisjIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuCisjCisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1l dDoKKyMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGlu IHRoZQorIyAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVk IHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQgQU5ZCisjIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBU TywgVEhFIElNUExJRUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkK KyMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBD T05TRVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOworIyBMT1NTIE9GIFVT RSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQgT04KKyMgQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMKKyMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisKK2Zyb20gZ29vZ2xlLmFwcGVuZ2luZS5leHQgaW1wb3J0IHdlYmFwcAorCitmcm9tIG1v ZGVsLnF1ZXVlcyBpbXBvcnQgUXVldWUKKworIyBGYWxsIGJhY2sgdG8gc2ltcGxlanNvbiwgYmVj YXVzZSB3ZSBhcmUgc3RpbGwgb24gUHl0aG9uIDIuNS4KK3RyeToKKyAgICBpbXBvcnQganNvbgor ZXhjZXB0IEltcG9ydEVycm9yOgorICAgIGltcG9ydCBzaW1wbGVqc29uIGFzIGpzb24KKworCitj bGFzcyBRdWV1ZUxlbmd0aEpTT04od2ViYXBwLlJlcXVlc3RIYW5kbGVyKToKKyAgICBkZWYgZ2V0 KHNlbGYsIHF1ZXVlX25hbWUpOgorICAgICAgICBzZWxmLnJlc3BvbnNlLmhlYWRlcnNbIkFjY2Vz cy1Db250cm9sLUFsbG93LU9yaWdpbiJdID0gIioiCisKKyAgICAgICAgcXVldWVfbmFtZSA9IHF1 ZXVlX25hbWUubG93ZXIoKQorICAgICAgICBxdWV1ZSA9IFF1ZXVlLnF1ZXVlX3dpdGhfbmFtZShx dWV1ZV9uYW1lKQorICAgICAgICBpZiBub3QgcXVldWU6CisgICAgICAgICAgICBzZWxmLmVycm9y KDQwNCkKKyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgIHNlbGYucmVzcG9uc2UuaGVhZGVy c1snQ29udGVudC1UeXBlJ10gPSAnYXBwbGljYXRpb24vanNvbicKKworICAgICAgICBzdGF0dXMg PSB7CisgICAgICAgICAgICAicXVldWVfbGVuZ3RoIjogbGVuKHF1ZXVlLndvcmtfaXRlbXMoKS5p dGVtX2lkcykKKyAgICAgICAgfQorICAgICAgICBzZWxmLnJlc3BvbnNlLm91dC53cml0ZShqc29u LmR1bXBzKHN0YXR1cykpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBUb29scy9RdWV1ZVN0YXR1c1Nl cnZlci9oYW5kbGVycy9xdWV1ZWxlbmd0aGpzb24ucHkKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOmVv bC1zdHlsZQojIyAtMCwwICsxICMjCitMRgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5 CkluZGV4OiBUb29scy9RdWV1ZVN0YXR1c1NlcnZlci9oYW5kbGVycy9xdWV1ZXN0YXR1c2pzb24u cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvaGFuZGxlcnMvcXVldWVz dGF0dXNqc29uLnB5CShyZXZpc2lvbiAxNjIyODEpCisrKyBUb29scy9RdWV1ZVN0YXR1c1NlcnZl ci9oYW5kbGVycy9xdWV1ZXN0YXR1c2pzb24ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNCArMSw0 IEBACi0jIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMg Q29weXJpZ2h0IChDKSAyMDEzLCAyMDE0IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNDUsMzAgKzQ1LDUxIEBAIGNsYXNzIFF1 ZXVlU3RhdHVzSlNPTih3ZWJhcHAuUmVxdWVzdEhhbmQKIAogICAgICAgICByb3dzID0gW10KICAg ICAgICAgZm9yIGl0ZW1faWQgaW4gcXVldWVkX2l0ZW1zLml0ZW1faWRzOgotICAgICAgICAgICAg c3RhdHVzZXMgPSBRdWV1ZVN0YXR1cy5hbGwoKS5maWx0ZXIoJ3F1ZXVlX25hbWUgPScsIHF1ZXVl Lm5hbWUoKSkuZmlsdGVyKCdhY3RpdmVfcGF0Y2hfaWQgPScsIGl0ZW1faWQpLm9yZGVyKCctZGF0 ZScpLmZldGNoKDEpCi0gICAgICAgICAgICBzdGF0dXMgPSBzdGF0dXNlc1swXS5tZXNzYWdlIGlm IHN0YXR1c2VzIGVsc2UgIiIKKyAgICAgICAgICAgIHBhdGNoU3RhdHVzUXVlcnkgPSBRdWV1ZVN0 YXR1cy5hbGwoKS5maWx0ZXIoJ3F1ZXVlX25hbWUgPScsIHF1ZXVlLm5hbWUoKSkuZmlsdGVyKCdh Y3RpdmVfcGF0Y2hfaWQgPScsIGl0ZW1faWQpLm9yZGVyKCctZGF0ZScpCisgICAgICAgICAgICBz dGF0dXNlcyA9IHBhdGNoU3RhdHVzUXVlcnkuZmV0Y2goMSkKKyAgICAgICAgICAgIG1lc3NhZ2Ug PSBOb25lCisgICAgICAgICAgICBtZXNzYWdlX3RpbWUgPSBOb25lCisgICAgICAgICAgICBidWdf aWQgPSBOb25lCisgICAgICAgICAgICByZXN1bHRzX3VybCA9IE5vbmUKKyAgICAgICAgICAgIGlm IHN0YXR1c2VzOgorICAgICAgICAgICAgICAgIG1lc3NhZ2UgPSBzdGF0dXNlc1swXS5tZXNzYWdl CisgICAgICAgICAgICAgICAgbWVzc2FnZV90aW1lID0gc3RhdHVzZXNbMF0uZGF0ZQorICAgICAg ICAgICAgICAgIGJ1Z19pZCA9IHN0YXR1c2VzWzBdLmFjdGl2ZV9idWdfaWQKKyAgICAgICAgICAg ICAgICByZXN1bHRzX3VybCA9IHNlbGYucmVxdWVzdC5ob3N0X3VybCArICIvcmVzdWx0cy8iICsg c3RyKHN0YXR1c2VzWzBdLmtleSgpLmlkKCkpIGlmIHN0YXR1c2VzWzBdLnJlc3VsdHNfZmlsZSBl bHNlIE5vbmUKKyAgICAgICAgICAgIAogICAgICAgICAgICAgcm93cy5hcHBlbmQoewogICAgICAg ICAgICAgICAgICJhdHRhY2htZW50X2lkIjogaXRlbV9pZCwKKyAgICAgICAgICAgICAgICAiYnVn X2lkIjogYnVnX2lkLAogICAgICAgICAgICAgICAgICJhY3RpdmUiOiBhY3RpdmVfaXRlbXMgYW5k IGFjdGl2ZV9pdGVtcy50aW1lX2Zvcl9pdGVtKGl0ZW1faWQpICE9IE5vbmUsCi0gICAgICAgICAg ICAgICAgInN0YXR1cyI6IHN0YXR1cywKKyAgICAgICAgICAgICAgICAiYWN0aXZlX3NpbmNlIjog YWN0aXZlX2l0ZW1zIGFuZCBhY3RpdmVfaXRlbXMudGltZV9mb3JfaXRlbShpdGVtX2lkKSwKKyAg ICAgICAgICAgICAgICAibGF0ZXN0X21lc3NhZ2UiOiBtZXNzYWdlLAorICAgICAgICAgICAgICAg ICJsYXRlc3RfbWVzc2FnZV90aW1lIjogbWVzc2FnZV90aW1lLAorICAgICAgICAgICAgICAgICJt ZXNzYWdlX2NvdW50IjogcGF0Y2hTdGF0dXNRdWVyeS5jb3VudCgpLAogICAgICAgICAgICAgICAg ICJzdGF0dXNfcGFnZSI6IHNlbGYucmVxdWVzdC5ob3N0X3VybCArICIvcGF0Y2gvIiArIHN0cihp dGVtX2lkKSwKKyAgICAgICAgICAgICAgICAibGF0ZXN0X3Jlc3VsdHMiOiByZXN1bHRzX3VybCwK ICAgICAgICAgICAgIH0pCiAgICAgICAgIHJldHVybiByb3dzCiAKICAgICBkZWYgX2JvdHMoc2Vs ZiwgcXVldWUpOgorICAgICAgICAjIENvbGxlY3QgYWxsIGJvdHMgdGhhdCBldmVyIHNlcnZlZCB0 aGlzIHF1ZXVlLgogICAgICAgICBib3RfaWRfc3RhdHVzZXMgPSBRdWV1ZVN0YXR1cy5hbGwocHJv amVjdGlvbj1bJ2JvdF9pZCddLCBkaXN0aW5jdD1UcnVlKS5maWx0ZXIoJ3F1ZXVlX25hbWUgPScs IHF1ZXVlLm5hbWUoKSkuZmV0Y2goNTAwKQogICAgICAgICBib3RfaWRzID0gbGlzdChlbnRyeS5i b3RfaWQgZm9yIGVudHJ5IGluIGJvdF9pZF9zdGF0dXNlcykKICAgICAgICAgcmVzdWx0ID0gW10K ICAgICAgICAgZm9yIGJvdF9pZCBpbiBib3RfaWRzOgogICAgICAgICAgICAgc3RhdHVzID0gUXVl dWVTdGF0dXMuYWxsKCkuZmlsdGVyKCdib3RfaWQgPScsIGJvdF9pZCkub3JkZXIoJy1kYXRlJyku Z2V0KCkKKworICAgICAgICAgICAgaWYgc3RhdHVzLnF1ZXVlX25hbWUgIT0gcXVldWUubmFtZSgp OgorICAgICAgICAgICAgICAgICMgVGhlIGJvdCBnb3QgcmUtcHVycG9zZWQsIGFuZCBpcyBzZXJ2 aW5nIGEgZGlmZmVyZW50IHF1ZXVlIG5vdy4KKyAgICAgICAgICAgICAgICBjb250aW51ZQorCiAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKHsKICAgICAgICAgICAgICAgICAiYm90X2lkIjogYm90 X2lkLAogICAgICAgICAgICAgICAgICJzdGF0dXNfcGFnZSI6IHNlbGYucmVxdWVzdC5ob3N0X3Vy bCArICIvcXVldWUtc3RhdHVzLyIgKyBxdWV1ZS5uYW1lKCkgKyAiL2JvdHMvIiArIGJvdF9pZCwK ICAgICAgICAgICAgICAgICAibGF0ZXN0X21lc3NhZ2UiOiBzdGF0dXMubWVzc2FnZSwKICAgICAg ICAgICAgICAgICAibGF0ZXN0X21lc3NhZ2VfdGltZSI6IHN0YXR1cy5kYXRlLAorICAgICAgICAg ICAgICAgICJsYXRlc3RfbWVzc2FnZV9idWdfaWQiOiBzdGF0dXMuYWN0aXZlX2J1Z19pZCwKKyAg ICAgICAgICAgICAgICAibGF0ZXN0X21lc3NhZ2VfcGF0Y2hfaWQiOiBzdGF0dXMuYWN0aXZlX3Bh dGNoX2lkLAogICAgICAgICAgICAgICAgICJsYXRlc3Rfb3V0cHV0Ijogc2VsZi5yZXF1ZXN0Lmhv c3RfdXJsICsgIi9yZXN1bHRzLyIgKyBzdHIoc3RhdHVzLmtleSgpLmlkKCkpIGlmIHN0YXR1cy5y ZXN1bHRzX2ZpbGUgZWxzZSBOb25lLAotICAgICAgICAgICAgICAgICJhY3RpdmVfYnVnX2lkIjog c3RhdHVzLmFjdGl2ZV9idWdfaWQsCi0gICAgICAgICAgICAgICAgImFjdGl2ZV9wYXRjaF9pZCI6 IHN0YXR1cy5hY3RpdmVfcGF0Y2hfaWQsCiAgICAgICAgICAgICB9KQogICAgICAgICByZXR1cm4g cmVzdWx0CiAKQEAgLTg1LDYgKzEwNiw3IEBAIGNsYXNzIFF1ZXVlU3RhdHVzSlNPTih3ZWJhcHAu UmVxdWVzdEhhbmQKIAogICAgICAgICBzdGF0dXMgPSB7CiAgICAgICAgICAgICAic3RhdHVzX3Bh Z2UiOiBzZWxmLnJlcXVlc3QuaG9zdF91cmwgKyAiL3F1ZXVlLXN0YXR1cy8iICsgcXVldWVfbmFt ZSwKKyAgICAgICAgICAgICJjaGFydHNfcGFnZSI6IHNlbGYucmVxdWVzdC5ob3N0X3VybCArICIv cXVldWUtY2hhcnRzLyIgKyBxdWV1ZV9uYW1lLAogICAgICAgICAgICAgInF1ZXVlIjogc2VsZi5f cm93c19mb3Jfd29ya19pdGVtcyhxdWV1ZSksCiAgICAgICAgICAgICAiYm90cyI6IHNlbGYuX2Jv dHMocXVldWUpLAogICAgICAgICB9Cg==