208920 2020-03-11 08:56:38 -0700 [ews] Resubmit patches to commit-queue which were cq- by commit-queue and later cq+ 2020-03-18 07:44:50 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=196628 InRadar P2 Normal --- 201934 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1628662 0 aakash_jain 2020-03-11 08:56:38 -0700 EWS django app should resubmit patches to commit-queue which were cq- by commit-queue (e.g.: due to flaky test failure) and later were cq+. Currently ews django app does not re-submit any patch, it sends the patch to buildbot only once. Because of this is a patch which was rejected by commit-queue, and later cq+ again by patch author, would not be picked up again. 1628664 1 393247 aakash_jain 2020-03-11 09:08:42 -0700 Created attachment 393247 WIP 1630849 2 393778 aakash_jain 2020-03-17 12:47:50 -0700 Created attachment 393778 Patch 1630865 3 393778 jbedard 2020-03-17 13:44:39 -0700 Comment on attachment 393778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393778&action=review > Tools/BuildSlaveSupport/ews-app/ews/fetcher.py:106 > def patches_to_send_to_buildbot(self, patch_ids, commit_queue=False): If we are adding a new 'patches_to_send_to_commit_queue' function, what's the point of this flag? > Tools/BuildSlaveSupport/ews-app/ews/common/bugzilla.py:67 > + def convert_iso_timestamp(cls, iso_timestamp): Nit: Not convinced that this should be a separate function, I would have put the logic in the above function. > Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py:-102 > - return Buildbot.icons_for_queues_mapping I think this deletion was unintentional. > Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py:104 > + def fetch_builders(cls): Do we ever intend to call this outside of update_builder_name_to_id_mapping? Seems like we should consider putting the contents inside that function 1630891 4 393788 aakash_jain 2020-03-17 14:32:02 -0700 Created attachment 393788 Patch 1630896 5 aakash_jain 2020-03-17 14:35:36 -0700 (In reply to Jonathan Bedard from comment #3) > If we are adding a new 'patches_to_send_to_commit_queue' function, what's the point of this flag? Removed in updated patch > Nit: Not convinced that this should be a separate function, I would have put the logic in the above function. Moved inside same function. > > - return Buildbot.icons_for_queues_mapping > I think this deletion was unintentional. It was actually intentional. The return value is never used and the function name also doesn't indicate that the function will return anything. > Do we ever intend to call this outside of update_builder_name_to_id_mapping? Seems like we should consider putting the contents inside that function Done in updated patch. 1630960 6 ews-feeder 2020-03-17 17:01:48 -0700 Committed r258611: <https://trac.webkit.org/changeset/258611> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393788. 1630961 7 webkit-bug-importer 2020-03-17 17:02:16 -0700 <rdar://problem/60561892> 393247 2020-03-11 09:08:42 -0700 2020-03-17 12:47:47 -0700 WIP bug-208920-20200311120841.patch text/plain 6872 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODI2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDIwLTAzLTExICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBSZXN1Ym1pdCBwYXRjaGVzIHRvIGNvbW1pdC1xdWV1ZSB3aGlj aCB3ZXJlIGNxLSBieSBjb21taXQtcXVldWUgYW5kIGxhdGVyIGNxKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVpbGRib3QucHk6CisgICAgICAgIChCdWlsZGJvdCk6CisgICAgICAg IChCdWlsZGJvdC5mZXRjaF9idWlsZGVycyk6IE1ldGhvZCB0byBmZXRjaCBidWlsZGVycyBpbmZv cm1hdGlvbiBmcm9tIGJ1aWxkYm90LgorICAgICAgICAoQnVpbGRib3QudXBkYXRlX2J1aWxkZXJf bmFtZV90b19pZF9tYXBwaW5nKTogTWV0aG9kIHRvIGdlbmVyYXRlIGJ1aWxkZXIgbmFtZSB0byBp ZCBtYXBwaW5nLgorICAgICAgICAoQnVpbGRib3QuZmV0Y2hfcGVuZGluZ19hbmRfaW5wcm9ncmVz c19idWlsZHMpOiBNZXRob2QgdG8gZmV0Y2ggcGVuZGlnbiBhbmQgaW4tcHJvZ3Jlc3MgYnVpbGRz IGZyb20gYnVpbGRib3QuCisgICAgICAgIChCdWlsZGJvdC5nZXRfcGF0Y2hlc19pbl9xdWV1ZSk6 IE1ldGhvZCB0byBmZXRjaCBsaXN0IG9mIHBhdGNoZXMgd2hpY2ggYXJlIHBlbmRpbmcgb3IgYXJl IGluLXByb2dyZXNzIG9uIGJ1aWxkYm90LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3 cy1hcHAvZXdzL2ZldGNoZXIucHk6CisgICAgICAgIChGZXRjaExvb3AuX19pbml0X18pOiBVcGRh dGUgYnVpbGRlciBuYW1lIHRvIGlkIG1hcHBpbmcuIFdlIGp1c3QgbmVlZCB0byB1cGRhdGUgaXQg b25lLXRpbWUsIHNpbmNlIHdlIG5lZWQgdGhlIGlkIG9ubHkKKyAgICAgICAgZm9yIGNvbW1pdC1x dWV1ZSB3aGljaCBpc24ndCBleHBlY3RlZCB0byBjaGFuZ2UuCisgICAgICAgIChGZXRjaExvb3Au cnVuKToKKyAgICAgICAgKEJ1Z3ppbGxhUGF0Y2hGZXRjaGVyLmZldGNoX2NvbW1pdF9xdWV1ZV9w YXRjaGVzKToKKyAgICAgICAgKEJ1Z3ppbGxhUGF0Y2hGZXRjaGVyLnNlbmRfcGF0Y2hlc190b19i dWlsZGJvdCk6IEFsbG93IHNlbmRpbmcgdGhlIHBhdGNoIGFnYWluIHRvIGNvbW1pdC1xdWV1ZS4K KyAgICAgICAgKEJ1Z3ppbGxhUGF0Y2hGZXRjaGVyLnBhdGNoZXNfdG9fc2VuZF90b19jb21taXRf cXVldWUpOiBGaW5kIHBhdGNoZXMgd2hpY2ggbmVlZHMgdG8gYmUgc2VudCB0byBjb21taXQtcXVl dWUsIGJhc2VkIG9uCisgICAgICAgIHdoZXRoZXIgdGhlIHBhdGNoIGlzIGFscmVhZHkgd2FpdGlu ZyBvciBpbi1wcm9ncmVzcyBvbiBjb21taXQtcXVldWUuCisKIDIwMjAtMDMtMTEgIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3NdIEFkZCB1bml0IHRl c3QgdG8gcHJldmVudCBtdWx0aXBsZSBzY2hlZHVsZXJzIGZvciBhIGJ1aWxkZXIuCkluZGV4OiBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9mZXRjaGVyLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2ZldGNoZXIucHkJKHJldmlz aW9uIDI1ODI2MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2ZldGNo ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgY2xhc3MgRmV0Y2hMb29wKCk6 CiAgICAgICAgIHRocmVhZC5zdGFydCgpCiAKICAgICBkZWYgcnVuKHNlbGYpOgorICAgICAgICBC dWlsZGJvdC51cGRhdGVfYnVpbGRlcl9uYW1lX3RvX2lkX21hcHBpbmcoKQogICAgICAgICB3aGls ZSBUcnVlOgogICAgICAgICAgICAgQnVpbGRib3QudXBkYXRlX2ljb25zX2Zvcl9xdWV1ZXNfbWFw cGluZygpCiAgICAgICAgICAgICB0cnk6CkBAIC02OSw3ICs3MCw3IEBAIGNsYXNzIEJ1Z3ppbGxh UGF0Y2hGZXRjaGVyKCk6CiAgICAgICAgIHBhdGNoX2lkc19jb21taXRfcXVldWUgPSBCdWd6aWxs YVBhdGNoRmV0Y2hlci5maWx0ZXJfdmFsaWRfcGF0Y2hlcyhwYXRjaF9pZHNfY29tbWl0X3F1ZXVl KQogICAgICAgICBfbG9nLmRlYnVnKCdjcSsgcGF0Y2hlczoge30nLmZvcm1hdChwYXRjaF9pZHNf Y29tbWl0X3F1ZXVlKSkKICAgICAgICAgUGF0Y2guc2F2ZV9wYXRjaGVzKHBhdGNoX2lkc19jb21t aXRfcXVldWUpCi0gICAgICAgIHBhdGNoZXNfdG9fc2VuZCA9IHNlbGYucGF0Y2hlc190b19zZW5k X3RvX2J1aWxkYm90KHBhdGNoX2lkc19jb21taXRfcXVldWUsIGNvbW1pdF9xdWV1ZT1UcnVlKQor ICAgICAgICBwYXRjaGVzX3RvX3NlbmQgPSBzZWxmLnBhdGNoZXNfdG9fc2VuZF90b19jb21taXRf cXVldWUocGF0Y2hfaWRzX2NvbW1pdF9xdWV1ZSkKICAgICAgICAgX2xvZy5pbmZvKCd7fSBjcSsg cGF0Y2hlcywge30gcGF0Y2hlcyBuZWVkIHRvIGJlIHNlbnQgdG8gY29tbWl0IHF1ZXVlOiB7fScu Zm9ybWF0KGxlbihwYXRjaF9pZHNfY29tbWl0X3F1ZXVlKSwgbGVuKHBhdGNoZXNfdG9fc2VuZCks IHBhdGNoZXNfdG9fc2VuZCkpCiAgICAgICAgIHNlbGYuc2VuZF9wYXRjaGVzX3RvX2J1aWxkYm90 KHBhdGNoZXNfdG9fc2VuZCwgc2VuZF90b19jb21taXRfcXVldWU9VHJ1ZSkKIApAQCAtODUsOCAr ODYsOCBAQCBjbGFzcyBCdWd6aWxsYVBhdGNoRmV0Y2hlcigpOgogICAgICAgICAgICAgICAgIF9s b2cud2FybignUGF0Y2ggaXMgb2Jzb2xldGUsIHNraXBwaW5nJykKICAgICAgICAgICAgICAgICBQ YXRjaC5zZXRfb2Jzb2xldGUocGF0Y2hfaWQpCiAgICAgICAgICAgICAgICAgY29udGludWUKLSAg ICAgICAgICAgIGlmIFBhdGNoLmlzX3BhdGNoX3NlbnRfdG9fYnVpbGRib3QocGF0Y2hfaWQsIGNv bW1pdF9xdWV1ZT1zZW5kX3RvX2NvbW1pdF9xdWV1ZSk6Ci0gICAgICAgICAgICAgICAgX2xvZy5l cnJvcignUGF0Y2gge30gaXMgYWxyZWFkeSBzZW50IHRvIGJ1aWxkYm90L2NvbW1pdC1xdWV1ZS4n LmZvcm1hdChwYXRjaF9pZCkpCisgICAgICAgICAgICBpZiBub3Qgc2VuZF90b19jb21taXRfcXVl dWUgYW5kIFBhdGNoLmlzX3BhdGNoX3NlbnRfdG9fYnVpbGRib3QocGF0Y2hfaWQpOgorICAgICAg ICAgICAgICAgIF9sb2cuZXJyb3IoJ1BhdGNoIHt9IGlzIGFscmVhZHkgc2VudCB0byBidWlsZGJv dC4nLmZvcm1hdChwYXRjaF9pZCkpCiAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAg ICAgIFBhdGNoLnNldF9zZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkLCBUcnVlLCBjb21taXRfcXVl dWU9c2VuZF90b19jb21taXRfcXVldWUpCiAgICAgICAgICAgICByYyA9IEJ1aWxkYm90LnNlbmRf cGF0Y2hfdG9fYnVpbGRib3QoYnpfcGF0Y2hbJ3BhdGgnXSwKQEAgLTEwMiw2ICsxMDMsMTYgQEAg Y2xhc3MgQnVnemlsbGFQYXRjaEZldGNoZXIoKToKICAgICBkZWYgcGF0Y2hlc190b19zZW5kX3Rv X2J1aWxkYm90KHNlbGYsIHBhdGNoX2lkcywgY29tbWl0X3F1ZXVlPUZhbHNlKToKICAgICAgICAg cmV0dXJuIFtwYXRjaF9pZCBmb3IgcGF0Y2hfaWQgaW4gcGF0Y2hfaWRzIGlmIG5vdCBQYXRjaC5p c19wYXRjaF9zZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkLCBjb21taXRfcXVldWUpXQogCisgICAg ZGVmIHBhdGNoZXNfdG9fc2VuZF90b19jb21taXRfcXVldWUoc2VsZiwgcGF0Y2hfaWRzKToKKyAg ICAgICAgaWYgbm90IHBhdGNoX2lkczoKKyAgICAgICAgICAgIHJldHVybiBwYXRjaF9pZHMKKyAg ICAgICAgcGF0Y2hlc190b19zZW5kID0gW10KKyAgICAgICAgcGF0Y2hlc19pbl9xdWV1ZSA9IHNl dChCdWlsZGJvdC5nZXRfcGF0Y2hlc19pbl9xdWV1ZSgnQ29tbWl0LVF1ZXVlJykpCisgICAgICAg IGZvciBwYXRjaF9pZCBpbiBzZXQocGF0Y2hfaWRzKToKKyAgICAgICAgICAgIGlmIHN0cihwYXRj aF9pZCkgbm90IGluIHBhdGNoZXNfaW5fcXVldWU6CisgICAgICAgICAgICAgICAgcGF0Y2hlc190 b19zZW5kLmFwcGVuZChwYXRjaF9pZCkKKyAgICAgICAgcmV0dXJuIHBhdGNoZXNfdG9fc2VuZAor CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGZpbHRlcl92YWxpZF9wYXRjaGVzKGNscywgcGF0 Y2hfaWRzKToKICAgICAgICAgcmV0dXJuIGxpc3QoZmlsdGVyKGxhbWJkYSBwOiBQYXRjaC5pc192 YWxpZF9wYXRjaF9pZChwKSwgcGF0Y2hfaWRzKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWlsZGJvdC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVpbGRib3QucHkJKHJldmlzaW9u IDI1ODI2MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9i dWlsZGJvdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBCdWlsZGJv dCgpOgogICAgIEFMTF9SRVNVTFRTID0gbHJhbmdlKDcpCiAgICAgU1VDQ0VTUywgV0FSTklOR1Ms IEZBSUxVUkUsIFNLSVBQRUQsIEVYQ0VQVElPTiwgUkVUUlksIENBTkNFTExFRCA9IEFMTF9SRVNV TFRTCiAgICAgaWNvbnNfZm9yX3F1ZXVlc19tYXBwaW5nID0ge30KKyAgICBidWlsZGVyX25hbWVf dG9faWRfbWFwcGluZyA9IHt9CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2VuZF9wYXRj aF90b19idWlsZGJvdChjbHMsIHBhdGNoX3BhdGgsIHNlbmRfdG9fY29tbWl0X3F1ZXVlPUZhbHNl LCBwcm9wZXJ0aWVzPU5vbmUpOgpAQCAtOTksNyArMTAwLDQyIEBAIGNsYXNzIEJ1aWxkYm90KCk6 CiAgICAgICAgICAgICBzaG9ydG5hbWUgPSBidWlsZGVyLmdldCgnc2hvcnRuYW1lJykKICAgICAg ICAgICAgIEJ1aWxkYm90Lmljb25zX2Zvcl9xdWV1ZXNfbWFwcGluZ1tzaG9ydG5hbWVdID0gYnVp bGRlci5nZXQoJ2ljb24nKQogCi0gICAgICAgIHJldHVybiBCdWlsZGJvdC5pY29uc19mb3JfcXVl dWVzX21hcHBpbmcKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZmV0Y2hfYnVpbGRlcnMoY2xz KToKKyAgICAgICAgdXJsID0gJ2h0dHBzOi8ve30vYXBpL3YyL2J1aWxkZXJzJy5mb3JtYXQoY29u ZmlnLkJVSUxEQk9UX1NFUlZFUl9IT1NUKQorICAgICAgICBidWlsZGVyc19kYXRhID0gdXRpbC5m ZXRjaF9kYXRhX2Zyb21fdXJsKHVybCkKKyAgICAgICAgaWYgbm90IGJ1aWxkZXJzX2RhdGE6Cisg ICAgICAgICAgICByZXR1cm4ge30KKyAgICAgICAgcmV0dXJuIGJ1aWxkZXJzX2RhdGEuanNvbigp CisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgdXBkYXRlX2J1aWxkZXJfbmFtZV90b19pZF9t YXBwaW5nKGNscyk6CisgICAgICAgIGNvbmZpZyA9IGNscy5mZXRjaF9idWlsZGVycygpCisgICAg ICAgIGZvciBidWlsZGVyIGluIGNvbmZpZy5nZXQoJ2J1aWxkZXJzJywgW10pOgorICAgICAgICAg ICAgbmFtZSA9IGJ1aWxkZXIuZ2V0KCduYW1lJykKKyAgICAgICAgICAgIEJ1aWxkYm90LmJ1aWxk ZXJfbmFtZV90b19pZF9tYXBwaW5nW25hbWVdID0gYnVpbGRlci5nZXQoJ2J1aWxkZXJpZCcpCisK KyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZmV0Y2hfcGVuZGluZ19hbmRfaW5wcm9ncmVzc19i dWlsZHMoY2xzLCBidWlsZGVyX2Z1bGxfbmFtZSk6CisgICAgICAgIGJ1aWxkZXJpZCA9IEJ1aWxk Ym90LmJ1aWxkZXJfbmFtZV90b19pZF9tYXBwaW5nLmdldChidWlsZGVyX2Z1bGxfbmFtZSkKKyAg ICAgICAgaWYgbm90IGJ1aWxkZXJpZDoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0ludmFsaWQg YnVpbGRlcjoge30nLmZvcm1hdChidWlsZGVyX2Z1bGxfbmFtZSkpCisgICAgICAgICAgICByZXR1 cm4ge30KKyAgICAgICAgdXJsID0gJ2h0dHBzOi8ve30vYXBpL3YyL2J1aWxkZXJzL3t9L2J1aWxk cmVxdWVzdHM/Y29tcGxldGU9ZmFsc2UmcHJvcGVydHk9KicuZm9ybWF0KGNvbmZpZy5CVUlMREJP VF9TRVJWRVJfSE9TVCwgYnVpbGRlcmlkKQorICAgICAgICBidWlsZGVyc19kYXRhID0gdXRpbC5m ZXRjaF9kYXRhX2Zyb21fdXJsKHVybCkKKyAgICAgICAgaWYgbm90IGJ1aWxkZXJzX2RhdGE6Cisg ICAgICAgICAgICByZXR1cm4ge30KKyAgICAgICAgcmV0dXJuIGJ1aWxkZXJzX2RhdGEuanNvbigp CisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZ2V0X3BhdGNoZXNfaW5fcXVldWUoY2xzLCBi dWlsZGVyX2Z1bGxfbmFtZSk6CisgICAgICAgIHBhdGNoX2lkcyA9IFtdCisgICAgICAgIGJ1aWxk cyA9IGNscy5mZXRjaF9wZW5kaW5nX2FuZF9pbnByb2dyZXNzX2J1aWxkcyhidWlsZGVyX2Z1bGxf bmFtZSkKKyAgICAgICAgZm9yIGJ1aWxkcmVxdWVzdCBpbiBidWlsZHMuZ2V0KCdidWlsZHJlcXVl c3RzJywgW10pOgorICAgICAgICAgICAgcHJvcGVydGllcyA9IGJ1aWxkcmVxdWVzdC5nZXQoJ3By b3BlcnRpZXMnKQorICAgICAgICAgICAgaWYgcHJvcGVydGllczoKKyAgICAgICAgICAgICAgICBw YXRjaF9pZHMuYXBwZW5kKHByb3BlcnRpZXMuZ2V0KCdwYXRjaF9pZCcpWzBdKQorICAgICAgICBy ZXR1cm4gcGF0Y2hfaWRzCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgcmV0cnlfYnVpbGQo Y2xzLCBidWlsZGVyX2lkLCBidWlsZF9udW1iZXIpOgo= 393778 2020-03-17 12:47:50 -0700 2020-03-17 14:31:59 -0700 Patch bug-208920-20200317154749.patch text/plain 9930 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODU3MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDIwLTAzLTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBSZXN1Ym1pdCBwYXRjaGVzIHRvIGNvbW1pdC1xdWV1ZSB3aGlj aCB3ZXJlIGNxLSBieSBjb21taXQtcXVldWUgYW5kIGxhdGVyIGNxKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVpbGRib3QucHk6CisgICAgICAgIChCdWlsZGJvdC5mZXRjaF9idWls ZGVycyk6IE1ldGhvZCB0byBmZXRjaCBidWlsZGVycyBpbmZvcm1hdGlvbiBmcm9tIGJ1aWxkYm90 LgorICAgICAgICAoQnVpbGRib3QudXBkYXRlX2J1aWxkZXJfbmFtZV90b19pZF9tYXBwaW5nKTog TWV0aG9kIHRvIGdlbmVyYXRlIGJ1aWxkZXIgbmFtZSB0byBpZCBtYXBwaW5nLgorICAgICAgICAo QnVpbGRib3QuZmV0Y2hfcGVuZGluZ19hbmRfaW5wcm9ncmVzc19idWlsZHMpOiBNZXRob2QgdG8g ZmV0Y2ggcGVuZGlnbiBhbmQgaW4tcHJvZ3Jlc3MgYnVpbGRzIGZyb20gYnVpbGRib3QuCisgICAg ICAgIChCdWlsZGJvdC5nZXRfcGF0Y2hlc19pbl9xdWV1ZSk6IE1ldGhvZCB0byBmZXRjaCBsaXN0 IG9mIHBhdGNoZXMgd2hpY2ggYXJlIHBlbmRpbmcgb3IgYXJlIGluLXByb2dyZXNzIG9uIGJ1aWxk Ym90LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6 aWxsYS5weToKKyAgICAgICAgKEJ1Z3ppbGxhLmdldF9jcV9wbHVzX3RpbWVzdGFtcCk6IEdldCB0 aW1lc3RhbXAgd2hlbiBjcSsgZmxhZyB3YXMgc2V0LgorICAgICAgICAoQnVnemlsbGEuY29udmVy dF9pc29fdGltZXN0YW1wKTogQ29udmVydCB0aGUgdGltZXN0YW1wIHN0cmluZyB0byBpc28gdGlt ZXN0YW1wLiBUaGlzIHRpbWVzdGFtcCBpcyBpbiBVVEMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWFwcC9ld3MvZmV0Y2hlci5weToKKyAgICAgICAgKEZldGNoTG9vcC5ydW4pOiBV cGRhdGUgYnVpbGRlciBuYW1lIHRvIGlkIG1hcHBpbmcuIFdlIGp1c3QgbmVlZCB0byB1cGRhdGUg aXQgb25lLXRpbWUsIHNpbmNlIHdlIG5lZWQgdGhlIGlkIG9ubHkKKyAgICAgICAgZm9yIGNvbW1p dC1xdWV1ZSB3aGljaCBpc24ndCBleHBlY3RlZCB0byBjaGFuZ2UuCisgICAgICAgIChCdWd6aWxs YVBhdGNoRmV0Y2hlci5mZXRjaF9jb21taXRfcXVldWVfcGF0Y2hlcyk6CisgICAgICAgIChCdWd6 aWxsYVBhdGNoRmV0Y2hlci5zZW5kX3BhdGNoZXNfdG9fYnVpbGRib3QpOiBBbGxvdyBzZW5kaW5n IHRoZSBwYXRjaCBhZ2FpbiB0byBjb21taXQtcXVldWUuCisgICAgICAgIChCdWd6aWxsYVBhdGNo RmV0Y2hlci5wYXRjaGVzX3RvX3NlbmRfdG9fY29tbWl0X3F1ZXVlKTogRmluZCBwYXRjaGVzIHdo aWNoIG5lZWRzIHRvIGJlIHNlbnQgdG8gY29tbWl0LXF1ZXVlLiBGaWx0ZXIKKyAgICAgICAgb3V0 IHBhdGNoZXMgd2hpY2ggYXJlIGFscmVhZHkgd2FpdGluZyBvciBpbi1wcm9ncmVzcyBvbiBjb21t aXQtcXVldWUsIG9yIHdob3NlIHJlY2VudCBidWlsZCB3YXMgY29tcGxldGVkIGFmdGVyCisgICAg ICAgIHNldHRpbmcgY3ErIGZsYWcgb24gYnVnemlsbGEuCisKIDIwMjAtMDMtMTcgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgbGVzcyBzeW5jIElQQyBmb3Ig SVRQIHRlc3RSdW5uZXIgbWV0aG9kcwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWFwcC9ld3MvZmV0Y2hlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYXBwL2V3cy9mZXRjaGVyLnB5CShyZXZpc2lvbiAyNTg1NzIpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9mZXRjaGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y MCwxMyArMjAsMTYgQEAKICMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBTT0ZUV0FS RSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAor aW1wb3J0IGRhdGV0aW1lCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHB5dHoKIGltcG9ydCB0aHJl YWRpbmcKIGltcG9ydCB0aW1lCiAKIGZyb20gZXdzLmNvbW1vbi5idWd6aWxsYSBpbXBvcnQgQnVn emlsbGEKIGZyb20gZXdzLmNvbW1vbi5idWlsZGJvdCBpbXBvcnQgQnVpbGRib3QKIGZyb20gZXdz Lm1vZGVscy5wYXRjaCBpbXBvcnQgUGF0Y2gKK2Zyb20gZXdzLnZpZXdzLnN0YXR1c2J1YmJsZSBp bXBvcnQgU3RhdHVzQnViYmxlCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykK IApAQCAtMzksNiArNDIsNyBAQCBjbGFzcyBGZXRjaExvb3AoKToKICAgICAgICAgdGhyZWFkLnN0 YXJ0KCkKIAogICAgIGRlZiBydW4oc2VsZik6CisgICAgICAgIEJ1aWxkYm90LnVwZGF0ZV9idWls ZGVyX25hbWVfdG9faWRfbWFwcGluZygpCiAgICAgICAgIHdoaWxlIFRydWU6CiAgICAgICAgICAg ICBCdWlsZGJvdC51cGRhdGVfaWNvbnNfZm9yX3F1ZXVlc19tYXBwaW5nKCkKICAgICAgICAgICAg IHRyeToKQEAgLTY5LDcgKzczLDcgQEAgY2xhc3MgQnVnemlsbGFQYXRjaEZldGNoZXIoKToKICAg ICAgICAgcGF0Y2hfaWRzX2NvbW1pdF9xdWV1ZSA9IEJ1Z3ppbGxhUGF0Y2hGZXRjaGVyLmZpbHRl cl92YWxpZF9wYXRjaGVzKHBhdGNoX2lkc19jb21taXRfcXVldWUpCiAgICAgICAgIF9sb2cuZGVi dWcoJ2NxKyBwYXRjaGVzOiB7fScuZm9ybWF0KHBhdGNoX2lkc19jb21taXRfcXVldWUpKQogICAg ICAgICBQYXRjaC5zYXZlX3BhdGNoZXMocGF0Y2hfaWRzX2NvbW1pdF9xdWV1ZSkKLSAgICAgICAg cGF0Y2hlc190b19zZW5kID0gc2VsZi5wYXRjaGVzX3RvX3NlbmRfdG9fYnVpbGRib3QocGF0Y2hf aWRzX2NvbW1pdF9xdWV1ZSwgY29tbWl0X3F1ZXVlPVRydWUpCisgICAgICAgIHBhdGNoZXNfdG9f c2VuZCA9IHNlbGYucGF0Y2hlc190b19zZW5kX3RvX2NvbW1pdF9xdWV1ZShwYXRjaF9pZHNfY29t bWl0X3F1ZXVlKQogICAgICAgICBfbG9nLmluZm8oJ3t9IGNxKyBwYXRjaGVzLCB7fSBwYXRjaGVz IG5lZWQgdG8gYmUgc2VudCB0byBjb21taXQgcXVldWU6IHt9Jy5mb3JtYXQobGVuKHBhdGNoX2lk c19jb21taXRfcXVldWUpLCBsZW4ocGF0Y2hlc190b19zZW5kKSwgcGF0Y2hlc190b19zZW5kKSkK ICAgICAgICAgc2VsZi5zZW5kX3BhdGNoZXNfdG9fYnVpbGRib3QocGF0Y2hlc190b19zZW5kLCBz ZW5kX3RvX2NvbW1pdF9xdWV1ZT1UcnVlKQogCkBAIC04NSw4ICs4OSw4IEBAIGNsYXNzIEJ1Z3pp bGxhUGF0Y2hGZXRjaGVyKCk6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuKCdQYXRjaCBpcyBv YnNvbGV0ZSwgc2tpcHBpbmcnKQogICAgICAgICAgICAgICAgIFBhdGNoLnNldF9vYnNvbGV0ZShw YXRjaF9pZCkKICAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgaWYgUGF0Y2gu aXNfcGF0Y2hfc2VudF90b19idWlsZGJvdChwYXRjaF9pZCwgY29tbWl0X3F1ZXVlPXNlbmRfdG9f Y29tbWl0X3F1ZXVlKToKLSAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdQYXRjaCB7fSBpcyBh bHJlYWR5IHNlbnQgdG8gYnVpbGRib3QvY29tbWl0LXF1ZXVlLicuZm9ybWF0KHBhdGNoX2lkKSkK KyAgICAgICAgICAgIGlmIG5vdCBzZW5kX3RvX2NvbW1pdF9xdWV1ZSBhbmQgUGF0Y2guaXNfcGF0 Y2hfc2VudF90b19idWlsZGJvdChwYXRjaF9pZCk6CisgICAgICAgICAgICAgICAgX2xvZy5lcnJv cignUGF0Y2gge30gaXMgYWxyZWFkeSBzZW50IHRvIGJ1aWxkYm90LicuZm9ybWF0KHBhdGNoX2lk KSkKICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgUGF0Y2guc2V0X3NlbnRf dG9fYnVpbGRib3QocGF0Y2hfaWQsIFRydWUsIGNvbW1pdF9xdWV1ZT1zZW5kX3RvX2NvbW1pdF9x dWV1ZSkKICAgICAgICAgICAgIHJjID0gQnVpbGRib3Quc2VuZF9wYXRjaF90b19idWlsZGJvdChi el9wYXRjaFsncGF0aCddLApAQCAtMTAyLDYgKzEwNiwyOCBAQCBjbGFzcyBCdWd6aWxsYVBhdGNo RmV0Y2hlcigpOgogICAgIGRlZiBwYXRjaGVzX3RvX3NlbmRfdG9fYnVpbGRib3Qoc2VsZiwgcGF0 Y2hfaWRzLCBjb21taXRfcXVldWU9RmFsc2UpOgogICAgICAgICByZXR1cm4gW3BhdGNoX2lkIGZv ciBwYXRjaF9pZCBpbiBwYXRjaF9pZHMgaWYgbm90IFBhdGNoLmlzX3BhdGNoX3NlbnRfdG9fYnVp bGRib3QocGF0Y2hfaWQsIGNvbW1pdF9xdWV1ZSldCiAKKyAgICBkZWYgcGF0Y2hlc190b19zZW5k X3RvX2NvbW1pdF9xdWV1ZShzZWxmLCBwYXRjaF9pZHMpOgorICAgICAgICBpZiBub3QgcGF0Y2hf aWRzOgorICAgICAgICAgICAgcmV0dXJuIHBhdGNoX2lkcworICAgICAgICBwYXRjaGVzX2luX3F1 ZXVlID0gc2V0KEJ1aWxkYm90LmdldF9wYXRjaGVzX2luX3F1ZXVlKCdDb21taXQtUXVldWUnKSkK KyAgICAgICAgcGF0Y2hfaWRzID0gW3BhdGNoX2lkIGZvciBwYXRjaF9pZCBpbiBzZXQocGF0Y2hf aWRzKSBpZiBzdHIocGF0Y2hfaWQpIG5vdCBpbiBwYXRjaGVzX2luX3F1ZXVlXQorCisgICAgICAg IHBhdGNoX2lkc190b19zZW5kID0gW10KKyAgICAgICAgZm9yIHBhdGNoX2lkIGluIHBhdGNoX2lk czoKKyAgICAgICAgICAgIHBhdGNoID0gUGF0Y2guZ2V0X3BhdGNoKHBhdGNoX2lkKQorICAgICAg ICAgICAgcmVjZW50X2J1aWxkLCBfID0gU3RhdHVzQnViYmxlKCkuZ2V0X2xhdGVzdF9idWlsZF9m b3JfcXVldWUocGF0Y2gsICdjb21taXQnKQorICAgICAgICAgICAgaWYgbm90IHJlY2VudF9idWls ZDoKKyAgICAgICAgICAgICAgICBwYXRjaF9pZHNfdG9fc2VuZC5hcHBlbmQocGF0Y2hfaWQpCisg ICAgICAgICAgICAgICAgY29udGludWUKKyAgICAgICAgICAgIHJlY2VudF9idWlsZF90aW1lc3Rh bXAgPSBkYXRldGltZS5kYXRldGltZS5mcm9tdGltZXN0YW1wKHJlY2VudF9idWlsZC5jb21wbGV0 ZV9hdCwgdHo9cHl0ei5VVEMpCisgICAgICAgICAgICBjcV90aW1lc3RhbXAgPSBCdWd6aWxsYS5n ZXRfY3FfcGx1c190aW1lc3RhbXAocGF0Y2hfaWQpCisgICAgICAgICAgICBpZiBub3QgY3FfdGlt ZXN0YW1wOgorICAgICAgICAgICAgICAgIHBhdGNoX2lkc190b19zZW5kLmFwcGVuZChwYXRjaF9p ZCkKKyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgaWYgY3FfdGltZXN0YW1w ID4gcmVjZW50X2J1aWxkX3RpbWVzdGFtcDoKKyAgICAgICAgICAgICAgICBwYXRjaF9pZHNfdG9f c2VuZC5hcHBlbmQocGF0Y2hfaWQpCisgICAgICAgIHJldHVybiBwYXRjaF9pZHNfdG9fc2VuZAor CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGZpbHRlcl92YWxpZF9wYXRjaGVzKGNscywgcGF0 Y2hfaWRzKToKICAgICAgICAgcmV0dXJuIGxpc3QoZmlsdGVyKGxhbWJkYSBwOiBQYXRjaC5pc192 YWxpZF9wYXRjaF9pZChwKSwgcGF0Y2hfaWRzKSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWd6aWxsYS5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9C dWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVnemlsbGEucHkJKHJldmlzaW9u IDI1ODU3MikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9i dWd6aWxsYS5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsNiArMzMsNyBAQCBmcm9tIGV3cy5tb2Rl bHMucGF0Y2ggaW1wb3J0IFBhdGNoCiBmcm9tIGV3cy50aGlyZHBhcnR5LkJlYXV0aWZ1bFNvdXAg aW1wb3J0IEJlYXV0aWZ1bFNvdXAsIFNvdXBTdHJhaW5lcgogaW1wb3J0IGV3cy5jb21tb24udXRp bCBhcyB1dGlsCiBpbXBvcnQgZXdzLmNvbmZpZyBhcyBjb25maWcKK2ltcG9ydCBkYXRldXRpbC5w YXJzZXIKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCkBAIC01MSw2ICs1 MiwyNiBAQCBjbGFzcyBCdWd6aWxsYSgpOgogICAgICAgICByZXR1cm4gYXR0YWNobWVudF9qc29u CiAKICAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZ2V0X2NxX3BsdXNfdGltZXN0YW1wKGNscywg YXR0YWNobWVudF9pZCk6CisgICAgICAgIGF0dGFjaG1lbnRfanNvbiA9IEJ1Z3ppbGxhLl9mZXRj aF9hdHRhY2htZW50X2pzb24oYXR0YWNobWVudF9pZCkKKyAgICAgICAgaWYgbm90IGF0dGFjaG1l bnRfanNvbjoKKyAgICAgICAgICAgIF9sb2cud2FybignVW5hYmxlIHRvIGZldGNoIGF0dGFjaG1l bnQge30uJy5mb3JtYXQoYXR0YWNobWVudF9pZCkpCisgICAgICAgICAgICByZXR1cm4gTm9uZQor CisgICAgICAgIGZvciBmbGFnIGluIGF0dGFjaG1lbnRfanNvbi5nZXQoJ2ZsYWdzJyk6CisgICAg ICAgICAgICBpZiBmbGFnLmdldCgnbmFtZScpID09ICdjb21taXQtcXVldWUnIGFuZCBmbGFnLmdl dCgnc3RhdHVzJykgPT0gJysnOgorICAgICAgICAgICAgICAgIHJldHVybiBjbHMuY29udmVydF9p c29fdGltZXN0YW1wKGZsYWcuZ2V0KCdtb2RpZmljYXRpb25fZGF0ZScpKQorICAgICAgICByZXR1 cm4gTm9uZQorCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGNvbnZlcnRfaXNvX3RpbWVzdGFt cChjbHMsIGlzb190aW1lc3RhbXApOgorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXR1cm4g ZGF0ZXV0aWwucGFyc2VyLnBhcnNlKGlzb190aW1lc3RhbXApCisgICAgICAgIGV4Y2VwdDoKKyAg ICAgICAgICAgIF9sb2cuZXJyb3IoJ1VuYWJsZSB0byBwYXJzZSB0aW1lc3RhbXA6IHt9Jy5mb3Jt YXQoaXNvX3RpbWVzdGFtcCkpCisgICAgICAgIHJldHVybiBOb25lCisKKyAgICBAY2xhc3NtZXRo b2QKICAgICBkZWYgc2F2ZV9hdHRhY2htZW50KGNscywgYXR0YWNobWVudF9pZCwgYXR0YWNobWVu dF9kYXRhKToKICAgICAgICAgd2l0aCBvcGVuKEJ1Z3ppbGxhLmZpbGVfcGF0aF9mb3JfcGF0Y2go YXR0YWNobWVudF9pZCksICd3JykgYXMgYXR0YWNobWVudF9maWxlOgogICAgICAgICAgICAgYXR0 YWNobWVudF9maWxlLndyaXRlKGF0dGFjaG1lbnRfZGF0YSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWlsZGJvdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vYnVpbGRib3QucHkJKHJl dmlzaW9uIDI1ODU3MikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2Nv bW1vbi9idWlsZGJvdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBC dWlsZGJvdCgpOgogICAgIEFMTF9SRVNVTFRTID0gbHJhbmdlKDcpCiAgICAgU1VDQ0VTUywgV0FS TklOR1MsIEZBSUxVUkUsIFNLSVBQRUQsIEVYQ0VQVElPTiwgUkVUUlksIENBTkNFTExFRCA9IEFM TF9SRVNVTFRTCiAgICAgaWNvbnNfZm9yX3F1ZXVlc19tYXBwaW5nID0ge30KKyAgICBidWlsZGVy X25hbWVfdG9faWRfbWFwcGluZyA9IHt9CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2Vu ZF9wYXRjaF90b19idWlsZGJvdChjbHMsIHBhdGNoX3BhdGgsIHNlbmRfdG9fY29tbWl0X3F1ZXVl PUZhbHNlLCBwcm9wZXJ0aWVzPU5vbmUpOgpAQCAtOTksNyArMTAwLDQzIEBAIGNsYXNzIEJ1aWxk Ym90KCk6CiAgICAgICAgICAgICBzaG9ydG5hbWUgPSBidWlsZGVyLmdldCgnc2hvcnRuYW1lJykK ICAgICAgICAgICAgIEJ1aWxkYm90Lmljb25zX2Zvcl9xdWV1ZXNfbWFwcGluZ1tzaG9ydG5hbWVd ID0gYnVpbGRlci5nZXQoJ2ljb24nKQogCi0gICAgICAgIHJldHVybiBCdWlsZGJvdC5pY29uc19m b3JfcXVldWVzX21hcHBpbmcKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZmV0Y2hfYnVpbGRl cnMoY2xzKToKKyAgICAgICAgdXJsID0gJ2h0dHBzOi8ve30vYXBpL3YyL2J1aWxkZXJzJy5mb3Jt YXQoY29uZmlnLkJVSUxEQk9UX1NFUlZFUl9IT1NUKQorICAgICAgICBidWlsZGVyc19kYXRhID0g dXRpbC5mZXRjaF9kYXRhX2Zyb21fdXJsKHVybCkKKyAgICAgICAgaWYgbm90IGJ1aWxkZXJzX2Rh dGE6CisgICAgICAgICAgICByZXR1cm4ge30KKyAgICAgICAgcmV0dXJuIGJ1aWxkZXJzX2RhdGEu anNvbigpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgdXBkYXRlX2J1aWxkZXJfbmFtZV90 b19pZF9tYXBwaW5nKGNscyk6CisgICAgICAgIGNvbmZpZyA9IGNscy5mZXRjaF9idWlsZGVycygp CisgICAgICAgIGZvciBidWlsZGVyIGluIGNvbmZpZy5nZXQoJ2J1aWxkZXJzJywgW10pOgorICAg ICAgICAgICAgbmFtZSA9IGJ1aWxkZXIuZ2V0KCduYW1lJykKKyAgICAgICAgICAgIEJ1aWxkYm90 LmJ1aWxkZXJfbmFtZV90b19pZF9tYXBwaW5nW25hbWVdID0gYnVpbGRlci5nZXQoJ2J1aWxkZXJp ZCcpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZmV0Y2hfcGVuZGluZ19hbmRfaW5wcm9n cmVzc19idWlsZHMoY2xzLCBidWlsZGVyX2Z1bGxfbmFtZSk6CisgICAgICAgIGJ1aWxkZXJpZCA9 IEJ1aWxkYm90LmJ1aWxkZXJfbmFtZV90b19pZF9tYXBwaW5nLmdldChidWlsZGVyX2Z1bGxfbmFt ZSkKKyAgICAgICAgaWYgbm90IGJ1aWxkZXJpZDoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0lu dmFsaWQgYnVpbGRlcjoge30nLmZvcm1hdChidWlsZGVyX2Z1bGxfbmFtZSkpCisgICAgICAgICAg ICByZXR1cm4ge30KKyAgICAgICAgdXJsID0gJ2h0dHBzOi8ve30vYXBpL3YyL2J1aWxkZXJzL3t9 L2J1aWxkcmVxdWVzdHM/Y29tcGxldGU9ZmFsc2UmcHJvcGVydHk9KicuZm9ybWF0KGNvbmZpZy5C VUlMREJPVF9TRVJWRVJfSE9TVCwgYnVpbGRlcmlkKQorICAgICAgICBidWlsZGVyc19kYXRhID0g dXRpbC5mZXRjaF9kYXRhX2Zyb21fdXJsKHVybCkKKyAgICAgICAgaWYgbm90IGJ1aWxkZXJzX2Rh dGE6CisgICAgICAgICAgICByZXR1cm4ge30KKyAgICAgICAgcmV0dXJuIGJ1aWxkZXJzX2RhdGEu anNvbigpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgZ2V0X3BhdGNoZXNfaW5fcXVldWUo Y2xzLCBidWlsZGVyX2Z1bGxfbmFtZSk6CisgICAgICAgIHBhdGNoX2lkcyA9IFtdCisgICAgICAg IGJ1aWxkcyA9IGNscy5mZXRjaF9wZW5kaW5nX2FuZF9pbnByb2dyZXNzX2J1aWxkcyhidWlsZGVy X2Z1bGxfbmFtZSkKKyAgICAgICAgZm9yIGJ1aWxkcmVxdWVzdCBpbiBidWlsZHMuZ2V0KCdidWls ZHJlcXVlc3RzJywgW10pOgorICAgICAgICAgICAgcHJvcGVydGllcyA9IGJ1aWxkcmVxdWVzdC5n ZXQoJ3Byb3BlcnRpZXMnKQorICAgICAgICAgICAgaWYgcHJvcGVydGllczoKKyAgICAgICAgICAg ICAgICBwYXRjaF9pZHMuYXBwZW5kKHByb3BlcnRpZXMuZ2V0KCdwYXRjaF9pZCcpWzBdKQorICAg ICAgICBfbG9nLmRlYnVnKCdQYXRjaGVzIGluIHF1ZXVlIGZvciB7fToge30nLmZvcm1hdChidWls ZGVyX2Z1bGxfbmFtZSwgcGF0Y2hfaWRzKSkKKyAgICAgICAgcmV0dXJuIHBhdGNoX2lkcwogCiAg ICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHJldHJ5X2J1aWxkKGNscywgYnVpbGRlcl9pZCwgYnVp bGRfbnVtYmVyKToK 393788 2020-03-17 14:32:02 -0700 2020-03-17 17:01:48 -0700 Patch bug-208920-20200317173200.patch text/plain 9737 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODU3MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDIwLTAzLTE3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBSZXN1Ym1pdCBwYXRjaGVzIHRvIGNvbW1pdC1xdWV1ZSB3aGlj aCB3ZXJlIGNxLSBieSBjb21taXQtcXVldWUgYW5kIGxhdGVyIGNxKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTIwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3Mt YXBwL2V3cy9jb21tb24vYnVpbGRib3QucHk6CisgICAgICAgIChCdWlsZGJvdC51cGRhdGVfYnVp bGRlcl9uYW1lX3RvX2lkX21hcHBpbmcpOiBNZXRob2QgdG8gZ2VuZXJhdGUgYnVpbGRlciBuYW1l IHRvIGlkIG1hcHBpbmcuCisgICAgICAgIChCdWlsZGJvdC5mZXRjaF9wZW5kaW5nX2FuZF9pbnBy b2dyZXNzX2J1aWxkcyk6IE1ldGhvZCB0byBmZXRjaCBwZW5kaWduIGFuZCBpbi1wcm9ncmVzcyBi dWlsZHMgZnJvbSBidWlsZGJvdC4KKyAgICAgICAgKEJ1aWxkYm90LmdldF9wYXRjaGVzX2luX3F1 ZXVlKTogTWV0aG9kIHRvIGZldGNoIGxpc3Qgb2YgcGF0Y2hlcyB3aGljaCBhcmUgcGVuZGluZyBv ciBhcmUgaW4tcHJvZ3Jlc3Mgb24gYnVpbGRib3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWFwcC9ld3MvY29tbW9uL2J1Z3ppbGxhLnB5OgorICAgICAgICAoQnVnemlsbGEuZ2V0 X2NxX3BsdXNfdGltZXN0YW1wKTogR2V0IFVUQyB0aW1lc3RhbXAgd2hlbiBjcSsgZmxhZyB3YXMg c2V0LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2ZldGNoZXIucHk6 CisgICAgICAgIChGZXRjaExvb3AucnVuKTogVXBkYXRlIGJ1aWxkZXIgbmFtZSB0byBpZCBtYXBw aW5nLiBXZSBqdXN0IG5lZWQgdG8gdXBkYXRlIGl0IG9uZS10aW1lLCBzaW5jZSB3ZSBuZWVkIHRo ZSBpZCBvbmx5CisgICAgICAgIGZvciBjb21taXQtcXVldWUgd2hpY2ggaXNuJ3QgZXhwZWN0ZWQg dG8gY2hhbmdlLgorICAgICAgICAoQnVnemlsbGFQYXRjaEZldGNoZXIuZmV0Y2hfY29tbWl0X3F1 ZXVlX3BhdGNoZXMpOgorICAgICAgICAoQnVnemlsbGFQYXRjaEZldGNoZXIuc2VuZF9wYXRjaGVz X3RvX2J1aWxkYm90KTogQWxsb3cgc2VuZGluZyB0aGUgcGF0Y2ggYWdhaW4gdG8gY29tbWl0LXF1 ZXVlLgorICAgICAgICAoQnVnemlsbGFQYXRjaEZldGNoZXIucGF0Y2hlc190b19zZW5kX3RvX2Nv bW1pdF9xdWV1ZSk6IEZpbmQgcGF0Y2hlcyB3aGljaCBuZWVkcyB0byBiZSBzZW50IHRvIGNvbW1p dC1xdWV1ZS4gRmlsdGVyCisgICAgICAgIG91dCBwYXRjaGVzIHdoaWNoIGFyZSBhbHJlYWR5IHdh aXRpbmcgb3IgaW4tcHJvZ3Jlc3Mgb24gY29tbWl0LXF1ZXVlLCBvciB3aG9zZSByZWNlbnQgYnVp bGQgd2FzIGNvbXBsZXRlZCBhZnRlcgorICAgICAgICBzZXR0aW5nIGNxKyBmbGFnIG9uIGJ1Z3pp bGxhLgorCiAyMDIwLTAzLTE3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgVXNlIGxlc3Mgc3luYyBJUEMgZm9yIElUUCB0ZXN0UnVubmVyIG1ldGhvZHMKSW5kZXg6 IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2ZldGNoZXIucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvZmV0Y2hlci5weQkocmV2 aXNpb24gMjU4NTcyKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvZmV0 Y2hlci5weQkod29ya2luZyBjb3B5KQpAQCAtMjAsMTMgKzIwLDE2IEBACiAjIE9SIFRPUlQgKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBP RiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCBkYXRldGltZQogaW1wb3J0IGxvZ2dp bmcKK2ltcG9ydCBweXR6CiBpbXBvcnQgdGhyZWFkaW5nCiBpbXBvcnQgdGltZQogCiBmcm9tIGV3 cy5jb21tb24uYnVnemlsbGEgaW1wb3J0IEJ1Z3ppbGxhCiBmcm9tIGV3cy5jb21tb24uYnVpbGRi b3QgaW1wb3J0IEJ1aWxkYm90CiBmcm9tIGV3cy5tb2RlbHMucGF0Y2ggaW1wb3J0IFBhdGNoCitm cm9tIGV3cy52aWV3cy5zdGF0dXNidWJibGUgaW1wb3J0IFN0YXR1c0J1YmJsZQogCiBfbG9nID0g bG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKQEAgLTM5LDYgKzQyLDcgQEAgY2xhc3MgRmV0 Y2hMb29wKCk6CiAgICAgICAgIHRocmVhZC5zdGFydCgpCiAKICAgICBkZWYgcnVuKHNlbGYpOgor ICAgICAgICBCdWlsZGJvdC51cGRhdGVfYnVpbGRlcl9uYW1lX3RvX2lkX21hcHBpbmcoKQogICAg ICAgICB3aGlsZSBUcnVlOgogICAgICAgICAgICAgQnVpbGRib3QudXBkYXRlX2ljb25zX2Zvcl9x dWV1ZXNfbWFwcGluZygpCiAgICAgICAgICAgICB0cnk6CkBAIC02OSw3ICs3Myw3IEBAIGNsYXNz IEJ1Z3ppbGxhUGF0Y2hGZXRjaGVyKCk6CiAgICAgICAgIHBhdGNoX2lkc19jb21taXRfcXVldWUg PSBCdWd6aWxsYVBhdGNoRmV0Y2hlci5maWx0ZXJfdmFsaWRfcGF0Y2hlcyhwYXRjaF9pZHNfY29t bWl0X3F1ZXVlKQogICAgICAgICBfbG9nLmRlYnVnKCdjcSsgcGF0Y2hlczoge30nLmZvcm1hdChw YXRjaF9pZHNfY29tbWl0X3F1ZXVlKSkKICAgICAgICAgUGF0Y2guc2F2ZV9wYXRjaGVzKHBhdGNo X2lkc19jb21taXRfcXVldWUpCi0gICAgICAgIHBhdGNoZXNfdG9fc2VuZCA9IHNlbGYucGF0Y2hl c190b19zZW5kX3RvX2J1aWxkYm90KHBhdGNoX2lkc19jb21taXRfcXVldWUsIGNvbW1pdF9xdWV1 ZT1UcnVlKQorICAgICAgICBwYXRjaGVzX3RvX3NlbmQgPSBzZWxmLnBhdGNoZXNfdG9fc2VuZF90 b19jb21taXRfcXVldWUocGF0Y2hfaWRzX2NvbW1pdF9xdWV1ZSkKICAgICAgICAgX2xvZy5pbmZv KCd7fSBjcSsgcGF0Y2hlcywge30gcGF0Y2hlcyBuZWVkIHRvIGJlIHNlbnQgdG8gY29tbWl0IHF1 ZXVlOiB7fScuZm9ybWF0KGxlbihwYXRjaF9pZHNfY29tbWl0X3F1ZXVlKSwgbGVuKHBhdGNoZXNf dG9fc2VuZCksIHBhdGNoZXNfdG9fc2VuZCkpCiAgICAgICAgIHNlbGYuc2VuZF9wYXRjaGVzX3Rv X2J1aWxkYm90KHBhdGNoZXNfdG9fc2VuZCwgc2VuZF90b19jb21taXRfcXVldWU9VHJ1ZSkKIApA QCAtODUsOCArODksOCBAQCBjbGFzcyBCdWd6aWxsYVBhdGNoRmV0Y2hlcigpOgogICAgICAgICAg ICAgICAgIF9sb2cud2FybignUGF0Y2ggaXMgb2Jzb2xldGUsIHNraXBwaW5nJykKICAgICAgICAg ICAgICAgICBQYXRjaC5zZXRfb2Jzb2xldGUocGF0Y2hfaWQpCiAgICAgICAgICAgICAgICAgY29u dGludWUKLSAgICAgICAgICAgIGlmIFBhdGNoLmlzX3BhdGNoX3NlbnRfdG9fYnVpbGRib3QocGF0 Y2hfaWQsIGNvbW1pdF9xdWV1ZT1zZW5kX3RvX2NvbW1pdF9xdWV1ZSk6Ci0gICAgICAgICAgICAg ICAgX2xvZy5lcnJvcignUGF0Y2gge30gaXMgYWxyZWFkeSBzZW50IHRvIGJ1aWxkYm90L2NvbW1p dC1xdWV1ZS4nLmZvcm1hdChwYXRjaF9pZCkpCisgICAgICAgICAgICBpZiBub3Qgc2VuZF90b19j b21taXRfcXVldWUgYW5kIFBhdGNoLmlzX3BhdGNoX3NlbnRfdG9fYnVpbGRib3QocGF0Y2hfaWQp OgorICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1BhdGNoIHt9IGlzIGFscmVhZHkgc2VudCB0 byBidWlsZGJvdC4nLmZvcm1hdChwYXRjaF9pZCkpCiAgICAgICAgICAgICAgICAgY29udGludWUK ICAgICAgICAgICAgIFBhdGNoLnNldF9zZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkLCBUcnVlLCBj b21taXRfcXVldWU9c2VuZF90b19jb21taXRfcXVldWUpCiAgICAgICAgICAgICByYyA9IEJ1aWxk Ym90LnNlbmRfcGF0Y2hfdG9fYnVpbGRib3QoYnpfcGF0Y2hbJ3BhdGgnXSwKQEAgLTk5LDggKzEw MywzMCBAQCBjbGFzcyBCdWd6aWxsYVBhdGNoRmV0Y2hlcigpOgogICAgICAgICAgICAgICAgIFBh dGNoLnNldF9zZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkLCBGYWxzZSwgY29tbWl0X3F1ZXVlPXNl bmRfdG9fY29tbWl0X3F1ZXVlKQogICAgICAgICAgICAgICAgICNGSVhNRTogc2VuZCBhbiBlbWFp bCBmb3IgdGhpcyBmYWlsdXJlCiAKLSAgICBkZWYgcGF0Y2hlc190b19zZW5kX3RvX2J1aWxkYm90 KHNlbGYsIHBhdGNoX2lkcywgY29tbWl0X3F1ZXVlPUZhbHNlKToKLSAgICAgICAgcmV0dXJuIFtw YXRjaF9pZCBmb3IgcGF0Y2hfaWQgaW4gcGF0Y2hfaWRzIGlmIG5vdCBQYXRjaC5pc19wYXRjaF9z ZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkLCBjb21taXRfcXVldWUpXQorICAgIGRlZiBwYXRjaGVz X3RvX3NlbmRfdG9fYnVpbGRib3Qoc2VsZiwgcGF0Y2hfaWRzKToKKyAgICAgICAgcmV0dXJuIFtw YXRjaF9pZCBmb3IgcGF0Y2hfaWQgaW4gcGF0Y2hfaWRzIGlmIG5vdCBQYXRjaC5pc19wYXRjaF9z ZW50X3RvX2J1aWxkYm90KHBhdGNoX2lkKV0KKworICAgIGRlZiBwYXRjaGVzX3RvX3NlbmRfdG9f Y29tbWl0X3F1ZXVlKHNlbGYsIHBhdGNoX2lkcyk6CisgICAgICAgIGlmIG5vdCBwYXRjaF9pZHM6 CisgICAgICAgICAgICByZXR1cm4gcGF0Y2hfaWRzCisgICAgICAgIHBhdGNoZXNfaW5fcXVldWUg PSBzZXQoQnVpbGRib3QuZ2V0X3BhdGNoZXNfaW5fcXVldWUoJ0NvbW1pdC1RdWV1ZScpKQorICAg ICAgICBwYXRjaF9pZHMgPSBbcGF0Y2hfaWQgZm9yIHBhdGNoX2lkIGluIHNldChwYXRjaF9pZHMp IGlmIHN0cihwYXRjaF9pZCkgbm90IGluIHBhdGNoZXNfaW5fcXVldWVdCisKKyAgICAgICAgcGF0 Y2hfaWRzX3RvX3NlbmQgPSBbXQorICAgICAgICBmb3IgcGF0Y2hfaWQgaW4gcGF0Y2hfaWRzOgor ICAgICAgICAgICAgcGF0Y2ggPSBQYXRjaC5nZXRfcGF0Y2gocGF0Y2hfaWQpCisgICAgICAgICAg ICByZWNlbnRfYnVpbGQsIF8gPSBTdGF0dXNCdWJibGUoKS5nZXRfbGF0ZXN0X2J1aWxkX2Zvcl9x dWV1ZShwYXRjaCwgJ2NvbW1pdCcpCisgICAgICAgICAgICBpZiBub3QgcmVjZW50X2J1aWxkOgor ICAgICAgICAgICAgICAgIHBhdGNoX2lkc190b19zZW5kLmFwcGVuZChwYXRjaF9pZCkKKyAgICAg ICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgcmVjZW50X2J1aWxkX3RpbWVzdGFtcCA9 IGRhdGV0aW1lLmRhdGV0aW1lLmZyb210aW1lc3RhbXAocmVjZW50X2J1aWxkLmNvbXBsZXRlX2F0 LCB0ej1weXR6LlVUQykKKyAgICAgICAgICAgIGNxX3RpbWVzdGFtcCA9IEJ1Z3ppbGxhLmdldF9j cV9wbHVzX3RpbWVzdGFtcChwYXRjaF9pZCkKKyAgICAgICAgICAgIGlmIG5vdCBjcV90aW1lc3Rh bXA6CisgICAgICAgICAgICAgICAgcGF0Y2hfaWRzX3RvX3NlbmQuYXBwZW5kKHBhdGNoX2lkKQor ICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICBpZiBjcV90aW1lc3RhbXAgPiBy ZWNlbnRfYnVpbGRfdGltZXN0YW1wOgorICAgICAgICAgICAgICAgIHBhdGNoX2lkc190b19zZW5k LmFwcGVuZChwYXRjaF9pZCkKKyAgICAgICAgcmV0dXJuIHBhdGNoX2lkc190b19zZW5kCiAKICAg ICBAY2xhc3NtZXRob2QKICAgICBkZWYgZmlsdGVyX3ZhbGlkX3BhdGNoZXMoY2xzLCBwYXRjaF9p ZHMpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9uL2J1 Z3ppbGxhLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAv ZXdzL2NvbW1vbi9idWd6aWxsYS5weQkocmV2aXNpb24gMjU4NTcyKQorKysgVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9uL2J1Z3ppbGxhLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0zMyw2ICszMyw3IEBAIGZyb20gZXdzLm1vZGVscy5wYXRjaCBpbXBvcnQgUGF0Y2gKIGZy b20gZXdzLnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVsU291cCwgU291 cFN0cmFpbmVyCiBpbXBvcnQgZXdzLmNvbW1vbi51dGlsIGFzIHV0aWwKIGltcG9ydCBld3MuY29u ZmlnIGFzIGNvbmZpZworaW1wb3J0IGRhdGV1dGlsLnBhcnNlcgogCiBfbG9nID0gbG9nZ2luZy5n ZXRMb2dnZXIoX19uYW1lX18pCiAKQEAgLTUxLDYgKzUyLDIxIEBAIGNsYXNzIEJ1Z3ppbGxhKCk6 CiAgICAgICAgIHJldHVybiBhdHRhY2htZW50X2pzb24KIAogICAgIEBjbGFzc21ldGhvZAorICAg IGRlZiBnZXRfY3FfcGx1c190aW1lc3RhbXAoY2xzLCBhdHRhY2htZW50X2lkKToKKyAgICAgICAg YXR0YWNobWVudF9qc29uID0gQnVnemlsbGEuX2ZldGNoX2F0dGFjaG1lbnRfanNvbihhdHRhY2ht ZW50X2lkKQorICAgICAgICBpZiBub3QgYXR0YWNobWVudF9qc29uOgorICAgICAgICAgICAgX2xv Zy53YXJuKCdVbmFibGUgdG8gZmV0Y2ggYXR0YWNobWVudCB7fS4nLmZvcm1hdChhdHRhY2htZW50 X2lkKSkKKyAgICAgICAgICAgIHJldHVybiBOb25lCisKKyAgICAgICAgZm9yIGZsYWcgaW4gYXR0 YWNobWVudF9qc29uLmdldCgnZmxhZ3MnKToKKyAgICAgICAgICAgIGlmIGZsYWcuZ2V0KCduYW1l JykgPT0gJ2NvbW1pdC1xdWV1ZScgYW5kIGZsYWcuZ2V0KCdzdGF0dXMnKSA9PSAnKyc6CisgICAg ICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZGF0ZXV0aWwucGFy c2VyLnBhcnNlKGZsYWcuZ2V0KCdtb2RpZmljYXRpb25fZGF0ZScpKQorICAgICAgICAgICAgICAg IGV4Y2VwdDoKKyAgICAgICAgICAgICAgICAgICAgX2xvZy5lcnJvcignVW5hYmxlIHRvIHBhcnNl IHRpbWVzdGFtcDoge30nLmZvcm1hdChmbGFnLmdldCgnbW9kaWZpY2F0aW9uX2RhdGUnKSkpCisg ICAgICAgIHJldHVybiBOb25lCisKKyAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2F2ZV9hdHRh Y2htZW50KGNscywgYXR0YWNobWVudF9pZCwgYXR0YWNobWVudF9kYXRhKToKICAgICAgICAgd2l0 aCBvcGVuKEJ1Z3ppbGxhLmZpbGVfcGF0aF9mb3JfcGF0Y2goYXR0YWNobWVudF9pZCksICd3Jykg YXMgYXR0YWNobWVudF9maWxlOgogICAgICAgICAgICAgYXR0YWNobWVudF9maWxlLndyaXRlKGF0 dGFjaG1lbnRfZGF0YSkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdz L2NvbW1vbi9idWlsZGJvdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYXBwL2V3cy9jb21tb24vYnVpbGRib3QucHkJKHJldmlzaW9uIDI1ODU3MikKKysrIFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi9idWlsZGJvdC5weQkod29y a2luZyBjb3B5KQpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBCdWlsZGJvdCgpOgogICAgIEFMTF9S RVNVTFRTID0gbHJhbmdlKDcpCiAgICAgU1VDQ0VTUywgV0FSTklOR1MsIEZBSUxVUkUsIFNLSVBQ RUQsIEVYQ0VQVElPTiwgUkVUUlksIENBTkNFTExFRCA9IEFMTF9SRVNVTFRTCiAgICAgaWNvbnNf Zm9yX3F1ZXVlc19tYXBwaW5nID0ge30KKyAgICBidWlsZGVyX25hbWVfdG9faWRfbWFwcGluZyA9 IHt9CiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgc2VuZF9wYXRjaF90b19idWlsZGJvdChj bHMsIHBhdGNoX3BhdGgsIHNlbmRfdG9fY29tbWl0X3F1ZXVlPUZhbHNlLCBwcm9wZXJ0aWVzPU5v bmUpOgpAQCAtOTksNyArMTAwLDM4IEBAIGNsYXNzIEJ1aWxkYm90KCk6CiAgICAgICAgICAgICBz aG9ydG5hbWUgPSBidWlsZGVyLmdldCgnc2hvcnRuYW1lJykKICAgICAgICAgICAgIEJ1aWxkYm90 Lmljb25zX2Zvcl9xdWV1ZXNfbWFwcGluZ1tzaG9ydG5hbWVdID0gYnVpbGRlci5nZXQoJ2ljb24n KQogCi0gICAgICAgIHJldHVybiBCdWlsZGJvdC5pY29uc19mb3JfcXVldWVzX21hcHBpbmcKKyAg ICBAY2xhc3NtZXRob2QKKyAgICBkZWYgdXBkYXRlX2J1aWxkZXJfbmFtZV90b19pZF9tYXBwaW5n KGNscyk6CisgICAgICAgIHVybCA9ICdodHRwczovL3t9L2FwaS92Mi9idWlsZGVycycuZm9ybWF0 KGNvbmZpZy5CVUlMREJPVF9TRVJWRVJfSE9TVCkKKyAgICAgICAgYnVpbGRlcnNfZGF0YSA9IHV0 aWwuZmV0Y2hfZGF0YV9mcm9tX3VybCh1cmwpCisgICAgICAgIGlmIG5vdCBidWlsZGVyc19kYXRh OgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzX2Rh dGEuanNvbigpLmdldCgnYnVpbGRlcnMnLCBbXSk6CisgICAgICAgICAgICBuYW1lID0gYnVpbGRl ci5nZXQoJ25hbWUnKQorICAgICAgICAgICAgQnVpbGRib3QuYnVpbGRlcl9uYW1lX3RvX2lkX21h cHBpbmdbbmFtZV0gPSBidWlsZGVyLmdldCgnYnVpbGRlcmlkJykKKworICAgIEBjbGFzc21ldGhv ZAorICAgIGRlZiBmZXRjaF9wZW5kaW5nX2FuZF9pbnByb2dyZXNzX2J1aWxkcyhjbHMsIGJ1aWxk ZXJfZnVsbF9uYW1lKToKKyAgICAgICAgYnVpbGRlcmlkID0gQnVpbGRib3QuYnVpbGRlcl9uYW1l X3RvX2lkX21hcHBpbmcuZ2V0KGJ1aWxkZXJfZnVsbF9uYW1lKQorICAgICAgICBpZiBub3QgYnVp bGRlcmlkOgorICAgICAgICAgICAgX2xvZy5lcnJvcignSW52YWxpZCBidWlsZGVyOiB7fScuZm9y bWF0KGJ1aWxkZXJfZnVsbF9uYW1lKSkKKyAgICAgICAgICAgIHJldHVybiB7fQorICAgICAgICB1 cmwgPSAnaHR0cHM6Ly97fS9hcGkvdjIvYnVpbGRlcnMve30vYnVpbGRyZXF1ZXN0cz9jb21wbGV0 ZT1mYWxzZSZwcm9wZXJ0eT0qJy5mb3JtYXQoY29uZmlnLkJVSUxEQk9UX1NFUlZFUl9IT1NULCBi dWlsZGVyaWQpCisgICAgICAgIGJ1aWxkZXJzX2RhdGEgPSB1dGlsLmZldGNoX2RhdGFfZnJvbV91 cmwodXJsKQorICAgICAgICBpZiBub3QgYnVpbGRlcnNfZGF0YToKKyAgICAgICAgICAgIHJldHVy biB7fQorICAgICAgICByZXR1cm4gYnVpbGRlcnNfZGF0YS5qc29uKCkKKworICAgIEBjbGFzc21l dGhvZAorICAgIGRlZiBnZXRfcGF0Y2hlc19pbl9xdWV1ZShjbHMsIGJ1aWxkZXJfZnVsbF9uYW1l KToKKyAgICAgICAgcGF0Y2hfaWRzID0gW10KKyAgICAgICAgYnVpbGRzID0gY2xzLmZldGNoX3Bl bmRpbmdfYW5kX2lucHJvZ3Jlc3NfYnVpbGRzKGJ1aWxkZXJfZnVsbF9uYW1lKQorICAgICAgICBm b3IgYnVpbGRyZXF1ZXN0IGluIGJ1aWxkcy5nZXQoJ2J1aWxkcmVxdWVzdHMnLCBbXSk6CisgICAg ICAgICAgICBwcm9wZXJ0aWVzID0gYnVpbGRyZXF1ZXN0LmdldCgncHJvcGVydGllcycpCisgICAg ICAgICAgICBpZiBwcm9wZXJ0aWVzOgorICAgICAgICAgICAgICAgIHBhdGNoX2lkcy5hcHBlbmQo cHJvcGVydGllcy5nZXQoJ3BhdGNoX2lkJylbMF0pCisgICAgICAgIF9sb2cuZGVidWcoJ1BhdGNo ZXMgaW4gcXVldWUgZm9yIHt9OiB7fScuZm9ybWF0KGJ1aWxkZXJfZnVsbF9uYW1lLCBwYXRjaF9p ZHMpKQorICAgICAgICByZXR1cm4gcGF0Y2hfaWRzCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBk ZWYgcmV0cnlfYnVpbGQoY2xzLCBidWlsZGVyX2lkLCBidWlsZF9udW1iZXIpOgo=