218212 2020-10-26 16:17:55 -0700 [webkitscmpy] Support finding commit by tag 2020-10-28 13:06:56 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu jlewis3 webkit-bug-importer oldest_to_newest 1701672 0 jbedard 2020-10-26 16:17:55 -0700 Finding a commit by tag is a bit difficult because git and svn treat tags differently. In svn, tags are classified the same way branches are. In Git, tags are a reference to a commit. 1701673 1 webkit-bug-importer 2020-10-26 16:18:14 -0700 <rdar://problem/70700121> 1701674 2 412363 jbedard 2020-10-26 16:31:40 -0700 Created attachment 412363 Patch 1702465 3 ews-feeder 2020-10-28 13:06:55 -0700 Committed r269117: <https://trac.webkit.org/changeset/269117> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412363. 412363 2020-10-26 16:31:40 -0700 2020-10-28 13:06:55 -0700 Patch bug-218212-20201026163139.patch text/plain 22093 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODk5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM2IEBACisyMDIwLTEwLTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFN1cHBvcnQgZmluZGluZyBjb21taXQgYnkgdGFn CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTgyMTIK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcwNzAwMTIxPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAg ICAgIChHaXQuY29tbWl0KTogRmluZCBhIGNvbW1pdCByZWZlcnJlZCB0byBieSBhIHByb3ZpZGVk IHRhZy4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9sb2NhbC9zY20ucHk6CisgICAgICAgIChTY20uZmluZCk6IEZpbmQgYSBjb21taXQgYnkgdGFn LCBpZiBhcHBsaWNhYmxlLgorICAgICAgICAoU2NtLmNvbW1pdCk6CisgICAgICAgICogU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5OgorICAgICAg ICAoU3ZuLmluZm8pOiBQdWxsIGluZm9ybWF0aW9uIGJ5IHRhZywgc3VwcG9ydCBub24tc3RhbmRh cmQgYnJhbmNoZXMuCisgICAgICAgIChTdm4uX2NhY2hlX3JldmlzaW9ucyk6IFN1cHBvcnQgbm9u LXN0YW5kYXJkIGJyYW5jaGVzLgorICAgICAgICAoU3ZuLl9icmFuY2hfZm9yKTogUmV0dXJuIHRo ZSBub24tc3RhbmRhcmQgYnJhbmNoIG5hbWUgZm9yIHRhZ3MuCisgICAgICAgIChTdm4uY29tbWl0 KTogRmluZCBhIGNvbW1pdCByZWZlcnJlZCB0byBieSBhIHByb3ZpZGVkIHRhZy4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9n aXQucHk6CisgICAgICAgIChHaXQpOiBTdXBwb3J0IHRhZ3MuCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5OgorICAg ICAgICAoU3ZuLl9faW5pdF9fKTogU3VwcG9ydCB0YWdzLgorICAgICAgICAoU3ZuLnRhZ3MpOiBU YWdzIGFyZSBzaW1wbHkgc3BlY2lhbGl6ZWQgYnJhbmNoZXMsIHJldHVybiB0aGUgbmFtZXMgb2Yg dGhvc2UgdGFncworICAgICAgICBiYXNlZCBvbiB0aGUgY29tbWl0IG1hcHBpbmcuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3Vu aXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEdpdCk6CisgICAgICAg IChUZXN0R2l0LnRlc3RfdGFnKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RTdm4p OgorICAgICAgICAoVGVzdFN2bi50ZXN0X3RhZyk6CisKIDIwMjAtMTAtMjYgIEFha2FzaCBKYWlu ICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IHNraXBwaW5nIHNwZWNp ZmljIGZpbGVzIGZyb20gcmVwb3J0LW5vbi1pbmNsdXNpdmUtbGFuZ3VhZ2UKSW5kZXg6IFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyNjg5OTUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpA QCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5z dGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEt aW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNp b24oMCwgMiwgNSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDIsIDYpCiAKIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2RhdGV1dGlsJywgVmVyc2lvbigyLCA4LCAxKSwgcHlwaV9uYW1lPSdw eXRob24tZGF0ZXV0aWwnKSkKIApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNp b24gMjY4OTk1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsMTAgKzE1MSwxMyBAQCBj bGFzcyBHaXQoU2NtKToKICAgICAgICAgcmVzdWx0ID0gW2JyYW5jaC5sc3RyaXAoJyAqJykgZm9y IGJyYW5jaCBpbiBmaWx0ZXIobGFtYmRhIGJyYW5jaDogJy0+JyBub3QgaW4gYnJhbmNoLCBicmFu Y2guc3Rkb3V0LnNwbGl0bGluZXMoKSldCiAgICAgICAgIHJldHVybiBzb3J0ZWQoc2V0KFsnLycu am9pbihicmFuY2guc3BsaXQoJy8nKVsyOl0pIGlmIGJyYW5jaC5zdGFydHN3aXRoKCdyZW1vdGVz L29yaWdpbi8nKSBlbHNlIGJyYW5jaCBmb3IgYnJhbmNoIGluIHJlc3VsdF0pKQogCi0gICAgZGVm IGNvbW1pdChzZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwg YnJhbmNoPU5vbmUpOgorICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1O b25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSk6CiAgICAgICAgIGlm IHJldmlzaW9uIGFuZCBub3Qgc2VsZi5pc19zdm46CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4 Y2VwdGlvbignVGhpcyBnaXQgY2hlY2tvdXQgZG9lcyBub3Qgc3VwcG9ydCBTVk4gcmV2aXNpb25z JykKICAgICAgICAgZWxpZiByZXZpc2lvbjoKKyAgICAgICAgICAgIGlmIGhhc2g6CisgICAgICAg ICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignQ2Fubm90IGRlZmluZSBib3RoIGhhc2ggYW5kIHJl dmlzaW9uJykKKwogICAgICAgICAgICAgcmV2aXNpb24gPSBDb21taXQuX3BhcnNlX3JldmlzaW9u KHJldmlzaW9uLCBkb19hc3NlcnQ9VHJ1ZSkKICAgICAgICAgICAgIHJldmlzaW9uX2xvZyA9IHJ1 bigKICAgICAgICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdzdm4nLCAnZmluZC1yZXYn LCAncnt9Jy5mb3JtYXQocmV2aXNpb24pXSwKQEAgLTE3NSw2ICsxNzgsOCBAQCBjbGFzcyBHaXQo U2NtKToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVmaW5lIGJv dGggcmV2aXNpb24gYW5kIGlkZW50aWZpZXInKQogICAgICAgICAgICAgaWYgaGFzaDoKICAgICAg ICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVmaW5lIGJvdGggaGFzaCBhbmQg aWRlbnRpZmllcicpCisgICAgICAgICAgICBpZiB0YWc6CisgICAgICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvcignQ2Fubm90IGRlZmluZSBib3RoIHRhZyBhbmQgaWRlbnRpZmllcicpCiAKICAg ICAgICAgICAgIHBhcnNlZF9icmFuY2hfcG9pbnQsIGlkZW50aWZpZXIsIHBhcnNlZF9icmFuY2gg PSBDb21taXQuX3BhcnNlX2lkZW50aWZpZXIoaWRlbnRpZmllciwgZG9fYXNzZXJ0PVRydWUpCiAg ICAgICAgICAgICBpZiBwYXJzZWRfYnJhbmNoOgpAQCAtMjEzLDEyICsyMTgsMTUgQEAgY2xhc3Mg R2l0KFNjbSk6CiAgICAgICAgICAgICBpZiBpZGVudGlmaWVyIDwgMDoKICAgICAgICAgICAgICAg ICBpZGVudGlmaWVyID0gTm9uZQogCi0gICAgICAgIGVsaWYgYnJhbmNoOgorICAgICAgICBlbGlm IGJyYW5jaCBvciB0YWc6CiAgICAgICAgICAgICBpZiBoYXNoOgotICAgICAgICAgICAgICAgIHJh aXNlIFZhbHVlRXJyb3IoJ0Nhbm5vdCBkZWZpbmUgYm90aCBicmFuY2ggYW5kIGhhc2gnKQotICAg ICAgICAgICAgbG9nID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2xvZycsIGJyYW5jaCwgJy0x J10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0 Zi04JykKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVmaW5lIGJv dGggdGFnL2JyYW5jaCBhbmQgaGFzaCcpCisgICAgICAgICAgICBpZiBicmFuY2ggYW5kIHRhZzoK KyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVmaW5lIGJvdGggdGFn IGFuZCBicmFuY2gnKQorCisgICAgICAgICAgICBsb2cgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgp LCAnbG9nJywgYnJhbmNoIG9yIHRhZywgJy0xJ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVy ZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKICAgICAgICAgICAgIGlmIGxvZy5yZXR1 cm5jb2RlOgotICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCJGYWlsZWQgdG8g cmV0cmlldmUgY29tbWl0IGluZm9ybWF0aW9uIGZvciAne30nIi5mb3JtYXQoYnJhbmNoKSkKKyAg ICAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiRmFpbGVkIHRvIHJldHJpZXZlIGNv bW1pdCBpbmZvcm1hdGlvbiBmb3IgJ3t9JyIuZm9ybWF0KGJyYW5jaCBvciB0YWcpKQogCiAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICBoYXNoID0gQ29tbWl0Ll9wYXJzZV9oYXNoKGhhc2gsIGRv X2Fzc2VydD1UcnVlKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvc2NtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQkocmV2aXNpb24gMjY4 OTk1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvc2NtLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsNiArMTIwLDkgQEAgY2xhc3MgU2Nt KG9iamVjdCk6CiAgICAgICAgIGVsaWYgYXJndW1lbnQgaW4gc2VsZi5icmFuY2hlczoKICAgICAg ICAgICAgIHJlc3VsdCA9IHNlbGYuY29tbWl0KGJyYW5jaD1hcmd1bWVudCkKIAorICAgICAgICBl bGlmIGFyZ3VtZW50IGluIHNlbGYudGFnczoKKyAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuY29t bWl0KHRhZz1hcmd1bWVudCkKKwogICAgICAgICBlbHNlOgogICAgICAgICAgICAgaWYgb2Zmc2V0 OgogICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid+JyBvZmZzZXRzIGFyZSBub3Qg c3VwcG9ydGVkIGZvciByZXZpc2lvbnMgYW5kIGlkZW50aWZpZXJzIikKQEAgLTE0MCw3ICsxNDMs NyBAQCBjbGFzcyBTY20ob2JqZWN0KToKICAgICAgICAgICAgIGJyYW5jaD1yZXN1bHQuYnJhbmNo LAogICAgICAgICApCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249 Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSk6CisgICAgZGVmIGNvbW1pdChzZWxm LCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUs IHRhZz1Ob25lKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigpCiAKICAgICBk ZWYgcHJpb3JpdGl6ZV9icmFuY2hlcyhzZWxmLCBicmFuY2hlcyk6CkluZGV4OiBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAyNjg5OTUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAg LTY5LDkgKzY5LDE3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgc2VsZi5fbWV0YWRh dGFfY2FjaGUgPSBkaWN0KHZlcnNpb249c3RyKHNlbGYuQ0FDSEVfVkVSU0lPTikpCiAKICAgICBA ZGVjb3JhdG9ycy5NZW1vaXplKGNhY2hlZD1GYWxzZSkKLSAgICBkZWYgaW5mbyhzZWxmLCBicmFu Y2g9Tm9uZSwgcmV2aXNpb249Tm9uZSk6CisgICAgZGVmIGluZm8oc2VsZiwgYnJhbmNoPU5vbmUs IHJldmlzaW9uPU5vbmUsIHRhZz1Ob25lKToKKyAgICAgICAgaWYgdGFnIGFuZCBicmFuY2g6Cisg ICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3Qgc3BlY2lmeSBib3RoIGJyYW5jaCBh bmQgdGFnJykKKyAgICAgICAgaWYgdGFnIGFuZCByZXZpc2lvbjoKKyAgICAgICAgICAgIHJhaXNl IFZhbHVlRXJyb3IoJ0Nhbm5vdCBzcGVjaWZ5IGJvdGggYnJhbmNoIGFuZCB0YWcnKQorCiAgICAg ICAgIHJldmlzaW9uID0gQ29tbWl0Ll9wYXJzZV9yZXZpc2lvbihyZXZpc2lvbikKLSAgICAgICAg YWRkaXRpb25hbF9hcmdzID0gWydeL2JyYW5jaGVzL3t9Jy5mb3JtYXQoYnJhbmNoKV0gaWYgYnJh bmNoIGFuZCBicmFuY2ggIT0gc2VsZi5kZWZhdWx0X2JyYW5jaCBlbHNlIFtdCisgICAgICAgIGlm IGJyYW5jaCBhbmQgYnJhbmNoICE9IHNlbGYuZGVmYXVsdF9icmFuY2ggYW5kICcvJyBub3QgaW4g YnJhbmNoOgorICAgICAgICAgICAgYnJhbmNoID0gJ2JyYW5jaGVzL3t9Jy5mb3JtYXQoYnJhbmNo KQorICAgICAgICBhZGRpdGlvbmFsX2FyZ3MgPSBbJ14ve30nLmZvcm1hdChicmFuY2gpXSBpZiBi cmFuY2ggYW5kIGJyYW5jaCAhPSBzZWxmLmRlZmF1bHRfYnJhbmNoIGVsc2UgW10KKyAgICAgICAg YWRkaXRpb25hbF9hcmdzICs9IFsnXi90YWdzL3t9Jy5mb3JtYXQodGFnKV0gaWYgdGFnIGVsc2Ug W10KICAgICAgICAgYWRkaXRpb25hbF9hcmdzICs9IFsnLXInLCBzdHIocmV2aXNpb24pXSBpZiBy ZXZpc2lvbiBlbHNlIFtdCiAKICAgICAgICAgaW5mb19yZXN1bHQgPSBydW4oW3NlbGYuZXhlY3V0 YWJsZSgpLCAnaW5mbyddICsgYWRkaXRpb25hbF9hcmdzLCBjd2Q9c2VsZi5yb290X3BhdGgsIGNh cHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCkBAIC0xMzcsOSArMTQ1LDEyIEBA IGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgZGlkX3dhcm4gPSBGYWxzZQogICAgICAgICAg ICAgY291bnQgPSAwCiAgICAgICAgICAgICBsb2cgPSBOb25lCi0gICAgICAgICAgICBjYW5kaWRh dGVfaW5kZXggPSAtMSBpZiBpc19kZWZhdWx0X2JyYW5jaCBlbHNlIGxlbihzZWxmLl9tZXRhZGF0 YV9jYWNoZVtzZWxmLmRlZmF1bHRfYnJhbmNoXSkKIAotICAgICAgICAgICAgYnJhbmNoX2FyZyA9 ICdeL3t9e30nLmZvcm1hdCgnJyBpZiBpc19kZWZhdWx0X2JyYW5jaCBlbHNlICdicmFuY2hlcy8n LCBicmFuY2gpCisgICAgICAgICAgICBpZiBpc19kZWZhdWx0X2JyYW5jaCBvciAnLycgaW4gYnJh bmNoOgorICAgICAgICAgICAgICAgIGJyYW5jaF9hcmcgPSAnXi97fScuZm9ybWF0KGJyYW5jaCkK KyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgYnJhbmNoX2FyZyA9ICdeL2JyYW5j aGVzL3t9Jy5mb3JtYXQoYnJhbmNoKQorCiAgICAgICAgICAgICBrd2FyZ3MgPSBkaWN0KCkKICAg ICAgICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8gPj0gKDMsIDApOgogICAgICAgICAgICAgICAg IGt3YXJncyA9IGRpY3QoZW5jb2Rpbmc9J3V0Zi04JykKQEAgLTIzOCw5ICsyNDksMTQgQEAgY2xh c3MgU3ZuKFNjbSk6CiAgICAgICAgIGlmIGxlbihwYXJ0aWFsKSA8PSAzOgogICAgICAgICAgICAg cmFpc2Ugc2VsZi5FeGNlcHRpb24oJ01hbGZvcm1lZCBzZXQgIG9mIGVkaXRlZCBmaWxlcycpCiAg ICAgICAgIHBhcnRpYWwgPSBwYXJ0aWFsWzI6XS5zcGxpdCgnICcpWzBdCi0gICAgICAgIHJldHVy biBwYXJ0aWFsLnNwbGl0KCcvJylbMiBpZiBwYXJ0aWFsLnN0YXJ0c3dpdGgoJy9icmFuY2hlcycp IGVsc2UgMV0KKyAgICAgICAgY2FuZGlkYXRlID0gcGFydGlhbC5zcGxpdCgnLycpWzIgaWYgcGFy dGlhbC5zdGFydHN3aXRoKCcvYnJhbmNoZXMnKSBlbHNlIDFdCiAKLSAgICBkZWYgY29tbWl0KHNl bGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9u ZSk6CisgICAgICAgICMgVGFncyBhcmUgYSB1bmlxdWUgY2FzZSBmb3IgU1ZOLCBiZWNhdXNlIHRo ZXkncmUgdHJlYXRlZCBhcyBicmFuY2hlcyBpbiBuYXRpdmUgU1ZOCisgICAgICAgIGlmIGNhbmRp ZGF0ZSA9PSAndGFncyc6CisgICAgICAgICAgICByZXR1cm4gcGFydGlhbFsxOl0ucnN0cmlwKCcv JykKKyAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZQorCisgICAgZGVmIGNvbW1pdChzZWxmLCBoYXNo PU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1O b25lKToKICAgICAgICAgaWYgaGFzaDoKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1NW TiBkb2VzIG5vdCBzdXBwb3J0IEdpdCBoYXNoZXMnKQogCkBAIC0yNDgsNiArMjY0LDggQEAgY2xh c3MgU3ZuKFNjbSk6CiAgICAgICAgIGlmIGlkZW50aWZpZXIgaXMgbm90IE5vbmU6CiAgICAgICAg ICAgICBpZiByZXZpc2lvbjoKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5u b3QgZGVmaW5lIGJvdGggcmV2aXNpb24gYW5kIGlkZW50aWZpZXInKQorICAgICAgICAgICAgaWYg dGFnOgorICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0Nhbm5vdCBkZWZpbmUgYm90 aCB0YWcgYW5kIGlkZW50aWZpZXInKQogCiAgICAgICAgICAgICBwYXJzZWRfYnJhbmNoX3BvaW50 LCBpZGVudGlmaWVyLCBwYXJzZWRfYnJhbmNoID0gQ29tbWl0Ll9wYXJzZV9pZGVudGlmaWVyKGlk ZW50aWZpZXIsIGRvX2Fzc2VydD1UcnVlKQogICAgICAgICAgICAgaWYgcGFyc2VkX2JyYW5jaDoK QEAgLTI4NiwxNSArMzA0LDIzIEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICBlbGlmIHJldmlz aW9uOgogICAgICAgICAgICAgaWYgYnJhbmNoOgogICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVl RXJyb3IoJ0Nhbm5vdCBkZWZpbmUgYm90aCBicmFuY2ggYW5kIHJldmlzaW9uJykKKyAgICAgICAg ICAgIGlmIHRhZzoKKyAgICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVm aW5lIGJvdGggdGFnIGFuZCByZXZpc2lvbicpCiAgICAgICAgICAgICByZXZpc2lvbiA9IENvbW1p dC5fcGFyc2VfcmV2aXNpb24ocmV2aXNpb24sIGRvX2Fzc2VydD1UcnVlKQogICAgICAgICAgICAg YnJhbmNoID0gc2VsZi5fYnJhbmNoX2ZvcihyZXZpc2lvbikKICAgICAgICAgICAgIGluZm8gPSBz ZWxmLmluZm8oY2FjaGVkPVRydWUsIGJyYW5jaD1icmFuY2gsIHJldmlzaW9uPXJldmlzaW9uKQog CiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBicmFuY2ggPSBicmFuY2ggb3Igc2VsZi5icmFu Y2gKLSAgICAgICAgICAgIGluZm8gPSBzZWxmLmluZm8oYnJhbmNoPWJyYW5jaCkKKyAgICAgICAg ICAgIGlmIGJyYW5jaCBhbmQgdGFnOgorICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3Io J0Nhbm5vdCBkZWZpbmUgYm90aCBicmFuY2ggYW5kIHRhZycpCisKKyAgICAgICAgICAgIGJyYW5j aCA9IE5vbmUgaWYgdGFnIGVsc2UgYnJhbmNoIG9yIHNlbGYuYnJhbmNoCisgICAgICAgICAgICBp bmZvID0gc2VsZi5pbmZvKHRhZz10YWcpIGlmIHRhZyBlbHNlIHNlbGYuaW5mbyhicmFuY2g9YnJh bmNoKQogICAgICAgICAgICAgaWYgbm90IGluZm86Ci0gICAgICAgICAgICAgICAgcmFpc2Ugc2Vs Zi5FeGNlcHRpb24oIid7fScgaXMgbm90IGEgcmVjb2duaXplZCBicmFuY2giLmZvcm1hdChicmFu Y2gpKQorICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCIne30nIGlzIG5vdCBh IHJlY29nbml6ZWQge30iLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgdGFnIG9yIGJyYW5j aCwKKyAgICAgICAgICAgICAgICAgICAgJ3RhZycgaWYgdGFnIGVsc2UgJ2JyYW5jaCcsCisgICAg ICAgICAgICAgICAgKSkKICAgICAgICAgICAgIHJldmlzaW9uID0gaW50KGluZm9bJ0xhc3QgQ2hh bmdlZCBSZXYnXSkKICAgICAgICAgICAgIGlmIGJyYW5jaCAhPSBzZWxmLmRlZmF1bHRfYnJhbmNo OgogICAgICAgICAgICAgICAgIGJyYW5jaCA9IHNlbGYuX2JyYW5jaF9mb3IocmV2aXNpb24pCkBA IC0zMjQsNyArMzUwLDExIEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICBpZiBicmFuY2hfcG9p bnQgYW5kIHBhcnNlZF9icmFuY2hfcG9pbnQgYW5kIGJyYW5jaF9wb2ludCAhPSBwYXJzZWRfYnJh bmNoX3BvaW50OgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigiUHJvdmlkZWQgJ2JyYW5j aF9wb2ludCcgZG9lcyBub3QgbWF0Y2ggYnJhbmNoIHBvaW50IG9mIHNwZWNpZmllZCBicmFuY2gi KQogCi0gICAgICAgIGJyYW5jaF9hcmcgPSAnXi97fXt9Jy5mb3JtYXQoJycgaWYgYnJhbmNoID09 IHNlbGYuZGVmYXVsdF9icmFuY2ggZWxzZSAnYnJhbmNoZXMvJywgYnJhbmNoKQorICAgICAgICBp ZiBicmFuY2ggPT0gc2VsZi5kZWZhdWx0X2JyYW5jaCBvciAnLycgaW4gYnJhbmNoOgorICAgICAg ICAgICAgYnJhbmNoX2FyZyA9ICdeL3t9Jy5mb3JtYXQoYnJhbmNoKQorICAgICAgICBlbHNlOgor ICAgICAgICAgICAgYnJhbmNoX2FyZyA9ICdeL2JyYW5jaGVzL3t9Jy5mb3JtYXQoYnJhbmNoKQor CiAgICAgICAgIGxvZyA9IHJ1bigKICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2xv ZycsICctbCcsICcxJywgJy1yJywgc3RyKHJldmlzaW9uKSwgYnJhbmNoX2FyZ10sIGN3ZD1zZWxm LnJvb3RfcGF0aCwKICAgICAgICAgICAgIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1 dGYtOCcsCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9tb2Nrcy9sb2NhbC9naXQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvZ2l0LnB5CShyZXZpc2lv biAyNjg5OTUpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAg Y2xhc3MgR2l0KG1vY2tzLlN1YnByb2Nlc3MpOgogICAgICAgICBzZWxmLmRldGFjaGVkID0gZGV0 YWNoZWQgb3IgRmFsc2UKIAogICAgICAgICBzZWxmLmJyYW5jaGVzID0gYnJhbmNoZXMgb3IgW10K LSAgICAgICAgc2VsZi50YWdzID0gdGFncyBvciBbXQorICAgICAgICBzZWxmLnRhZ3MgPSB0YWdz IG9yIHt9CiAKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlID0gbG9j YWwuR2l0LmV4ZWN1dGFibGUoKQpAQCAtMTE5LDYgKzExOSw5IEBAIGNsYXNzIEdpdChtb2Nrcy5T dWJwcm9jZXNzKToKICAgICAgICAgICAgICksCiAgICAgICAgIF0KIAorICAgICAgICBzZWxmLnRh Z3NbJ3RhZy0xJ10gPSBzZWxmLmNvbW1pdHNbJ2JyYW5jaC1hJ11bLTFdCisgICAgICAgIHNlbGYu dGFnc1sndGFnLTInXSA9IHNlbGYuY29tbWl0c1snYnJhbmNoLWInXVstMV0KKwogICAgICAgICBp ZiBnaXRfc3ZuOgogICAgICAgICAgICAgZ2l0X3N2bl9yb3V0ZXMgPSBbCiAgICAgICAgICAgICAg ICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKQEAgLTIyMiw3ICsyMjUsNyBAQCBub3RoaW5nIHRv IGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgY3dkPXNlbGYucGF0 aCwKICAgICAgICAgICAgICAgICBnZW5lcmF0b3I9bGFtYmRhICphcmdzLCAqKmt3YXJnczogbW9j a3MuUHJvY2Vzc0NvbXBsZXRpb24oCiAgICAgICAgICAgICAgICAgICAgIHJldHVybmNvZGU9MCwK LSAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihzZWxmLnRhZ3MpICsgJ1xuJywK KyAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdcbicuam9pbihzb3J0ZWQoc2VsZi50YWdzLmtl eXMoKSkpICsgJ1xuJywKICAgICAgICAgICAgICAgICApLAogICAgICAgICAgICAgKSwgbW9ja3Mu U3VicHJvY2Vzcy5Sb3V0ZSgKICAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGFibGUsICdyZXYt cGFyc2UnLCAnLS1hYmJyZXYtcmVmJywgJ29yaWdpbi9IRUFEJywKQEAgLTMxOSw2ICszMjIsOCBA QCBub3RoaW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICByZXR1 cm4gc2VsZi5jb21taXRzW3NlbGYuYnJhbmNoXVstMV0KICAgICAgICAgaWYgc29tZXRoaW5nIGlu IHNlbGYuY29tbWl0cy5rZXlzKCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5jb21taXRzW3Nv bWV0aGluZ11bLTFdCisgICAgICAgIGlmIHNvbWV0aGluZyBpbiBzZWxmLnRhZ3Mua2V5cygpOgor ICAgICAgICAgICAgcmV0dXJuIHNlbGYudGFnc1tzb21ldGhpbmddCiAKICAgICAgICAgc29tZXRo aW5nID0gc3RyKHNvbWV0aGluZykKICAgICAgICAgaWYgJy4uJyBpbiBzb21ldGhpbmc6CkluZGV4 OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvbW9ja3MvbG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAyNjg5OTUpCisr KyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9s b2NhbC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDEzICs0NSwxMiBAQCBjbGFzcyBTdm4o bW9ja3MuU3VicHJvY2Vzcyk6CiAgICAgICAgICAgICBkYXRlPWRhdGV0aW1lLmZyb210aW1lc3Rh bXAoY29tbWl0LnRpbWVzdGFtcCkuc3RyZnRpbWUoJyVZLSVtLSVkICVIOiVNOiVTIHt9ICglYSwg JWQgJWIgJVkpJy5mb3JtYXQoY2xzLlVUQ19PRkZTRVQpKSwKICAgICAgICAgKQogCi0gICAgZGVm IF9faW5pdF9fKHNlbGYsIHBhdGg9Jy8uaW52YWxpZC1zdm4nLCBicmFuY2g9Tm9uZSwgcmVtb3Rl PU5vbmUsIGJyYW5jaGVzPU5vbmUsIHRhZ3M9Tm9uZSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYs IHBhdGg9Jy8uaW52YWxpZC1zdm4nLCBicmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUsIGJyYW5jaGVz PU5vbmUpOgogICAgICAgICBzZWxmLnBhdGggPSBwYXRoCiAgICAgICAgIHNlbGYuYnJhbmNoID0g YnJhbmNoIG9yICd0cnVuaycKICAgICAgICAgc2VsZi5yZW1vdGUgPSByZW1vdGUgb3IgJ2h0dHBz Oi8vc3ZuLm1vY2sub3JnL3JlcG9zaXRvcnkve30nLmZvcm1hdChvcy5wYXRoLmJhc2VuYW1lKHBh dGgpKQogCiAgICAgICAgIHNlbGYuYnJhbmNoZXMgPSBicmFuY2hlcyBvciBbXQotICAgICAgICBz ZWxmLnRhZ3MgPSB0YWdzIG9yIFtdCiAgICAgICAgIHNlbGYuY29ubmVjdGVkID0gVHJ1ZQogCiAg ICAgICAgIHRyeToKQEAgLTEyMCw2ICsxMTksMjggQEAgY2xhc3MgU3ZuKG1vY2tzLlN1YnByb2Nl c3MpOgogICAgICAgICAgICAgKSwKICAgICAgICAgXQogCisgICAgICAgIHNlbGYuY29tbWl0c1sn dGFncy90YWctMSddID0gWworICAgICAgICAgICAgc2VsZi5jb21taXRzWydicmFuY2gtYSddWzBd LAorICAgICAgICAgICAgc2VsZi5jb21taXRzWydicmFuY2gtYSddWzFdLCBDb21taXQoCisgICAg ICAgICAgICAgICAgaWRlbnRpZmllcj0nMi4zQHRhZ3MvdGFnLTEnLAorICAgICAgICAgICAgICAg IHJldmlzaW9uPTksCisgICAgICAgICAgICAgICAgYXV0aG9yPWNvbnRyaWJ1dG9yLAorICAgICAg ICAgICAgICAgIHRpbWVzdGFtcD0xNjAxNjY4MTAwLAorICAgICAgICAgICAgICAgIG1lc3NhZ2U9 Jzl0aCBjb21taXRcbicsCisgICAgICAgICAgICApLAorICAgICAgICBdCisgICAgICAgIHNlbGYu Y29tbWl0c1sndGFncy90YWctMiddID0gWworICAgICAgICAgICAgc2VsZi5jb21taXRzWydicmFu Y2gtYiddWzBdLAorICAgICAgICAgICAgc2VsZi5jb21taXRzWydicmFuY2gtYiddWzFdLAorICAg ICAgICAgICAgc2VsZi5jb21taXRzWydicmFuY2gtYiddWzJdLCBDb21taXQoCisgICAgICAgICAg ICAgICAgaWRlbnRpZmllcj0nMi40QHRhZ3MvdGFnLTInLAorICAgICAgICAgICAgICAgIHJldmlz aW9uPTEwLAorICAgICAgICAgICAgICAgIGF1dGhvcj1jb250cmlidXRvciwKKyAgICAgICAgICAg ICAgICB0aW1lc3RhbXA9MTYwMTY2OTEwMCwKKyAgICAgICAgICAgICAgICBtZXNzYWdlPScxMHRo IGNvbW1pdFxuJywKKyAgICAgICAgICAgICksCisgICAgICAgIF0KKwogICAgICAgICBzdXBlcihT dm4sIHNlbGYpLl9faW5pdF9fKAogICAgICAgICAgICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgK ICAgICAgICAgICAgICAgICAnL3Vzci9iaW4vd2hpY2gnLCAnc3ZuJywKQEAgLTEzMCw3ICsxNTEs NyBAQCBjbGFzcyBTdm4obW9ja3MuU3VicHJvY2Vzcyk6CiAgICAgICAgICAgICApLCBtb2Nrcy5T dWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSwgJ2luZm8n LAogICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCi0gICAgICAgICAgICAgICAgZ2VuZXJh dG9yPWxhbWJkYSAqYXJncywgKiprd2FyZ3M6IHNlbGYuX2luZm8oY3dkPWt3YXJncy5nZXQoJ2N3 ZCcsJycpKQorICAgICAgICAgICAgICAgIGdlbmVyYXRvcj1sYW1iZGEgKmFyZ3MsICoqa3dhcmdz OiBzZWxmLl9pbmZvKGN3ZD1rd2FyZ3MuZ2V0KCdjd2QnLCAnJykpCiAgICAgICAgICAgICApLCBt b2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIHNlbGYuZXhlY3V0YWJsZSwg J2luZm8nLCBzZWxmLkJSQU5DSF9SRSwKICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLApA QCAtMTQwLDE0ICsxNjEsMTQgQEAgY2xhc3MgU3ZuKG1vY2tzLlN1YnByb2Nlc3MpOgogICAgICAg ICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCiAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJk YSAqYXJncywgKiprd2FyZ3M6IG1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAogICAgICAgICAgICAg ICAgICAgICByZXR1cm5jb2RlPTAsCi0gICAgICAgICAgICAgICAgICAgIHN0ZG91dD0nL1xuJy5q b2luKHNvcnRlZChzZXQoc2VsZi5icmFuY2hlcykgfCBzZXQoc2VsZi5jb21taXRzLmtleXMoKSkg LSB7J3RydW5rJ30pKSArICcvXG4nLAorICAgICAgICAgICAgICAgICAgICBzdGRvdXQ9Jy9cbicu am9pbihzb3J0ZWQoc2V0KHNlbGYuYnJhbmNoZXMpIHwgc2V0KHNlbGYuY29tbWl0cy5rZXlzKCkp IC0geyd0cnVuayd9IC0gc2VsZi50YWdzKSkgKyAnL1xuJywKICAgICAgICAgICAgICAgICApIGlm IHNlbGYuY29ubmVjdGVkIGVsc2UgbW9ja3MuUHJvY2Vzc0NvbXBsZXRpb24ocmV0dXJuY29kZT0x KSwKICAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCiAgICAgICAgICAgICAg ICAgc2VsZi5leGVjdXRhYmxlLCAnbGlzdCcsICdeL3RhZ3MnLAogICAgICAgICAgICAgICAgIGN3 ZD1zZWxmLnBhdGgsCiAgICAgICAgICAgICAgICAgZ2VuZXJhdG9yPWxhbWJkYSAqYXJncywgKipr d2FyZ3M6IG1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAogICAgICAgICAgICAgICAgICAgICByZXR1 cm5jb2RlPTAsCi0gICAgICAgICAgICAgICAgICAgIHN0ZG91dD0nL1xuJy5qb2luKHNlbGYudGFn cykgKyAnL1xuJywKKyAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PScvXG4nLmpvaW4oW3RhZ1ts ZW4oJ3RhZ3MvJyk6XSBmb3IgdGFnIGluIHNvcnRlZChzZWxmLnRhZ3MpXSkgKyAnL1xuJywKICAg ICAgICAgICAgICAgICApIGlmIHNlbGYuY29ubmVjdGVkIGVsc2UgbW9ja3MuUHJvY2Vzc0NvbXBs ZXRpb24ocmV0dXJuY29kZT0xKSwKICAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91 dGUoCiAgICAgICAgICAgICAgICAgc2VsZi5leGVjdXRhYmxlLCAnbG9nJywgJy12JywgJy1xJywg c2VsZi5yZW1vdGUsICctcicsIHJlLmNvbXBpbGUocidcZCsnKSwKQEAgLTE2MCw3ICsxODEsNyBA QCBjbGFzcyBTdm4obW9ja3MuU3VicHJvY2Vzcyk6CiAgICAgICAgICAgICAgICAgICAgICAgICAn ICAgIE0gL3ticmFuY2h9L0NoYW5nZUxvZ1xuJwogICAgICAgICAgICAgICAgICAgICAgICAgJyAg ICBNIC97YnJhbmNofS9maWxlLmNwcFxuJy5mb3JtYXQoCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbGluZT1zZWxmLmxvZ19saW5lKHNlbGYuZmluZChyZXZpc2lvbj1hcmdzWzZdKSksCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJhbmNoPSd0cnVuaycgaWYgc2VsZi5maW5kKHJl dmlzaW9uPWFyZ3NbNl0pLmJyYW5jaCA9PSAndHJ1bmsnIGVsc2UgJ2JyYW5jaGVzL3t9Jy5mb3Jt YXQoc2VsZi5maW5kKHJldmlzaW9uPWFyZ3NbNl0pLmJyYW5jaCkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBicmFuY2g9c2VsZi5maW5kKHJldmlzaW9uPWFyZ3NbNl0pLmJyYW5jaCBpZiBz ZWxmLmZpbmQocmV2aXNpb249YXJnc1s2XSkuYnJhbmNoLnNwbGl0KCcvJylbMF0gaW4gWyd0cnVu aycsICd0YWdzJ10gZWxzZSAnYnJhbmNoZXMve30nLmZvcm1hdChzZWxmLmZpbmQocmV2aXNpb249 YXJnc1s2XSkuYnJhbmNoKQogICAgICAgICAgICAgICAgICAgICAgICAgKSwKICAgICAgICAgICAg ICAgICApIGlmIHNlbGYuY29ubmVjdGVkIGFuZCBzZWxmLmZpbmQocmV2aXNpb249YXJnc1s2XSkg ZWxzZSBtb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1cm5jb2RlPTEpLAogICAgICAgICAgICAg KSwgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKQEAgLTE5NSw2ICsyMTYsMTAgQEAgY2xhc3MgU3Zu KG1vY2tzLlN1YnByb2Nlc3MpOgogICAgICAgICAgICAgKSwKICAgICAgICAgKQogCisgICAgQHBy b3BlcnR5CisgICAgZGVmIHRhZ3Moc2VsZik6CisgICAgICAgIHJldHVybiBzZXQoYnJhbmNoIGZv ciBicmFuY2ggaW4gc2VsZi5jb21taXRzLmtleXMoKSBpZiBicmFuY2guc3RhcnRzd2l0aCgndGFn cycpKQorCiAgICAgZGVmIF9pbmZvKHNlbGYsIGJyYW5jaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBj d2Q9JycpOgogICAgICAgICBjb21taXQgPSBzZWxmLmZpbmQoYnJhbmNoPWJyYW5jaCwgcmV2aXNp b249cmV2aXNpb24pCiAgICAgICAgIGlmIG5vdCBjb21taXQ6CkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjg5OTUpCisrKyBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2NiwzICsxNjYsMTkgQEAgSGFzaDogMWFiZTI1YjQ0 M2U5CiAgICAgICAgICAgICAgICAgYnJhbmNoPSdtYWluJywKICAgICAgICAgICAgICAgICBtZXNz YWdlPSc0dGggY29tbWl0XG5zdm4taWQ6IGh0dHBzOi8vc3ZuLndlYmtpdC5vcmdyZXBvc2l0b3J5 L3JlcG9zaXRvcnkvdHJ1bmtANCAyNjhmNDVjYy1jZDA5LTA0MTAtYWIzYy1kNTI2OTFiNGRiZmMn LAogICAgICAgICAgICAgKSkKKworICAgIGRlZiB0ZXN0X3RhZ19zdm4oc2VsZik6CisgICAgICAg IHdpdGggbW9ja3MubG9jYWwuR2l0KCksIG1vY2tzLmxvY2FsLlN2bihzZWxmLnBhdGgpLCBNb2Nr VGltZSwgT3V0cHV0Q2FwdHVyZSgpIGFzIGNhcHR1cmVkOgorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgwLCBwcm9ncmFtLm1haW4oCisgICAgICAgICAgICAgICAgYXJncz0oJ2ZpbmQnLCAn dGFnLTEnLCAnLXEnKSwKKyAgICAgICAgICAgICAgICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAg ICAgICkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3Rkb3V0LmdldHZhbHVl KCksICcyLjNAdGFncy90YWctMSB8IHI5IHwgOXRoIGNvbW1pdFxuJykKKworICAgIGRlZiB0ZXN0 X3RhZ19naXQoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwg Z2l0X3N2bj1UcnVlKSwgbW9ja3MubG9jYWwuU3ZuKCksIE1vY2tUaW1lLCBPdXRwdXRDYXB0dXJl KCkgYXMgY2FwdHVyZWQ6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0u bWFpbigKKyAgICAgICAgICAgICAgICBhcmdzPSgnZmluZCcsICd0YWctMScsICctcScpLAorICAg ICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAgICAgICAgKSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUoKSwgJzIuMkBicmFuY2gtYSB8 IDYyMTY1MmFkZDdmYywgcjcgfCA3dGggY29tbWl0XG4nKQpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2ODk5NSkKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5 CSh3b3JraW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICAgICAgKQogCiAgICAgZGVmIHRlc3RfdGFncyhzZWxmKToKLSAg ICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoLCB0YWdzPSgndGFnLTEnLCAndGFn LTInKSk6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCk6CiAgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKAogICAgICAgICAgICAgICAgIGxvY2FsLkdpdChzZWxmLnBh dGgpLnRhZ3MsCiAgICAgICAgICAgICAgICAgWyd0YWctMScsICd0YWctMiddLApAQCAtMTk2LDcg KzE5Niw3IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRl c3RfYnJhbmNoZXNfcHJpb3JpdHkoc2VsZik6CiAgICAgICAgIGZvciBtb2NrIGluIFttb2Nrcy5s b2NhbC5HaXQoc2VsZi5wYXRoKSwgbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1U cnVlKV06Ci0gICAgICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpOgorICAg ICAgICAgICAgd2l0aCBtb2NrOgogICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCiAg ICAgICAgICAgICAgICAgICAgICdtYWluJywKICAgICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0 KHNlbGYucGF0aCkucHJpb3JpdGl6ZV9icmFuY2hlcyhbJ21haW4nLCAnYnJhbmNoLWEnLCAnZGV2 LzEyMzQ1JywgJ3NhZmFyaS02MTAtYnJhbmNoJywgJ3NhZmFyaS02MTAuMS1icmFuY2gnXSkKQEAg LTIxNiwzICsyMTYsMTEgQEAgY2xhc3MgVGVzdEdpdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgICAgICAgICAgICAgICdicmFuY2gtYScsCiAgICAgICAgICAgICAgICAgICAgIGxvY2FsLkdp dChzZWxmLnBhdGgpLnByaW9yaXRpemVfYnJhbmNoZXMoWydicmFuY2gtYScsICdkZXYvMTIzNDUn XSkKICAgICAgICAgICAgICAgICApCisKKyAgICBkZWYgdGVzdF90YWcoc2VsZik6CisgICAgICAg IGZvciBtb2NrIGluIFttb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKSwgbW9ja3MubG9jYWwuR2l0 KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKV06CisgICAgICAgICAgICB3aXRoIG1vY2s6CisgICAg ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICAgICAgJzYyMTY1 MmFkZDdmYzQxNjA5OWJkMjA2MzM2NmNjMzhmZjYxYWZlMzYnLAorICAgICAgICAgICAgICAgICAg ICBsb2NhbC5HaXQoc2VsZi5wYXRoKS5jb21taXQodGFnPSd0YWctMScpLmhhc2gsCisgICAgICAg ICAgICAgICAgKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI2ODk5NSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MSw3 ICs2MSw3IEBAIGNsYXNzIFRlc3RTdm4odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAg KQogCiAgICAgZGVmIHRlc3RfdGFncyhzZWxmKToKLSAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5T dm4oc2VsZi5wYXRoLCB0YWdzPSgndGFnLTEnLCAndGFnLTInKSk6CisgICAgICAgIHdpdGggbW9j a3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAog ICAgICAgICAgICAgICAgIGxvY2FsLlN2bihzZWxmLnBhdGgpLnRhZ3MsCiAgICAgICAgICAgICAg ICAgWyd0YWctMScsICd0YWctMiddLApAQCAtMTA3LDcgKzEwNyw3IEBAIGNsYXNzIFRlc3RTdm4o dW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgICAgICAgICAjIE91dC1vZi1ib3VuZHMgY29tbWl0 CiAgICAgICAgICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFpc2VzKGxvY2FsLlN2bi5FeGNlcHRpb24p OgotICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoTm9uZSwgbG9jYWwuU3ZuKHNlbGYu cGF0aCkuY29tbWl0KHJldmlzaW9uPTEwKSkKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKE5vbmUsIGxvY2FsLlN2bihzZWxmLnBhdGgpLmNvbW1pdChyZXZpc2lvbj0xMSkpCiAKICAg ICBkZWYgdGVzdF9jb21taXRfZnJvbV9icmFuY2goc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3Mu bG9jYWwuU3ZuKHNlbGYucGF0aCksIE91dHB1dENhcHR1cmUoKToKQEAgLTE5NiwzICsxOTYsNyBA QCBjbGFzcyBUZXN0U3ZuKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAg bG9jYWwuU3ZuKGRpcm5hbWUpLmNvbW1pdChyZXZpc2lvbj0zKQogICAgICAgICBmaW5hbGx5Ogog ICAgICAgICAgICAgc2h1dGlsLnJtdHJlZShkaXJuYW1lKQorCisgICAgZGVmIHRlc3RfdGFnKHNl bGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bihzZWxmLnBhdGgpLCBPdXRwdXRDYXB0 dXJlKCk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDksIGxvY2FsLlN2bihzZWxmLnBh dGgpLmNvbW1pdCh0YWc9J3RhZy0xJykucmV2aXNpb24pCg==