219409 2020-12-01 14:05:15 -0800 [webkitscmpy] Provide switch to exclude commit message 2020-12-02 11:30:05 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218827 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu jbedard slewis webkit-bug-importer oldest_to_newest 1711160 0 jbedard 2020-12-01 14:05:15 -0800 In SVN, retrieving the commit message requires a network request. In certain automation situations, this is not desirable. We should provide a way to opt out of this network request. 1711161 1 webkit-bug-importer 2020-12-01 14:05:30 -0800 <rdar://problem/71866445> 1711170 2 415162 jbedard 2020-12-01 14:20:26 -0800 Created attachment 415162 Patch 1711382 3 415162 aakash_jain 2020-12-02 10:39:44 -0800 Comment on attachment 415162 Patch rs=me 1711392 4 415235 jbedard 2020-12-02 11:02:18 -0800 Created attachment 415235 Patch for landing 1711411 5 ews-feeder 2020-12-02 11:30:04 -0800 Committed r270358: <https://trac.webkit.org/changeset/270358> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415235. 415162 2020-12-01 14:20:26 -0800 2020-12-02 11:02:14 -0800 Patch bug-219409-20201201162026.patch text/plain 19066 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDMyNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM1IEBACisyMDIwLTEyLTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFByb3ZpZGUgc3dpdGNoIHRvIGV4Y2x1ZGUgY29t bWl0IG1lc3NhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxOTQwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzE4NjY0NDU+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dp dC5weToKKyAgICAgICAgKEdpdC5jb21taXQpOiBQYXNzIC0tZm9ybWF0LXNob3J0IGlmIHRoZSB1 c2VyIGlzIG9wdGluZyBvdXQgb2YgdGhlIGNvbW1pdCBtZXNzYWdlLgorICAgICAgICAoR2l0LmZp bmQpOiBBZGQgaW5jbHVkZV9sb2cgZmxhZywgcGFzcyB0byBjb21taXQoLi4uKSBmdW5jdGlvbi4K KyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2Nh bC9zdm4ucHk6CisgICAgICAgIChTdm4uY29tbWl0KTogU2tpcCBuZXR3b3JrIGNhbGwgdG8gcmV0 cmlldmUgY29tbWl0IG1lc3NhZ2UgaWYgaW5jbHVkZV9sb2cgaXMgZmFsc2UuCisgICAgICAgICog U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weToKKyAg ICAgICAgKEZpbmQucGFyc2VyKTogQWRkIC0tbG9nIGFuZCAtLW5vLWxvZyBmbGFncy4KKyAgICAg ICAgKEZpbmQubWFpbik6IEFsbG93IHVzZXIgdG8gc2tpcCBuZXR3b3JrIGNhbGwgdG8gcmV0cmll dmUgY29tbWl0IG1lc3NhZ2UuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5pbmZvKTogU3VwcG9y dCBjYXNlIHdlcmUgU1ZOIGNhbm5vdCBkZXRlcm1pbmUgdGhlIGF1dGhvci4KKyAgICAgICAgKFN2 bi5jb21taXQpOiBTa2lwIG5ldHdvcmsgY2FsbCB0byByZXRyaWV2ZSBjb21taXQgbWVzc2FnZSBp ZiBpbmNsdWRlX2xvZyBpcyBmYWxzZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9zY21fYmFzZS5weToKKyAgICAgICAgKFNjbUJhc2UuY29tbWl0 KTogQWRkIGluY2x1ZGVfbG9nIGZsYWcuCisgICAgICAgIChTY21CYXNlLmZpbmQpOiBBZGQgaW5j bHVkZV9sb2cgZmxhZywgcGFzcyB0byBjb21taXQoLi4uKSBmdW5jdGlvbi4KKyAgICAgICAgKiBT Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRl c3QucHk6CisgICAgICAgIChUZXN0RmluZC50ZXN0X25vX2xvZ19zdm4pOgorICAgICAgICAoVGVz dEZpbmQudGVzdF9ub19sb2dfZ2l0KToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RH aXQudGVzdF9ub19sb2cpOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdExvY2FsU3Zu LnRlc3Rfbm9fbG9nKToKKyAgICAgICAgKFRlc3RSZW1vdGVTdm4udGVzdF9ub19sb2cpOgorCiAy MDIwLTEyLTAxICBTZXJnZXkgUnViYW5vdiAgPGNoaTE4N0BnbWFpbC5jb20+CiAKICAgICAgICAg QWRkIFNlcmdleSBSdWJhbm92IHRvIGNvbnRyaWJ1dG9ycy5qc29uCkluZGV4OiBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9f X2luaXRfXy5weQkocmV2aXNpb24gMjcwMzI0KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2 LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9ydEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwg d2Via2l0Y29yZXB5IHdpdGggYHBpcCBpbnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4 LXVybCA8cGFja2FnZSBpbmRleCBVUkw+YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAs IDQsIDEpCit2ZXJzaW9uID0gVmVyc2lvbigwLCA0LCAyKQogCiBBdXRvSW5zdGFsbC5yZWdpc3Rl cihQYWNrYWdlKCdkYXRldXRpbCcsIFZlcnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0ncHl0aG9u LWRhdGV1dGlsJykpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBW ZXJzaW9uKDAsIDE1LCAwKSkpCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9wcm9ncmFtLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dyYW0ucHkJKHJldmlzaW9uIDI3 MDMyNCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Byb2dyYW0ucHkJKHdvcmtpbmcgY29weSkKQEAgLTU0LDE3ICs1NCwyNSBAQCBjbGFzcyBGaW5k KENvbW1hbmQpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHBhcnNlcihjbHMsIHBhcnNl ciwgbG9nZ2Vycz1Ob25lKToKLSAgICAgICAgYXJndW1lbnRzLkxvZ2dpbmdHcm91cCgKKyAgICAg ICAgb3V0cHV0X2FyZ3MgPSBhcmd1bWVudHMuTG9nZ2luZ0dyb3VwKAogICAgICAgICAgICAgcGFy c2VyLAogICAgICAgICAgICAgbG9nZ2Vycz1sb2dnZXJzLAogICAgICAgICAgICAgaGVscD0ne30g YW1vdW50IG9mIGxvZ2dpbmcgYW5kIGNvbW1pdCBpbmZvcm1hdGlvbiBkaXNwbGF5ZWQnCi0gICAg ICAgICkuYWRkX2FyZ3VtZW50KAorICAgICAgICApCisgICAgICAgIG91dHB1dF9hcmdzLmFkZF9h cmd1bWVudCgKICAgICAgICAgICAgICctLWpzb24nLCAnLWonLAogICAgICAgICAgICAgaGVscD0n Q29udmVydCB0aGUgY29tbWl0IHRvIGEgbWFjaGluZS1yZWFkYWJsZSBKU09OIG9iamVjdCcsCiAg ICAgICAgICAgICBhY3Rpb249J3N0b3JlX3RydWUnLAogICAgICAgICAgICAgZGVzdD0nanNvbics CiAgICAgICAgICAgICBkZWZhdWx0PUZhbHNlLAogICAgICAgICApCisgICAgICAgIG91dHB1dF9h cmdzLmFkZF9hcmd1bWVudCgKKyAgICAgICAgICAgICctLWxvZycsICctLW5vLWxvZycsCisgICAg ICAgICAgICBoZWxwPSdJbmNsdWRlIHRoZSBjb21taXQgbWVzc2FnZSBmb3IgdGhlIHJlcXVlc3Rl ZCBjb21taXQnLAorICAgICAgICAgICAgYWN0aW9uPWFyZ3VtZW50cy5Ob0FjdGlvbiwKKyAgICAg ICAgICAgIGRlc3Q9J2luY2x1ZGVfbG9nJywKKyAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwKKyAg ICAgICAgKQogCiAgICAgICAgIHBhcnNlci5hZGRfYXJndW1lbnQoCiAgICAgICAgICAgICAnYXJn dW1lbnQnLCBuYXJncz0xLApAQCAtNzUsNyArODMsNyBAQCBjbGFzcyBGaW5kKENvbW1hbmQpOgog ICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBtYWluKGNscywgYXJncywgcmVwb3NpdG9yeSk6CiAg ICAgICAgIHRyeToKLSAgICAgICAgICAgIGNvbW1pdCA9IHJlcG9zaXRvcnkuZmluZChhcmdzLmFy Z3VtZW50WzBdKQorICAgICAgICAgICAgY29tbWl0ID0gcmVwb3NpdG9yeS5maW5kKGFyZ3MuYXJn dW1lbnRbMF0sIGluY2x1ZGVfbG9nPWFyZ3MuaW5jbHVkZV9sb2cpCiAgICAgICAgIGV4Y2VwdCAo bG9jYWwuU2NtLkV4Y2VwdGlvbiwgVmFsdWVFcnJvcikgYXMgZXhjZXB0aW9uOgogICAgICAgICAg ICAgIyBWYWx1ZUVycm9ycyBhbmQgU2NtIGV4Y2VwdGlvbnMgdXN1YWxseSBjb250YWluIGVub3Vn aCBpbmZvcm1hdGlvbiB0byBiZSBkaXNwbGF5ZWQKICAgICAgICAgICAgICMgdG8gdGhlIHVzZXIg YXMgYW4gZXJyb3IKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L3NjbV9iYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5CShyZXZpc2lvbiAyNzAzMjQp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9zY21f YmFzZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjMsNyArNjMsNyBAQCBjbGFzcyBTY21CYXNlKG9i amVjdCk6CiAgICAgZGVmIHRhZ3Moc2VsZik6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVk RXJyb3IoKQogCi0gICAgZGVmIGNvbW1pdChzZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUs IGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1Ob25lKToKKyAgICBkZWYgY29tbWl0 KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9 Tm9uZSwgdGFnPU5vbmUsIGluY2x1ZGVfbG9nPVRydWUpOgogICAgICAgICByYWlzZSBOb3RJbXBs ZW1lbnRlZEVycm9yKCkKIAogICAgIGRlZiBwcmlvcml0aXplX2JyYW5jaGVzKHNlbGYsIGJyYW5j aGVzKToKQEAgLTg1LDcgKzg1LDcgQEAgY2xhc3MgU2NtQmFzZShvYmplY3QpOgogICAgICAgICAg ICAgZmlsdGVyZWRfY2FuZGlkYXRlcyA9IGJyYW5jaGVzCiAgICAgICAgIHJldHVybiBzb3J0ZWQo ZmlsdGVyZWRfY2FuZGlkYXRlcylbMF0KIAotICAgIGRlZiBmaW5kKHNlbGYsIGFyZ3VtZW50KToK KyAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCwgaW5jbHVkZV9sb2c9VHJ1ZSk6CiAgICAgICAg IGlmIG5vdCBpc2luc3RhbmNlKGFyZ3VtZW50LCBzaXguc3RyaW5nX3R5cGVzKToKICAgICAgICAg ICAgIHJhaXNlIFZhbHVlRXJyb3IoIkV4cGVjdGVkICdhcmd1bWVudCcgdG8gYmUgYSBzdHJpbmcs IG5vdCAne30nIi5mb3JtYXQodHlwZShhcmd1bWVudCkpKQogCkBAIC05OCwxMyArOTgsMTMgQEAg Y2xhc3MgU2NtQmFzZShvYmplY3QpOgogICAgICAgICAgICAgYXJndW1lbnQgPSBhcmd1bWVudC5z cGxpdCgnficpWzBdCiAKICAgICAgICAgaWYgYXJndW1lbnQgPT0gJ0hFQUQnOgotICAgICAgICAg ICAgcmVzdWx0ID0gc2VsZi5jb21taXQoKQorICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jb21t aXQoaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2cpCiAKICAgICAgICAgZWxpZiBhcmd1bWVudCBpbiBz ZWxmLmJyYW5jaGVzOgotICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jb21taXQoYnJhbmNoPWFy Z3VtZW50KQorICAgICAgICAgICAgcmVzdWx0ID0gc2VsZi5jb21taXQoYnJhbmNoPWFyZ3VtZW50 LCBpbmNsdWRlX2xvZz1pbmNsdWRlX2xvZykKIAogICAgICAgICBlbGlmIGFyZ3VtZW50IGluIHNl bGYudGFnczoKLSAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuY29tbWl0KHRhZz1hcmd1bWVudCkK KyAgICAgICAgICAgIHJlc3VsdCA9IHNlbGYuY29tbWl0KHRhZz1hcmd1bWVudCwgaW5jbHVkZV9s b2c9aW5jbHVkZV9sb2cpCiAKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGlmIG9mZnNldDoK QEAgLTExNiw2ICsxMTYsNyBAQCBjbGFzcyBTY21CYXNlKG9iamVjdCk6CiAgICAgICAgICAgICAg ICAgcmV2aXNpb249cGFyc2VkX2NvbW1pdC5yZXZpc2lvbiwKICAgICAgICAgICAgICAgICBpZGVu dGlmaWVyPXBhcnNlZF9jb21taXQuaWRlbnRpZmllciwKICAgICAgICAgICAgICAgICBicmFuY2g9 cGFyc2VkX2NvbW1pdC5icmFuY2gsCisgICAgICAgICAgICAgICAgaW5jbHVkZV9sb2c9aW5jbHVk ZV9sb2csCiAgICAgICAgICAgICApCiAKICAgICAgICAgaWYgbm90IG9mZnNldDoKQEAgLTEyNCw2 ICsxMjUsNyBAQCBjbGFzcyBTY21CYXNlKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLmNv bW1pdCgKICAgICAgICAgICAgIGlkZW50aWZpZXI9cmVzdWx0LmlkZW50aWZpZXIgLSBvZmZzZXQs CiAgICAgICAgICAgICBicmFuY2g9cmVzdWx0LmJyYW5jaCwKKyAgICAgICAgICAgIGluY2x1ZGVf bG9nPWluY2x1ZGVfbG9nLAogICAgICAgICApCiAKICAgICBAY2xhc3NtZXRob2QKSW5kZXg6IFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI3MDMyNCkKKysrIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQkod29ya2luZyBj b3B5KQpAQCAtMTUxLDcgKzE1MSw3IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICByZXN1bHQg PSBbYnJhbmNoLmxzdHJpcCgnIConKSBmb3IgYnJhbmNoIGluIGZpbHRlcihsYW1iZGEgYnJhbmNo OiAnLT4nIG5vdCBpbiBicmFuY2gsIGJyYW5jaC5zdGRvdXQuc3BsaXRsaW5lcygpKV0KICAgICAg ICAgcmV0dXJuIHNvcnRlZChzZXQoWycvJy5qb2luKGJyYW5jaC5zcGxpdCgnLycpWzI6XSkgaWYg YnJhbmNoLnN0YXJ0c3dpdGgoJ3JlbW90ZXMvb3JpZ2luLycpIGVsc2UgYnJhbmNoIGZvciBicmFu Y2ggaW4gcmVzdWx0XSkpCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNp b249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUpOgorICAgIGRl ZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUs IGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVkZV9sb2c9VHJ1ZSk6CiAgICAgICAgIGlmIHJl dmlzaW9uIGFuZCBub3Qgc2VsZi5pc19zdm46CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2Vw dGlvbignVGhpcyBnaXQgY2hlY2tvdXQgZG9lcyBub3Qgc3VwcG9ydCBTVk4gcmV2aXNpb25zJykK ICAgICAgICAgZWxpZiByZXZpc2lvbjoKQEAgLTE3Miw2ICsxNzIsNyBAQCBjbGFzcyBHaXQoU2Nt KToKIAogICAgICAgICBkZWZhdWx0X2JyYW5jaCA9IHNlbGYuZGVmYXVsdF9icmFuY2gKICAgICAg ICAgcGFyc2VkX2JyYW5jaF9wb2ludCA9IE5vbmUKKyAgICAgICAgbG9nX2Zvcm1hdCA9IFsnLTEn XSBpZiBpbmNsdWRlX2xvZyBlbHNlIFsnLTEnLCAnLS1mb3JtYXQ9c2hvcnQnXQogCiAgICAgICAg IGlmIGlkZW50aWZpZXIgaXMgbm90IE5vbmU6CiAgICAgICAgICAgICBpZiByZXZpc2lvbjoKQEAg LTIwNCw3ICsyMDUsNyBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgIGlmIGlkZW50aWZp ZXIgPiBiYXNlX2NvdW50OgogICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdJ ZGVudGlmaWVyIHt9IGNhbm5vdCBiZSBmb3VuZCBvbiB0aGUgc3BlY2lmaWVkIGJyYW5jaCBpbiB0 aGUgY3VycmVudCBjaGVja291dCcuZm9ybWF0KGlkZW50aWZpZXIpKQogICAgICAgICAgICAgbG9n ID0gcnVuKAotICAgICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2xvZycsICd7fX57 fScuZm9ybWF0KGJyYW5jaCBvciAnSEVBRCcsIGJhc2VfY291bnQgLSBpZGVudGlmaWVyKSwgJy0x J10sCisgICAgICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgJ3t9fnt9Jy5m b3JtYXQoYnJhbmNoIG9yICdIRUFEJywgYmFzZV9jb3VudCAtIGlkZW50aWZpZXIpXSArIGxvZ19m b3JtYXQsCiAgICAgICAgICAgICAgICAgY3dkPXNlbGYucm9vdF9wYXRoLAogICAgICAgICAgICAg ICAgIGNhcHR1cmVfb3V0cHV0PVRydWUsCiAgICAgICAgICAgICAgICAgZW5jb2Rpbmc9J3V0Zi04 JywKQEAgLTIyNCwxMyArMjI1LDEzIEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgaWYg YnJhbmNoIGFuZCB0YWc6CiAgICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignQ2Fubm90 IGRlZmluZSBib3RoIHRhZyBhbmQgYnJhbmNoJykKIAotICAgICAgICAgICAgbG9nID0gcnVuKFtz ZWxmLmV4ZWN1dGFibGUoKSwgJ2xvZycsIGJyYW5jaCBvciB0YWcsICctMSddLCBjd2Q9c2VsZi5y b290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCisgICAgICAg ICAgICBsb2cgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgYnJhbmNoIG9yIHRhZ10g KyBsb2dfZm9ybWF0LCBjd2Q9c2VsZi5yb290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVu Y29kaW5nPSd1dGYtOCcpCiAgICAgICAgICAgICBpZiBsb2cucmV0dXJuY29kZToKICAgICAgICAg ICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbigiRmFpbGVkIHRvIHJldHJpZXZlIGNvbW1pdCBp bmZvcm1hdGlvbiBmb3IgJ3t9JyIuZm9ybWF0KGJyYW5jaCBvciB0YWcpKQogCiAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICBoYXNoID0gQ29tbWl0Ll9wYXJzZV9oYXNoKGhhc2gsIGRvX2Fzc2Vy dD1UcnVlKQotICAgICAgICAgICAgbG9nID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2xvZycs IGhhc2ggb3IgJ0hFQUQnLCAnLTEnXSwgY3dkPXNlbGYucm9vdF9wYXRoLCBjYXB0dXJlX291dHB1 dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorICAgICAgICAgICAgbG9nID0gcnVuKFtzZWxmLmV4 ZWN1dGFibGUoKSwgJ2xvZycsIGhhc2ggb3IgJ0hFQUQnXSArIGxvZ19mb3JtYXQsIGN3ZD1zZWxm LnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKICAgICAg ICAgICAgIGlmIGxvZy5yZXR1cm5jb2RlOgogICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhj ZXB0aW9uKCJGYWlsZWQgdG8gcmV0cmlldmUgY29tbWl0IGluZm9ybWF0aW9uIGZvciAne30nIi5m b3JtYXQoaGFzaCBvciAnSEVBRCcpKQogCkBAIC0yNjUsMTAgKzI2NiwxMCBAQCBjbGFzcyBHaXQo U2NtKToKICAgICAgICAgICAgIGJyYW5jaD1icmFuY2gsCiAgICAgICAgICAgICB0aW1lc3RhbXA9 aW50KGNvbW1pdF90aW1lLnN0ZG91dC5sc3RyaXAoKSksCiAgICAgICAgICAgICBhdXRob3I9Q29u dHJpYnV0b3IuZnJvbV9zY21fbG9nKGxvZy5zdGRvdXQuc3BsaXRsaW5lcygpWzFdKSwKLSAgICAg ICAgICAgIG1lc3NhZ2U9J1xuJy5qb2luKGxpbmVbNDpdIGZvciBsaW5lIGluIGxvZy5zdGRvdXQu c3BsaXRsaW5lcygpWzQ6XSksCisgICAgICAgICAgICBtZXNzYWdlPSdcbicuam9pbihsaW5lWzQ6 XSBmb3IgbGluZSBpbiBsb2cuc3Rkb3V0LnNwbGl0bGluZXMoKVs0Ol0pIGlmIGluY2x1ZGVfbG9n IGVsc2UgTm9uZSwKICAgICAgICAgKQogCi0gICAgZGVmIGZpbmQoc2VsZiwgYXJndW1lbnQpOgor ICAgIGRlZiBmaW5kKHNlbGYsIGFyZ3VtZW50LCBpbmNsdWRlX2xvZz1UcnVlKToKICAgICAgICAg aWYgbm90IGlzaW5zdGFuY2UoYXJndW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgogICAgICAgICAg ICAgcmFpc2UgVmFsdWVFcnJvcigiRXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBhIHN0cmluZywg bm90ICd7fSciLmZvcm1hdCh0eXBlKGFyZ3VtZW50KSkpCiAKQEAgLTI3OSw2ICsyODAsNyBAQCBj bGFzcyBHaXQoU2NtKToKICAgICAgICAgICAgICAgICByZXZpc2lvbj1wYXJzZWRfY29tbWl0LnJl dmlzaW9uLAogICAgICAgICAgICAgICAgIGlkZW50aWZpZXI9cGFyc2VkX2NvbW1pdC5pZGVudGlm aWVyLAogICAgICAgICAgICAgICAgIGJyYW5jaD1wYXJzZWRfY29tbWl0LmJyYW5jaCwKKyAgICAg ICAgICAgICAgICBpbmNsdWRlX2xvZz1pbmNsdWRlX2xvZywKICAgICAgICAgICAgICkKIAogICAg ICAgICBvdXRwdXQgPSBydW4oCkBAIC0yODcsNyArMjg5LDcgQEAgY2xhc3MgR2l0KFNjbSk6CiAg ICAgICAgICkKICAgICAgICAgaWYgb3V0cHV0LnJldHVybmNvZGU6CiAgICAgICAgICAgICByYWlz ZSBWYWx1ZUVycm9yKCIne30nIGlzIG5vdCBhbiBhcmd1bWVudCByZWNvZ25pemVkIGJ5IGdpdCIu Zm9ybWF0KGFyZ3VtZW50KSkKLSAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0KGhhc2g9b3V0cHV0 LnN0ZG91dC5yc3RyaXAoKSkKKyAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0KGhhc2g9b3V0cHV0 LnN0ZG91dC5yc3RyaXAoKSwgaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2cpCiAKICAgICBkZWYgY2hl Y2tvdXQoc2VsZiwgYXJndW1lbnQpOgogICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShhcmd1bWVu dCwgc2l4LnN0cmluZ190eXBlcyk6CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CShyZXZp c2lvbiAyNzAzMjQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTI1Nyw3ICsyNTcsNyBAQCBj bGFzcyBTdm4oU2NtKToKICAgICAgICAgICAgIHJldHVybiBwYXJ0aWFsWzE6XS5yc3RyaXAoJy8n KQogICAgICAgICByZXR1cm4gY2FuZGlkYXRlCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9 Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5v bmUpOgorICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVu dGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVkZV9sb2c9VHJ1ZSk6CiAg ICAgICAgIGlmIGhhc2g6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdTVk4gZG9lcyBu b3Qgc3VwcG9ydCBHaXQgaGFzaGVzJykKIApAQCAtMzYxLDkgKzM2MSw5IEBAIGNsYXNzIFN2bihT Y20pOgogICAgICAgICBsb2cgPSBydW4oCiAgICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCks ICdsb2cnLCAnLWwnLCAnMScsICctcicsIHN0cihyZXZpc2lvbiksIGJyYW5jaF9hcmddLCBjd2Q9 c2VsZi5yb290X3BhdGgsCiAgICAgICAgICAgICBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGlu Zz0ndXRmLTgnLAotICAgICAgICApCi0gICAgICAgIHNwbGl0X2xvZyA9IGxvZy5zdGRvdXQuc3Bs aXRsaW5lcygpCi0gICAgICAgIGlmIG5vdCBsb2cucmV0dXJuY29kZSBvciBsZW4oc3BsaXRfbG9n KSA+PSAzOgorICAgICAgICApIGlmIGluY2x1ZGVfbG9nIGVsc2UgTm9uZQorICAgICAgICBzcGxp dF9sb2cgPSBsb2cuc3Rkb3V0LnNwbGl0bGluZXMoKSBpZiBsb2cgZWxzZSBbXQorICAgICAgICBp ZiBsb2cgYW5kIChub3QgbG9nLnJldHVybmNvZGUgb3IgbGVuKHNwbGl0X2xvZykgPj0gMyk6CiAg ICAgICAgICAgICBhdXRob3JfbGluZSA9IHNwbGl0X2xvZ1sxXQogICAgICAgICAgICAgZm9yIGxp bmUgaW4gc3BsaXRfbG9nWzI6OF06CiAgICAgICAgICAgICAgICAgaWYgQ29udHJpYnV0b3IuU1ZO X1BBVENIX0ZST01fUkUubWF0Y2gobGluZSk6CkBAIC0zNzMsMTUgKzM3MywxNiBAQCBjbGFzcyBT dm4oU2NtKToKICAgICAgICAgICAgIGF1dGhvciA9IENvbnRyaWJ1dG9yLmZyb21fc2NtX2xvZyhh dXRob3JfbGluZSkKICAgICAgICAgICAgIG1lc3NhZ2UgPSAnXG4nLmpvaW4oc3BsaXRfbG9nWzM6 LTFdKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5sb2coJ0ZhaWxlZCB0byBjb25u ZWN0IHRvIHJlbW90ZSwgY2Fubm90IGNvbXB1dGUgY29tbWl0IG1lc3NhZ2UnKQotICAgICAgICAg ICAgZW1haWwgPSBpbmZvWydMYXN0IENoYW5nZWQgQXV0aG9yJ10KKyAgICAgICAgICAgIGlmIGlu Y2x1ZGVfbG9nOgorICAgICAgICAgICAgICAgIHNlbGYubG9nKCdGYWlsZWQgdG8gY29ubmVjdCB0 byByZW1vdGUsIGNhbm5vdCBjb21wdXRlIGNvbW1pdCBtZXNzYWdlJykKKyAgICAgICAgICAgIGVt YWlsID0gaW5mby5nZXQoJ0xhc3QgQ2hhbmdlZCBBdXRob3InKQogICAgICAgICAgICAgYXV0aG9y ID0gQ29udHJpYnV0b3IuYnlfZW1haWwuZ2V0KAogICAgICAgICAgICAgICAgIGVtYWlsLAogICAg ICAgICAgICAgICAgIENvbnRyaWJ1dG9yLmJ5X25hbWUuZ2V0KAogICAgICAgICAgICAgICAgICAg ICBlbWFpbCwKICAgICAgICAgICAgICAgICAgICAgQ29udHJpYnV0b3IobmFtZT1lbWFpbCwgZW1h aWxzPVtlbWFpbF0pLAogICAgICAgICAgICAgICAgICksCi0gICAgICAgICAgICApCisgICAgICAg ICAgICApIGlmIGVtYWlsIGVsc2UgTm9uZQogICAgICAgICAgICAgbWVzc2FnZSA9IE5vbmUKIAog ICAgICAgICByZXR1cm4gQ29tbWl0KApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CShy ZXZpc2lvbiAyNzAzMjQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS9yZW1vdGUvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzksNyArMTM5LDcg QEAgY2xhc3MgU3ZuKFNjbSk6CiAKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgICdMYXN0 IENoYW5nZWQgUmV2JzogcmVzcG9uc2VbJ2xwMTp2ZXJzaW9uLW5hbWUnXSwKLSAgICAgICAgICAg ICdMYXN0IENoYW5nZWQgQXV0aG9yJzogcmVzcG9uc2VbJ2xwMTpjcmVhdG9yLWRpc3BsYXluYW1l J10sCisgICAgICAgICAgICAnTGFzdCBDaGFuZ2VkIEF1dGhvcic6IHJlc3BvbnNlLmdldCgnbHAx OmNyZWF0b3ItZGlzcGxheW5hbWUnKSwKICAgICAgICAgICAgICdMYXN0IENoYW5nZWQgRGF0ZSc6 ICcgJy5qb2luKHJlc3BvbnNlWydscDE6Y3JlYXRpb25kYXRlJ10uc3BsaXQoJ1QnKSkuc3BsaXQo Jy4nKVswXSwKICAgICAgICAgICAgICdSZXZpc2lvbic6IHJldmlzaW9uLAogICAgICAgICB9CkBA IC0zMTUsNyArMzE1LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICByZXR1cm4gbGVu KHNlbGYuX21ldGFkYXRhX2NhY2hlW2JyYW5jaF0pCiAgICAgICAgIHJldHVybiBzZWxmLl9jb21t aXRfY291bnQocmV2aXNpb249c2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXVswXSwgYnJhbmNo PXNlbGYuZGVmYXVsdF9icmFuY2gpCiAKLSAgICBkZWYgY29tbWl0KHNlbGYsIGhhc2g9Tm9uZSwg cmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFuY2g9Tm9uZSwgdGFnPU5vbmUpOgor ICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVy PU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVkZV9sb2c9VHJ1ZSk6CiAgICAgICAg IGlmIGhhc2g6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdTVk4gZG9lcyBub3Qgc3Vw cG9ydCBHaXQgaGFzaGVzJykKIApAQCAtMzY4LDcgKzM2OCw3IEBAIGNsYXNzIFN2bihTY20pOgog ICAgICAgICAgICAgaWYgdGFnOgogICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0Nh bm5vdCBkZWZpbmUgYm90aCB0YWcgYW5kIHJldmlzaW9uJykKICAgICAgICAgICAgIHJldmlzaW9u ID0gQ29tbWl0Ll9wYXJzZV9yZXZpc2lvbihyZXZpc2lvbiwgZG9fYXNzZXJ0PVRydWUpCi0gICAg ICAgICAgICBicmFuY2ggPSBzZWxmLl9icmFuY2hfZm9yKHJldmlzaW9uKQorICAgICAgICAgICAg YnJhbmNoID0gc2VsZi5fYnJhbmNoX2ZvcihyZXZpc2lvbikgb3Igc2VsZi5kZWZhdWx0X2JyYW5j aAogICAgICAgICAgICAgaW5mbyA9IHNlbGYuaW5mbyhjYWNoZWQ9VHJ1ZSwgYnJhbmNoPWJyYW5j aCwgcmV2aXNpb249cmV2aXNpb24pCiAKICAgICAgICAgZWxzZToKQEAgLTQxMSwyMSArNDExLDIw IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgICAgICAgICAnPFM6ZW5kLXJldmlzaW9u PntyZXZpc2lvbn08L1M6ZW5kLXJldmlzaW9uPlxuJwogICAgICAgICAgICAgICAgICAgICAnPFM6 bGltaXQ+MTwvUzpsaW1pdD5cbicKICAgICAgICAgICAgICAgICAgICAgJzwvUzpsb2ctcmVwb3J0 PlxuJy5mb3JtYXQocmV2aXNpb249cmV2aXNpb24pLAotICAgICAgICApCisgICAgICAgICkgaWYg aW5jbHVkZV9sb2cgZWxzZSBOb25lCiAKLSAgICAgICAgaWYgcmVzcG9uc2Uuc3RhdHVzX2NvZGUg PT0gMjAwOgorICAgICAgICBpZiByZXNwb25zZSBhbmQgcmVzcG9uc2Uuc3RhdHVzX2NvZGUgPT0g MjAwOgogICAgICAgICAgICAgcmVzcG9uc2UgPSB4bWx0b2RpY3QucGFyc2UocmVzcG9uc2UudGV4 dCkKICAgICAgICAgICAgIHJlc3BvbnNlID0gcmVzcG9uc2UuZ2V0KCdTOmxvZy1yZXBvcnQnLCB7 fSkuZ2V0KCdTOmxvZy1pdGVtJykKIAogICAgICAgICAgICAgbmFtZSA9IHJlc3BvbnNlLmdldCgn RDpjcmVhdG9yLWRpc3BsYXluYW1lJykKICAgICAgICAgICAgIG1lc3NhZ2UgPSByZXNwb25zZS5n ZXQoJ0Q6Y29tbWVudCcsIE5vbmUpCi0gICAgICAgICAgICBpZiBub3QgbmFtZToKLSAgICAgICAg ICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIGZpbmQgY3JlYXRvciBuYW1l JykKIAogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5sb2coJ0ZhaWxlZCB0byBjb25u ZWN0IHRvIHJlbW90ZSwgY2Fubm90IGNvbXB1dGUgY29tbWl0IG1lc3NhZ2UnKQorICAgICAgICAg ICAgaWYgaW5jbHVkZV9sb2c6CisgICAgICAgICAgICAgICAgc2VsZi5sb2coJ0ZhaWxlZCB0byBj b25uZWN0IHRvIHJlbW90ZSwgY2Fubm90IGNvbXB1dGUgY29tbWl0IG1lc3NhZ2UnKQogICAgICAg ICAgICAgbWVzc2FnZSA9IE5vbmUKLSAgICAgICAgICAgIG5hbWUgPSBpbmZvWydMYXN0IENoYW5n ZWQgQXV0aG9yJ10KKyAgICAgICAgICAgIG5hbWUgPSBpbmZvLmdldCgnTGFzdCBDaGFuZ2VkIEF1 dGhvcicpCiAKICAgICAgICAgYXV0aG9yID0gQ29udHJpYnV0b3IuYnlfZW1haWwuZ2V0KAogICAg ICAgICAgICAgbmFtZSwKQEAgLTQzMyw3ICs0MzIsNyBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAg ICAgICAgICAgICBuYW1lLAogICAgICAgICAgICAgICAgIENvbnRyaWJ1dG9yKG5hbWU9bmFtZSwg ZW1haWxzPVtuYW1lXSBpZiAnQCcgaW4gbmFtZSBlbHNlIFtdKSwKICAgICAgICAgICAgICksCi0g ICAgICAgICkKKyAgICAgICAgKSBpZiBuYW1lIGVsc2UgTm9uZQogCiAgICAgICAgIHJldHVybiBD b21taXQoCiAgICAgICAgICAgICByZXZpc2lvbj1pbnQocmV2aXNpb24pLApJbmRleDogVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvZmluZF91bml0dGVzdC5weQkocmV2aXNpb24gMjcwMzI0KQorKysg VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5k X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xOTAsMyArMTkwLDE5IEBAIEhhc2g6IDFh YmUyNWI0NDNlOQogICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAogICAgICAgICAgICAg KSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUoKSwg JzIuMkBicmFuY2gtYSB8IDYyMTY1MmFkZDdmYywgcjcgfCA3dGggY29tbWl0XG4nKQorCisgICAg ZGVmIHRlc3Rfbm9fbG9nX3N2bihzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQo KSwgbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCksIE1vY2tUaW1lLCBPdXRwdXRDYXB0dXJlKCkg YXMgY2FwdHVyZWQ6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFp bigKKyAgICAgICAgICAgICAgICBhcmdzPSgnZmluZCcsICd0cnVuaycsICctLW5vLWxvZycsICct cScpLAorICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAgICAgICAgKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUoKSwgJzRAdHJ1 bmsgfCByNlxuJykKKworICAgIGRlZiB0ZXN0X25vX2xvZ19naXQoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKSwgbW9ja3MubG9jYWwu U3ZuKCksIE1vY2tUaW1lLCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQ6CisgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKDAsIHByb2dyYW0ubWFpbigKKyAgICAgICAgICAgICAgICBhcmdz PSgnZmluZCcsICdtYWluJywgJy0tbm8tbG9nJywgJy1xJyksCisgICAgICAgICAgICAgICAgcGF0 aD1zZWxmLnBhdGgsCisgICAgICAgICAgICApKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNh cHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLCAnNEBtYWluIHwgYmFlNWQxZTkwOTk5LCByNlxuJykK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy NzAzMjQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjM4LDMgKzIzOCw4IEBA IGNsYXNzIFRlc3RHaXQodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCgnNjIxNjUyYWRkN2ZjNDE2MDk5YmQyMDYzMzY2Y2MzOGZmNjFhZmUzNics IHJlcG9zaXRvcnkuY2hlY2tvdXQoJ3RhZy0xJykuaGFzaCkKICAgICAgICAgICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCc2MjE2NTJhZGQ3ZmM0MTYwOTliZDIwNjMzNjZjYzM4ZmY2MWFmZTM2Jywg cmVwb3NpdG9yeS5jb21taXQoKS5oYXNoKQorCisgICAgZGVmIHRlc3Rfbm9fbG9nKHNlbGYpOgor ICAgICAgICBmb3IgbW9jayBpbiBbbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCksIG1vY2tzLmxv Y2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1ZSldOgorICAgICAgICAgICAgd2l0aCBtb2Nr OgorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKGxvY2FsLkdpdChzZWxmLnBhdGgp LmNvbW1pdChpZGVudGlmaWVyPSc0QG1haW4nLCBpbmNsdWRlX2xvZz1GYWxzZSkubWVzc2FnZSkK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rl c3Qvc3ZuX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy NzAzMjQpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L3N2bl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjE4LDYgKzIxOCwxMCBA QCBjbGFzcyBUZXN0TG9jYWxTdm4odW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCg5LCByZXBvc2l0b3J5LmNoZWNrb3V0KCd0YWctMScpLnJldmlzaW9uKQog ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg5LCByZXBvc2l0b3J5LmNvbW1pdCgpLnJldmlz aW9uKQogCisgICAgZGVmIHRlc3Rfbm9fbG9nKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxv Y2FsLlN2bihzZWxmLnBhdGgpLCBPdXRwdXRDYXB0dXJlKCk6CisgICAgICAgICAgICBzZWxmLmFz c2VydElzTm9uZShsb2NhbC5Tdm4oc2VsZi5wYXRoKS5jb21taXQoaWRlbnRpZmllcj0nNEB0cnVu aycsIGluY2x1ZGVfbG9nPUZhbHNlKS5tZXNzYWdlKQorCiAKIGNsYXNzIFRlc3RSZW1vdGVTdm4o dW5pdHRlc3QuVGVzdENhc2UpOgogICAgIHJlbW90ZSA9ICdodHRwczovL3N2bi53ZWJraXQub3Jn L3JlcG9zaXRvcnkvd2Via2l0JwpAQCAtMzAxLDMgKzMwNSw3IEBAIGNsYXNzIFRlc3RSZW1vdGVT dm4odW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X3RhZ19wcmV2aW91cyhzZWxmKToK ICAgICAgICAgd2l0aCBtb2Nrcy5yZW1vdGUuU3ZuKCk6CiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKDcsIHJlbW90ZS5Tdm4oc2VsZi5yZW1vdGUpLmNvbW1pdChpZGVudGlmaWVyPScyLjJA dGFncy90YWctMScpLnJldmlzaW9uKQorCisgICAgZGVmIHRlc3Rfbm9fbG9nKHNlbGYpOgorICAg ICAgICB3aXRoIG1vY2tzLnJlbW90ZS5Tdm4oKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNO b25lKHJlbW90ZS5Tdm4oc2VsZi5yZW1vdGUpLmNvbW1pdChpZGVudGlmaWVyPSc0QHRydW5rJywg aW5jbHVkZV9sb2c9RmFsc2UpLm1lc3NhZ2UpCg== 415235 2020-12-02 11:02:18 -0800 2020-12-02 11:30:05 -0800 Patch for landing bug-219409-20201202130216.patch text/plain 19101 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDM1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM1IEBACisyMDIwLTEyLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFByb3ZpZGUgc3dpdGNoIHRvIGV4Y2x1ZGUgY29t bWl0IG1lc3NhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxOTQwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzE4NjY0NDU+CisKKyAgICAgICAg UnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2Fs L2dpdC5weToKKyAgICAgICAgKEdpdC5jb21taXQpOiBQYXNzIC0tZm9ybWF0LXNob3J0IGlmIHRo ZSB1c2VyIGlzIG9wdGluZyBvdXQgb2YgdGhlIGNvbW1pdCBtZXNzYWdlLgorICAgICAgICAoR2l0 LmZpbmQpOiBBZGQgaW5jbHVkZV9sb2cgZmxhZywgcGFzcyB0byBjb21taXQoLi4uKSBmdW5jdGlv bi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9s b2NhbC9zdm4ucHk6CisgICAgICAgIChTdm4uY29tbWl0KTogU2tpcCBuZXR3b3JrIGNhbGwgdG8g cmV0cmlldmUgY29tbWl0IG1lc3NhZ2UgaWYgaW5jbHVkZV9sb2cgaXMgZmFsc2UuCisgICAgICAg ICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weToK KyAgICAgICAgKEZpbmQucGFyc2VyKTogQWRkIC0tbG9nIGFuZCAtLW5vLWxvZyBmbGFncy4KKyAg ICAgICAgKEZpbmQubWFpbik6IEFsbG93IHVzZXIgdG8gc2tpcCBuZXR3b3JrIGNhbGwgdG8gcmV0 cmlldmUgY29tbWl0IG1lc3NhZ2UuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvcmVtb3RlL3N2bi5weToKKyAgICAgICAgKFN2bi5pbmZvKTogU3Vw cG9ydCBjYXNlIHdlcmUgU1ZOIGNhbm5vdCBkZXRlcm1pbmUgdGhlIGF1dGhvci4KKyAgICAgICAg KFN2bi5jb21taXQpOiBTa2lwIG5ldHdvcmsgY2FsbCB0byByZXRyaWV2ZSBjb21taXQgbWVzc2Fn ZSBpZiBpbmNsdWRlX2xvZyBpcyBmYWxzZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS9zY21fYmFzZS5weToKKyAgICAgICAgKFNjbUJhc2UuY29t bWl0KTogQWRkIGluY2x1ZGVfbG9nIGZsYWcuCisgICAgICAgIChTY21CYXNlLmZpbmQpOiBBZGQg aW5jbHVkZV9sb2cgZmxhZywgcGFzcyB0byBjb21taXQoLi4uKSBmdW5jdGlvbi4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0RmluZC50ZXN0X25vX2xvZ19zdm4pOgorICAgICAgICAo VGVzdEZpbmQudGVzdF9ub19sb2dfZ2l0KToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weToKKyAgICAgICAgKFRl c3RHaXQudGVzdF9ub19sb2cpOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdExvY2Fs U3ZuLnRlc3Rfbm9fbG9nKToKKyAgICAgICAgKFRlc3RSZW1vdGVTdm4udGVzdF9ub19sb2cpOgor CiAyMDIwLTEyLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAg ICAgICBbd2Via2l0c2NtcHldIEhhbmRsZSBhZGRpbmcsIG1vZGlmeWluZyBhbmQgZGVsZXRpbmcg ZmlsZXMgb24gYnJhbmNoZXMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAy NzAzNTMpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9fX2luaXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1w b3J0RXJyb3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlw IGluc3RhbGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVS TD5gIgogICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgNCwgMikKK3ZlcnNpb24gPSBWZXJz aW9uKDAsIDQsIDMpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2RhdGV1dGlsJywg VmVyc2lvbigyLCA4LCAxKSwgcHlwaV9uYW1lPSdweXRob24tZGF0ZXV0aWwnKSkKIEF1dG9JbnN0 YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNpb24oMCwgMTUsIDApKSkKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Byb2dy YW0ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvcHJvZ3JhbS5weQkocmV2aXNpb24gMjcwMzUzKQorKysgVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvcHJvZ3JhbS5weQkod29ya2luZyBj b3B5KQpAQCAtNTQsMTcgKzU0LDI1IEBAIGNsYXNzIEZpbmQoQ29tbWFuZCk6CiAKICAgICBAY2xh c3NtZXRob2QKICAgICBkZWYgcGFyc2VyKGNscywgcGFyc2VyLCBsb2dnZXJzPU5vbmUpOgotICAg ICAgICBhcmd1bWVudHMuTG9nZ2luZ0dyb3VwKAorICAgICAgICBvdXRwdXRfYXJncyA9IGFyZ3Vt ZW50cy5Mb2dnaW5nR3JvdXAoCiAgICAgICAgICAgICBwYXJzZXIsCiAgICAgICAgICAgICBsb2dn ZXJzPWxvZ2dlcnMsCiAgICAgICAgICAgICBoZWxwPSd7fSBhbW91bnQgb2YgbG9nZ2luZyBhbmQg Y29tbWl0IGluZm9ybWF0aW9uIGRpc3BsYXllZCcKLSAgICAgICAgKS5hZGRfYXJndW1lbnQoCisg ICAgICAgICkKKyAgICAgICAgb3V0cHV0X2FyZ3MuYWRkX2FyZ3VtZW50KAogICAgICAgICAgICAg Jy0tanNvbicsICctaicsCiAgICAgICAgICAgICBoZWxwPSdDb252ZXJ0IHRoZSBjb21taXQgdG8g YSBtYWNoaW5lLXJlYWRhYmxlIEpTT04gb2JqZWN0JywKICAgICAgICAgICAgIGFjdGlvbj0nc3Rv cmVfdHJ1ZScsCiAgICAgICAgICAgICBkZXN0PSdqc29uJywKICAgICAgICAgICAgIGRlZmF1bHQ9 RmFsc2UsCiAgICAgICAgICkKKyAgICAgICAgb3V0cHV0X2FyZ3MuYWRkX2FyZ3VtZW50KAorICAg ICAgICAgICAgJy0tbG9nJywgJy0tbm8tbG9nJywKKyAgICAgICAgICAgIGhlbHA9J0luY2x1ZGUg dGhlIGNvbW1pdCBtZXNzYWdlIGZvciB0aGUgcmVxdWVzdGVkIGNvbW1pdCcsCisgICAgICAgICAg ICBhY3Rpb249YXJndW1lbnRzLk5vQWN0aW9uLAorICAgICAgICAgICAgZGVzdD0naW5jbHVkZV9s b2cnLAorICAgICAgICAgICAgZGVmYXVsdD1UcnVlLAorICAgICAgICApCiAKICAgICAgICAgcGFy c2VyLmFkZF9hcmd1bWVudCgKICAgICAgICAgICAgICdhcmd1bWVudCcsIG5hcmdzPTEsCkBAIC03 NSw3ICs4Myw3IEBAIGNsYXNzIEZpbmQoQ29tbWFuZCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAg ZGVmIG1haW4oY2xzLCBhcmdzLCByZXBvc2l0b3J5KToKICAgICAgICAgdHJ5OgotICAgICAgICAg ICAgY29tbWl0ID0gcmVwb3NpdG9yeS5maW5kKGFyZ3MuYXJndW1lbnRbMF0pCisgICAgICAgICAg ICBjb21taXQgPSByZXBvc2l0b3J5LmZpbmQoYXJncy5hcmd1bWVudFswXSwgaW5jbHVkZV9sb2c9 YXJncy5pbmNsdWRlX2xvZykKICAgICAgICAgZXhjZXB0IChsb2NhbC5TY20uRXhjZXB0aW9uLCBW YWx1ZUVycm9yKSBhcyBleGNlcHRpb246CiAgICAgICAgICAgICAjIFZhbHVlRXJyb3JzIGFuZCBT Y20gZXhjZXB0aW9ucyB1c3VhbGx5IGNvbnRhaW4gZW5vdWdoIGluZm9ybWF0aW9uIHRvIGJlIGRp c3BsYXllZAogICAgICAgICAgICAgIyB0byB0aGUgdXNlciBhcyBhbiBlcnJvcgpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvc2NtX2Jhc2UucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvc2NtX2Jhc2UucHkJKHJldmlzaW9uIDI3MDM1MykKKysrIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3NjbV9iYXNlLnB5CSh3b3JraW5nIGNvcHkp CkBAIC02Myw3ICs2Myw3IEBAIGNsYXNzIFNjbUJhc2Uob2JqZWN0KToKICAgICBkZWYgdGFncyhz ZWxmKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigpCiAKLSAgICBkZWYgY29t bWl0KHNlbGYsIGhhc2g9Tm9uZSwgcmV2aXNpb249Tm9uZSwgaWRlbnRpZmllcj1Ob25lLCBicmFu Y2g9Tm9uZSwgdGFnPU5vbmUpOgorICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZp c2lvbj1Ob25lLCBpZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSwgaW5jbHVk ZV9sb2c9VHJ1ZSk6CiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IoKQogCiAgICAg ZGVmIHByaW9yaXRpemVfYnJhbmNoZXMoc2VsZiwgYnJhbmNoZXMpOgpAQCAtODUsNyArODUsNyBA QCBjbGFzcyBTY21CYXNlKG9iamVjdCk6CiAgICAgICAgICAgICBmaWx0ZXJlZF9jYW5kaWRhdGVz ID0gYnJhbmNoZXMKICAgICAgICAgcmV0dXJuIHNvcnRlZChmaWx0ZXJlZF9jYW5kaWRhdGVzKVsw XQogCi0gICAgZGVmIGZpbmQoc2VsZiwgYXJndW1lbnQpOgorICAgIGRlZiBmaW5kKHNlbGYsIGFy Z3VtZW50LCBpbmNsdWRlX2xvZz1UcnVlKToKICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoYXJn dW1lbnQsIHNpeC5zdHJpbmdfdHlwZXMpOgogICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigi RXhwZWN0ZWQgJ2FyZ3VtZW50JyB0byBiZSBhIHN0cmluZywgbm90ICd7fSciLmZvcm1hdCh0eXBl KGFyZ3VtZW50KSkpCiAKQEAgLTk4LDEzICs5OCwxMyBAQCBjbGFzcyBTY21CYXNlKG9iamVjdCk6 CiAgICAgICAgICAgICBhcmd1bWVudCA9IGFyZ3VtZW50LnNwbGl0KCd+JylbMF0KIAogICAgICAg ICBpZiBhcmd1bWVudCA9PSAnSEVBRCc6Ci0gICAgICAgICAgICByZXN1bHQgPSBzZWxmLmNvbW1p dCgpCisgICAgICAgICAgICByZXN1bHQgPSBzZWxmLmNvbW1pdChpbmNsdWRlX2xvZz1pbmNsdWRl X2xvZykKIAogICAgICAgICBlbGlmIGFyZ3VtZW50IGluIHNlbGYuYnJhbmNoZXM6Ci0gICAgICAg ICAgICByZXN1bHQgPSBzZWxmLmNvbW1pdChicmFuY2g9YXJndW1lbnQpCisgICAgICAgICAgICBy ZXN1bHQgPSBzZWxmLmNvbW1pdChicmFuY2g9YXJndW1lbnQsIGluY2x1ZGVfbG9nPWluY2x1ZGVf bG9nKQogCiAgICAgICAgIGVsaWYgYXJndW1lbnQgaW4gc2VsZi50YWdzOgotICAgICAgICAgICAg cmVzdWx0ID0gc2VsZi5jb21taXQodGFnPWFyZ3VtZW50KQorICAgICAgICAgICAgcmVzdWx0ID0g c2VsZi5jb21taXQodGFnPWFyZ3VtZW50LCBpbmNsdWRlX2xvZz1pbmNsdWRlX2xvZykKIAogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgaWYgb2Zmc2V0OgpAQCAtMTE2LDYgKzExNiw3IEBAIGNs YXNzIFNjbUJhc2Uob2JqZWN0KToKICAgICAgICAgICAgICAgICByZXZpc2lvbj1wYXJzZWRfY29t bWl0LnJldmlzaW9uLAogICAgICAgICAgICAgICAgIGlkZW50aWZpZXI9cGFyc2VkX2NvbW1pdC5p ZGVudGlmaWVyLAogICAgICAgICAgICAgICAgIGJyYW5jaD1wYXJzZWRfY29tbWl0LmJyYW5jaCwK KyAgICAgICAgICAgICAgICBpbmNsdWRlX2xvZz1pbmNsdWRlX2xvZywKICAgICAgICAgICAgICkK IAogICAgICAgICBpZiBub3Qgb2Zmc2V0OgpAQCAtMTI0LDYgKzEyNSw3IEBAIGNsYXNzIFNjbUJh c2Uob2JqZWN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuY29tbWl0KAogICAgICAgICAgICAgaWRl bnRpZmllcj1yZXN1bHQuaWRlbnRpZmllciAtIG9mZnNldCwKICAgICAgICAgICAgIGJyYW5jaD1y ZXN1bHQuYnJhbmNoLAorICAgICAgICAgICAgaW5jbHVkZV9sb2c9aW5jbHVkZV9sb2csCiAgICAg ICAgICkKIAogICAgIEBjbGFzc21ldGhvZApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQko cmV2aXNpb24gMjcwMzUzKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNyArMTUxLDcg QEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgIHJlc3VsdCA9IFticmFuY2gubHN0cmlwKCcgKicp IGZvciBicmFuY2ggaW4gZmlsdGVyKGxhbWJkYSBicmFuY2g6ICctPicgbm90IGluIGJyYW5jaCwg YnJhbmNoLnN0ZG91dC5zcGxpdGxpbmVzKCkpXQogICAgICAgICByZXR1cm4gc29ydGVkKHNldChb Jy8nLmpvaW4oYnJhbmNoLnNwbGl0KCcvJylbMjpdKSBpZiBicmFuY2guc3RhcnRzd2l0aCgncmVt b3Rlcy9vcmlnaW4vJykgZWxzZSBicmFuY2ggZm9yIGJyYW5jaCBpbiByZXN1bHRdKSkKIAotICAg IGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlmaWVyPU5v bmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSk6CisgICAgZGVmIGNvbW1pdChzZWxmLCBoYXNoPU5v bmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRhZz1Ob25l LCBpbmNsdWRlX2xvZz1UcnVlKToKICAgICAgICAgaWYgcmV2aXNpb24gYW5kIG5vdCBzZWxmLmlz X3N2bjoKICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhjZXB0aW9uKCdUaGlzIGdpdCBjaGVja291 dCBkb2VzIG5vdCBzdXBwb3J0IFNWTiByZXZpc2lvbnMnKQogICAgICAgICBlbGlmIHJldmlzaW9u OgpAQCAtMTcyLDYgKzE3Miw3IEBAIGNsYXNzIEdpdChTY20pOgogCiAgICAgICAgIGRlZmF1bHRf YnJhbmNoID0gc2VsZi5kZWZhdWx0X2JyYW5jaAogICAgICAgICBwYXJzZWRfYnJhbmNoX3BvaW50 ID0gTm9uZQorICAgICAgICBsb2dfZm9ybWF0ID0gWyctMSddIGlmIGluY2x1ZGVfbG9nIGVsc2Ug WyctMScsICctLWZvcm1hdD1zaG9ydCddCiAKICAgICAgICAgaWYgaWRlbnRpZmllciBpcyBub3Qg Tm9uZToKICAgICAgICAgICAgIGlmIHJldmlzaW9uOgpAQCAtMjA0LDcgKzIwNSw3IEBAIGNsYXNz IEdpdChTY20pOgogICAgICAgICAgICAgaWYgaWRlbnRpZmllciA+IGJhc2VfY291bnQ6CiAgICAg ICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0lkZW50aWZpZXIge30gY2Fubm90IGJl IGZvdW5kIG9uIHRoZSBzcGVjaWZpZWQgYnJhbmNoIGluIHRoZSBjdXJyZW50IGNoZWNrb3V0Jy5m b3JtYXQoaWRlbnRpZmllcikpCiAgICAgICAgICAgICBsb2cgPSBydW4oCi0gICAgICAgICAgICAg ICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgJ3t9fnt9Jy5mb3JtYXQoYnJhbmNoIG9yICdI RUFEJywgYmFzZV9jb3VudCAtIGlkZW50aWZpZXIpLCAnLTEnXSwKKyAgICAgICAgICAgICAgICBb c2VsZi5leGVjdXRhYmxlKCksICdsb2cnLCAne31+e30nLmZvcm1hdChicmFuY2ggb3IgJ0hFQUQn LCBiYXNlX2NvdW50IC0gaWRlbnRpZmllcildICsgbG9nX2Zvcm1hdCwKICAgICAgICAgICAgICAg ICBjd2Q9c2VsZi5yb290X3BhdGgsCiAgICAgICAgICAgICAgICAgY2FwdHVyZV9vdXRwdXQ9VHJ1 ZSwKICAgICAgICAgICAgICAgICBlbmNvZGluZz0ndXRmLTgnLApAQCAtMjI0LDEzICsyMjUsMTMg QEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICBpZiBicmFuY2ggYW5kIHRhZzoKICAgICAg ICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdDYW5ub3QgZGVmaW5lIGJvdGggdGFnIGFuZCBi cmFuY2gnKQogCi0gICAgICAgICAgICBsb2cgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9n JywgYnJhbmNoIG9yIHRhZywgJy0xJ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRw dXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKKyAgICAgICAgICAgIGxvZyA9IHJ1bihbc2VsZi5l eGVjdXRhYmxlKCksICdsb2cnLCBicmFuY2ggb3IgdGFnXSArIGxvZ19mb3JtYXQsIGN3ZD1zZWxm LnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKICAgICAg ICAgICAgIGlmIGxvZy5yZXR1cm5jb2RlOgogICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhj ZXB0aW9uKCJGYWlsZWQgdG8gcmV0cmlldmUgY29tbWl0IGluZm9ybWF0aW9uIGZvciAne30nIi5m b3JtYXQoYnJhbmNoIG9yIHRhZykpCiAKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGhhc2gg PSBDb21taXQuX3BhcnNlX2hhc2goaGFzaCwgZG9fYXNzZXJ0PVRydWUpCi0gICAgICAgICAgICBs b2cgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgaGFzaCBvciAnSEVBRCcsICctMSdd LCBjd2Q9c2VsZi5yb290X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYt OCcpCisgICAgICAgICAgICBsb2cgPSBydW4oW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgaGFz aCBvciAnSEVBRCddICsgbG9nX2Zvcm1hdCwgY3dkPXNlbGYucm9vdF9wYXRoLCBjYXB0dXJlX291 dHB1dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQogICAgICAgICAgICAgaWYgbG9nLnJldHVybmNv ZGU6CiAgICAgICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oIkZhaWxlZCB0byByZXRy aWV2ZSBjb21taXQgaW5mb3JtYXRpb24gZm9yICd7fSciLmZvcm1hdChoYXNoIG9yICdIRUFEJykp CiAKQEAgLTI2NSwxMCArMjY2LDEwIEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgYnJh bmNoPWJyYW5jaCwKICAgICAgICAgICAgIHRpbWVzdGFtcD1pbnQoY29tbWl0X3RpbWUuc3Rkb3V0 LmxzdHJpcCgpKSwKICAgICAgICAgICAgIGF1dGhvcj1Db250cmlidXRvci5mcm9tX3NjbV9sb2co bG9nLnN0ZG91dC5zcGxpdGxpbmVzKClbMV0pLAotICAgICAgICAgICAgbWVzc2FnZT0nXG4nLmpv aW4obGluZVs0Ol0gZm9yIGxpbmUgaW4gbG9nLnN0ZG91dC5zcGxpdGxpbmVzKClbNDpdKSwKKyAg ICAgICAgICAgIG1lc3NhZ2U9J1xuJy5qb2luKGxpbmVbNDpdIGZvciBsaW5lIGluIGxvZy5zdGRv dXQuc3BsaXRsaW5lcygpWzQ6XSkgaWYgaW5jbHVkZV9sb2cgZWxzZSBOb25lLAogICAgICAgICAp CiAKLSAgICBkZWYgZmluZChzZWxmLCBhcmd1bWVudCk6CisgICAgZGVmIGZpbmQoc2VsZiwgYXJn dW1lbnQsIGluY2x1ZGVfbG9nPVRydWUpOgogICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShhcmd1 bWVudCwgc2l4LnN0cmluZ190eXBlcyk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJF eHBlY3RlZCAnYXJndW1lbnQnIHRvIGJlIGEgc3RyaW5nLCBub3QgJ3t9JyIuZm9ybWF0KHR5cGUo YXJndW1lbnQpKSkKIApAQCAtMjc5LDYgKzI4MCw3IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAg ICAgICAgICAgIHJldmlzaW9uPXBhcnNlZF9jb21taXQucmV2aXNpb24sCiAgICAgICAgICAgICAg ICAgaWRlbnRpZmllcj1wYXJzZWRfY29tbWl0LmlkZW50aWZpZXIsCiAgICAgICAgICAgICAgICAg YnJhbmNoPXBhcnNlZF9jb21taXQuYnJhbmNoLAorICAgICAgICAgICAgICAgIGluY2x1ZGVfbG9n PWluY2x1ZGVfbG9nLAogICAgICAgICAgICAgKQogCiAgICAgICAgIG91dHB1dCA9IHJ1bigKQEAg LTI4Nyw3ICsyODksNyBAQCBjbGFzcyBHaXQoU2NtKToKICAgICAgICAgKQogICAgICAgICBpZiBv dXRwdXQucmV0dXJuY29kZToKICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgaXMg bm90IGFuIGFyZ3VtZW50IHJlY29nbml6ZWQgYnkgZ2l0Ii5mb3JtYXQoYXJndW1lbnQpKQotICAg ICAgICByZXR1cm4gc2VsZi5jb21taXQoaGFzaD1vdXRwdXQuc3Rkb3V0LnJzdHJpcCgpKQorICAg ICAgICByZXR1cm4gc2VsZi5jb21taXQoaGFzaD1vdXRwdXQuc3Rkb3V0LnJzdHJpcCgpLCBpbmNs dWRlX2xvZz1pbmNsdWRlX2xvZykKIAogICAgIGRlZiBjaGVja291dChzZWxmLCBhcmd1bWVudCk6 CiAgICAgICAgIGlmIG5vdCBpc2luc3RhbmNlKGFyZ3VtZW50LCBzaXguc3RyaW5nX3R5cGVzKToK SW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xv Y2FsL3N2bi5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkJKHJldmlzaW9uIDI3MDM1MykKKysrIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQko d29ya2luZyBjb3B5KQpAQCAtMjU3LDcgKzI1Nyw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAg ICAgICAgcmV0dXJuIHBhcnRpYWxbMTpdLnJzdHJpcCgnLycpCiAgICAgICAgIHJldHVybiBjYW5k aWRhdGUKIAotICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBp ZGVudGlmaWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSk6CisgICAgZGVmIGNvbW1pdChz ZWxmLCBoYXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5v bmUsIHRhZz1Ob25lLCBpbmNsdWRlX2xvZz1UcnVlKToKICAgICAgICAgaWYgaGFzaDoKICAgICAg ICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ1NWTiBkb2VzIG5vdCBzdXBwb3J0IEdpdCBoYXNoZXMn KQogCkBAIC0zNjEsOSArMzYxLDkgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgIGxvZyA9IHJ1 bigKICAgICAgICAgICAgIFtzZWxmLmV4ZWN1dGFibGUoKSwgJ2xvZycsICctbCcsICcxJywgJy1y Jywgc3RyKHJldmlzaW9uKSwgYnJhbmNoX2FyZ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwKICAgICAg ICAgICAgIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcsCi0gICAgICAgICkK LSAgICAgICAgc3BsaXRfbG9nID0gbG9nLnN0ZG91dC5zcGxpdGxpbmVzKCkKLSAgICAgICAgaWYg bm90IGxvZy5yZXR1cm5jb2RlIG9yIGxlbihzcGxpdF9sb2cpID49IDM6CisgICAgICAgICkgaWYg aW5jbHVkZV9sb2cgZWxzZSBOb25lCisgICAgICAgIHNwbGl0X2xvZyA9IGxvZy5zdGRvdXQuc3Bs aXRsaW5lcygpIGlmIGxvZyBlbHNlIFtdCisgICAgICAgIGlmIGxvZyBhbmQgKG5vdCBsb2cucmV0 dXJuY29kZSBvciBsZW4oc3BsaXRfbG9nKSA+PSAzKToKICAgICAgICAgICAgIGF1dGhvcl9saW5l ID0gc3BsaXRfbG9nWzFdCiAgICAgICAgICAgICBmb3IgbGluZSBpbiBzcGxpdF9sb2dbMjo4XToK ICAgICAgICAgICAgICAgICBpZiBDb250cmlidXRvci5TVk5fUEFUQ0hfRlJPTV9SRS5tYXRjaChs aW5lKToKQEAgLTM3MywxNSArMzczLDE2IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAg YXV0aG9yID0gQ29udHJpYnV0b3IuZnJvbV9zY21fbG9nKGF1dGhvcl9saW5lKQogICAgICAgICAg ICAgbWVzc2FnZSA9ICdcbicuam9pbihzcGxpdF9sb2dbMzotMV0pCiAgICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICBzZWxmLmxvZygnRmFpbGVkIHRvIGNvbm5lY3QgdG8gcmVtb3RlLCBjYW5ub3Qg Y29tcHV0ZSBjb21taXQgbWVzc2FnZScpCi0gICAgICAgICAgICBlbWFpbCA9IGluZm9bJ0xhc3Qg Q2hhbmdlZCBBdXRob3InXQorICAgICAgICAgICAgaWYgaW5jbHVkZV9sb2c6CisgICAgICAgICAg ICAgICAgc2VsZi5sb2coJ0ZhaWxlZCB0byBjb25uZWN0IHRvIHJlbW90ZSwgY2Fubm90IGNvbXB1 dGUgY29tbWl0IG1lc3NhZ2UnKQorICAgICAgICAgICAgZW1haWwgPSBpbmZvLmdldCgnTGFzdCBD aGFuZ2VkIEF1dGhvcicpCiAgICAgICAgICAgICBhdXRob3IgPSBDb250cmlidXRvci5ieV9lbWFp bC5nZXQoCiAgICAgICAgICAgICAgICAgZW1haWwsCiAgICAgICAgICAgICAgICAgQ29udHJpYnV0 b3IuYnlfbmFtZS5nZXQoCiAgICAgICAgICAgICAgICAgICAgIGVtYWlsLAogICAgICAgICAgICAg ICAgICAgICBDb250cmlidXRvcihuYW1lPWVtYWlsLCBlbWFpbHM9W2VtYWlsXSksCiAgICAgICAg ICAgICAgICAgKSwKLSAgICAgICAgICAgICkKKyAgICAgICAgICAgICkgaWYgZW1haWwgZWxzZSBO b25lCiAgICAgICAgICAgICBtZXNzYWdlID0gTm9uZQogCiAgICAgICAgIHJldHVybiBDb21taXQo CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9y ZW1vdGUvc3ZuLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4ucHkJKHJldmlzaW9uIDI3MDM1MykKKysrIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3JlbW90ZS9zdm4u cHkJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw3ICsxMzksNyBAQCBjbGFzcyBTdm4oU2NtKToKIAog ICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgJ0xhc3QgQ2hhbmdlZCBSZXYnOiByZXNwb25z ZVsnbHAxOnZlcnNpb24tbmFtZSddLAotICAgICAgICAgICAgJ0xhc3QgQ2hhbmdlZCBBdXRob3In OiByZXNwb25zZVsnbHAxOmNyZWF0b3ItZGlzcGxheW5hbWUnXSwKKyAgICAgICAgICAgICdMYXN0 IENoYW5nZWQgQXV0aG9yJzogcmVzcG9uc2UuZ2V0KCdscDE6Y3JlYXRvci1kaXNwbGF5bmFtZScp LAogICAgICAgICAgICAgJ0xhc3QgQ2hhbmdlZCBEYXRlJzogJyAnLmpvaW4ocmVzcG9uc2VbJ2xw MTpjcmVhdGlvbmRhdGUnXS5zcGxpdCgnVCcpKS5zcGxpdCgnLicpWzBdLAogICAgICAgICAgICAg J1JldmlzaW9uJzogcmV2aXNpb24sCiAgICAgICAgIH0KQEAgLTMxNSw3ICszMTUsNyBAQCBjbGFz cyBTdm4oU2NtKToKICAgICAgICAgICAgIHJldHVybiBsZW4oc2VsZi5fbWV0YWRhdGFfY2FjaGVb YnJhbmNoXSkKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdF9jb3VudChyZXZpc2lvbj1zZWxm Ll9tZXRhZGF0YV9jYWNoZVticmFuY2hdWzBdLCBicmFuY2g9c2VsZi5kZWZhdWx0X2JyYW5jaCkK IAotICAgIGRlZiBjb21taXQoc2VsZiwgaGFzaD1Ob25lLCByZXZpc2lvbj1Ob25lLCBpZGVudGlm aWVyPU5vbmUsIGJyYW5jaD1Ob25lLCB0YWc9Tm9uZSk6CisgICAgZGVmIGNvbW1pdChzZWxmLCBo YXNoPU5vbmUsIHJldmlzaW9uPU5vbmUsIGlkZW50aWZpZXI9Tm9uZSwgYnJhbmNoPU5vbmUsIHRh Zz1Ob25lLCBpbmNsdWRlX2xvZz1UcnVlKToKICAgICAgICAgaWYgaGFzaDoKICAgICAgICAgICAg IHJhaXNlIFZhbHVlRXJyb3IoJ1NWTiBkb2VzIG5vdCBzdXBwb3J0IEdpdCBoYXNoZXMnKQogCkBA IC0zNjgsNyArMzY4LDcgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBpZiB0YWc6CiAg ICAgICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcignQ2Fubm90IGRlZmluZSBib3RoIHRhZyBh bmQgcmV2aXNpb24nKQogICAgICAgICAgICAgcmV2aXNpb24gPSBDb21taXQuX3BhcnNlX3Jldmlz aW9uKHJldmlzaW9uLCBkb19hc3NlcnQ9VHJ1ZSkKLSAgICAgICAgICAgIGJyYW5jaCA9IHNlbGYu X2JyYW5jaF9mb3IocmV2aXNpb24pCisgICAgICAgICAgICBicmFuY2ggPSBzZWxmLl9icmFuY2hf Zm9yKHJldmlzaW9uKSBvciBzZWxmLmRlZmF1bHRfYnJhbmNoCiAgICAgICAgICAgICBpbmZvID0g c2VsZi5pbmZvKGNhY2hlZD1UcnVlLCBicmFuY2g9YnJhbmNoLCByZXZpc2lvbj1yZXZpc2lvbikK IAogICAgICAgICBlbHNlOgpAQCAtNDExLDIxICs0MTEsMjAgQEAgY2xhc3MgU3ZuKFNjbSk6CiAg ICAgICAgICAgICAgICAgICAgICc8UzplbmQtcmV2aXNpb24+e3JldmlzaW9ufTwvUzplbmQtcmV2 aXNpb24+XG4nCiAgICAgICAgICAgICAgICAgICAgICc8UzpsaW1pdD4xPC9TOmxpbWl0PlxuJwog ICAgICAgICAgICAgICAgICAgICAnPC9TOmxvZy1yZXBvcnQ+XG4nLmZvcm1hdChyZXZpc2lvbj1y ZXZpc2lvbiksCi0gICAgICAgICkKKyAgICAgICAgKSBpZiBpbmNsdWRlX2xvZyBlbHNlIE5vbmUK IAotICAgICAgICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSA9PSAyMDA6CisgICAgICAgIGlmIHJl c3BvbnNlIGFuZCByZXNwb25zZS5zdGF0dXNfY29kZSA9PSAyMDA6CiAgICAgICAgICAgICByZXNw b25zZSA9IHhtbHRvZGljdC5wYXJzZShyZXNwb25zZS50ZXh0KQogICAgICAgICAgICAgcmVzcG9u c2UgPSByZXNwb25zZS5nZXQoJ1M6bG9nLXJlcG9ydCcsIHt9KS5nZXQoJ1M6bG9nLWl0ZW0nKQog CiAgICAgICAgICAgICBuYW1lID0gcmVzcG9uc2UuZ2V0KCdEOmNyZWF0b3ItZGlzcGxheW5hbWUn KQogICAgICAgICAgICAgbWVzc2FnZSA9IHJlc3BvbnNlLmdldCgnRDpjb21tZW50JywgTm9uZSkK LSAgICAgICAgICAgIGlmIG5vdCBuYW1lOgotICAgICAgICAgICAgICAgIHJhaXNlIHNlbGYuRXhj ZXB0aW9uKCdGYWlsZWQgdG8gZmluZCBjcmVhdG9yIG5hbWUnKQogCiAgICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICBzZWxmLmxvZygnRmFpbGVkIHRvIGNvbm5lY3QgdG8gcmVtb3RlLCBjYW5ub3Qg Y29tcHV0ZSBjb21taXQgbWVzc2FnZScpCisgICAgICAgICAgICBpZiBpbmNsdWRlX2xvZzoKKyAg ICAgICAgICAgICAgICBzZWxmLmxvZygnRmFpbGVkIHRvIGNvbm5lY3QgdG8gcmVtb3RlLCBjYW5u b3QgY29tcHV0ZSBjb21taXQgbWVzc2FnZScpCiAgICAgICAgICAgICBtZXNzYWdlID0gTm9uZQot ICAgICAgICAgICAgbmFtZSA9IGluZm9bJ0xhc3QgQ2hhbmdlZCBBdXRob3InXQorICAgICAgICAg ICAgbmFtZSA9IGluZm8uZ2V0KCdMYXN0IENoYW5nZWQgQXV0aG9yJykKIAogICAgICAgICBhdXRo b3IgPSBDb250cmlidXRvci5ieV9lbWFpbC5nZXQoCiAgICAgICAgICAgICBuYW1lLApAQCAtNDMz LDcgKzQzMiw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgICAgIG5hbWUsCiAgICAg ICAgICAgICAgICAgQ29udHJpYnV0b3IobmFtZT1uYW1lLCBlbWFpbHM9W25hbWVdIGlmICdAJyBp biBuYW1lIGVsc2UgW10pLAogICAgICAgICAgICAgKSwKLSAgICAgICAgKQorICAgICAgICApIGlm IG5hbWUgZWxzZSBOb25lCiAKICAgICAgICAgcmV0dXJuIENvbW1pdCgKICAgICAgICAgICAgIHJl dmlzaW9uPWludChyZXZpc2lvbiksCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5k X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzAzNTMpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTE5MCwzICsxOTAsMTkgQEAgSGFzaDogMWFiZTI1YjQ0M2U5CiAgICAgICAgICAg ICAgICAgcGF0aD1zZWxmLnBhdGgsCiAgICAgICAgICAgICApKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLCAnMi4yQGJyYW5jaC1hIHwgNjIxNjUy YWRkN2ZjLCByNyB8IDd0aCBjb21taXRcbicpCisKKyAgICBkZWYgdGVzdF9ub19sb2dfc3ZuKHNl bGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdCgpLCBtb2Nrcy5sb2NhbC5Tdm4oc2Vs Zi5wYXRoKSwgTW9ja1RpbWUsIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcHJvZ3JhbS5tYWluKAorICAgICAgICAgICAgICAgIGFy Z3M9KCdmaW5kJywgJ3RydW5rJywgJy0tbm8tbG9nJywgJy1xJyksCisgICAgICAgICAgICAgICAg cGF0aD1zZWxmLnBhdGgsCisgICAgICAgICAgICApKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLCAnNEB0cnVuayB8IHI2XG4nKQorCisgICAgZGVm IHRlc3Rfbm9fbG9nX2dpdChzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2Vs Zi5wYXRoLCBnaXRfc3ZuPVRydWUpLCBtb2Nrcy5sb2NhbC5Tdm4oKSwgTW9ja1RpbWUsIE91dHB1 dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwg cHJvZ3JhbS5tYWluKAorICAgICAgICAgICAgICAgIGFyZ3M9KCdmaW5kJywgJ21haW4nLCAnLS1u by1sb2cnLCAnLXEnKSwKKyAgICAgICAgICAgICAgICBwYXRoPXNlbGYucGF0aCwKKyAgICAgICAg ICAgICkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQuc3Rkb3V0LmdldHZhbHVl KCksICc0QG1haW4gfCBiYWU1ZDFlOTA5OTksIHI2XG4nKQpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3MDM1MykKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0yMzgsMyArMjM4LDggQEAgY2xhc3MgVGVzdEdpdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAKICAgICAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCc2MjE2NTJh ZGQ3ZmM0MTYwOTliZDIwNjMzNjZjYzM4ZmY2MWFmZTM2JywgcmVwb3NpdG9yeS5jaGVja291dCgn dGFnLTEnKS5oYXNoKQogICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJzYyMTY1MmFk ZDdmYzQxNjA5OWJkMjA2MzM2NmNjMzhmZjYxYWZlMzYnLCByZXBvc2l0b3J5LmNvbW1pdCgpLmhh c2gpCisKKyAgICBkZWYgdGVzdF9ub19sb2coc2VsZik6CisgICAgICAgIGZvciBtb2NrIGluIFtt b2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKSwgbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0 X3N2bj1UcnVlKV06CisgICAgICAgICAgICB3aXRoIG1vY2s6CisgICAgICAgICAgICAgICAgc2Vs Zi5hc3NlcnRJc05vbmUobG9jYWwuR2l0KHNlbGYucGF0aCkuY29tbWl0KGlkZW50aWZpZXI9JzRA bWFpbicsIGluY2x1ZGVfbG9nPUZhbHNlKS5tZXNzYWdlKQpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3MDM1MykKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0yMTgsNiArMjE4LDEwIEBAIGNsYXNzIFRlc3RMb2NhbFN2bih1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDksIHJlcG9z aXRvcnkuY2hlY2tvdXQoJ3RhZy0xJykucmV2aXNpb24pCiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKDksIHJlcG9zaXRvcnkuY29tbWl0KCkucmV2aXNpb24pCiAKKyAgICBkZWYgdGVzdF9u b19sb2coc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCksIE91 dHB1dENhcHR1cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKGxvY2FsLlN2bihz ZWxmLnBhdGgpLmNvbW1pdChpZGVudGlmaWVyPSc0QHRydW5rJywgaW5jbHVkZV9sb2c9RmFsc2Up Lm1lc3NhZ2UpCisKIAogY2xhc3MgVGVzdFJlbW90ZVN2bih1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgcmVtb3RlID0gJ2h0dHBzOi8vc3ZuLndlYmtpdC5vcmcvcmVwb3NpdG9yeS93ZWJraXQnCkBA IC0zMDEsMyArMzA1LDcgQEAgY2xhc3MgVGVzdFJlbW90ZVN2bih1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgZGVmIHRlc3RfdGFnX3ByZXZpb3VzKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLnJl bW90ZS5Tdm4oKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoNywgcmVtb3RlLlN2bihz ZWxmLnJlbW90ZSkuY29tbWl0KGlkZW50aWZpZXI9JzIuMkB0YWdzL3RhZy0xJykucmV2aXNpb24p CisKKyAgICBkZWYgdGVzdF9ub19sb2coc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MucmVtb3Rl LlN2bigpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUocmVtb3RlLlN2bihzZWxmLnJl bW90ZSkuY29tbWl0KGlkZW50aWZpZXI9JzRAdHJ1bmsnLCBpbmNsdWRlX2xvZz1GYWxzZSkubWVz c2FnZSkK