222337 2021-02-23 16:35:27 -0800 [webkitscmpy] Add flag for caller to opt out of identifier computation 2021-02-24 14:02:40 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard dewei_zhu webkit-bug-importer oldest_to_newest 1732726 0 jbedard 2021-02-23 16:35:27 -0800 Identifier computation can be expensive in some cases. Add a flag to opt out of preforming this computation. 1732727 1 webkit-bug-importer 2021-02-23 16:35:52 -0800 <rdar://problem/74667858> 1732730 2 421369 jbedard 2021-02-23 16:41:37 -0800 Created attachment 421369 Patch 1732731 3 421369 jbedard 2021-02-23 16:42:47 -0800 Comment on attachment 421369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=421369&action=review > Tools/Scripts/libraries/webkitscmpy/setup.py:32 > + version='0.11.1', Note for the weird version bump: https://commits.webkit.org/234485@main should have bumped this to 0.11.0, I think I edited the version file in the wrong checkout. 1733068 4 dewei_zhu 2021-02-24 13:57:21 -0800 r=me 1733071 5 ews-feeder 2021-02-24 14:02:39 -0800 Committed r273437: <https://commits.webkit.org/r273437> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421369. 421369 2021-02-23 16:41:37 -0800 2021-02-24 14:02:40 -0800 Patch bug-222337-20210223164136.patch text/plain 22475 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzM1OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM3IEBACisyMDIxLTAyLTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEFkZCBmbGFnIGZvciBjYWxsZXIgdG8gb3B0IG91 dCBvZiBpZGVudGlmaWVyIGNvbXB1dGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIzMzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc0NjY3 ODU4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRf Xy5weTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0LmNvbW1pdCk6IEFsbG93IGNhbGxl ciB0byBvcHQtb3V0IG9mIHJldHJpZXZpbmcgdGhlIGlkZW50aWZpZXIuCisgICAgICAgIChHaXQu ZmluZCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAgKFN2bi5jb21taXQpOiBBbGxvdyBjYWxs ZXIgdG8gb3B0LW91dCBvZiByZXRyaWV2aW5nIHRoZSBpZGVudGlmaWVyLgorICAgICAgICAqIFNj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9iaXRidWNrZXQu cHk6CisgICAgICAgIChCaXRCdWNrZXQuY29tbWl0KTogQWxsb3cgY2FsbGVyIHRvIG9wdC1vdXQg b2YgcmV0cmlldmluZyB0aGUgaWRlbnRpZmllci4KKyAgICAgICAgKEJpdEJ1Y2tldC5maW5kKTog RGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvcmVtb3RlL2dpdF9odWIucHk6CisgICAgICAgIChHaXRIdWIuY29tbWl0KTogQWxsb3cgY2Fs bGVyIHRvIG9wdC1vdXQgb2YgcmV0cmlldmluZyB0aGUgaWRlbnRpZmllci4KKyAgICAgICAgKEdp dEh1Yi5maW5kKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5jb21taXQpOiBBbGxv dyBjYWxsZXIgdG8gb3B0LW91dCBvZiByZXRyaWV2aW5nIHRoZSBpZGVudGlmaWVyLgorICAgICAg ICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5 OgorICAgICAgICAoU2NtQmFzZS5jb21taXQpOiBBbGxvdyBjYWxsZXIgdG8gb3B0LW91dCBvZiBy ZXRyaWV2aW5nIHRoZSBpZGVudGlmaWVyLgorICAgICAgICAoU2NtQmFzZS5maW5kKTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVz dC9naXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0LnRlc3Rfbm9faWRlbnRpZmllcik6 CisgICAgICAgIChUZXN0R2l0SHViLnRlc3Rfbm9faWRlbnRpZmllcik6CisgICAgICAgIChUZXN0 Qml0QnVja2V0LnRlc3Rfbm9faWRlbnRpZmllcik6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHk6CisgICAgICAg IChUZXN0TG9jYWxTdm4udGVzdF9ub19pZGVudGlmaWVyKToKKyAgICAgICAgKFRlc3RSZW1vdGVT dm4udGVzdF9ub19pZGVudGlmaWVyKToKKwogMjAyMS0wMi0yMyAgSm9uYXRoYW4gQmVkYXJkICA8 amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgW2NoZWNrLXdlYmtpdC1zdHlsZV0gRml4IENv bnRyaWJ1dG9yIHNvcnRpbmcgaW4gUHl0aG9uIDMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CShyZXZpc2lvbiAyNzMzNTgpCisrKyBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS9zZXR1cC5weQkod29ya2luZyBjb3B5KQpAQCAt MjksNyArMjksNyBAQCBkZWYgcmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdHNj bXB5JywKLSAgICB2ZXJzaW9uPScwLjEwLjEnLAorICAgIHZlcnNpb249JzAuMTEuMScsCiAgICAg ZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2 biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNs YXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNzMzNTgp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2lu aXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJy b3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3Rh bGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgog ICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgMTAsIDEpCit2ZXJzaW9uID0gVmVyc2lvbigw LCAxMSwgMSkKIAogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnZW50cnlwb2ludHMnLCBW ZXJzaW9uKDAsIDMsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVy cycsIFZlcnNpb24oMCwgMTUsIDApKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5CShyZXZp c2lvbiAyNzMzNTgpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9zY21fYmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjYsNyArNjYsNyBAQCBjbGFz cyBTY21CYXNlKG9iamVjdCk6CiAgICAgZGVmIHRhZ3Moc2VsZik6CiAgICAgICAgIHJhaXNlIE5v dEltcGxlbWVudGVkRXJyb3IoKQogCi0gICAgZGVmIGNvbW1pdChzZWxmLCBoYXNoPU5vbmUsIHJl dmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1Ob25lLCBpbmNs dWRlX2xvZz1UcnVlKToKKyAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249 Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9n PVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVt ZW50ZWRFcnJvcigpCiAKICAgICBkZWYgcHJpb3JpdGl6ZV9icmFuY2hlcyhzZWxmLCBicmFuY2hl cyk6CkBAIC04OCw3ICs4OCw3IEBAIGNsYXNzIFNjbUJhc2Uob2JqZWN0KToKICAgICAgICAgICAg IGZpbHRlcmVkX2NhbmRpZGF0ZXMgPSBicmFuY2hlcwogICAgICAgICByZXR1cm4gc29ydGVkKGZp bHRlcmVkX2NhbmRpZGF0ZXMpWzBdCiAKLSAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCwgaW5j bHVkZV9sb2c9VHJ1ZSk6CisgICAgZGVmIGZpbmQoc2VsZiwgYXJndW1lbnQsIGluY2x1ZGVfbG9n PVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToKICAgICAgICAgaWYgbm90IGlzaW5zdGFu Y2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVF cnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBhIHN0cmluZywgbm90ICd7fSciLmZvcm1h dCh0eXBlKGFyZ3VtZW50KSkpCiAKQEAgLTEwNCwxMyArMTA0LDEzIEBAIGNsYXNzIFNjbUJhc2Uo b2JqZWN0KToKICAgICAgICAgICAgIGFyZ3VtZW50ID0gc2VsZi5kZWZhdWx0X2JyYW5jaAogCiAg ICAgICAgIGlmIGFyZ3VtZW50ID09ICdIRUFEJzoKLSAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYu Y29tbWl0KGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9nKQorICAgICAgICAgICAgcmVzdWx0ID0gc2Vs Zi5jb21taXQoaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2csIGluY2x1ZGVfaWRlbnRpZmllcj1pbmNs dWRlX2lkZW50aWZpZXIpCiAKICAgICAgICAgZWxpZiBhcmd1bWVudCBpbiBzZWxmLmJyYW5jaGVz OgotICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jb21taXQoYnJhbmNoPWFyZ3VtZW50LCBpbmNs dWRlX2xvZz1pbmNsdWRlX2xvZykKKyAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuY29tbWl0KGJy YW5jaD1hcmd1bWVudCwgaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2csIGluY2x1ZGVfaWRlbnRpZmll cj1pbmNsdWRlX2lkZW50aWZpZXIpCiAKICAgICAgICAgZWxpZiBhcmd1bWVudCBpbiBzZWxmLnRh Z3M6Ci0gICAgICAgICAgICByZXN1bHQgPSBzZWxmLmNvbW1pdCh0YWc9YXJndW1lbnQsIGluY2x1 ZGVfbG9nPWluY2x1ZGVfbG9nKQorICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jb21taXQodGFn PWFyZ3VtZW50LCBpbmNsdWRlX2xvZz1pbmNsdWRlX2xvZywgaW5jbHVkZV9pZGVudGlmaWVyPWlu Y2x1ZGVfaWRlbnRpZmllcikKIAogICAgICAgICBlbHNlOgogICAgICAgICAgICAgaWYgb2Zmc2V0 OgpAQCAtMTI2LDYgKzEyNiw3IEBAIGNsYXNzIFNjbUJhc2Uob2JqZWN0KToKICAgICAgICAgICAg ICAgICBpZGVudGlmaWVyPXBhcnNlZF9jb21taXQuaWRlbnRpZmllciwKICAgICAgICAgICAgICAg ICBicmFuY2g9cGFyc2VkX2NvbW1pdC5icmFuY2gsCiAgICAgICAgICAgICAgICAgaW5jbHVkZV9s b2c9aW5jbHVkZV9sb2csCisgICAgICAgICAgICAgICAgaW5jbHVkZV9pZGVudGlmaWVyPWluY2x1 ZGVfaWRlbnRpZmllciwKICAgICAgICAgICAgICkKIAogICAgICAgICBpZiBub3Qgb2Zmc2V0OgpA QCAtMTM1LDYgKzEzNiw3IEBAIGNsYXNzIFNjbUJhc2Uob2JqZWN0KToKICAgICAgICAgICAgIGlk ZW50aWZpZXI9cmVzdWx0LmlkZW50aWZpZXIgLSBvZmZzZXQsCiAgICAgICAgICAgICBicmFuY2g9 cmVzdWx0LmJyYW5jaCwKICAgICAgICAgICAgIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9nLAorICAg ICAgICAgICAgaW5jbHVkZV9pZGVudGlmaWVyPWluY2x1ZGVfaWRlbnRpZmllciwKICAgICAgICAg KQogCiAgICAgQGNsYXNzbWV0aG9kCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CShyZXZp c2lvbiAyNzMzNTgpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw3ICsxNTAsNyBAQCBj bGFzcyBHaXQoU2NtKToKICAgICAgICAgcmVzdWx0ID0gW2JyYW5jaC5sc3RyaXAoJyAqJykgZm9y IGJyYW5jaCBpbiBmaWx0ZXIobGFtYmRhIGJyYW5jaDogJy0+JyBub3QgaW4gYnJhbmNoLCBicmFu Y2guc3Rkb3V0LnNwbGl0bGluZXMoKSldCiAgICAgICAgIHJldHVybiBzb3J0ZWQoc2V0KFsnLycu am9pbihicmFuY2guc3BsaXQoJy8nKVsyOl0pIGlmIGJyYW5jaC5zdGFydHN3aXRoKCdyZW1vdGVz L29yaWdpbi8nKSBlbHNlIGJyYW5jaCBmb3IgYnJhbmNoIGluIHJlc3VsdF0pKQogCi0gICAgZGVm IGNvbW1pdChzZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwg YnJhbmNoPU5vbmUsIHRhZz1Ob25lLCBpbmNsdWRlX2xvZz1UcnVlKToKKyAgICBkZWYgY29tbWl0 KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9 Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVl KToKICAgICAgICAgaWYgcmV2aXNpb24gYW5kIG5vdCBzZWxmLmlzX3N2bjoKICAgICAgICAgICAg IHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdUaGlzIGdpdCBjaGVja291dCBkb2VzIG5vdCBzdXBwb3J0 IFNWTiByZXZpc2lvbnMnKQogICAgICAgICBlbGlmIHJldmlzaW9uOgpAQCAtMjQxLDkgKzI0MSw5 IEBAIGNsYXNzIEdpdChTY20pOgogCiAgICAgICAgIGJyYW5jaCA9IHNlbGYucHJpb3JpdGl6ZV9i cmFuY2hlcyhzZWxmLl9icmFuY2hlc19mb3IoaGFzaCkpCiAKLSAgICAgICAgaWYgbm90IGlkZW50 aWZpZXI6CisgICAgICAgIGlmIG5vdCBpZGVudGlmaWVyIGFuZCBpbmNsdWRlX2lkZW50aWZpZXI6 CiAgICAgICAgICAgICBpZGVudGlmaWVyID0gc2VsZi5fY29tbWl0X2NvdW50KGhhc2ggaWYgYnJh bmNoID09IGRlZmF1bHRfYnJhbmNoIGVsc2UgJ3t9Li57fScuZm9ybWF0KGRlZmF1bHRfYnJhbmNo LCBoYXNoKSkKLSAgICAgICAgYnJhbmNoX3BvaW50ID0gTm9uZSBpZiBicmFuY2ggPT0gZGVmYXVs dF9icmFuY2ggZWxzZSBzZWxmLl9jb21taXRfY291bnQoaGFzaCkgLSBpZGVudGlmaWVyCisgICAg ICAgIGJyYW5jaF9wb2ludCA9IE5vbmUgaWYgbm90IGluY2x1ZGVfaWRlbnRpZmllciBvciBicmFu Y2ggPT0gZGVmYXVsdF9icmFuY2ggZWxzZSBzZWxmLl9jb21taXRfY291bnQoaGFzaCkgLSBpZGVu dGlmaWVyCiAgICAgICAgIGlmIGJyYW5jaF9wb2ludCBhbmQgcGFyc2VkX2JyYW5jaF9wb2ludCBh bmQgYnJhbmNoX3BvaW50ICE9IHBhcnNlZF9icmFuY2hfcG9pbnQ6CiAgICAgICAgICAgICByYWlz ZSBWYWx1ZUVycm9yKCJQcm92aWRlZCAnYnJhbmNoX3BvaW50JyBkb2VzIG5vdCBtYXRjaCBicmFu Y2ggcG9pbnQgb2Ygc3BlY2lmaWVkIGJyYW5jaCIpCiAKQEAgLTI2MCw3ICsyNjAsNyBAQCBjbGFz cyBHaXQoU2NtKToKICAgICAgICAgcmV0dXJuIENvbW1pdCgKICAgICAgICAgICAgIGhhc2g9aGFz aCwKICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLAotICAgICAgICAgICAgaWRlbnRpZmll cj1pZGVudGlmaWVyLAorICAgICAgICAgICAgaWRlbnRpZmllcj1pZGVudGlmaWVyIGlmIGluY2x1 ZGVfaWRlbnRpZmllciBlbHNlIE5vbmUsCiAgICAgICAgICAgICBicmFuY2hfcG9pbnQ9YnJhbmNo X3BvaW50LAogICAgICAgICAgICAgYnJhbmNoPWJyYW5jaCwKICAgICAgICAgICAgIHRpbWVzdGFt cD1pbnQoY29tbWl0X3RpbWUuc3Rkb3V0LmxzdHJpcCgpKSwKQEAgLTI2OCw3ICsyNjgsNyBAQCBj bGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIG1lc3NhZ2U9J1xuJy5qb2luKGxpbmVbNDpdIGZv ciBsaW5lIGluIGxvZy5zdGRvdXQuc3BsaXRsaW5lcygpWzQ6XSkgaWYgaW5jbHVkZV9sb2cgZWxz ZSBOb25lLAogICAgICAgICApCiAKLSAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVk ZV9sb2c9VHJ1ZSk6CisgICAgZGVmIGZpbmQoc2VsZiwgYXJndW1lbnQsIGluY2x1ZGVfbG9nPVRy dWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2Uo YXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJv cigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBhIHN0cmluZywgbm90ICd7fSciLmZvcm1hdCh0 eXBlKGFyZ3VtZW50KSkpCiAKQEAgLTI4Niw2ICsyODYsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAg ICAgICAgICAgICAgICBpZGVudGlmaWVyPXBhcnNlZF9jb21taXQuaWRlbnRpZmllciwKICAgICAg ICAgICAgICAgICBicmFuY2g9cGFyc2VkX2NvbW1pdC5icmFuY2gsCiAgICAgICAgICAgICAgICAg aW5jbHVkZV9sb2c9aW5jbHVkZV9sb2csCisgICAgICAgICAgICAgICAgaW5jbHVkZV9pZGVudGlm aWVyPWluY2x1ZGVfaWRlbnRpZmllciwKICAgICAgICAgICAgICkKIAogICAgICAgICBvdXRwdXQg PSBydW4oCkBAIC0yOTQsNyArMjk1LDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICkKICAg ICAgICAgaWYgb3V0cHV0LnJldHVybmNvZGU6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9y KCIne30nIGlzIG5vdCBhbiBhcmd1bWVudCByZWNvZ25pemVkIGJ5IGdpdCIuZm9ybWF0KGFyZ3Vt ZW50KSkKLSAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0KGhhc2g9b3V0cHV0LnN0ZG91dC5yc3Ry aXAoKSwgaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2cpCisgICAgICAgIHJldHVybiBzZWxmLmNvbW1p dChoYXNoPW91dHB1dC5zdGRvdXQucnN0cmlwKCksIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9nLCBp bmNsdWRlX2lkZW50aWZpZXI9aW5jbHVkZV9pZGVudGlmaWVyKQogCiAgICAgZGVmIGNoZWNrb3V0 KHNlbGYsIGFyZ3VtZW50KToKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJndW1lbnQsIHNp eC5zdHJpbmdfdHlwZXMpOgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkocmV2aXNpb24g MjczMzU4KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbG9jYWwvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNjAsNyArMjYwLDcgQEAgY2xhc3Mg U3ZuKFNjbSk6CiAgICAgICAgICAgICByZXR1cm4gcGFydGlhbFsxOl0ucnN0cmlwKCcvJykKICAg ICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogCi0gICAgZGVmIGNvbW1pdChzZWxmLCBoYXNoPU5vbmUs IHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1Ob25lLCBp bmNsdWRlX2xvZz1UcnVlKToKKyAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNp b249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVf bG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToKICAgICAgICAgaWYgaGFzaDoKICAg ICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1NWTiBkb2VzIG5vdCBzdXBwb3J0IEdpdCBoYXNo ZXMnKQogCkBAIC0zNDAsMTQgKzM0MCwxNCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgICAg ICAgICBtaW51dGVzPWludCh0el9kaWZmWzM6NV0pLAogICAgICAgICAgICAgKSAqICgxIGlmIHR6 X2RpZmZbMF0gPT0gJy0nIGVsc2UgLTEpCiAKLSAgICAgICAgaWYgbm90IGlkZW50aWZpZXI6Cisg ICAgICAgIGlmIGluY2x1ZGVfaWRlbnRpZmllciBhbmQgbm90IGlkZW50aWZpZXI6CiAgICAgICAg ICAgICBpZiBicmFuY2ggIT0gc2VsZi5kZWZhdWx0X2JyYW5jaCBhbmQgcmV2aXNpb24gPiBzZWxm Ll9tZXRhZGF0YV9jYWNoZS5nZXQoc2VsZi5kZWZhdWx0X2JyYW5jaCwgWzBdKVstMV06CiAgICAg ICAgICAgICAgICAgc2VsZi5fY2FjaGVfcmV2aXNpb25zKGJyYW5jaD1zZWxmLmRlZmF1bHRfYnJh bmNoKQogICAgICAgICAgICAgaWYgcmV2aXNpb24gbm90IGluIHNlbGYuX21ldGFkYXRhX2NhY2hl LmdldChicmFuY2gsIFtdKToKICAgICAgICAgICAgICAgICBzZWxmLl9jYWNoZV9yZXZpc2lvbnMo YnJhbmNoPWJyYW5jaCkKICAgICAgICAgICAgIGlkZW50aWZpZXIgPSBzZWxmLl9jb21taXRfY291 bnQocmV2aXNpb249cmV2aXNpb24sIGJyYW5jaD1icmFuY2gpCiAKLSAgICAgICAgYnJhbmNoX3Bv aW50ID0gTm9uZSBpZiBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaCBlbHNlIHNlbGYuX2Nv bW1pdF9jb3VudChicmFuY2g9YnJhbmNoKQorICAgICAgICBicmFuY2hfcG9pbnQgPSBOb25lIGlm IG5vdCBpbmNsdWRlX2lkZW50aWZpZXIgb3IgYnJhbmNoID09IHNlbGYuZGVmYXVsdF9icmFuY2gg ZWxzZSBzZWxmLl9jb21taXRfY291bnQoYnJhbmNoPWJyYW5jaCkKICAgICAgICAgaWYgYnJhbmNo X3BvaW50IGFuZCBwYXJzZWRfYnJhbmNoX3BvaW50IGFuZCBicmFuY2hfcG9pbnQgIT0gcGFyc2Vk X2JyYW5jaF9wb2ludDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIlByb3ZpZGVkICdi cmFuY2hfcG9pbnQnIGRvZXMgbm90IG1hdGNoIGJyYW5jaCBwb2ludCBvZiBzcGVjaWZpZWQgYnJh bmNoIikKIApAQCAtMzgwLDcgKzM4MCw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICByZXR1 cm4gQ29tbWl0KAogICAgICAgICAgICAgcmV2aXNpb249aW50KHJldmlzaW9uKSwKICAgICAgICAg ICAgIGJyYW5jaD1icmFuY2gsCi0gICAgICAgICAgICBpZGVudGlmaWVyPWlkZW50aWZpZXIsCisg ICAgICAgICAgICBpZGVudGlmaWVyPWlkZW50aWZpZXIgaWYgaW5jbHVkZV9pZGVudGlmaWVyIGVs c2UgTm9uZSwKICAgICAgICAgICAgIGJyYW5jaF9wb2ludD1icmFuY2hfcG9pbnQsCiAgICAgICAg ICAgICB0aW1lc3RhbXA9aW50KGNhbGVuZGFyLnRpbWVnbShkYXRlLnRpbWV0dXBsZSgpKSkgaWYg ZGF0ZSBlbHNlIE5vbmUsCiAgICAgICAgICAgICBhdXRob3I9YXV0aG9yLApJbmRleDogVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL2JpdGJ1Y2tl dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9yZW1vdGUvYml0YnVja2V0LnB5CShyZXZpc2lvbiAyNzMzNTgpCisrKyBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvYml0YnVj a2V0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNyArMTM2LDcgQEAgY2xhc3MgQml0QnVja2V0 KFNjbSk6CiAgICAgICAgICAgICByZXR1cm4gW10KICAgICAgICAgcmV0dXJuIHNvcnRlZChbZGV0 YWlscy5nZXQoJ2Rpc3BsYXlJZCcpIGZvciBkZXRhaWxzIGluIHJlc3BvbnNlIGlmIGRldGFpbHMu Z2V0KCdkaXNwbGF5SWQnKV0pCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2 aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUsIGluY2x1 ZGVfbG9nPVRydWUpOgorICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1O b25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVkZV9sb2c9 VHJ1ZSwgaW5jbHVkZV9pZGVudGlmaWVyPVRydWUpOgogICAgICAgICBpZiByZXZpc2lvbjoKICAg ICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdDYW5ub3QgbWFwIHJldmlzaW9ucyB0byBj b21taXRzIG9uIEJpdEJ1Y2tldCcpCiAKQEAgLTIxNCwxMSArMjE0LDExIEBAIGNsYXNzIEJpdEJ1 Y2tldChTY20pOgogICAgICAgICAgICAgYnJhbmNoID0gTm9uZQogCiAgICAgICAgIGJyYW5jaF9w b2ludCA9IE5vbmUKLSAgICAgICAgaWYgYnJhbmNoIGFuZCBicmFuY2ggPT0gc2VsZi5kZWZhdWx0 X2JyYW5jaDoKKyAgICAgICAgaWYgaW5jbHVkZV9pZGVudGlmaWVyIGFuZCBicmFuY2ggYW5kIGJy YW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgaWYgbm90IGlkZW50aWZp ZXI6CiAgICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHNlbGYuX2Rpc3RhbmNlKGNvbW1pdF9k YXRhWydpZCddKQogCi0gICAgICAgIGVsaWYgYnJhbmNoOgorICAgICAgICBlbGlmIGluY2x1ZGVf aWRlbnRpZmllciBhbmQgYnJhbmNoOgogICAgICAgICAgICAgaWYgbm90IGlkZW50aWZpZXI6CiAg ICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IHNlbGYuX2Rpc3RhbmNlKGNvbW1pdF9kYXRhWydp ZCddLCBtYWduaXR1ZGU9MjU2LCBjb25kaXRpb249bGFtYmRhIHZhbDogc2VsZi5kZWZhdWx0X2Jy YW5jaCBub3QgaW4gdmFsKQogICAgICAgICAgICAgYnJhbmNoX3BvaW50ID0gc2VsZi5fZGlzdGFu Y2UoY29tbWl0X2RhdGFbJ2lkJ10pIC0gaWRlbnRpZmllcgpAQCAtMjMwLDcgKzIzMCw3IEBAIGNs YXNzIEJpdEJ1Y2tldChTY20pOgogICAgICAgICAgICAgaGFzaD1jb21taXRfZGF0YVsnaWQnXSwK ICAgICAgICAgICAgIHJldmlzaW9uPXJldmlzaW9uLAogICAgICAgICAgICAgYnJhbmNoX3BvaW50 PWJyYW5jaF9wb2ludCwKLSAgICAgICAgICAgIGlkZW50aWZpZXI9aWRlbnRpZmllciwKKyAgICAg ICAgICAgIGlkZW50aWZpZXI9aWRlbnRpZmllciBpZiBpbmNsdWRlX2lkZW50aWZpZXIgZWxzZSBO b25lLAogICAgICAgICAgICAgYnJhbmNoPWJyYW5jaCwKICAgICAgICAgICAgIHRpbWVzdGFtcD1p bnQoY29tbWl0X2RhdGFbJ2NvbW1pdHRlclRpbWVzdGFtcCddIC8gMTAwKSwKICAgICAgICAgICAg IGF1dGhvcj1zZWxmLmNvbnRyaWJ1dG9ycy5jcmVhdGUoCkBAIC0yMzksNyArMjM5LDcgQEAgY2xh c3MgQml0QnVja2V0KFNjbSk6CiAgICAgICAgICAgICApLCBtZXNzYWdlPWNvbW1pdF9kYXRhWydt ZXNzYWdlJ10gaWYgaW5jbHVkZV9sb2cgZWxzZSBOb25lLAogICAgICAgICApCiAKLSAgICBkZWYg ZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVkZV9sb2c9VHJ1ZSk6CisgICAgZGVmIGZpbmQoc2Vs ZiwgYXJndW1lbnQsIGluY2x1ZGVfbG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToK ICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgog ICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBh IHN0cmluZywgbm90ICd7fSciLmZvcm1hdCh0eXBlKGFyZ3VtZW50KSkpCiAKQEAgLTI1Nyw5ICsy NTcsMTAgQEAgY2xhc3MgQml0QnVja2V0KFNjbSk6CiAgICAgICAgICAgICAgICAgaWRlbnRpZmll cj1wYXJzZWRfY29tbWl0LmlkZW50aWZpZXIsCiAgICAgICAgICAgICAgICAgYnJhbmNoPXBhcnNl ZF9jb21taXQuYnJhbmNoLAogICAgICAgICAgICAgICAgIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9n LAorICAgICAgICAgICAgICAgIGluY2x1ZGVfaWRlbnRpZmllcj1pbmNsdWRlX2lkZW50aWZpZXIs CiAgICAgICAgICAgICApCiAKICAgICAgICAgY29tbWl0X2RhdGEgPSBzZWxmLnJlcXVlc3QoJ2Nv bW1pdHMve30nLmZvcm1hdChhcmd1bWVudCkpCiAgICAgICAgIGlmIG5vdCBjb21taXRfZGF0YToK ICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgaXMgbm90IGFuIGFyZ3VtZW50IHJl Y29nbml6ZWQgYnkgZ2l0Ii5mb3JtYXQoYXJndW1lbnQpKQotICAgICAgICByZXR1cm4gc2VsZi5j b21taXQoaGFzaD1jb21taXRfZGF0YVsnaWQnXSwgaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2cpCisg ICAgICAgIHJldHVybiBzZWxmLmNvbW1pdChoYXNoPWNvbW1pdF9kYXRhWydpZCddLCBpbmNsdWRl X2xvZz1pbmNsdWRlX2xvZywgaW5jbHVkZV9pZGVudGlmaWVyPWluY2x1ZGVfaWRlbnRpZmllcikK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Jl bW90ZS9naXRfaHViLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9naXRfaHViLnB5CShyZXZpc2lvbiAyNzMzNTgp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1v dGUvZ2l0X2h1Yi5weQkod29ya2luZyBjb3B5KQpAQCAtMjM1LDcgKzIzNSw3IEBAIGNsYXNzIEdp dEh1YihTY20pOgogICAgICAgICAgICAgcmV0dXJuIFtdCiAgICAgICAgIHJldHVybiBzb3J0ZWQo W2RldGFpbHMuZ2V0KCduYW1lJykgZm9yIGRldGFpbHMgaW4gcmVzcG9uc2UgaWYgZGV0YWlscy5n ZXQoJ25hbWUnKV0pCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249 Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9n PVRydWUpOgorICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBp ZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVkZV9sb2c9VHJ1ZSwg aW5jbHVkZV9pZGVudGlmaWVyPVRydWUpOgogICAgICAgICBpZiByZXZpc2lvbjoKICAgICAgICAg ICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdDYW5ub3QgbWFwIHJldmlzaW9ucyB0byBjb21taXRz IG9uIEdpdEh1YicpCiAKQEAgLTMwOSwxNCArMzA5LDE0IEBAIGNsYXNzIEdpdEh1YihTY20pOgog ICAgICAgICAgICAgYnJhbmNoID0gTm9uZQogCiAgICAgICAgIGJyYW5jaF9wb2ludCA9IE5vbmUK LSAgICAgICAgaWYgYnJhbmNoIGFuZCBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaDoKKyAg ICAgICAgaWYgaW5jbHVkZV9pZGVudGlmaWVyIGFuZCBicmFuY2ggYW5kIGJyYW5jaCA9PSBzZWxm LmRlZmF1bHRfYnJhbmNoOgogICAgICAgICAgICAgaWYgbm90IGlkZW50aWZpZXI6CiAgICAgICAg ICAgICAgICAgcmVzdWx0ID0gc2VsZi5fY291bnRfZm9yX3JlZihyZWY9Y29tbWl0X2RhdGFbJ3No YSddKQogICAgICAgICAgICAgICAgIGlmIG5vdCByZXN1bHQ6CiAgICAgICAgICAgICAgICAgICAg IHJhaXNlIEV4Y2VwdGlvbigne30ge30nLmZvcm1hdChyZXN1bHQsIGNvbW1pdF9kYXRhWydzaGEn XSkpCiAgICAgICAgICAgICAgICAgaWRlbnRpZmllciwgXyA9IHJlc3VsdAogCi0gICAgICAgIGVs aWYgYnJhbmNoOgorICAgICAgICBlbGlmIGluY2x1ZGVfaWRlbnRpZmllciBhbmQgYnJhbmNoOgog ICAgICAgICAgICAgaWYgbm90IGlkZW50aWZpZXI6CiAgICAgICAgICAgICAgICAgaWRlbnRpZmll ciA9IHNlbGYuX2RpZmZlcmVuY2Uoc2VsZi5kZWZhdWx0X2JyYW5jaCwgY29tbWl0X2RhdGFbJ3No YSddKQogICAgICAgICAgICAgYnJhbmNoX3BvaW50ID0gc2VsZi5fY291bnRfZm9yX3JlZihyZWY9 Y29tbWl0X2RhdGFbJ3NoYSddKVswXSAtIGlkZW50aWZpZXIKQEAgLTMzMSw3ICszMzEsNyBAQCBj bGFzcyBHaXRIdWIoU2NtKToKICAgICAgICAgICAgIGhhc2g9Y29tbWl0X2RhdGFbJ3NoYSddLAog ICAgICAgICAgICAgcmV2aXNpb249cmV2aXNpb24sCiAgICAgICAgICAgICBicmFuY2hfcG9pbnQ9 YnJhbmNoX3BvaW50LAotICAgICAgICAgICAgaWRlbnRpZmllcj1pZGVudGlmaWVyLAorICAgICAg ICAgICAgaWRlbnRpZmllcj1pZGVudGlmaWVyIGlmIGluY2x1ZGVfaWRlbnRpZmllciBlbHNlIE5v bmUsCiAgICAgICAgICAgICBicmFuY2g9YnJhbmNoLAogICAgICAgICAgICAgdGltZXN0YW1wPWlu dChjYWxlbmRhci50aW1lZ20oZGF0ZS50aW1ldHVwbGUoKSkpLAogICAgICAgICAgICAgYXV0aG9y PXNlbGYuY29udHJpYnV0b3JzLmNyZWF0ZSgKQEAgLTM0MCw3ICszNDAsNyBAQCBjbGFzcyBHaXRI dWIoU2NtKToKICAgICAgICAgICAgICksIG1lc3NhZ2U9Y29tbWl0X2RhdGFbJ2NvbW1pdCddWydt ZXNzYWdlJ10gaWYgaW5jbHVkZV9sb2cgZWxzZSBOb25lLAogICAgICAgICApCiAKLSAgICBkZWYg ZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVkZV9sb2c9VHJ1ZSk6CisgICAgZGVmIGZpbmQoc2Vs ZiwgYXJndW1lbnQsIGluY2x1ZGVfbG9nPVRydWUsIGluY2x1ZGVfaWRlbnRpZmllcj1UcnVlKToK ICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgog ICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBh IHN0cmluZywgbm90ICd7fSciLmZvcm1hdCh0eXBlKGFyZ3VtZW50KSkpCiAKQEAgLTM1OCw5ICsz NTgsMTAgQEAgY2xhc3MgR2l0SHViKFNjbSk6CiAgICAgICAgICAgICAgICAgaWRlbnRpZmllcj1w YXJzZWRfY29tbWl0LmlkZW50aWZpZXIsCiAgICAgICAgICAgICAgICAgYnJhbmNoPXBhcnNlZF9j b21taXQuYnJhbmNoLAogICAgICAgICAgICAgICAgIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9nLAor ICAgICAgICAgICAgICAgIGluY2x1ZGVfaWRlbnRpZmllcj1pbmNsdWRlX2lkZW50aWZpZXIsCiAg ICAgICAgICAgICApCiAKICAgICAgICAgY29tbWl0X2RhdGEgPSBzZWxmLnJlcXVlc3QoJ2NvbW1p dHMve30nLmZvcm1hdChhcmd1bWVudCkpCiAgICAgICAgIGlmIG5vdCBjb21taXRfZGF0YToKICAg ICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgaXMgbm90IGFuIGFyZ3VtZW50IHJlY29n bml6ZWQgYnkgZ2l0Ii5mb3JtYXQoYXJndW1lbnQpKQotICAgICAgICByZXR1cm4gc2VsZi5jb21t aXQoaGFzaD1jb21taXRfZGF0YVsnc2hhJ10sIGluY2x1ZGVfbG9nPWluY2x1ZGVfbG9nKQorICAg ICAgICByZXR1cm4gc2VsZi5jb21taXQoaGFzaD1jb21taXRfZGF0YVsnc2hhJ10sIGluY2x1ZGVf bG9nPWluY2x1ZGVfbG9nLCBpbmNsdWRlX2lkZW50aWZpZXI9aW5jbHVkZV9pZGVudGlmaWVyKQpJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcmVt b3RlL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CShyZXZpc2lvbiAyNzMzNTgpCisrKyBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0zMjMsNyArMzIzLDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAg ICAgICAgICByZXR1cm4gbGVuKHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0pCiAgICAgICAg IHJldHVybiBzZWxmLl9jb21taXRfY291bnQocmV2aXNpb249c2VsZi5fbWV0YWRhdGFfY2FjaGVb YnJhbmNoXVswXSwgYnJhbmNoPXNlbGYuZGVmYXVsdF9icmFuY2gpCiAKLSAgICBkZWYgY29tbWl0 KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9 Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9nPVRydWUpOgorICAgIGRlZiBjb21taXQoc2VsZiwg aGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0 YWc9Tm9uZSwgaW5jbHVkZV9sb2c9VHJ1ZSwgaW5jbHVkZV9pZGVudGlmaWVyPVRydWUpOgogICAg ICAgICBpZiBoYXNoOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignU1ZOIGRvZXMgbm90 IHN1cHBvcnQgR2l0IGhhc2hlcycpCiAKQEAgLTM5NiwxNCArMzk2LDE0IEBAIGNsYXNzIFN2bihT Y20pOgogCiAgICAgICAgIGRhdGUgPSBkYXRldGltZS5zdHJwdGltZShpbmZvWydMYXN0IENoYW5n ZWQgRGF0ZSddLCAnJVktJW0tJWQgJUg6JU06JVMnKSBpZiBpbmZvLmdldCgnTGFzdCBDaGFuZ2Vk IERhdGUnKSBlbHNlIE5vbmUKIAotICAgICAgICBpZiBub3QgaWRlbnRpZmllcjoKKyAgICAgICAg aWYgaW5jbHVkZV9pZGVudGlmaWVyIGFuZCBub3QgaWRlbnRpZmllcjoKICAgICAgICAgICAgIGlm IGJyYW5jaCAhPSBzZWxmLmRlZmF1bHRfYnJhbmNoIGFuZCByZXZpc2lvbiA+IHNlbGYuX21ldGFk YXRhX2NhY2hlLmdldChzZWxmLmRlZmF1bHRfYnJhbmNoLCBbMF0pWy0xXToKICAgICAgICAgICAg ICAgICBzZWxmLl9jYWNoZV9yZXZpc2lvbnMoYnJhbmNoPXNlbGYuZGVmYXVsdF9icmFuY2gpCiAg ICAgICAgICAgICBpZiByZXZpc2lvbiBub3QgaW4gc2VsZi5fbWV0YWRhdGFfY2FjaGUuZ2V0KGJy YW5jaCwgW10pOgogICAgICAgICAgICAgICAgIHNlbGYuX2NhY2hlX3JldmlzaW9ucyhicmFuY2g9 YnJhbmNoKQogICAgICAgICAgICAgaWRlbnRpZmllciA9IHNlbGYuX2NvbW1pdF9jb3VudChyZXZp c2lvbj1yZXZpc2lvbiwgYnJhbmNoPWJyYW5jaCkKIAotICAgICAgICBicmFuY2hfcG9pbnQgPSBO b25lIGlmIGJyYW5jaCA9PSBzZWxmLmRlZmF1bHRfYnJhbmNoIGVsc2Ugc2VsZi5fY29tbWl0X2Nv dW50KGJyYW5jaD1icmFuY2gpCisgICAgICAgIGJyYW5jaF9wb2ludCA9IE5vbmUgaWYgbm90IGlu Y2x1ZGVfaWRlbnRpZmllciBvciBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaCBlbHNlIHNl bGYuX2NvbW1pdF9jb3VudChicmFuY2g9YnJhbmNoKQogICAgICAgICBpZiBicmFuY2hfcG9pbnQg YW5kIHBhcnNlZF9icmFuY2hfcG9pbnQgYW5kIGJyYW5jaF9wb2ludCAhPSBwYXJzZWRfYnJhbmNo X3BvaW50OgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiUHJvdmlkZWQgJ2JyYW5jaF9w b2ludCcgZG9lcyBub3QgbWF0Y2ggYnJhbmNoIHBvaW50IG9mIHNwZWNpZmllZCBicmFuY2giKQog CkBAIC00MzksNyArNDM5LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgIHJldHVybiBDb21t aXQoCiAgICAgICAgICAgICByZXZpc2lvbj1pbnQocmV2aXNpb24pLAogICAgICAgICAgICAgYnJh bmNoPWJyYW5jaCwKLSAgICAgICAgICAgIGlkZW50aWZpZXI9aWRlbnRpZmllciwKKyAgICAgICAg ICAgIGlkZW50aWZpZXI9aWRlbnRpZmllciBpZiBpbmNsdWRlX2lkZW50aWZpZXIgZWxzZSBOb25l LAogICAgICAgICAgICAgYnJhbmNoX3BvaW50PWJyYW5jaF9wb2ludCwKICAgICAgICAgICAgIHRp bWVzdGFtcD1pbnQoY2FsZW5kYXIudGltZWdtKGRhdGUudGltZXR1cGxlKCkpKSBpZiBkYXRlIGVs c2UgTm9uZSwKICAgICAgICAgICAgIGF1dGhvcj1hdXRob3IsCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L2dpdF91bml0dGVzdC5weQkocmV2aXNpb24gMjczMzU4KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3Qu cHkJKHdvcmtpbmcgY29weSkKQEAgLTI3Miw2ICsyNzIsMTIgQEAgY2xhc3MgVGVzdEdpdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIobG9j YWwuR2l0KHNlbGYucGF0aCkuZmluZCgnNEB0cnVuaycpKSwgJzRAbWFpbicpCiAgICAgICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIobG9jYWwuR2l0KHNlbGYucGF0aCkuZmluZCgnNEBt YXN0ZXInKSksICc0QG1haW4nKQogCisgICAgZGVmIHRlc3Rfbm9faWRlbnRpZmllcihzZWxmKToK KyAgICAgICAgZm9yIG1vY2sgaW4gW21vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpLCBtb2Nrcy5s b2NhbC5HaXQoc2VsZi5wYXRoLCBnaXRfc3ZuPVRydWUpXToKKyAgICAgICAgICAgIHdpdGggbW9j azoKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2VydElzTm9uZShsb2NhbC5HaXQoc2VsZi5wYXRo KS5maW5kKCdtYWluJywgaW5jbHVkZV9pZGVudGlmaWVyPUZhbHNlKS5pZGVudGlmaWVyKQorCisK IGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRw czovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvd2Via2l0JwogCkBAIC0zODAsNiArMzg2LDEw IEBAIGNsYXNzIFRlc3RHaXRIdWIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzdHIocmVtb3RlLkdpdEh1YihzZWxmLnJlbW90ZSkuZmluZCgnNEB0cnVu aycpKSwgJzRAbWFpbicpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihyZW1vdGUu R2l0SHViKHNlbGYucmVtb3RlKS5maW5kKCc0QG1hc3RlcicpKSwgJzRAbWFpbicpCiAKKyAgICBk ZWYgdGVzdF9ub19pZGVudGlmaWVyKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLnJlbW90ZS5H aXRIdWIoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKHJlbW90ZS5HaXRIdWIoc2Vs Zi5yZW1vdGUpLmZpbmQoJ21haW4nLCBpbmNsdWRlX2lkZW50aWZpZXI9RmFsc2UpLmlkZW50aWZp ZXIpCisKIAogY2xhc3MgVGVzdEJpdEJ1Y2tldCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgcmVt b3RlID0gJ2h0dHBzOi8vYml0YnVja2V0LmV4YW1wbGUuY29tL3Byb2plY3RzL1dFQktJVC9yZXBv cy93ZWJraXQnCkBAIC00ODgsMyArNDk4LDcgQEAgY2xhc3MgVGVzdEJpdEJ1Y2tldCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgIHdpdGggbW9ja3MucmVtb3RlLkJpdEJ1Y2tldCgpOgogICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIocmVtb3RlLkJpdEJ1Y2tldChzZWxmLnJlbW90 ZSkuZmluZCgnNEB0cnVuaycpKSwgJzRAbWFpbicpCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHN0cihyZW1vdGUuQml0QnVja2V0KHNlbGYucmVtb3RlKS5maW5kKCc0QG1hc3RlcicpKSwg JzRAbWFpbicpCisKKyAgICBkZWYgdGVzdF9ub19pZGVudGlmaWVyKHNlbGYpOgorICAgICAgICB3 aXRoIG1vY2tzLnJlbW90ZS5CaXRCdWNrZXQoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNO b25lKHJlbW90ZS5CaXRCdWNrZXQoc2VsZi5yZW1vdGUpLmZpbmQoJ21haW4nLCBpbmNsdWRlX2lk ZW50aWZpZXI9RmFsc2UpLmlkZW50aWZpZXIpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L3N2bl91bml0dGVzdC5weQkocmV2aXNpb24gMjczMzU4KQorKysgVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTIyNyw2ICsyMjcsMTAgQEAgY2xhc3MgVGVzdExvY2FsU3ZuKHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGxvY2FsLlN2bihz ZWxmLnBhdGgpLmZpbmQoJzRAbWFpbicpKSwgJzRAdHJ1bmsnKQogICAgICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzdHIobG9jYWwuU3ZuKHNlbGYucGF0aCkuZmluZCgnNEBtYXN0ZXInKSksICc0 QHRydW5rJykKIAorICAgIGRlZiB0ZXN0X25vX2lkZW50aWZpZXIoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCksIE91dHB1dENhcHR1cmUoKToKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0SXNOb25lKGxvY2FsLlN2bihzZWxmLnBhdGgpLmZpbmQoJ3RydW5rJywg aW5jbHVkZV9pZGVudGlmaWVyPUZhbHNlKS5pZGVudGlmaWVyKQorCiAKIGNsYXNzIFRlc3RSZW1v dGVTdm4odW5pdHRlc3QuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczovL3N2bi5leGFt cGxlLm9yZy9yZXBvc2l0b3J5L3dlYmtpdCcKQEAgLTMyMCwzICszMjQsNyBAQCBjbGFzcyBUZXN0 UmVtb3RlU3ZuKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUu U3ZuKCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihyZW1vdGUuU3ZuKHNlbGYu cmVtb3RlKS5maW5kKCc0QG1haW4nKSksICc0QHRydW5rJykKICAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc3RyKHJlbW90ZS5Tdm4oc2VsZi5yZW1vdGUpLmZpbmQoJzRAbWFzdGVyJykpLCAn NEB0cnVuaycpCisKKyAgICBkZWYgdGVzdF9ub19pZGVudGlmaWVyKHNlbGYpOgorICAgICAgICB3 aXRoIG1vY2tzLnJlbW90ZS5Tdm4oKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKHJl bW90ZS5Tdm4oc2VsZi5yZW1vdGUpLmZpbmQoJ3RydW5rJywgaW5jbHVkZV9pZGVudGlmaWVyPUZh bHNlKS5pZGVudGlmaWVyKQo=