151730 2015-12-01 16:42:25 -0800 Web Inspector: Handle YieldExpressions in the ScriptSyntaxTree 2015-12-02 09:27:54 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned bburg commit-queue graouts joepeck mattbaker nvasilyev saam timothy webkit-bug-importer ysuzuki oldest_to_newest 1145452 0 joepeck 2015-12-01 16:42:25 -0800 * SUMMARY Handle YieldExpressions in the ScriptSyntaxTree. This is needed to show Type annotations in scripts that have generators / yield expressions. 1145454 1 webkit-bug-importer 2015-12-01 16:42:59 -0800 <rdar://problem/23715945> 1145455 2 266410 joepeck 2015-12-01 16:43:42 -0800 Created attachment 266410 [PATCH] Proposed Fix 1145573 3 266410 bburg 2015-12-02 08:41:33 -0800 Comment on attachment 266410 [PATCH] Proposed Fix r=me, yay tests. 1145590 4 266410 commit-queue 2015-12-02 09:27:51 -0800 Comment on attachment 266410 [PATCH] Proposed Fix Clearing flags on attachment: 266410 Committed r192945: <http://trac.webkit.org/changeset/192945> 1145591 5 commit-queue 2015-12-02 09:27:54 -0800 All reviewed patches have been landed. Closing bug. 266410 2015-12-01 16:43:42 -0800 2015-12-02 09:27:51 -0800 [PATCH] Proposed Fix yield.patch text/plain 9150 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmOGVmOTlmLi4xMjQ2Y2MyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMTIt MDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIg SW5zcGVjdG9yOiBIYW5kbGUgWWllbGRFeHByZXNzaW9ucyBpbiB0aGUgU2NyaXB0U3ludGF4VHJl ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNzMw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvbW9kZWwvcGFyc2Utc2NyaXB0LXN5bnRheC10cmVlLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvbW9kZWwvcGFyc2Utc2NyaXB0LXN5bnRheC10cmVlLmh0bWw6CisKIDIw MTUtMTItMDEgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAg ICAgICBUZXN0IGdhcmRlbmluZyBhZnRlciByMTkyODk0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvbW9kZWwvcGFyc2Utc2NyaXB0LXN5bnRheC10cmVlLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9wYXJzZS1zY3JpcHQtc3ludGF4LXRyZWUtZXhw ZWN0ZWQudHh0CmluZGV4IDhkOGIyMDUuLjkxZWE4YTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci9tb2RlbC9wYXJzZS1zY3JpcHQtc3ludGF4LXRyZWUtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2RlbC9wYXJzZS1zY3JpcHQtc3ludGF4LXRyZWUt ZXhwZWN0ZWQudHh0CkBAIC0zOCw2ICszOCw3IEBAIHBhc3NlZCBWYXJpYWJsZURlY2xhcmF0aW9u CiBwYXNzZWQgVmFyaWFibGVEZWNsYXJhdG9yCiBwYXNzZWQgV2hpbGVTdGF0ZW1lbnQKIHBhc3Nl ZCBXaXRoU3RhdGVtZW50CitwYXNzZWQgWWllbGRFeHByZXNzaW9uCiBwYXNzZWQgQ2xhc3NTdGF0 ZW1lbnQsIFN1cGVyLCBNZXRhUHJvcGVydHkKIHBhc3NlZCBBc3NpZ25tZW50UGF0dGVybgogcGFz c2VkIEFycm93RnVuY3Rpb25FeHByZXNzaW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvbW9kZWwvcGFyc2Utc2NyaXB0LXN5bnRheC10cmVlLmh0bWwgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvbW9kZWwvcGFyc2Utc2NyaXB0LXN5bnRheC10cmVlLmh0bWwKaW5kZXggNGE5ZGMz My4uM2E5ZDA5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL21vZGVsL3BhcnNl LXNjcmlwdC1zeW50YXgtdHJlZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9tb2Rl bC9wYXJzZS1zY3JpcHQtc3ludGF4LXRyZWUuaHRtbApAQCAtMTkzLDYgKzE5Myw3IEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUucGFyYW1zWzFdLnR5cGUg PT09IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLklkZW50aWZpZXIpOwog ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuYm9keSk7CiAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnQobm9kZS5ib2R5LnR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5v ZGVUeXBlLkJsb2NrU3RhdGVtZW50KTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydCghbm9kZS5n ZW5lcmF0b3IpOwogICAgIG5vZGUgPSBtYWtlTm9kZSgieCA9IHtnZXQgZm9vKCl7cmV0dXJuIDIw fX0iLCB0cnVlKTsKICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLnJpZ2h0LnByb3BlcnRp ZXNbMF0udmFsdWUudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9kZVR5 cGUuRnVuY3Rpb25FeHByZXNzaW9uKTsKICAgICBub2RlID0gbWFrZU5vZGUoInggPSB7c2V0IGZv byh4KXtyZXR1cm4gMjB9fSIsIHRydWUpOwpAQCAtMjA3LDYgKzIwOCw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuYXJndW1lbnRzWzBdLnBhcmFtc1sx XS50eXBlID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5Ob2RlVHlwZS5JZGVudGlm aWVyKTsKICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLmFyZ3VtZW50c1swXS5ib2R5KTsK ICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLmFyZ3VtZW50c1swXS5ib2R5LnR5cGUgPT09 IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLkJsb2NrU3RhdGVtZW50KTsK KyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydCghbm9kZS5hcmd1bWVudHNbMF0uZ2VuZXJhdG9yKTsK ICAgICBJbnNwZWN0b3JUZXN0LmxvZygicGFzc2VkIEZ1bmN0aW9uRXhwcmVzc2lvbiIpOwogCiAg ICAgbm9kZSA9IG1ha2VOb2RlKCJmb287IiwgdHJ1ZSk7CkBAIC00NDMsNiArNDQ1LDIxIEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuYm9keS50eXBlID09 PSBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5Ob2RlVHlwZS5CbG9ja1N0YXRlbWVudCk7 CiAgICAgSW5zcGVjdG9yVGVzdC5sb2coInBhc3NlZCBXaXRoU3RhdGVtZW50Iik7CiAKKyAgICBu b2RlID0gbWFrZU5vZGUoImZ1bmN0aW9uKiBnZW4oKSB7IHlpZWxkIDE7IHlpZWxkKiBbMSwyXTsg fSIsIGZhbHNlKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLnR5cGUgPT09IFdlYklu c3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLkZ1bmN0aW9uRGVjbGFyYXRpb24pOwor ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuZ2VuZXJhdG9yKTsKKyAgICBJbnNwZWN0b3JU ZXN0LmFzc2VydChub2RlLmJvZHkudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRy ZWUuTm9kZVR5cGUuQmxvY2tTdGF0ZW1lbnQpOworICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG5v ZGUuYm9keS5ib2R5Lmxlbmd0aCA9PT0gMik7CisgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQobm9k ZS5ib2R5LmJvZHlbMF0udHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9k ZVR5cGUuRXhwcmVzc2lvblN0YXRlbWVudCk7CisgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQobm9k ZS5ib2R5LmJvZHlbMF0uZXhwcmVzc2lvbi50eXBlID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0U3lu dGF4VHJlZS5Ob2RlVHlwZS5ZaWVsZEV4cHJlc3Npb24pOworICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0KCFub2RlLmJvZHkuYm9keVswXS5leHByZXNzaW9uLmRlbGVnYXRlKTsKKyAgICBJbnNwZWN0 b3JUZXN0LmFzc2VydChub2RlLmJvZHkuYm9keVswXS5leHByZXNzaW9uLmFyZ3VtZW50LnR5cGUg PT09IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLkxpdGVyYWwpOworICAg IEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuYm9keS5ib2R5WzFdLnR5cGUgPT09IFdlYkluc3Bl Y3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLkV4cHJlc3Npb25TdGF0ZW1lbnQpOworICAg IEluc3BlY3RvclRlc3QuYXNzZXJ0KG5vZGUuYm9keS5ib2R5WzFdLmV4cHJlc3Npb24udHlwZSA9 PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9kZVR5cGUuWWllbGRFeHByZXNzaW9u KTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLmJvZHkuYm9keVsxXS5leHByZXNzaW9u LmRlbGVnYXRlKTsKKyAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChub2RlLmJvZHkuYm9keVsxXS5l eHByZXNzaW9uLmFyZ3VtZW50LnR5cGUgPT09IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVl Lk5vZGVUeXBlLkFycmF5RXhwcmVzc2lvbik7CisgICAgSW5zcGVjdG9yVGVzdC5sb2coInBhc3Nl ZCBZaWVsZEV4cHJlc3Npb24iKTsKKwogICAgIG5vZGUgPSBtYWtlTm9kZSgiY2xhc3MgQyB7IGNv bnN0cnVjdG9yKCkgeyBzdXBlcigpOyBuZXcudGFyZ2V0OyB9IH0iLCBmYWxzZSk7CiAgICAgSW5z cGVjdG9yVGVzdC5hc3NlcnQobm9kZS50eXBlID09PSBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4 VHJlZS5Ob2RlVHlwZS5DbGFzc0RlY2xhcmF0aW9uKTsKICAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dChub2RlLmJvZHkudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUuTm9kZVR5 cGUuQ2xhc3NCb2R5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDIxNjY5YmQuLjA0NGQx NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE1LTEyLTAx ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIElu c3BlY3RvcjogSGFuZGxlIFlpZWxkRXhwcmVzc2lvbnMgaW4gdGhlIFNjcmlwdFN5bnRheFRyZWUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTczMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9Nb2RlbHMvTmF0aXZlRnVuY3Rpb25QYXJhbWV0ZXJzLmpzOgorICAgICAgICBBZGQg dGhlIEdlbmVyYXRvciBBUEkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9TY3Jp cHRTeW50YXhUcmVlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUu cHJvdG90eXBlLl9yZWN1cnNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhU cmVlLnByb3RvdHlwZS5fY3JlYXRlSW50ZXJuYWxTeW50YXhUcmVlKToKKyAgICAgICAgSGFuZGxl IFlpZWxkRXhwcmVzc2lvbnMuCisKKzIwMTUtMTItMDEgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUaW1lc3RhbXAgaW4gVG9v bHRpcCBvZiBFdmVudCBNYXJrZXJzIGlzIGluY29ycmVjdAogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUxNzIyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9OYXRpdmVGdW5jdGlvblBhcmFtZXRl cnMuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvTmF0aXZl RnVuY3Rpb25QYXJhbWV0ZXJzLmpzCmluZGV4IDI5MTQwOTUuLjMzM2E0ODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9OYXRpdmVGdW5jdGlv blBhcmFtZXRlcnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv TW9kZWxzL05hdGl2ZUZ1bmN0aW9uUGFyYW1ldGVycy5qcwpAQCAtMzQ1LDYgKzM0NSwxMyBAQCBX ZWJJbnNwZWN0b3IuTmF0aXZlUHJvdG90eXBlRnVuY3Rpb25QYXJhbWV0ZXJzID0gewogICAgICAg ICBfX3Byb3RvX186IG51bGwsCiAgICAgfSwKIAorICAgIEdlbmVyYXRvcjogeworICAgICAgICBu ZXh0OiAidmFsdWUiLAorICAgICAgICByZXR1cm46ICJ2YWx1ZSIsCisgICAgICAgIHRocm93OiAi ZXhjZXB0aW9uIiwKKyAgICAgICAgX19wcm90b19fOiBudWxsLAorICAgIH0sCisKICAgICAvLyBD dXJhdGVkIERPTSBJbnRlcmZhY2VzLgogCiAgICAgRWxlbWVudDogewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NjcmlwdFN5bnRheFRyZWUu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3lu dGF4VHJlZS5qcwppbmRleCBkM2FjMzcyLi5jYTVmNjMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3ludGF4VHJlZS5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU2NyaXB0U3ludGF4 VHJlZS5qcwpAQCAtNDk0LDYgKzQ5NCwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJl ZSA9IGNsYXNzIFNjcmlwdFN5bnRheFRyZWUgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZQogICAg ICAgICAgICAgdGhpcy5fcmVjdXJzZShub2RlLm9iamVjdCwgY2FsbGJhY2ssIHN0YXRlKTsKICAg ICAgICAgICAgIHRoaXMuX3JlY3Vyc2Uobm9kZS5ib2R5LCBjYWxsYmFjaywgc3RhdGUpOwogICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRy ZWUuTm9kZVR5cGUuWWllbGRFeHByZXNzaW9uOgorICAgICAgICAgICAgY2FsbGJhY2sobm9kZSwg c3RhdGUpOworICAgICAgICAgICAgdGhpcy5fcmVjdXJzZShub2RlLmFyZ3VtZW50LCBjYWxsYmFj aywgc3RhdGUpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIC8vIEFsbCB0aGUgbGVhZiBu b2RlcyBnbyBoZXJlLgogICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVl Lk5vZGVUeXBlLkRlYnVnZ2VyU3RhdGVtZW50OgogICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5T Y3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLkVtcHR5U3RhdGVtZW50OgpAQCAtNTQ2LDYgKzU1MCw3 IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlID0gY2xhc3MgU2NyaXB0U3ludGF4VHJl ZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgICAgICAgICAgICAgcGFyYW1zOiBub2Rl LnBhcmFtcy5tYXAodGhpcy5fY3JlYXRlSW50ZXJuYWxTeW50YXhUcmVlLCB0aGlzKSwKICAgICAg ICAgICAgICAgICBkZWZhdWx0czogbm9kZS5kZWZhdWx0cy5tYXAodGhpcy5fY3JlYXRlSW50ZXJu YWxTeW50YXhUcmVlLCB0aGlzKSwKICAgICAgICAgICAgICAgICBib2R5OiB0aGlzLl9jcmVhdGVJ bnRlcm5hbFN5bnRheFRyZWUobm9kZS5ib2R5KSwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I6 IG5vZGUuZ2VuZXJhdG9yLAogICAgICAgICAgICAgICAgIGV4cHJlc3Npb246IG5vZGUuZXhwcmVz c2lvbiwgLy8gQm9vbGVhbiBpbmRpY2F0aW5nIGlmIHRoZSBib2R5IGEgc2luZ2xlIGV4cHJlc3Np b24gb3IgYSBibG9jayBzdGF0ZW1lbnQuCiAgICAgICAgICAgICAgICAgdHlwZVByb2ZpbGluZ1Jl dHVybkRpdm90OiBub2RlLnJhbmdlWzBdCiAgICAgICAgICAgICB9OwpAQCAtNjkwLDYgKzY5NSw3 IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlID0gY2xhc3MgU2NyaXB0U3ludGF4VHJl ZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgICAgICAgICAgICAgcGFyYW1zOiBub2Rl LnBhcmFtcy5tYXAodGhpcy5fY3JlYXRlSW50ZXJuYWxTeW50YXhUcmVlLCB0aGlzKSwKICAgICAg ICAgICAgICAgICBkZWZhdWx0czogbm9kZS5kZWZhdWx0cy5tYXAodGhpcy5fY3JlYXRlSW50ZXJu YWxTeW50YXhUcmVlLCB0aGlzKSwKICAgICAgICAgICAgICAgICBib2R5OiB0aGlzLl9jcmVhdGVJ bnRlcm5hbFN5bnRheFRyZWUobm9kZS5ib2R5KSwKKyAgICAgICAgICAgICAgICBnZW5lcmF0b3I6 IG5vZGUuZ2VuZXJhdG9yLAogICAgICAgICAgICAgICAgIHR5cGVQcm9maWxpbmdSZXR1cm5EaXZv dDogbm9kZS5yYW5nZVswXQogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAt NzAwLDYgKzcwNiw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlID0gY2xhc3MgU2Ny aXB0U3ludGF4VHJlZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplCiAgICAgICAgICAgICAgICAg cGFyYW1zOiBub2RlLnBhcmFtcy5tYXAodGhpcy5fY3JlYXRlSW50ZXJuYWxTeW50YXhUcmVlLCB0 aGlzKSwKICAgICAgICAgICAgICAgICBkZWZhdWx0czogbm9kZS5kZWZhdWx0cy5tYXAodGhpcy5f Y3JlYXRlSW50ZXJuYWxTeW50YXhUcmVlLCB0aGlzKSwKICAgICAgICAgICAgICAgICBib2R5OiB0 aGlzLl9jcmVhdGVJbnRlcm5hbFN5bnRheFRyZWUobm9kZS5ib2R5KSwKKyAgICAgICAgICAgICAg ICBnZW5lcmF0b3I6IG5vZGUuZ2VuZXJhdG9yLAogICAgICAgICAgICAgICAgIHR5cGVQcm9maWxp bmdSZXR1cm5EaXZvdDogbm9kZS5yYW5nZVswXSAvLyBUaGlzIG1heSBiZSBvdmVycmlkZGVuIGlu IHRoZSBQcm9wZXJ0eSBBU1Qgbm9kZS4KICAgICAgICAgICAgIH07CiAgICAgICAgICAgICBicmVh azsKQEAgLTkyNCw2ICs5MzEsMTMgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdFN5bnRheFRyZWUgPSBj bGFzcyBTY3JpcHRTeW50YXhUcmVlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamUKICAgICAgICAg ICAgICAgICBib2R5OiB0aGlzLl9jcmVhdGVJbnRlcm5hbFN5bnRheFRyZWUobm9kZS5ib2R5KQog ICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJZaWVsZEV4 cHJlc3Npb24iOgorICAgICAgICAgICAgcmVzdWx0ID0geworICAgICAgICAgICAgICAgIHR5cGU6 IFdlYkluc3BlY3Rvci5TY3JpcHRTeW50YXhUcmVlLk5vZGVUeXBlLllpZWxkRXhwcmVzc2lvbiwK KyAgICAgICAgICAgICAgICBhcmd1bWVudDogdGhpcy5fY3JlYXRlSW50ZXJuYWxTeW50YXhUcmVl KG5vZGUuYXJndW1lbnQpLAorICAgICAgICAgICAgICAgIGRlbGVnYXRlOiBub2RlLmRlbGVnYXRl CisgICAgICAgICAgICB9OworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAg ICAgICAgICAgICBjb25zb2xlLmVycm9yKCJVbnN1cHBvcnRlZCBTeW50YXggVHJlZSBOb2RlOiAi ICsgbm9kZS50eXBlLCBub2RlKTsKICAgICAgICAgICAgIHJldHVybiBudWxsOwpAQCAtOTk5LDQg KzEwMTMsNSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0U3ludGF4VHJlZS5Ob2RlVHlwZSA9IHsKICAg ICBWYXJpYWJsZURlY2xhcmF0b3I6IFN5bWJvbCgidmFyaWFibGUtZGVjbGFyYXRvciIpLAogICAg IFdoaWxlU3RhdGVtZW50OiBTeW1ib2woIndoaWxlLXN0YXRlbWVudCIpLAogICAgIFdpdGhTdGF0 ZW1lbnQ6IFN5bWJvbCgid2l0aC1zdGF0ZW1lbnQiKSwKKyAgICBZaWVsZEV4cHJlc3Npb246IFN5 bWJvbCgieWllbGQtZXhwcmVzc2lvbiIpLAogfTsK