31772 2009-11-21 12:48:40 -0800 'bugzilla-tool help' should only show common commands like how 'git help' does 2009-11-25 18:22:49 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 31771 1 eric webkit-unassigned abarth oldest_to_newest 165636 0 eric 2009-11-21 12:48:40 -0800 'bugzilla-tool help' should only show common commands like how 'git help' does We're adding more and more commands to bugzilla-tool to support the style queues and personal workflows. We don't need to show these to every user, as they would likely find them overwhelming. We need to add a flag to Command to mark it as a "common" command to be shown in the primary help. Examples of commands which we would not mark as "common": commit-queue style-queue build 166546 1 43868 eric 2009-11-25 13:36:12 -0800 Created attachment 43868 Add help command 166549 2 43868 abarth 2009-11-25 13:46:12 -0800 Comment on attachment 43868 Add help command 4141 class Command(object): 4242 name = None 43 show_in_main_help = False We should just let this inherit instead of explicitly declaring False for a bunch of concrete commands. Otherwise looks great. 166550 3 eric 2009-11-25 13:49:25 -0800 (In reply to comment #2) > (From update of attachment 43868 [details]) > 4141 class Command(object): > 4242 name = None > 43 show_in_main_help = False > > We should just let this inherit instead of explicitly declaring False for a > bunch of concrete commands. > > Otherwise looks great. I did that at first and then I added the = False later, as it seemed to make the Commands more self-documenting. I take it you disagree. :) (I mentioned this in the ChangeLog.) 166551 4 abarth 2009-11-25 13:59:38 -0800 The other option is to remove the default. Having both the default and the explicit sets doesn't seem optimal. 166600 5 eric 2009-11-25 18:22:49 -0800 Committed r51403: <http://trac.webkit.org/changeset/51403> 43868 2009-11-25 13:36:12 -0800 2009-11-25 13:46:23 -0800 Add help command bug-31772-20091125163610.patch text/plain 21693 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlMTQwZjIwLi5hMTE1MTFiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzUgQEAKIDIwMDktMTEt MjUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICdidWd6aWxsYS10b29sIGhlbHAnIHNob3VsZCBv bmx5IHNob3cgY29tbW9uIGNvbW1hbmRzIGxpa2UgaG93ICdnaXQgaGVscCcgZG9lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzE3NzIKKworICAgICAg ICBJIGFsc28gdG9vayB0aGlzIG9wcG9ydHVuaXR5IHRvIG1ha2UgJ2hlbHAnIGEgcmVhbCBDb21t YW5kLgorICAgICAgICBNYWtpbmcgJ2hlbHAnIGEgcmVhbCBjb21tYW5kIHJlcXVpcmVkIGFkZGlu ZyBDb21tYW5kLnRvb2wgKHdoaWNoIHdlJ3ZlIHdhbnRlZCB0byBkbyBmb3IgYSB3aGlsZSkuCisK KyAgICAgICAgKiBTY3JpcHRzL2J1Z3ppbGxhLXRvb2w6CisgICAgICAgICAtIGNoYW5nZSBzaG91 bGRfc2hvd19jb21tYW5kX2hlbHAgdG8gc2hvdWxkX3Nob3dfaW5fbWFpbl9oZWxwCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5OgorICAgICAgICAgLSBNYXJr IGNvbW1hbmRzIGFzIGJlaW5nIHNob3duIGluIG1haW4gaGVscCBvciBub3QuCisgICAgICAgICAt IHNob3dfaW5fbWFpbl9oZWxwID0gRmFsc2UgaXMgbm90IHJlcXVpcmVkIChkZWZhdWx0IGlzIGZh bHNlKSwKKyAgICAgICAgICAgYnV0IGl0IHNlZW1lZCB0byBtYWtlIHRoZSBjb21tYW5kcyBtb3Jl IHNlbGYtZG9jdW1lbnRpbmcuCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1 ZXJpZXMucHk6IGRpdHRvCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVl cy5weTogZGl0dG8KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvdXBsb2FkLnB5 OiBkaXR0bworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sLnB5Ogor ICAgICAgICAgLSBNYWtlIENvbW1hbmQgaG9sZCBhIHBvaW50ZXIgdG8gdG9vbCBpbiBzZWxmLnRv b2wuICBNb3N0IENvbW1hbmQKKyAgICAgICAgICAgc3ViY2xhc3NlcyBkbyBub3QgdGFrZSBhZHZh bnRhZ2Ugb2YgdGhpcyB5ZXQsIGJ1dCBpdCB3YXMgcmVxdWlyZWQKKyAgICAgICAgICAgZm9yIEhl bHBDb21tYW5kIHRvIGJlIGFibGUgdG8gcmVhY2ggdGhlIHRvb2wgZnJvbSBfaGVscF9lcGlsb2co KS4KKyAgICAgICAgIC0gTW92ZSBNdWx0aUNvbW1hbmRUb29sLl9zdGFuZGFsb25lX2hlbHBfZm9y X2NvbW1hbmQgdG8gQ29tbWFuZC5zdGFuZGFsb25lX2hlbHAKKyAgICAgICAgIC0gTW92ZSBNdWx0 aUNvbW1hbmRUb29sLl9oZWxwX2VwaWxvZyB0byBDb21tYW5kLl9oZWxwX2VwaWxvZworICAgICAg ICAgLSBNb3ZlICJoZWxwIiBsb2dpYyBpbnRvIEhlbHBDb21tYW5kLmV4ZWN1dGUoKQorICAgICAg ICAgLSBDaGFuZ2Ugc2hvdWxkX3Nob3dfY29tbWFuZF9oZWxwIHRvIHNob3VsZF9zaG93X2luX21h aW5faGVscCBhbmQgYWRkIGEgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgKiBTY3Jp cHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbF91bml0dGVzdC5weToKKyAgICAgICAgIC0gVGVz dCBoaWRpbmcgb2YgQ29tbWFuZHMgaW4gLS1oZWxwLCBhbmQgdGhhdCBhbGwgY29tbWFuZHMgYXJl IHNob3duIGluICdoZWxwIC0tYWxsLWNvbW1hbmRzJworCisyMDA5LTExLTI1ICBFcmljIFNlaWRl bCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgog CiAgICAgICAgIENlbnRyYWxpemUgcmVxdWlyZWQgYXJndW1lbnQgcGFyc2luZyBpbiBDb21tYW5k CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wgYi9XZWJLaXRU b29scy9TY3JpcHRzL2J1Z3ppbGxhLXRvb2wKaW5kZXggZmRhMzU0OC4uOGUwMTgxZCAxMDA3NTUK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sCisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvYnVnemlsbGEtdG9vbApAQCAtNzEsNyArNzEsOSBAQCBjbGFzcyBCdWd6aWxsYVRv b2woTXVsdGlDb21tYW5kVG9vbCk6CiAgICAgZGVmIHBhdGgoc2VsZik6CiAgICAgICAgIHJldHVy biBfX2ZpbGVfXwogCi0gICAgZGVmIHNob3VsZF9zaG93X2NvbW1hbmRfaGVscChzZWxmLCBjb21t YW5kKToKKyAgICBkZWYgc2hvdWxkX3Nob3dfaW5fbWFpbl9oZWxwKHNlbGYsIGNvbW1hbmQpOgor ICAgICAgICBpZiBub3QgY29tbWFuZC5zaG93X2luX21haW5faGVscDoKKyAgICAgICAgICAgIHJl dHVybiBGYWxzZQogICAgICAgICBpZiBjb21tYW5kLnJlcXVpcmVzX2xvY2FsX2NvbW1pdHM6CiAg ICAgICAgICAgICByZXR1cm4gc2VsZi5zY20oKS5zdXBwb3J0c19sb2NhbF9jb21taXRzKCkKICAg ICAgICAgcmV0dXJuIFRydWUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxl cy9jb21tYW5kcy9kb3dubG9hZC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21t YW5kcy9kb3dubG9hZC5weQppbmRleCAzMDdiY2RmLi5kMGViMjY1IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvZG93bmxvYWQucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL2Rvd25sb2FkLnB5CkBAIC02Nyw2ICs2Nyw3 IEBAIGNsYXNzIEJ1aWxkU2VxdWVuY2UoQ29uZGl0aW9uYWxMYW5kaW5nU2VxdWVuY2UpOgogCiBj bGFzcyBCdWlsZChDb21tYW5kKToKICAgICBuYW1lID0gImJ1aWxkIgorICAgIHNob3dfaW5fbWFp bl9oZWxwID0gRmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIG9wdGlvbnMg PSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKICAgICAgICAgb3B0aW9u cyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9vcHRpb25zKCkKQEAgLTgwLDYgKzgxLDcg QEAgY2xhc3MgQnVpbGQoQ29tbWFuZCk6CiAKIGNsYXNzIEFwcGx5QXR0YWNobWVudChDb21tYW5k KToKICAgICBuYW1lID0gImFwcGx5LWF0dGFjaG1lbnQiCisgICAgc2hvd19pbl9tYWluX2hlbHAg PSBUcnVlCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gV2ViS2l0 QXBwbHlpbmdTY3JpcHRzLmFwcGx5X29wdGlvbnMoKSArIFdlYktpdExhbmRpbmdTY3JpcHRzLmNs ZWFuaW5nX29wdGlvbnMoKQogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJBcHBseSBh biBhdHRhY2htZW50IHRvIHRoZSBsb2NhbCB3b3JraW5nIGRpcmVjdG9yeSIsICJBVFRBQ0hNRU5U X0lEIiwgb3B0aW9ucz1vcHRpb25zKQpAQCAtOTMsNiArOTUsNyBAQCBjbGFzcyBBcHBseUF0dGFj aG1lbnQoQ29tbWFuZCk6CiAKIGNsYXNzIEFwcGx5UGF0Y2hlcyhDb21tYW5kKToKICAgICBuYW1l ID0gImFwcGx5LXBhdGNoZXMiCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBUcnVlCiAgICAgZGVm IF9faW5pdF9fKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gV2ViS2l0QXBwbHlpbmdTY3JpcHRz LmFwcGx5X29wdGlvbnMoKSArIFdlYktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlvbnMo KQogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJBcHBseSByZXZpZXdlZCBwYXRjaGVz IGZyb20gcHJvdmlkZWQgYnVncyB0byB0aGUgbG9jYWwgd29ya2luZyBkaXJlY3RvcnkiLCAiQlVH SUQiLCBvcHRpb25zPW9wdGlvbnMpCkBAIC0xNTksNiArMTYyLDcgQEAgY2xhc3MgTGFuZERpZmZT ZXF1ZW5jZShDb25kaXRpb25hbExhbmRpbmdTZXF1ZW5jZSk6CiAKIGNsYXNzIExhbmREaWZmKENv bW1hbmQpOgogICAgIG5hbWUgPSAibGFuZC1kaWZmIgorICAgIHNob3dfaW5fbWFpbl9oZWxwID0g VHJ1ZQogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IFsKICAgICAg ICAgICAgIG1ha2Vfb3B0aW9uKCItciIsICItLXJldmlld2VyIiwgYWN0aW9uPSJzdG9yZSIsIHR5 cGU9InN0cmluZyIsIGRlc3Q9InJldmlld2VyIiwgaGVscD0iVXBkYXRlIENoYW5nZUxvZ3MgdG8g c2F5IFJldmlld2VkIGJ5IFJFVklFV0VSLiIpLApAQCAtMjU1LDYgKzI1OSw3IEBAIGNsYXNzIENo ZWNrU3R5bGVTZXF1ZW5jZShMYW5kaW5nU2VxdWVuY2UpOgogCiBjbGFzcyBDaGVja1N0eWxlKEFi c3RyYWN0UGF0Y2hQcm9jZXNzaW5nQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJjaGVjay1zdHlsZSIK KyAgICBzaG93X2luX21haW5faGVscCA9IEZhbHNlCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgog ICAgICAgICBvcHRpb25zID0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuY2xlYW5pbmdfb3B0aW9ucygp CiAgICAgICAgIG9wdGlvbnMgKz0gV2ViS2l0TGFuZGluZ1NjcmlwdHMuYnVpbGRfb3B0aW9ucygp CkBAIC0yODQsNiArMjg5LDcgQEAgY2xhc3MgQnVpbGRBdHRhY2htZW50U2VxdWVuY2UoTGFuZGlu Z1NlcXVlbmNlKToKIAogY2xhc3MgQnVpbGRBdHRhY2htZW50KEFic3RyYWN0UGF0Y2hQcm9jZXNz aW5nQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJidWlsZC1hdHRhY2htZW50IgorICAgIHNob3dfaW5f bWFpbl9oZWxwID0gRmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIG9wdGlv bnMgPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5jbGVhbmluZ19vcHRpb25zKCkKICAgICAgICAgb3B0 aW9ucyArPSBXZWJLaXRMYW5kaW5nU2NyaXB0cy5idWlsZF9vcHRpb25zKCkKQEAgLTMxOSw2ICsz MjUsNyBAQCBjbGFzcyBBYnN0cmFjdFBhdGNoTGFuZGluZ0NvbW1hbmQoQWJzdHJhY3RQYXRjaFBy b2Nlc3NpbmdDb21tYW5kKToKIAogY2xhc3MgTGFuZEF0dGFjaG1lbnQoQWJzdHJhY3RQYXRjaExh bmRpbmdDb21tYW5kKToKICAgICBuYW1lID0gImxhbmQtYXR0YWNobWVudCIKKyAgICBzaG93X2lu X21haW5faGVscCA9IFRydWUKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIEFic3Ry YWN0UGF0Y2hMYW5kaW5nQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGFuZCBwYXRjaGVzIGZyb20g YnVnemlsbGEsIG9wdGlvbmFsbHkgYnVpbGRpbmcgYW5kIHRlc3RpbmcgdGhlbSBmaXJzdCIsICJB VFRBQ0hNRU5UX0lEIFtBVFRBQ0hNRU5UX0lEU10iKQogCkBAIC0zMjgsNiArMzM1LDcgQEAgY2xh c3MgTGFuZEF0dGFjaG1lbnQoQWJzdHJhY3RQYXRjaExhbmRpbmdDb21tYW5kKToKIAogY2xhc3Mg TGFuZFBhdGNoZXMoQWJzdHJhY3RQYXRjaExhbmRpbmdDb21tYW5kKToKICAgICBuYW1lID0gImxh bmQtcGF0Y2hlcyIKKyAgICBzaG93X2luX21haW5faGVscCA9IFRydWUKICAgICBkZWYgX19pbml0 X18oc2VsZik6CiAgICAgICAgIEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFuZC5fX2luaXRfXyhz ZWxmLCAiTGFuZCBhbGwgcGF0Y2hlcyBvbiB0aGUgZ2l2ZW4gYnVncywgb3B0aW9uYWxseSBidWls ZGluZyBhbmQgdGVzdGluZyB0aGVtIGZpcnN0IiwgIkJVR0lEIFtCVUdJRFNdIikKIApAQCAtMzQy LDYgKzM1MCw3IEBAIGNsYXNzIExhbmRQYXRjaGVzKEFic3RyYWN0UGF0Y2hMYW5kaW5nQ29tbWFu ZCk6CiAKIGNsYXNzIFJvbGxvdXQoQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJyb2xsb3V0IgorICAg IHNob3dfaW5fbWFpbl9oZWxwID0gVHJ1ZQogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAg ICAgb3B0aW9ucyA9IFdlYktpdExhbmRpbmdTY3JpcHRzLmNsZWFuaW5nX29wdGlvbnMoKQogICAg ICAgICBvcHRpb25zICs9IFdlYktpdExhbmRpbmdTY3JpcHRzLmJ1aWxkX29wdGlvbnMoKQpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXJpZXMucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllcy5weQppbmRleCBi MzA0ODExLi4yZTY2YWZiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv Y29tbWFuZHMvcXVlcmllcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29t bWFuZHMvcXVlcmllcy5weQpAQCAtNTYsNiArNTYsNyBAQCBmcm9tIG1vZHVsZXMud29ya3F1ZXVl IGltcG9ydCBXb3JrUXVldWUsIFdvcmtRdWV1ZURlbGVnYXRlCiAKIGNsYXNzIEJ1Z3NUb0NvbW1p dChDb21tYW5kKToKICAgICBuYW1lID0gImJ1Z3MtdG8tY29tbWl0IgorICAgIHNob3dfaW5fbWFp bl9oZWxwID0gRmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIENvbW1hbmQu X19pbml0X18oc2VsZiwgIkxpc3QgYnVncyBpbiB0aGUgY29tbWl0LXF1ZXVlIikKIApAQCAtNjcs NiArNjgsNyBAQCBjbGFzcyBCdWdzVG9Db21taXQoQ29tbWFuZCk6CiAKIGNsYXNzIFBhdGNoZXNU b0NvbW1pdChDb21tYW5kKToKICAgICBuYW1lID0gInBhdGNoZXMtdG8tY29tbWl0IgorICAgIHNo b3dfaW5fbWFpbl9oZWxwID0gRmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAg IENvbW1hbmQuX19pbml0X18oc2VsZiwgIkxpc3QgcGF0Y2hlcyBpbiB0aGUgY29tbWl0LXF1ZXVl IikKIApAQCAtNzksNiArODEsNyBAQCBjbGFzcyBQYXRjaGVzVG9Db21taXQoQ29tbWFuZCk6CiAK IGNsYXNzIFJldmlld2VkUGF0Y2hlcyhDb21tYW5kKToKICAgICBuYW1lID0gInJldmlld2VkLXBh dGNoZXMiCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBGYWxzZQogICAgIGRlZiBfX2luaXRfXyhz ZWxmKToKICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiTGlzdCByKydkIHBhdGNoZXMg b24gYSBidWciLCAiQlVHSUQiKQogCkBAIC05MSw2ICs5NCw3IEBAIGNsYXNzIFJldmlld2VkUGF0 Y2hlcyhDb21tYW5kKToKIAogY2xhc3MgVHJlZVN0YXR1cyhDb21tYW5kKToKICAgICBuYW1lID0g InRyZWUtc3RhdHVzIgorICAgIHNob3dfaW5fbWFpbl9oZWxwID0gVHJ1ZQogICAgIGRlZiBfX2lu aXRfXyhzZWxmKToKICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiUHJpbnQgdGhlIHN0 YXR1cyBvZiB0aGUgJXMgYnVpbGRib3RzIiAlIEJ1aWxkQm90LmRlZmF1bHRfaG9zdCkKIApkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3F1ZXVlcy5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy9xdWV1ZXMucHkKaW5kZXggMWE1 ZmEzMy4uMjdjNGJlOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL3F1ZXVlcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFu ZHMvcXVldWVzLnB5CkBAIC0xMTAsNiArMTEwLDcgQEAgY2xhc3MgQWJzdHJhY3RRdWV1ZShDb21t YW5kLCBXb3JrUXVldWVEZWxlZ2F0ZSk6CiAKIGNsYXNzIENvbW1pdFF1ZXVlKEFic3RyYWN0UXVl dWUpOgogICAgIG5hbWUgPSAiY29tbWl0LXF1ZXVlIgorICAgIHNob3dfaW5fbWFpbl9oZWxwID0g RmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIEFic3RyYWN0UXVldWUuX19p bml0X18oc2VsZikKIApAQCAtMTY2LDYgKzE2Nyw3IEBAIGNsYXNzIEFic3RyYWN0VHJ5UXVldWUo QWJzdHJhY3RRdWV1ZSk6CiAKIGNsYXNzIFN0eWxlUXVldWUoQWJzdHJhY3RUcnlRdWV1ZSk6CiAg ICAgbmFtZSA9ICJzdHlsZS1xdWV1ZSIKKyAgICBzaG93X2luX21haW5faGVscCA9IEZhbHNlCiAg ICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBBYnN0cmFjdFRyeVF1ZXVlLl9faW5pdF9f KHNlbGYpCiAKQEAgLTE3OCw2ICsxODAsNyBAQCBjbGFzcyBTdHlsZVF1ZXVlKEFic3RyYWN0VHJ5 UXVldWUpOgogCiBjbGFzcyBCdWlsZFF1ZXVlKEFic3RyYWN0VHJ5UXVldWUpOgogICAgIG5hbWUg PSAiYnVpbGQtcXVldWUiCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBGYWxzZQogICAgIGRlZiBf X2luaXRfXyhzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IFdlYktpdFBvcnQucG9ydF9vcHRpb25z KCkKICAgICAgICAgQWJzdHJhY3RUcnlRdWV1ZS5fX2luaXRfXyhzZWxmLCBvcHRpb25zKQpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2NvbW1hbmRzL3VwbG9hZC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jb21tYW5kcy91cGxvYWQucHkKaW5kZXggMTU2 MWE1NS4uY2M1MmUzMyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2Nv bW1hbmRzL3VwbG9hZC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFu ZHMvdXBsb2FkLnB5CkBAIC01Niw2ICs1Niw3IEBAIGZyb20gbW9kdWxlcy53b3JrcXVldWUgaW1w b3J0IFdvcmtRdWV1ZSwgV29ya1F1ZXVlRGVsZWdhdGUKIAogY2xhc3MgQ29tbWl0TWVzc2FnZUZv ckN1cnJlbnREaWZmKENvbW1hbmQpOgogICAgIG5hbWUgPSAiY29tbWl0LW1lc3NhZ2UiCisgICAg c2hvd19pbl9tYWluX2hlbHAgPSBGYWxzZQogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAg ICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiUHJpbnQgYSBjb21taXQgbWVzc2FnZSBzdWl0YWJs ZSBmb3IgdGhlIHVuY29tbWl0dGVkIGNoYW5nZXMiKQogCkBAIC02Niw2ICs2Nyw3IEBAIGNsYXNz IENvbW1pdE1lc3NhZ2VGb3JDdXJyZW50RGlmZihDb21tYW5kKToKIAogY2xhc3MgT2Jzb2xldGVB dHRhY2htZW50cyhDb21tYW5kKToKICAgICBuYW1lID0gIm9ic29sZXRlLWF0dGFjaG1lbnRzIgor ICAgIHNob3dfaW5fbWFpbl9oZWxwID0gRmFsc2UKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAg ICAgICAgIENvbW1hbmQuX19pbml0X18oc2VsZiwgIk1hcmsgYWxsIGF0dGFjaG1lbnRzIG9uIGEg YnVnIGFzIG9ic29sZXRlIiwgIkJVR0lEIikKIApAQCAtNzksNiArODEsNyBAQCBjbGFzcyBPYnNv bGV0ZUF0dGFjaG1lbnRzKENvbW1hbmQpOgogCiBjbGFzcyBQb3N0RGlmZihDb21tYW5kKToKICAg ICBuYW1lID0gInBvc3QtZGlmZiIKKyAgICBzaG93X2luX21haW5faGVscCA9IFRydWUKICAgICBk ZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIG9wdGlvbnMgPSBbCiAgICAgICAgICAgICBtYWtl X29wdGlvbigiLW0iLCAiLS1kZXNjcmlwdGlvbiIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJp bmciLCBkZXN0PSJkZXNjcmlwdGlvbiIsIGhlbHA9IkRlc2NyaXB0aW9uIHN0cmluZyBmb3IgdGhl IGF0dGFjaG1lbnQgKGRlZmF1bHQ6IFwicGF0Y2hcIikiKSwKQEAgLTEyMCw2ICsxMjMsNyBAQCBj bGFzcyBQb3N0RGlmZihDb21tYW5kKToKIAogY2xhc3MgUG9zdENvbW1pdHMoQ29tbWFuZCk6CiAg ICAgbmFtZSA9ICJwb3N0LWNvbW1pdHMiCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBUcnVlCiAg ICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gWwogICAgICAgICAgICAg bWFrZV9vcHRpb24oIi1iIiwgIi0tYnVnLWlkIiwgYWN0aW9uPSJzdG9yZSIsIHR5cGU9InN0cmlu ZyIsIGRlc3Q9ImJ1Z19pZCIsIGhlbHA9IlNwZWNpZnkgYnVnIGlkIGlmIG5vIFVSTCBpcyBwcm92 aWRlZCBpbiB0aGUgY29tbWl0IGxvZy4iKSwKQEAgLTE2OCw2ICsxNzIsNyBAQCBjbGFzcyBQb3N0 Q29tbWl0cyhDb21tYW5kKToKIAogY2xhc3MgQ3JlYXRlQnVnKENvbW1hbmQpOgogICAgIG5hbWUg PSAiY3JlYXRlLWJ1ZyIKKyAgICBzaG93X2luX21haW5faGVscCA9IFRydWUKICAgICBkZWYgX19p bml0X18oc2VsZik6CiAgICAgICAgIG9wdGlvbnMgPSBbCiAgICAgICAgICAgICBtYWtlX29wdGlv bigiLS1jYyIsIGFjdGlvbj0ic3RvcmUiLCB0eXBlPSJzdHJpbmciLCBkZXN0PSJjYyIsIGhlbHA9 IkNvbW1hLXNlcGFyYXRlZCBsaXN0IG9mIGVtYWlsIGFkZHJlc3NlcyB0byBjYXJib24tY29weS4i KSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0 b29sLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkK aW5kZXggODkzY2JhMi4uMWUxMjMzZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL211bHRpY29tbWFuZHRvb2wucHkKQEAgLTQwLDYgKzQwLDcgQEAgZnJvbSBtb2R1bGVzLmxv Z2dpbmcgaW1wb3J0IGxvZwogCiBjbGFzcyBDb21tYW5kKG9iamVjdCk6CiAgICAgbmFtZSA9IE5v bmUKKyAgICBzaG93X2luX21haW5faGVscCA9IEZhbHNlCiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IGhlbHBfdGV4dCwgYXJndW1lbnRfbmFtZXM9Tm9uZSwgb3B0aW9ucz1Ob25lLCByZXF1aXJlc19s b2NhbF9jb21taXRzPUZhbHNlKToKICAgICAgICAgc2VsZi5oZWxwX3RleHQgPSBoZWxwX3RleHQK ICAgICAgICAgc2VsZi5hcmd1bWVudF9uYW1lcyA9IGFyZ3VtZW50X25hbWVzCkBAIC00Nyw2ICs0 OCwxNCBAQCBjbGFzcyBDb21tYW5kKG9iamVjdCk6CiAgICAgICAgIHNlbGYub3B0aW9ucyA9IG9w dGlvbnMKICAgICAgICAgc2VsZi5vcHRpb25fcGFyc2VyID0gSGVscFByaW50aW5nT3B0aW9uUGFy c2VyKHVzYWdlPVNVUFBSRVNTX1VTQUdFLCBhZGRfaGVscF9vcHRpb249RmFsc2UsIG9wdGlvbl9s aXN0PXNlbGYub3B0aW9ucykKICAgICAgICAgc2VsZi5yZXF1aXJlc19sb2NhbF9jb21taXRzID0g cmVxdWlyZXNfbG9jYWxfY29tbWl0cworICAgICAgICBzZWxmLnRvb2wgPSBOb25lCisKKyAgICAj IFRoZSB0b29sIGNhbGxzIGJpbmRfdG9fdG9vbCBvbiBlYWNoIENvbW1hbmQgYWZ0ZXIgYWRkaW5n IGl0IHRvIGl0cyBsaXN0LgorICAgIGRlZiBiaW5kX3RvX3Rvb2woc2VsZiwgdG9vbCk6CisgICAg ICAgICMgQ29tbWFuZCBpbnN0YW5jZXMgY2FuIG9ubHkgYmUgYm91bmQgdG8gb25lIHRvb2wgYXQg YSB0aW1lLgorICAgICAgICBpZiBzZWxmLnRvb2wgYW5kIHRvb2wgIT0gc2VsZi50b29sOgorICAg ICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJDb21tYW5kIGFscmVhZHkgYm91bmQgdG8gdG9vbCEi KQorICAgICAgICBzZWxmLnRvb2wgPSB0b29sCiAKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVm IF9wYXJzZV9yZXF1aXJlZF9hcmd1bWVudHMoYXJndW1lbnRfbmFtZXMpOgpAQCAtODksNiArOTgs MTEgQEAgY2xhc3MgQ29tbWFuZChvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIDEKICAgICAg ICAgcmV0dXJuIHNlbGYuZXhlY3V0ZShjb21tYW5kX29wdGlvbnMsIGNvbW1hbmRfYXJncywgdG9v bCkgb3IgMAogCisgICAgZGVmIHN0YW5kYWxvbmVfaGVscChzZWxmKToKKyAgICAgICAgaGVscF90 ZXh0ID0gc2VsZi5uYW1lX3dpdGhfYXJndW1lbnRzKCkubGp1c3QobGVuKHNlbGYubmFtZV93aXRo X2FyZ3VtZW50cygpKSArIDMpICsgc2VsZi5oZWxwX3RleHQgKyAiXG4iCisgICAgICAgIGhlbHBf dGV4dCArPSBzZWxmLm9wdGlvbl9wYXJzZXIuZm9ybWF0X29wdGlvbl9oZWxwKEluZGVudGVkSGVs cEZvcm1hdHRlcigpKQorICAgICAgICByZXR1cm4gaGVscF90ZXh0CisKICAgICBkZWYgZXhlY3V0 ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50 ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQiCiAKQEAgLTEwMSw3ICsxMTUsNyBA QCBjbGFzcyBIZWxwUHJpbnRpbmdPcHRpb25QYXJzZXIoT3B0aW9uUGFyc2VyKToKICAgICBkZWYg ZXJyb3Ioc2VsZiwgbXNnKToKICAgICAgICAgc2VsZi5wcmludF91c2FnZShzeXMuc3RkZXJyKQog ICAgICAgICBlcnJvcl9tZXNzYWdlID0gIiVzOiBlcnJvcjogJXNcbiIgJSAoc2VsZi5nZXRfcHJv Z19uYW1lKCksIG1zZykKLSAgICAgICAgZXJyb3JfbWVzc2FnZSArPSAiXG5UeXBlIFwiIiArIHNl bGYuZ2V0X3Byb2dfbmFtZSgpICsgIiAtLWhlbHBcIiB0byBzZWUgdXNhZ2UuXG4iCisgICAgICAg IGVycm9yX21lc3NhZ2UgKz0gIlxuVHlwZSBcIiVzIC0taGVscFwiIHRvIHNlZSB1c2FnZS5cbiIg JSBzZWxmLmdldF9wcm9nX25hbWUoKQogICAgICAgICBzZWxmLmV4aXQoMSwgZXJyb3JfbWVzc2Fn ZSkKIAogICAgICMgV2Ugb3ZlcnJpZGUgZm9ybWF0X2VwaWxvZyB0byBhdm9pZCB0aGUgZGVmYXVs dCBmb3JtYXR0aW5nIHdoaWNoIHdvdWxkIHBhcmFncmFwaC13cmFwIHRoZSBlcGlsb2cKQEAgLTEx MiwxMSArMTI2LDU3IEBAIGNsYXNzIEhlbHBQcmludGluZ09wdGlvblBhcnNlcihPcHRpb25QYXJz ZXIpOgogICAgICAgICByZXR1cm4gIiIKIAogCitjbGFzcyBIZWxwQ29tbWFuZChDb21tYW5kKToK KyAgICBuYW1lID0gImhlbHAiCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBGYWxzZQorCisgICAg ZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAgICBvcHRpb25zID0gWworICAgICAgICAgICAgbWFr ZV9vcHRpb24oIi1hIiwgIi0tYWxsLWNvbW1hbmRzIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVz dD0ic2hvd19hbGxfY29tbWFuZHMiLCBoZWxwPSJQcmludCBhbGwgYXZhaWxhYmxlIGNvbW1hbmRz IiksCisgICAgICAgIF0KKyAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiRGlzcGxheSBp bmZvcm1hdGlvbiBhYm91dCB0aGlzIHByb2dyYW0gb3IgaXRzIHN1YmNvbW1hbmRzIiwgIltDT01N QU5EXSIsIG9wdGlvbnM9b3B0aW9ucykKKyAgICAgICAgc2VsZi5zaG93X2FsbF9jb21tYW5kcyA9 IEZhbHNlICMgQSBoYWNrIHVzZWQgdG8gcGFzcyAtLWFsbC1jb21tYW5kcyB0byBfaGVscF9lcGls b2cgZXZlbiB0aG91Z2ggaXQncyBjYWxsZWQgYnkgdGhlIE9wdGlvblBhcnNlci4KKworICAgIGRl ZiBfaGVscF9lcGlsb2coc2VsZik6CisgICAgICAgICMgT25seSBzaG93IGNvbW1hbmRzIHdoaWNo IGFyZSByZWxldmFudCB0byB0aGlzIGNoZWNrb3V0J3MgU0NNIHN5c3RlbS4gIE1pZ2h0IHRoaXMg YmUgY29uZnVzaW5nIHRvIHNvbWUgdXNlcnM/CisgICAgICAgIGlmIHNlbGYuc2hvd19hbGxfY29t bWFuZHM6CisgICAgICAgICAgICBlcGlsb2cgPSAiQWxsICVwcm9nIGNvbW1hbmRzOlxuIgorICAg ICAgICAgICAgcmVsZXZhbnRfY29tbWFuZHMgPSBzZWxmLnRvb2wuY29tbWFuZHNbOl0KKyAgICAg ICAgZWxzZToKKyAgICAgICAgICAgIGVwaWxvZyA9ICJDb21tb24gJXByb2cgY29tbWFuZHM6XG4i CisgICAgICAgICAgICByZWxldmFudF9jb21tYW5kcyA9IGZpbHRlcihzZWxmLnRvb2wuc2hvdWxk X3Nob3dfaW5fbWFpbl9oZWxwLCBzZWxmLnRvb2wuY29tbWFuZHMpCisgICAgICAgIGxvbmdlc3Rf bmFtZV9sZW5ndGggPSBtYXgobWFwKGxhbWJkYSBjb21tYW5kOiBsZW4oY29tbWFuZC5uYW1lKSwg cmVsZXZhbnRfY29tbWFuZHMpKQorICAgICAgICByZWxldmFudF9jb21tYW5kcy5zb3J0KGxhbWJk YSBhLCBiOiBjbXAoYS5uYW1lLCBiLm5hbWUpKQorICAgICAgICBjb21tYW5kX2hlbHBfdGV4dHMg PSBtYXAobGFtYmRhIGNvbW1hbmQ6ICIgICAlcyAgICVzXG4iICUgKGNvbW1hbmQubmFtZS5sanVz dChsb25nZXN0X25hbWVfbGVuZ3RoKSwgY29tbWFuZC5oZWxwX3RleHQpLCByZWxldmFudF9jb21t YW5kcykKKyAgICAgICAgZXBpbG9nICs9ICIlc1xuIiAlICIiLmpvaW4oY29tbWFuZF9oZWxwX3Rl eHRzKQorICAgICAgICBlcGlsb2cgKz0gIlNlZSAnJXByb2cgaGVscCAtLWFsbC1jb21tYW5kcycg dG8gbGlzdCBhbGwgY29tbWFuZHMuXG4iCisgICAgICAgIGVwaWxvZyArPSAiU2VlICclcHJvZyBo ZWxwIENPTU1BTkQnIGZvciBtb3JlIGluZm9ybWF0aW9uIG9uIGEgc3BlY2lmaWMgY29tbWFuZC5c biIKKyAgICAgICAgcmV0dXJuIHNlbGYudG9vbC5nbG9iYWxfb3B0aW9uX3BhcnNlci5leHBhbmRf cHJvZ19uYW1lKGVwaWxvZykKKworICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3Ms IHRvb2wpOgorICAgICAgICBpZiBhcmdzOgorICAgICAgICAgICAgY29tbWFuZCA9IHNlbGYudG9v bC5jb21tYW5kX2J5X25hbWUoYXJnc1swXSkKKyAgICAgICAgICAgIGlmIGNvbW1hbmQ6CisgICAg ICAgICAgICAgICAgcHJpbnQgY29tbWFuZC5zdGFuZGFsb25lX2hlbHAoKQorICAgICAgICAgICAg ICAgIHJldHVybiAwCisKKyAgICAgICAgc2VsZi5zaG93X2FsbF9jb21tYW5kcyA9IG9wdGlvbnMu c2hvd19hbGxfY29tbWFuZHMKKyAgICAgICAgdG9vbC5nbG9iYWxfb3B0aW9uX3BhcnNlci5wcmlu dF9oZWxwKCkKKyAgICAgICAgcmV0dXJuIDAKKworCiBjbGFzcyBNdWx0aUNvbW1hbmRUb29sKG9i amVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWU9Tm9uZSwgY29tbWFuZHM9Tm9uZSk6 CiAgICAgICAgICMgQWxsb3cgdGhlIHVuaXQgdGVzdHMgdG8gZGlzYWJsZSBjb21tYW5kIGF1dG8t ZGlzY292ZXJ5LgogICAgICAgICBzZWxmLmNvbW1hbmRzID0gY29tbWFuZHMgb3IgW2NscygpIGZv ciBjbHMgaW4gc2VsZi5fZmluZF9hbGxfY29tbWFuZHMoKSBpZiBjbHMubmFtZV0KLSAgICAgICAg c2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNlciA9IEhlbHBQcmludGluZ09wdGlvblBhcnNlcihlcGls b2dfbWV0aG9kPXNlbGYuX2hlbHBfZXBpbG9nLCBwcm9nPW5hbWUsIHVzYWdlPXNlbGYuX3VzYWdl X2xpbmUoKSkKKyAgICAgICAgc2VsZi5oZWxwX2NvbW1hbmQgPSBzZWxmLmNvbW1hbmRfYnlfbmFt ZShIZWxwQ29tbWFuZC5uYW1lKQorICAgICAgICAjIFJlcXVpcmUgYSBoZWxwIGNvbW1hbmQsIGV2 ZW4gaWYgdGhlIG1hbnVhbCB0ZXN0IGxpc3QgZG9lc24ndCBpbmNsdWRlIG9uZS4KKyAgICAgICAg aWYgbm90IHNlbGYuaGVscF9jb21tYW5kOgorICAgICAgICAgICAgc2VsZi5oZWxwX2NvbW1hbmQg PSBIZWxwQ29tbWFuZCgpCisgICAgICAgICAgICBzZWxmLmNvbW1hbmRzLmFwcGVuZChzZWxmLmhl bHBfY29tbWFuZCkKKyAgICAgICAgZm9yIGNvbW1hbmQgaW4gc2VsZi5jb21tYW5kczoKKyAgICAg ICAgICAgIGNvbW1hbmQuYmluZF90b190b29sKHNlbGYpCisgICAgICAgIHNlbGYuZ2xvYmFsX29w dGlvbl9wYXJzZXIgPSBIZWxwUHJpbnRpbmdPcHRpb25QYXJzZXIoZXBpbG9nX21ldGhvZD1zZWxm LmhlbHBfY29tbWFuZC5faGVscF9lcGlsb2csIHByb2c9bmFtZSwgdXNhZ2U9c2VsZi5fdXNhZ2Vf bGluZSgpKQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIF9hZGRfYWxsX3N1YmNsYXNzZXMo Y2xzLCBjbGFzc190b19jcmF3bCwgc2Vlbl9jbGFzc2VzKToKQEAgLTEzNSwyNiArMTk1LDkgQEAg Y2xhc3MgTXVsdGlDb21tYW5kVG9vbChvYmplY3QpOgogICAgIGRlZiBfdXNhZ2VfbGluZSgpOgog ICAgICAgICByZXR1cm4gIlVzYWdlOiAlcHJvZyBbb3B0aW9uc10gQ09NTUFORCBbQVJHU10iCiAK LSAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX3N0YW5kYWxvbmVfaGVscF9mb3JfY29tbWFuZChj bHMsIGNvbW1hbmQpOgotICAgICAgICBoZWxwX3RleHQgPSBjb21tYW5kLm5hbWVfd2l0aF9hcmd1 bWVudHMoKS5sanVzdChsZW4oY29tbWFuZC5uYW1lX3dpdGhfYXJndW1lbnRzKCkpICsgMykgKyBj b21tYW5kLmhlbHBfdGV4dCArICJcbiIKLSAgICAgICAgaGVscF90ZXh0ICs9IGNvbW1hbmQub3B0 aW9uX3BhcnNlci5mb3JtYXRfb3B0aW9uX2hlbHAoSW5kZW50ZWRIZWxwRm9ybWF0dGVyKCkpCi0g ICAgICAgIHJldHVybiBoZWxwX3RleHQKLQogICAgIGRlZiBuYW1lKHNlbGYpOgogICAgICAgICBy ZXR1cm4gc2VsZi5nbG9iYWxfb3B0aW9uX3BhcnNlci5nZXRfcHJvZ19uYW1lKCkKIAotICAgIGRl ZiBfaGVscF9lcGlsb2coc2VsZik6Ci0gICAgICAgICMgT25seSBzaG93IGNvbW1hbmRzIHdoaWNo IGFyZSByZWxldmFudCB0byB0aGlzIGNoZWNrb3V0J3MgU0NNIHN5c3RlbS4gIE1pZ2h0IHRoaXMg YmUgY29uZnVzaW5nIHRvIHNvbWUgdXNlcnM/Ci0gICAgICAgIHJlbGV2YW50X2NvbW1hbmRzID0g ZmlsdGVyKHNlbGYuc2hvdWxkX3Nob3dfY29tbWFuZF9oZWxwLCBzZWxmLmNvbW1hbmRzKQotICAg ICAgICBsb25nZXN0X25hbWVfbGVuZ3RoID0gbWF4KG1hcChsYW1iZGEgY29tbWFuZDogbGVuKGNv bW1hbmQubmFtZSksIHJlbGV2YW50X2NvbW1hbmRzKSkKLSAgICAgICAgcmVsZXZhbnRfY29tbWFu ZHMuc29ydChsYW1iZGEgYSwgYjogY21wKGEubmFtZSwgYi5uYW1lKSkKLSAgICAgICAgY29tbWFu ZF9oZWxwX3RleHRzID0gbWFwKGxhbWJkYSBjb21tYW5kOiAiICAgJXMgICAlc1xuIiAlIChjb21t YW5kLm5hbWUubGp1c3QobG9uZ2VzdF9uYW1lX2xlbmd0aCksIGNvbW1hbmQuaGVscF90ZXh0KSwg cmVsZXZhbnRfY29tbWFuZHMpCi0gICAgICAgIGVwaWxvZyA9ICIlcHJvZyBzdXBwb3J0cyB0aGUg Zm9sbG93aW5nIGNvbW1hbmRzOlxuIgotICAgICAgICBlcGlsb2cgKz0gIiVzXG4iICUgIiIuam9p bihjb21tYW5kX2hlbHBfdGV4dHMpCi0gICAgICAgIGVwaWxvZyArPSAiU2VlICclcHJvZyBoZWxw IENPTU1BTkQnIGZvciBtb3JlIGluZm9ybWF0aW9uIG9uIGEgc3BlY2lmaWMgY29tbWFuZC5cbiIK LSAgICAgICAgcmV0dXJuIHNlbGYuZ2xvYmFsX29wdGlvbl9wYXJzZXIuZXhwYW5kX3Byb2dfbmFt ZShlcGlsb2cpCi0KICAgICBkZWYgaGFuZGxlX2dsb2JhbF9hcmdzKHNlbGYsIGFyZ3MpOgogICAg ICAgICAob3B0aW9ucywgYXJncykgPSBzZWxmLmdsb2JhbF9vcHRpb25fcGFyc2VyLnBhcnNlX2Fy Z3MoYXJncykKICAgICAgICAgIyBXZSBzaG91bGQgbmV2ZXIgaGl0IHRoaXMgYmVjYXVzZSBfc3Bs aXRfYXJncyBzcGxpdHMgYXQgdGhlIGZpcnN0IGFyZyB3aXRob3V0IGEgbGVhZGluZyAiLSIuCkBA IC0xODYsOCArMjI5LDggQEAgY2xhc3MgTXVsdGlDb21tYW5kVG9vbChvYmplY3QpOgogICAgIGRl ZiBwYXRoKHNlbGYpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yLCAic3ViY2xh c3NlcyBtdXN0IGltcGxlbWVudCIKIAotICAgIGRlZiBzaG91bGRfc2hvd19jb21tYW5kX2hlbHAo c2VsZiwgY29tbWFuZCk6Ci0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IsICJzdWJj bGFzc2VzIG11c3QgaW1wbGVtZW50IgorICAgIGRlZiBzaG91bGRfc2hvd19pbl9tYWluX2hlbHAo c2VsZiwgY29tbWFuZCk6CisgICAgICAgIHJldHVybiBjb21tYW5kLnNob3dfaW5fbWFpbl9oZWxw CiAKICAgICBkZWYgc2hvdWxkX2V4ZWN1dGVfY29tbWFuZChzZWxmLCBjb21tYW5kKToKICAgICAg ICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvciwgInN1YmNsYXNzZXMgbXVzdCBpbXBsZW1lbnQi CkBAIC0xOTgsMTggKzI0MSw3IEBAIGNsYXNzIE11bHRpQ29tbWFuZFRvb2wob2JqZWN0KToKICAg ICAgICAgIyBIYW5kbGUgLS1oZWxwLCBldGM6CiAgICAgICAgIHNlbGYuaGFuZGxlX2dsb2JhbF9h cmdzKGdsb2JhbF9hcmdzKQogCi0gICAgICAgIGlmIG5vdCBjb21tYW5kX25hbWU6Ci0gICAgICAg ICAgICBzZWxmLmdsb2JhbF9vcHRpb25fcGFyc2VyLmVycm9yKCJObyBjb21tYW5kIHNwZWNpZmll ZCIpCi0KLSAgICAgICAgaWYgY29tbWFuZF9uYW1lID09ICJoZWxwIjoKLSAgICAgICAgICAgIGlm IGFyZ3NfYWZ0ZXJfY29tbWFuZF9uYW1lOgotICAgICAgICAgICAgICAgIGNvbW1hbmQgPSBzZWxm LmNvbW1hbmRfYnlfbmFtZShhcmdzX2FmdGVyX2NvbW1hbmRfbmFtZVswXSkKLSAgICAgICAgICAg ICAgICBsb2coc2VsZi5fc3RhbmRhbG9uZV9oZWxwX2Zvcl9jb21tYW5kKGNvbW1hbmQpKQotICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBzZWxmLmdsb2JhbF9vcHRpb25fcGFyc2Vy LnByaW50X2hlbHAoKQotICAgICAgICAgICAgcmV0dXJuIDAKLQotICAgICAgICBjb21tYW5kID0g c2VsZi5jb21tYW5kX2J5X25hbWUoY29tbWFuZF9uYW1lKQorICAgICAgICBjb21tYW5kID0gc2Vs Zi5jb21tYW5kX2J5X25hbWUoY29tbWFuZF9uYW1lKSBvciBzZWxmLmhlbHBfY29tbWFuZAogICAg ICAgICBpZiBub3QgY29tbWFuZDoKICAgICAgICAgICAgIHNlbGYuZ2xvYmFsX29wdGlvbl9wYXJz ZXIuZXJyb3IoIiVzIGlzIG5vdCBhIHJlY29nbml6ZWQgY29tbWFuZCIgJSBjb21tYW5kX25hbWUp CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0 b29sX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFu ZHRvb2xfdW5pdHRlc3QucHkKaW5kZXggNGE2MmY1NC4uYzcxY2MwOSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRlc3QucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRlc3Qu cHkKQEAgLTM1LDEyICszNSwxNiBAQCBmcm9tIG9wdHBhcnNlIGltcG9ydCBtYWtlX29wdGlvbgog CiBjbGFzcyBUcml2aWFsQ29tbWFuZChDb21tYW5kKToKICAgICBuYW1lID0gInRyaXZpYWwiCisg ICAgc2hvd19pbl9tYWluX2hlbHAgPSBUcnVlCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dh cmdzKToKICAgICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCAiaGVscCB0ZXh0IiwgKiprd2Fy Z3MpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKICAgICAg ICAgcGFzcwogCitjbGFzcyBVbmNvbW1vbkNvbW1hbmQoVHJpdmlhbENvbW1hbmQpOgorICAgIG5h bWUgPSAidW5jb21tb24iCisgICAgc2hvd19pbl9tYWluX2hlbHAgPSBGYWxzZQogCiBjbGFzcyBD b21tYW5kVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfbmFtZV93aXRoX2Fy Z3VtZW50cyhzZWxmKToKQEAgLTc2LDExICs4MCw4IEBAIGNsYXNzIFRyaXZpYWxUb29sKE11bHRp Q29tbWFuZFRvb2wpOgogICAgIGRlZiBwYXRoKCk6CiAgICAgICAgIHJldHVybiBfX2ZpbGVfXwog Ci0gICAgZGVmIHNob3VsZF9zaG93X2NvbW1hbmRfaGVscChzZWxmLCBjb21tYW5kKToKLSAgICAg ICAgcmV0dXJuIFRydWUKLQogICAgIGRlZiBzaG91bGRfZXhlY3V0ZV9jb21tYW5kKHNlbGYsIGNv bW1hbmQpOgotICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICByZXR1cm4gKFRydWUsIE5vbmUp CiAKIAogY2xhc3MgTXVsdGlDb21tYW5kVG9vbFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgpAQCAt MTA3LDE4ICsxMDgsNTAgQEAgY2xhc3MgTXVsdGlDb21tYW5kVG9vbFRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRvb2wuY29tbWFuZF9ieV9uYW1lKCJ0 cml2aWFsIikubmFtZSwgInRyaXZpYWwiKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRvb2wu Y29tbWFuZF9ieV9uYW1lKCJiYXIiKSwgTm9uZSkKIAotICAgIGRlZiB0ZXN0X2NvbW1hbmRfaGVs cChzZWxmKToKLSAgICAgICAgY29tbWFuZF93aXRoX29wdGlvbnMgPSBUcml2aWFsQ29tbWFuZChv cHRpb25zPVttYWtlX29wdGlvbigiLS1teV9vcHRpb24iKV0pCi0gICAgICAgIHRvb2wgPSBUcml2 aWFsVG9vbChjb21tYW5kcz1bY29tbWFuZF93aXRoX29wdGlvbnNdKQotCisgICAgZGVmIF9hc3Nl cnRfdG9vbF9tYWluX291dHB1dHMoc2VsZiwgdG9vbCwgbWFpbl9hcmdzLCBleHBlY3RlZF9zdGRv dXQsIGV4cGVjdGVkX3N0ZGVyciA9ICIiLCBleGl0X2NvZGU9MCk6CiAgICAgICAgIGNhcHR1cmUg PSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgY2FwdHVyZS5jYXB0dXJlX291dHB1dCgpCi0gICAg ICAgIGV4aXRfY29kZSA9IHRvb2wubWFpbihbInRvb2wiLCAiaGVscCIsICJ0cml2aWFsIl0pCisg ICAgICAgIGV4aXRfY29kZSA9IHRvb2wubWFpbihtYWluX2FyZ3MpCiAgICAgICAgIChzdGRvdXRf c3RyaW5nLCBzdGRlcnJfc3RyaW5nKSA9IGNhcHR1cmUucmVzdG9yZV9vdXRwdXQoKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHN0ZG91dF9zdHJpbmcsIGV4cGVjdGVkX3N0ZG91dCkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZGVycikKKwor ICAgIGRlZiB0ZXN0X2dsb2JhbF9oZWxwKHNlbGYpOgorICAgICAgICB0b29sID0gVHJpdmlhbFRv b2woY29tbWFuZHM9W1RyaXZpYWxDb21tYW5kKCksIFVuY29tbW9uQ29tbWFuZCgpXSkKKyAgICAg ICAgZXhwZWN0ZWRfY29tbW9uX2NvbW1hbmRzX2hlbHAgPSAiIiJVc2FnZTogdHJpdmlhbC10b29s IFtvcHRpb25zXSBDT01NQU5EIFtBUkdTXQorCitPcHRpb25zOgorICAtaCwgLS1oZWxwICBzaG93 IHRoaXMgaGVscCBtZXNzYWdlIGFuZCBleGl0CisKK0NvbW1vbiB0cml2aWFsLXRvb2wgY29tbWFu ZHM6CisgICB0cml2aWFsICAgaGVscCB0ZXh0CisKK1NlZSAndHJpdmlhbC10b29sIGhlbHAgLS1h bGwtY29tbWFuZHMnIHRvIGxpc3QgYWxsIGNvbW1hbmRzLgorU2VlICd0cml2aWFsLXRvb2wgaGVs cCBDT01NQU5EJyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBvbiBhIHNwZWNpZmljIGNvbW1hbmQuCisK KyIiIgorICAgICAgICBzZWxmLl9hc3NlcnRfdG9vbF9tYWluX291dHB1dHModG9vbCwgWyJ0b29s IiwgImhlbHAiXSwgZXhwZWN0ZWRfY29tbW9uX2NvbW1hbmRzX2hlbHApCisgICAgICAgIGV4cGVj dGVkX2FsbF9jb21tYW5kc19oZWxwID0gIiIiVXNhZ2U6IHRyaXZpYWwtdG9vbCBbb3B0aW9uc10g Q09NTUFORCBbQVJHU10KKworT3B0aW9uczoKKyAgLWgsIC0taGVscCAgc2hvdyB0aGlzIGhlbHAg bWVzc2FnZSBhbmQgZXhpdAorCitBbGwgdHJpdmlhbC10b29sIGNvbW1hbmRzOgorICAgaGVscCAg ICAgICBEaXNwbGF5IGluZm9ybWF0aW9uIGFib3V0IHRoaXMgcHJvZ3JhbSBvciBpdHMgc3ViY29t bWFuZHMKKyAgIHRyaXZpYWwgICAgaGVscCB0ZXh0CisgICB1bmNvbW1vbiAgIGhlbHAgdGV4dAor CitTZWUgJ3RyaXZpYWwtdG9vbCBoZWxwIC0tYWxsLWNvbW1hbmRzJyB0byBsaXN0IGFsbCBjb21t YW5kcy4KK1NlZSAndHJpdmlhbC10b29sIGhlbHAgQ09NTUFORCcgZm9yIG1vcmUgaW5mb3JtYXRp b24gb24gYSBzcGVjaWZpYyBjb21tYW5kLgorCisiIiIKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3Rv b2xfbWFpbl9vdXRwdXRzKHRvb2wsIFsidG9vbCIsICJoZWxwIiwgIi0tYWxsLWNvbW1hbmRzIl0s IGV4cGVjdGVkX2FsbF9jb21tYW5kc19oZWxwKQorCisgICAgZGVmIHRlc3RfY29tbWFuZF9oZWxw KHNlbGYpOgorICAgICAgICBjb21tYW5kX3dpdGhfb3B0aW9ucyA9IFRyaXZpYWxDb21tYW5kKG9w dGlvbnM9W21ha2Vfb3B0aW9uKCItLW15X29wdGlvbiIpXSkKKyAgICAgICAgdG9vbCA9IFRyaXZp YWxUb29sKGNvbW1hbmRzPVtjb21tYW5kX3dpdGhfb3B0aW9uc10pCiAgICAgICAgIGV4cGVjdGVk X3N1YmNvbW1hbmRfaGVscCA9ICJ0cml2aWFsIFtvcHRpb25zXSAgIGhlbHAgdGV4dFxuT3B0aW9u czpcbiAgLS1teV9vcHRpb249TVlfT1BUSU9OXG5cbiIKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChleGl0X2NvZGUsIDApCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Rkb3V0X3N0cmluZywg IiIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RkZXJyX3N0cmluZywgZXhwZWN0ZWRfc3Vi Y29tbWFuZF9oZWxwKQorICAgICAgICBzZWxmLl9hc3NlcnRfdG9vbF9tYWluX291dHB1dHModG9v bCwgWyJ0b29sIiwgImhlbHAiLCAidHJpdmlhbCJdLCBleHBlY3RlZF9zdWJjb21tYW5kX2hlbHAp CiAKIAogaWYgX19uYW1lX18gPT0gIl9fbWFpbl9fIjoK