216529 2020-09-14 22:55:18 -0700 [JSC] Intl.Collator should take collation option 2020-09-15 14:59:16 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 213425 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1688600 0 ysuzuki 2020-09-14 22:55:18 -0700 https://github.com/tc39/ecma402/issues/380 We have consensus. 1688601 1 ysuzuki 2020-09-14 22:57:14 -0700 https://github.com/tc39/ecma402/pull/459 1688612 2 408797 ysuzuki 2020-09-14 23:55:10 -0700 Created attachment 408797 Patch 1688766 3 408797 ross.kirsling 2020-09-15 11:21:39 -0700 Comment on attachment 408797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408797&action=review r=me > Source/JavaScriptCore/runtime/IntlCollator.cpp:185 > + throwRangeError(globalObject, scope, "collation must be unicode-locale-identifier's \"type\""_s); Hmm, we shouldn't require the user to know Unicode spec productions. 😅 To match what we've done in other Intl classes, I would suggest "collation is not a well-formed collation value". 1688819 4 408797 ysuzuki 2020-09-15 13:13:05 -0700 Comment on attachment 408797 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408797&action=review Thanks! >> Source/JavaScriptCore/runtime/IntlCollator.cpp:185 >> + throwRangeError(globalObject, scope, "collation must be unicode-locale-identifier's \"type\""_s); > > Hmm, we shouldn't require the user to know Unicode spec productions. 😅 > To match what we've done in other Intl classes, I would suggest "collation is not a well-formed collation value". That's good! Changed. 1688866 5 ysuzuki 2020-09-15 14:58:37 -0700 Committed r267102: <https://trac.webkit.org/changeset/267102> 1688867 6 webkit-bug-importer 2020-09-15 14:59:16 -0700 <rdar://problem/68943945> 408797 2020-09-14 23:55:10 -0700 2020-09-15 11:21:39 -0700 Patch bug-216529-20200914235509.patch text/plain 10929 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ZTE3ZDhkOGY1YTYzZGI3NGZhN2YxOTAyMDM3NzlhMTAyNjBlOTgyLi5hODAwMTk5YTFlNDFkNDA3 NDBkY2U1NGI4YWQyY2ZlM2E0YTM4ZGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wOS0xNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEludGwuQ29sbGF0b3Igc2hvdWxkIHRha2UgY29sbGF0aW9uIG9w dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2 NTI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyBwYXRjaCBhZGRzICJjb2xsYXRpb24iIG9wdGlvbiB0byBJbnRsLkNvbGxhdG9yLiBXZSBhcmUg YWxyZWFkeSBnZXR0aW5nIGNvbnNlbnN1c1sxXSwgYW5kIHdpbGwgYmUgaW50ZWdyYXRlZCBpbnRv IHRoZSBzcGVjLgorICAgICAgICBQcmV2aW91c2x5LCBwYXNzaW5nICJjb2xsYXRpb24iIGlzIG9u bHkgYXZhaWxhYmxlIHRocm91Z2ggIi11LWNvLSIgdW5pY29kZSBleHRlbnNpb24gaW4gdGhlIHBh c3NlZCBsb2NhbGUuIFRoZSBwcm9wb3NhbCBleHBvc2VzCisgICAgICAgIGNvbGxhdGlvbiBvcHRp b24gYXMgYW4gb3B0aW9uIHRvIEludGwuQ29sbGF0b3Igc28gdGhhdCB3ZSBjYW4gc2V0IGl0IGVh c2lseS4KKyAgICAgICAgImNvbGxhdGlvbiIgaXMgdXNlZCBvbmx5IHdoZW4gInVzYWdlIiBpcyAi c29ydCIuICJzZWFyY2giIHVzYWdlIHdpbGwgZmlsdGVyIG91dCBjb2xsYXRpb24gb3B0aW9ucyBz aW5jZSAic2VhcmNoIiBpdHNlbGYgaXMgb25lIG9mCisgICAgICAgIHRoZSAiY29sbGF0aW9uIiBv cHRpb24uCisKKyAgICAgICAgWzFdOiBodHRwczovL2dpdGh1Yi5jb20vdGMzOS9lY21hNDAyL3B1 bGwvNDU5CisKKyAgICAgICAgKiBydW50aW1lL0ludGxDb2xsYXRvci5jcHA6CisgICAgICAgIChK U0M6OkludGxDb2xsYXRvcjo6c29ydExvY2FsZURhdGEpOgorICAgICAgICAoSlNDOjpJbnRsQ29s bGF0b3I6OmluaXRpYWxpemVDb2xsYXRvcik6CisKIDIwMjAtMDktMTQgIEtlaXRoIE1pbGxlciAg PGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgQnl0ZWNvZGVQYXJzZXIgc2hvdWxk IEdldExvY2FsIG9wX3JldCdzIHZhbHVlIGV2ZW4gaWYgaXQncyB1bnVzZWQgYnkgdGhlIGNhbGxl cgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bENvbGxhdG9y LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxDb2xsYXRvci5jcHAKaW5k ZXggNTZjMzMxMTRmNjliZGQ2MTM4NDI2ZDAyMTIyNTQ5ZGMwNTAyYmQwOC4uMjljYmUyZDc1OGNk MDdiODE1Y2UyNGUxYjNmMDRmNGYyYzYwMDViYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSW50bENvbGxhdG9yLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9JbnRsQ29sbGF0b3IuY3BwCkBAIC04NSwyNyArODUsMjYgQEAgVmVjdG9yPFN0 cmluZz4gSW50bENvbGxhdG9yOjpzb3J0TG9jYWxlRGF0YShjb25zdCBTdHJpbmcmIGxvY2FsZSwg UmVsZXZhbnRFeHRlbnMKICAgICAgICAga2V5TG9jYWxlRGF0YS5hcHBlbmQoeyB9KTsKIAogICAg ICAgICBVRXJyb3JDb2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICAgICAgVUVudW1lcmF0 aW9uKiBlbnVtZXJhdGlvbiA9IHVjb2xfZ2V0S2V5d29yZFZhbHVlc0ZvckxvY2FsZSgiY29sbGF0 aW9uIiwgbG9jYWxlLnV0ZjgoKS5kYXRhKCksIGZhbHNlLCAmc3RhdHVzKTsKKyAgICAgICAgYXV0 byBlbnVtZXJhdGlvbiA9IHN0ZDo6dW5pcXVlX3B0cjxVRW51bWVyYXRpb24sIElDVURlbGV0ZXI8 dWVudW1fY2xvc2U+Pih1Y29sX2dldEtleXdvcmRWYWx1ZXNGb3JMb2NhbGUoImNvbGxhdGlvbiIs IGxvY2FsZS51dGY4KCkuZGF0YSgpLCBmYWxzZSwgJnN0YXR1cykpOwogICAgICAgICBpZiAoVV9T VUNDRVNTKHN0YXR1cykpIHsKICAgICAgICAgICAgIGNvbnN0IGNoYXIqIGNvbGxhdGlvbjsKLSAg ICAgICAgICAgIHdoaWxlICgoY29sbGF0aW9uID0gdWVudW1fbmV4dChlbnVtZXJhdGlvbiwgbnVs bHB0ciwgJnN0YXR1cykpICYmIFVfU1VDQ0VTUyhzdGF0dXMpKSB7CisgICAgICAgICAgICB3aGls ZSAoKGNvbGxhdGlvbiA9IHVlbnVtX25leHQoZW51bWVyYXRpb24uZ2V0KCksIG51bGxwdHIsICZz dGF0dXMpKSAmJiBVX1NVQ0NFU1Moc3RhdHVzKSkgewogICAgICAgICAgICAgICAgIC8vIDEwLjIu MyAiVGhlIHZhbHVlcyAic3RhbmRhcmQiIGFuZCAic2VhcmNoIiBtdXN0IG5vdCBiZSB1c2VkIGFz IGVsZW1lbnRzIGluIGFueSBbW3NvcnRMb2NhbGVEYXRhXV1bbG9jYWxlXS5jbyBhbmQgW1tzZWFy Y2hMb2NhbGVEYXRhXV1bbG9jYWxlXS5jbyBhcnJheS4iCiAgICAgICAgICAgICAgICAgaWYgKCFz dHJjbXAoY29sbGF0aW9uLCAic3RhbmRhcmQiKSB8fCAhc3RyY21wKGNvbGxhdGlvbiwgInNlYXJj aCIpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgICAgIC8v IE1hcCBrZXl3b3JkIHZhbHVlcyB0byBCQ1AgNDcgZXF1aXZhbGVudHMuCiAgICAgICAgICAgICAg ICAgaWYgKCFzdHJjbXAoY29sbGF0aW9uLCAiZGljdGlvbmFyeSIpKQotICAgICAgICAgICAgICAg ICAgICBjb2xsYXRpb24gPSAiZGljdCI7CisgICAgICAgICAgICAgICAgICAgIGtleUxvY2FsZURh dGEuYXBwZW5kKCJkaWN0Il9zKTsKICAgICAgICAgICAgICAgICBlbHNlIGlmICghc3RyY21wKGNv bGxhdGlvbiwgImdiMjMxMmhhbiIpKQotICAgICAgICAgICAgICAgICAgICBjb2xsYXRpb24gPSAi Z2IyMzEyIjsKKyAgICAgICAgICAgICAgICAgICAga2V5TG9jYWxlRGF0YS5hcHBlbmQoImdiMjMx MiJfcyk7CiAgICAgICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChjb2xsYXRpb24sICJwaG9u ZWJvb2siKSkKLSAgICAgICAgICAgICAgICAgICAgY29sbGF0aW9uID0gInBob25lYmsiOworICAg ICAgICAgICAgICAgICAgICBrZXlMb2NhbGVEYXRhLmFwcGVuZCgicGhvbmViayJfcyk7CiAgICAg ICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChjb2xsYXRpb24sICJ0cmFkaXRpb25hbCIpKQot ICAgICAgICAgICAgICAgICAgICBjb2xsYXRpb24gPSAidHJhZCI7Ci0KLSAgICAgICAgICAgICAg ICBrZXlMb2NhbGVEYXRhLmFwcGVuZChjb2xsYXRpb24pOworICAgICAgICAgICAgICAgICAgICBr ZXlMb2NhbGVEYXRhLmFwcGVuZCgidHJhZCJfcyk7CisgICAgICAgICAgICAgICAgZWxzZQorICAg ICAgICAgICAgICAgICAgICBrZXlMb2NhbGVEYXRhLmFwcGVuZChjb2xsYXRpb24pOwogICAgICAg ICAgICAgfQotICAgICAgICAgICAgdWVudW1fY2xvc2UoZW51bWVyYXRpb24pOwogICAgICAgICB9 CiAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTE3OCw2ICsxNzcsMTggQEAgdm9pZCBJbnRsQ29s bGF0b3I6OmluaXRpYWxpemVDb2xsYXRvcihKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBK U1ZhbHVlIGxvY2EKICAgICBMb2NhbGVNYXRjaGVyIGxvY2FsZU1hdGNoZXIgPSBpbnRsT3B0aW9u PExvY2FsZU1hdGNoZXI+KGdsb2JhbE9iamVjdCwgb3B0aW9ucywgdm0ucHJvcGVydHlOYW1lcy0+ bG9jYWxlTWF0Y2hlciwgeyB7ICJsb29rdXAiX3MsIExvY2FsZU1hdGNoZXI6Okxvb2t1cCB9LCB7 ICJiZXN0IGZpdCJfcywgTG9jYWxlTWF0Y2hlcjo6QmVzdEZpdCB9IH0sICJsb2NhbGVNYXRjaGVy IG11c3QgYmUgZWl0aGVyIFwibG9va3VwXCIgb3IgXCJiZXN0IGZpdFwiIl9zLCBMb2NhbGVNYXRj aGVyOjpCZXN0Rml0KTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwog CisgICAgeworICAgICAgICBTdHJpbmcgY29sbGF0aW9uID0gaW50bFN0cmluZ09wdGlvbihnbG9i YWxPYmplY3QsIG9wdGlvbnMsIHZtLnByb3BlcnR5TmFtZXMtPmNvbGxhdGlvbiwgeyB9LCBudWxs cHRyLCBudWxscHRyKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgp KTsKKyAgICAgICAgaWYgKCFjb2xsYXRpb24uaXNOdWxsKCkpIHsKKyAgICAgICAgICAgIGlmICgh aXNVbmljb2RlTG9jYWxlSWRlbnRpZmllclR5cGUoY29sbGF0aW9uKSkgeworICAgICAgICAgICAg ICAgIHRocm93UmFuZ2VFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiY29sbGF0aW9uIG11c3Qg YmUgdW5pY29kZS1sb2NhbGUtaWRlbnRpZmllcidzIFwidHlwZVwiIl9zKTsKKyAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgICAgICBsb2NhbGVPcHRpb25zW3N0 YXRpY19jYXN0PHVuc2lnbmVkPihSZWxldmFudEV4dGVuc2lvbktleTo6Q28pXSA9IFdURk1vdmUo Y29sbGF0aW9uKTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIFRyaVN0YXRlIG51bWVyaWMgPSBp bnRsQm9vbGVhbk9wdGlvbihnbG9iYWxPYmplY3QsIG9wdGlvbnMsIHZtLnByb3BlcnR5TmFtZXMt Pm51bWVyaWMpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CiAgICAg aWYgKG51bWVyaWMgIT0gVHJpU3RhdGU6OkluZGV0ZXJtaW5hdGUpCkBAIC0yMjAsMTYgKzIzMSwy MCBAQCB2b2lkIEludGxDb2xsYXRvcjo6aW5pdGlhbGl6ZUNvbGxhdG9yKEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QsIEpTVmFsdWUgbG9jYQogICAgIENTdHJpbmcgZGF0YUxvY2FsZVdpdGhF eHRlbnNpb25zOwogICAgIHN3aXRjaCAobV91c2FnZSkgewogICAgIGNhc2UgVXNhZ2U6OlNvcnQ6 Ci0gICAgICAgIGRhdGFMb2NhbGVXaXRoRXh0ZW5zaW9ucyA9IG1fbG9jYWxlLnV0ZjgoKTsKKyAg ICAgICAgaWYgKGNvbGxhdGlvbi5pc051bGwoKSkKKyAgICAgICAgICAgIGRhdGFMb2NhbGVXaXRo RXh0ZW5zaW9ucyA9IHJlc29sdmVkLmRhdGFMb2NhbGUudXRmOCgpOworICAgICAgICBlbHNlCisg ICAgICAgICAgICBkYXRhTG9jYWxlV2l0aEV4dGVuc2lvbnMgPSBtYWtlU3RyaW5nKHJlc29sdmVk LmRhdGFMb2NhbGUsICItdS1jby0iLCBtX2NvbGxhdGlvbikudXRmOCgpOwogICAgICAgICBicmVh azsKICAgICBjYXNlIFVzYWdlOjpTZWFyY2g6CiAgICAgICAgIC8vIHNlYXJjaExvY2FsZURhdGEg ZmlsdGVycyBvdXQgImNvIiB1bmljb2RlIGV4dGVuc2lvbi4gSG93ZXZlciwgd2UgbmVlZCB0byBw YXNzICJjbyIgdG8gSUNVIHdoZW4gVXNhZ2U6OlNlYXJjaCBpcyBzcGVjaWZpZWQuCiAgICAgICAg IC8vIFNvIHdlIG5lZWQgdG8gcGFzcyAiY28iIHVuaWNvZGUgZXh0ZW5zaW9uIHRocm91Z2ggbG9j YWxlLiBTaW5jZSB0aGUgb3RoZXIgcmVsZXZhbnQgZXh0ZW5zaW9ucyBhcmUgaGFuZGxlZCB2aWEg dWNvbF9zZXRBdHRyaWJ1dGUsCiAgICAgICAgIC8vIHdlIGNhbiBqdXN0IHVzZSBkYXRhTG9jYWxl CisgICAgICAgIC8vIFNpbmNlIHNlYXJjaExvY2FsZURhdGEgZmlsdGVycyBvdXQgImNvIiB1bmlj b2RlIGV4dGVuc2lvbiwgImNvbGxhdGlvbiIgb3B0aW9uIGlzIGp1c3QgaWdub3JlZC4KICAgICAg ICAgZGF0YUxvY2FsZVdpdGhFeHRlbnNpb25zID0gbWFrZVN0cmluZyhyZXNvbHZlZC5kYXRhTG9j YWxlLCAiLXUtY28tc2VhcmNoIikudXRmOCgpOwogICAgICAgICBicmVhazsKICAgICB9Ci0gICAg ZGF0YUxvZ0xuSWYoSW50bENvbGxhdG9ySW50ZXJuYWw6OnZlcmJvc2UsICJkYXRhTG9jYWxlV2l0 aEV4dGVuc2lvbnM6KCIsIGRhdGFMb2NhbGVXaXRoRXh0ZW5zaW9ucywgIikiKTsKKyAgICBkYXRh TG9nTG5JZihJbnRsQ29sbGF0b3JJbnRlcm5hbDo6dmVyYm9zZSwgImxvY2FsZTooIiwgcmVzb2x2 ZWQubG9jYWxlLCAiKSxkYXRhTG9jYWxlV2l0aEV4dGVuc2lvbnM6KCIsIGRhdGFMb2NhbGVXaXRo RXh0ZW5zaW9ucywgIikiKTsKIAogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9S OwogICAgIG1fY29sbGF0b3IgPSBzdGQ6OnVuaXF1ZV9wdHI8VUNvbGxhdG9yLCBVQ29sbGF0b3JE ZWxldGVyPih1Y29sX29wZW4oZGF0YUxvY2FsZVdpdGhFeHRlbnNpb25zLmRhdGEoKSwgJnN0YXR1 cykpOwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwpp bmRleCBjZGFkZmU0YTNlZDU1MWE2NDE3YzlmMjUzN2U5MTg3ODlhNDI5NzQ4Li5lYWU5NjNlYWVm NTUxMjc5ZmFiYjRhNGY5MDVmZjljNjZkMjhkMGNmIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5n ZUxvZworKysgYi9KU1Rlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA5LTE0 ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW0pTQ10gSW50 bC5Db2xsYXRvciBzaG91bGQgdGFrZSBjb2xsYXRpb24gb3B0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY1MjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHN0cmVzcy9pbnRsLWNvbGxhdG9yLWNv LWV4dGVuc2lvbi5qczoKKyAgICAgICAgKHNob3VsZFRocm93KToKKwogMjAyMC0wOS0xNCAgS2Vp dGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBCeXRlY29kZVBh cnNlciBzaG91bGQgR2V0TG9jYWwgb3BfcmV0J3MgdmFsdWUgZXZlbiBpZiBpdCdzIHVudXNlZCBi eSB0aGUgY2FsbGVyCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLWNvbGxhdG9yLWNv LWV4dGVuc2lvbi5qcyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtY29sbGF0b3ItY28tZXh0ZW5zaW9u LmpzCmluZGV4IDUyMTIxYjNjYTc1MjVhNmQxMzVmOThmZDY1NWJhNzU4ODhhMzVkOTMuLjQ3MTRj NzNjZTcyZDk5MDFlNjNiYzE5M2JiOWFiMzJmYTNhZWE2ZDYgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMv c3RyZXNzL2ludGwtY29sbGF0b3ItY28tZXh0ZW5zaW9uLmpzCisrKyBiL0pTVGVzdHMvc3RyZXNz L2ludGwtY29sbGF0b3ItY28tZXh0ZW5zaW9uLmpzCkBAIC0xNSwxMCArMTUsMjYgQEAgZnVuY3Rp b24gc2hvdWxkQmVBcnJheShhY3R1YWwsIGV4cGVjdGVkKSB7CiAgICAgfQogfQogCitmdW5jdGlv biBzaG91bGRUaHJvdyhmdW5jLCBlcnJvck1lc3NhZ2UpIHsKKyAgICB2YXIgZXJyb3JUaHJvd24g PSBmYWxzZTsKKyAgICB2YXIgZXJyb3IgPSBudWxsOworICAgIHRyeSB7CisgICAgICAgIGZ1bmMo KTsKKyAgICB9IGNhdGNoIChlKSB7CisgICAgICAgIGVycm9yVGhyb3duID0gdHJ1ZTsKKyAgICAg ICAgZXJyb3IgPSBlOworICAgIH0KKyAgICBpZiAoIWVycm9yVGhyb3duKQorICAgICAgICB0aHJv dyBuZXcgRXJyb3IoJ25vdCB0aHJvd24nKTsKKyAgICBpZiAoU3RyaW5nKGVycm9yKSAhPT0gZXJy b3JNZXNzYWdlKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoYGJhZCBlcnJvcjogJHtTdHJpbmco ZXJyb3IpfWApOworfQorCiBzaG91bGRCZUFycmF5KFsiQUUiLCAiXHUwMEM0Il0uc29ydChuZXcg SW50bC5Db2xsYXRvcigiZGUiLCB7dXNhZ2U6ICJzb3J0In0pLmNvbXBhcmUpLCBbIlx1MDBDNCIs ICJBRSJdKTsKIHNob3VsZEJlQXJyYXkoWyJBRSIsICJcdTAwQzQiXS5zb3J0KG5ldyBJbnRsLkNv bGxhdG9yKCJkZSIsIHt1c2FnZTogInNlYXJjaCJ9KS5jb21wYXJlKSwgWyJBRSIsICJcdTAwQzQi XSk7CiBzaG91bGRCZShuZXcgSW50bC5Db2xsYXRvcigiZGUiLCB7dXNhZ2U6ICJzb3J0In0pLnJl c29sdmVkT3B0aW9ucygpLmxvY2FsZSwgImRlIik7CiBzaG91bGRCZShuZXcgSW50bC5Db2xsYXRv cigiZGUiLCB7dXNhZ2U6ICJzZWFyY2gifSkucmVzb2x2ZWRPcHRpb25zKCkubG9jYWxlLCAiZGUi KTsKK3Nob3VsZEJlKG5ldyBJbnRsLkNvbGxhdG9yKCJkZSIsIHt1c2FnZTogInNvcnQiLCBjb2xs YXRpb246ICJwaG9uZWJrIn0pLnJlc29sdmVkT3B0aW9ucygpLmxvY2FsZSwgImRlIik7CiBzaG91 bGRCZUFycmF5KFsiMiIsICIxMCJdLnNvcnQobmV3IEludGwuQ29sbGF0b3IoImRlIiwge3VzYWdl OiAic29ydCJ9KS5jb21wYXJlKSwgWyIxMCIsICIyIl0pOwogc2hvdWxkQmVBcnJheShbIjIiLCAi MTAiXS5zb3J0KG5ldyBJbnRsLkNvbGxhdG9yKCJkZSIsIHt1c2FnZTogInNlYXJjaCJ9KS5jb21w YXJlKSwgWyIxMCIsICIyIl0pOwogCkBAIC00MCw2ICs1NiwyOCBAQCBmdW5jdGlvbiBzaG91bGRC ZUFycmF5KGFjdHVhbCwgZXhwZWN0ZWQpIHsKIHNob3VsZEJlKG5ldyBJbnRsLkNvbGxhdG9yKCJk ZS11LWtuIiwge3VzYWdlOiAic2VhcmNoIn0pLnJlc29sdmVkT3B0aW9ucygpLmxvY2FsZSwgImRl LXUta24iKTsKIAogc2hvdWxkQmVBcnJheShbImEiLCAiYWUiLCAiw6QiLCAiw6YiXS5zb3J0KG5l dyBJbnRsLkNvbGxhdG9yKCJkZS11LWNvLXBob25lYmsiKS5jb21wYXJlKSwgWyJhIiwgImFlIiwg IsOkIiwgIsOmIl0pOworc2hvdWxkQmVBcnJheShbImEiLCAiYWUiLCAiw6QiLCAiw6YiXS5zb3J0 KG5ldyBJbnRsLkNvbGxhdG9yKCJkZSIsIHsgY29sbGF0aW9uOiAncGhvbmViaycgfSkuY29tcGFy ZSksIFsiYSIsICJhZSIsICLDpCIsICLDpiJdKTsKIHNob3VsZEJlQXJyYXkoWyJhIiwgImFlIiwg IsOkIiwgIsOmIl0uc29ydChuZXcgSW50bC5Db2xsYXRvcigiZGUiKS5jb21wYXJlKSwgWyJhIiwg IsOkIiwgImFlIiwgIsOmIl0pOwogc2hvdWxkQmVBcnJheShbImEiLCAiYWUiLCAiw6QiLCAiw6Yi XS5zb3J0KG5ldyBJbnRsLkNvbGxhdG9yKCJkZS11LWNvLXBob25lYmsiLCB7IHVzYWdlOiAnc2Vh cmNoJyB9KS5jb21wYXJlKSwgWyJhIiwgImFlIiwgIsOkIiwgIsOmIl0pOworc2hvdWxkQmVBcnJh eShbImEiLCAiYWUiLCAiw6QiLCAiw6YiXS5zb3J0KG5ldyBJbnRsLkNvbGxhdG9yKCJkZSIsIHsg dXNhZ2U6ICdzZWFyY2gnLCBjb2xsYXRpb246ICdwaG9uZWJrJyB9KS5jb21wYXJlKSwgWyJhIiwg ImFlIiwgIsOkIiwgIsOmIl0pOwogc2hvdWxkQmVBcnJheShbImEiLCAiYWUiLCAiw6QiLCAiw6Yi XS5zb3J0KG5ldyBJbnRsLkNvbGxhdG9yKCJkZSIsIHsgdXNhZ2U6ICdzZWFyY2gnIH0pLmNvbXBh cmUpLCBbImEiLCAiYWUiLCAiw6QiLCAiw6YiXSk7CisKKy8vIFdlIGNhbm5vdCBzZXQgc29ydCAv IHNlYXJjaCAvIHN0YW5kYXJkIHRob3VnaCAiY29sbGF0aW9uIiBvcHRpb24uIFVzZSAidXNhZ2Ui IGluc3RlYWQuCitzaG91bGRCZShuZXcgSW50bC5Db2xsYXRvcigiZGUtdS1rbiIsIHtjb2xsYXRp b246ICJzZWFyY2gifSkucmVzb2x2ZWRPcHRpb25zKCkuY29sbGF0aW9uLCAiZGVmYXVsdCIpOwor c2hvdWxkQmUobmV3IEludGwuQ29sbGF0b3IoImRlLXUta24iLCB7Y29sbGF0aW9uOiAic29ydCJ9 KS5yZXNvbHZlZE9wdGlvbnMoKS5jb2xsYXRpb24sICJkZWZhdWx0Iik7CitzaG91bGRCZShuZXcg SW50bC5Db2xsYXRvcigiZGUtdS1rbiIsIHtjb2xsYXRpb246ICJzdGFuZGFyZCJ9KS5yZXNvbHZl ZE9wdGlvbnMoKS5jb2xsYXRpb24sICJkZWZhdWx0Iik7CitzaG91bGRCZShuZXcgSW50bC5Db2xs YXRvcigiZGUtdS1rbiIsIHt1c2FnZTogInNlYXJjaCIsIGNvbGxhdGlvbjogInNlYXJjaCJ9KS5y ZXNvbHZlZE9wdGlvbnMoKS5jb2xsYXRpb24sICJkZWZhdWx0Iik7CitzaG91bGRCZShuZXcgSW50 bC5Db2xsYXRvcigiZGUtdS1rbiIsIHt1c2FnZTogInNlYXJjaCIsIGNvbGxhdGlvbjogInNvcnQi fSkucmVzb2x2ZWRPcHRpb25zKCkuY29sbGF0aW9uLCAiZGVmYXVsdCIpOworc2hvdWxkQmUobmV3 IEludGwuQ29sbGF0b3IoImRlLXUta24iLCB7dXNhZ2U6ICJzZWFyY2giLCBjb2xsYXRpb246ICJz dGFuZGFyZCJ9KS5yZXNvbHZlZE9wdGlvbnMoKS5jb2xsYXRpb24sICJkZWZhdWx0Iik7CisKK3No b3VsZFRocm93KCgpID0+IHsKKyAgICBuZXcgSW50bC5Db2xsYXRvcigiZGUtdS1rbiIsIHsiY29s bGF0aW9uIjogInBob25lYm9vayJ9KTsKK30sIGBSYW5nZUVycm9yOiBjb2xsYXRpb24gbXVzdCBi ZSB1bmljb2RlLWxvY2FsZS1pZGVudGlmaWVyJ3MgInR5cGUiYCk7CisKK3Nob3VsZEJlKG5ldyBJ bnRsLkNvbGxhdG9yKCJkZS11LWtuIiwge2NvbGxhdGlvbjogInBob25lYmsifSkucmVzb2x2ZWRP cHRpb25zKCkuY29sbGF0aW9uLCAicGhvbmViayIpOworc2hvdWxkQmUobmV3IEludGwuQ29sbGF0 b3IoImRlLXUta24iLCB7dXNhZ2U6ICJzb3J0IiwgY29sbGF0aW9uOiAicGhvbmViayJ9KS5yZXNv bHZlZE9wdGlvbnMoKS5jb2xsYXRpb24sICJwaG9uZWJrIik7CitzaG91bGRCZShuZXcgSW50bC5D b2xsYXRvcigiZGUtdS1rbiIsIHt1c2FnZTogInNlYXJjaCIsIGNvbGxhdGlvbjogInBob25lYmsi fSkucmVzb2x2ZWRPcHRpb25zKCkuY29sbGF0aW9uLCAiZGVmYXVsdCIpOworc2hvdWxkQmUobmV3 IEludGwuQ29sbGF0b3IoImRlLXUtY28tZGljdCIsIHtjb2xsYXRpb246ICJwaG9uZWJrIn0pLnJl c29sdmVkT3B0aW9ucygpLmNvbGxhdGlvbiwgInBob25lYmsiKTsKK3Nob3VsZEJlKG5ldyBJbnRs LkNvbGxhdG9yKCJkZS11LWNvLWRpY3QiLCB7Y29sbGF0aW9uOiAicGhvbmViayJ9KS5yZXNvbHZl ZE9wdGlvbnMoKS5sb2NhbGUsICJkZSIpOworc2hvdWxkQmUobmV3IEludGwuQ29sbGF0b3IoImRl LXUtY28tZGljdCIsIHt1c2FnZTogInNlYXJjaCIsIGNvbGxhdGlvbjogInBob25lYmsifSkucmVz b2x2ZWRPcHRpb25zKCkuY29sbGF0aW9uLCAiZGVmYXVsdCIpOworc2hvdWxkQmUobmV3IEludGwu Q29sbGF0b3IoImRlLXUtY28tZGljdCIsIHt1c2FnZTogInNlYXJjaCIsIGNvbGxhdGlvbjogInBo b25lYmsifSkucmVzb2x2ZWRPcHRpb25zKCkubG9jYWxlLCAiZGUiKTsK