193735 2019-01-23 12:54:21 -0800 [ews-app] Add method to save Build data to database 2019-01-28 15:09:27 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193890 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue lforschler webkit-bug-importer oldest_to_newest 1497508 0 aakash_jain 2019-01-23 12:54:21 -0800 We should add method to save Build data to database for ews-app. 1497516 1 359931 aakash_jain 2019-01-23 12:58:35 -0800 Created attachment 359931 Proposed path 1497528 2 359931 lforschler 2019-01-23 13:15:42 -0800 Comment on attachment 359931 Proposed path View in context: https://bugs.webkit.org/attachment.cgi?id=359931&action=review logic looks good to me, with possible name/refactoring. > Tools/BuildSlaveSupport/ews-app/ews/common/util.py:46 > +def is_valid_int_id(id): would this be ok as 'is_valid_id' ? > Tools/BuildSlaveSupport/ews-app/ews/models/build.py:51 > + def save_build(cls, patch_id, buildid, builderid, number, result, state_string, started_at, complete_at=None): since we are using underscores for patch_id, should we continue that with build_id, builder_id? > Tools/BuildSlaveSupport/ews-app/ews/models/build.py:72 > + if not (util.is_valid_int_id(patch_id) and util.is_valid_int_id(buildid) and util.is_valid_int_id(builderid) and util.is_valid_int_id(number)): nit: extra space before the last 'and' 1498986 3 360334 aakash_jain 2019-01-28 04:51:15 -0800 Created attachment 360334 Updated patch > would this be ok as 'is_valid_id' ? renamed. Also updated the method to make it more generic. > since we are using underscores for patch_id, should we continue that with build_id, builder_id? Uploaded Patch for this change in https://bugs.webkit.org/show_bug.cgi?id=193883 Also updated this patch to use build_id, builder_id. > nit: extra space before the last 'and' Fixed. Also added some more functionality (e.g.: update_build() method). Can you please review again? 1499106 4 aakash_jain 2019-01-28 11:28:51 -0800 This patch should apply to ToT after https://bugs.webkit.org/show_bug.cgi?id=193883 1499135 5 360334 commit-queue 2019-01-28 12:12:54 -0800 Comment on attachment 360334 Updated patch Rejecting attachment 360334 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 360334, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Tools/ChangeLog is not at the top of the file. Full output: https://webkit-queues.webkit.org/results/10926382 1499208 6 aakash_jain 2019-01-28 15:08:50 -0800 Committed r240603: <https://trac.webkit.org/changeset/240603> 1499209 7 webkit-bug-importer 2019-01-28 15:09:27 -0800 <rdar://problem/47612792> 359931 2019-01-23 12:58:35 -0800 2019-01-28 04:51:15 -0800 Proposed path 0001-ews-app-Add-method-to-save-Build-data-to-database.patch text/plain 4510 aakash_jain RnJvbSA3NThiYTE3MTQyZDEyM2E4ZjBjYTUxZGJmMzZkMzZlZDgyMzUyYzdlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYWthc2ggSmFpbiA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgpE YXRlOiBXZWQsIDIzIEphbiAyMDE5IDE1OjU1OjU0IC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gW2V3 cy1hcHBdIEFkZCBtZXRob2QgdG8gc2F2ZSBCdWlsZCBkYXRhIHRvIGRhdGFiYXNlCiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNzM1CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCiogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvbW9kZWxzL2J1aWxk LnB5OgooQnVpbGQuc2F2ZV9idWlsZCk6IE1ldGhvZCB0byBzYXZlIGJ1aWxkIGluZm9ybWF0aW9u IHRvIGRhdGFiYXNlLgooQnVpbGQuZ2V0X2V4aXN0aW5nX2J1aWxkX2luZm8pOiBNZXRob2QgdG8g ZmV0Y2ggZXhpc3RpbmcgYnVpbGQgaW5mbyBmcm9tIGRhdGFiYXNlLgooQnVpbGQuaXNfdmFsaWRf cmVzdWx0KTogTWV0aG9kIHRvIHZhbGlkYXRlIGJ1aWxkIHJlc3VsdC4KKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy9jb21tb24vdXRpbC5weToKKGlzX3ZhbGlkX2ludF9pZCk6IE1ldGhv ZCB0byB2YWxpZGF0ZSB2YWxpZCBpZC4KLS0tCiAuLi4vZXdzLWFwcC9ld3MvY29tbW9uL3V0aWwu cHkgICAgICAgICAgICAgICAgfCAgNyArKysrCiAuLi4vZXdzLWFwcC9ld3MvbW9kZWxzL2J1aWxk LnB5ICAgICAgICAgICAgICAgfCAzNyArKysrKysrKysrKysrKysrKysrCiBUb29scy9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAxNCArKysrKysrCiAzIGZpbGVzIGNo YW5nZWQsIDU4IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYXBwL2V3cy9jb21tb24vdXRpbC5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1hcHAvZXdzL2NvbW1vbi91dGlsLnB5CmluZGV4IDIxOTkxMzgzNTMwLi5jN2MyMTVhYWYz YyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9u L3V0aWwucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9u L3V0aWwucHkKQEAgLTQxLDMgKzQxLDEwIEBAIGRlZiBmZXRjaF9kYXRhX2Zyb21fdXJsKHVybCk6 CiAgICAgICAgIF9sb2cuZXJyb3IoJ0FjY2Vzc2VkIHt1cmx9IHdpdGggdW5leHBlY3RlZCBzdGF0 dXMgY29kZSB7c3RhdHVzX2NvZGV9LicuZm9ybWF0KHVybD11cmwsIHN0YXR1c19jb2RlPXJlc3Bv bnNlLnN0YXR1c19jb2RlKSkKICAgICAgICAgcmV0dXJuIE5vbmUKICAgICByZXR1cm4gcmVzcG9u c2UKKworCitkZWYgaXNfdmFsaWRfaW50X2lkKGlkKToKKyAgICBpZiBub3QgaWQgb3IgdHlwZShp ZCkgIT0gaW50IG9yIGlkIDwgMDoKKyAgICAgICAgX2xvZy53YXJuKCdJbnZhbGlkIGlkOiB7fScu Zm9ybWF0KGlkKSkKKyAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgcmV0dXJuIFRydWUKZGlmZiAt LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5w eSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weQpp bmRleCA0NmI0YjI3OGMzMC4uMGMwYmY5YTZjYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weQorKysgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHkKQEAgLTIyLDggKzIyLDE0IEBA CiAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgdW5pY29kZV9saXRlcmFscwogCitpbXBvcnQgbG9n Z2luZworCiBmcm9tIGRqYW5nby5kYiBpbXBvcnQgbW9kZWxzCitmcm9tIGV3cy5jb25maWcgaW1w b3J0IEVSUl9VTkVYUEVDVEVELCBTVUNDRVNTCiBmcm9tIGV3cy5tb2RlbHMucGF0Y2ggaW1wb3J0 IFBhdGNoCitpbXBvcnQgZXdzLmNvbW1vbi51dGlsIGFzIHV0aWwKKworX2xvZyA9IGxvZ2dpbmcu Z2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNzIEJ1aWxkKG1vZGVscy5Nb2RlbCk6CkBAIC00 MCwzICs0NiwzNCBAQCBjbGFzcyBCdWlsZChtb2RlbHMuTW9kZWwpOgogCiAgICAgZGVmIF9fc3Ry X18oc2VsZik6CiAgICAgICAgIHJldHVybiBzdHIoc2VsZi5idWlsZGlkKQorCisgICAgQGNsYXNz bWV0aG9kCisgICAgZGVmIHNhdmVfYnVpbGQoY2xzLCBwYXRjaF9pZCwgYnVpbGRpZCwgYnVpbGRl cmlkLCBudW1iZXIsIHJlc3VsdCwgc3RhdGVfc3RyaW5nLCBzdGFydGVkX2F0LCBjb21wbGV0ZV9h dD1Ob25lKToKKyAgICAgICAgaWYgbm90ICBCdWlsZC5pc192YWxpZF9yZXN1bHQocGF0Y2hfaWQs IGJ1aWxkaWQsIGJ1aWxkZXJpZCwgbnVtYmVyLCByZXN1bHQsIHN0YXRlX3N0cmluZywgc3RhcnRl ZF9hdCwgY29tcGxldGVfYXQpOgorICAgICAgICAgICAgcmV0dXJuIEVSUl9VTkVYUEVDVEVECisK KyAgICAgICAgIyBJZiB0aGUgYnVpbGQgZGF0YSBpcyBhbHJlYWR5IHByZXNlbnQgaW4gZGF0YWJh c2UsIHVwZGF0ZSBpdC4KKyAgICAgICAgYnVpbGQgPSBCdWlsZC5nZXRfZXhpc3RpbmdfYnVpbGRf aW5mbyhidWlsZGlkKQorICAgICAgICBpZiBidWlsZDoKKyAgICAgICAgICAgIGJ1aWxkLmRlbGV0 ZSgpCisgICAgICAgIEJ1aWxkKHBhdGNoX2lkLCBidWlsZGlkLCBidWlsZGVyaWQsIG51bWJlciwg cmVzdWx0LCBzdGF0ZV9zdHJpbmcsIHN0YXJ0ZWRfYXQsIGNvbXBsZXRlX2F0KS5zYXZlKCkKKyAg ICAgICAgX2xvZy5pbmZvKCdTYXZlZCBidWlsZCB7fSBpbiBkYXRhYmFzZSBmb3IgcGF0Y2hfaWQ6 IHt9Jy5mb3JtYXQoYnVpbGRpZCwgcGF0Y2hfaWQpKQorICAgICAgICByZXR1cm4gU1VDQ0VTUwor CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGdldF9leGlzdGluZ19idWlsZF9pbmZvKGNscywg YnVpbGRpZCk6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBCdWlsZC5vYmplY3Rz LmdldChidWlsZGlkPWJ1aWxkaWQpCisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgIHJldHVy biBOb25lCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgaXNfdmFsaWRfcmVzdWx0KGNscywg cGF0Y2hfaWQsIGJ1aWxkaWQsIGJ1aWxkZXJpZCwgbnVtYmVyLCByZXN1bHQsIHN0YXRlX3N0cmlu Zywgc3RhcnRlZF9hdCwgY29tcGxldGVfYXQ9Tm9uZSk6CisgICAgICAgIGlmIG5vdCAodXRpbC5p c192YWxpZF9pbnRfaWQocGF0Y2hfaWQpIGFuZCB1dGlsLmlzX3ZhbGlkX2ludF9pZChidWlsZGlk KSBhbmQgdXRpbC5pc192YWxpZF9pbnRfaWQoYnVpbGRlcmlkKSAgYW5kIHV0aWwuaXNfdmFsaWRf aW50X2lkKG51bWJlcikpOgorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICAgICAgaWYg bm90IFBhdGNoLmlzX2V4aXN0aW5nX3BhdGNoX2lkKHBhdGNoX2lkKToKKyAgICAgICAgICAgIF9s b2cuZXJyb3IoJ3BhdGNoX2lkOiB7fSBkb2VzIG5vdCBleGlzdCBpbiBkYXRhYmFzZScuZm9ybWF0 KHBhdGNoX2lkKSkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgICAgIHJldHVybiBU cnVlCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg MjI4ZmNkYTcxMWMuLmJhNDEzZWZjZWE5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMjMgIEFha2FzaCBK YWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtld3MtYXBwXSBBZGQgbWV0 aG9kIHRvIHNhdmUgQnVpbGQgZGF0YSB0byBkYXRhYmFzZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNzM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9tb2RlbHMvYnVpbGQucHk6CisgICAgICAgIChCdWlsZC5zYXZlX2J1aWxkKTogTWV0aG9kIHRv IHNhdmUgYnVpbGQgaW5mb3JtYXRpb24gdG8gZGF0YWJhc2UuCisgICAgICAgIChCdWlsZC5nZXRf ZXhpc3RpbmdfYnVpbGRfaW5mbyk6IE1ldGhvZCB0byBmZXRjaCBleGlzdGluZyBidWlsZCBpbmZv IGZyb20gZGF0YWJhc2UuCisgICAgICAgIChCdWlsZC5pc192YWxpZF9yZXN1bHQpOiBNZXRob2Qg dG8gdmFsaWRhdGUgYnVpbGQgcmVzdWx0LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3 cy1hcHAvZXdzL2NvbW1vbi91dGlsLnB5OgorICAgICAgICAoaXNfdmFsaWRfaW50X2lkKTogTWV0 aG9kIHRvIHZhbGlkYXRlIHZhbGlkIGlkLgorCiAyMDE5LTAxLTIzICBBYWthc2ggSmFpbiAgPGFh a2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzLWFwcF0gUmVuYW1lIGV3cyBtb2Rl bCBidWlsZGVybWFwcGluZ3MgdG8gYnVpbGRlcm1hcHBpbmcKLS0gCjIuMTcuMiAoQXBwbGUgR2l0 LTExMykKCg== 360334 2019-01-28 04:51:15 -0800 2019-01-28 12:12:54 -0800 Updated patch 0003-ews-app-Add-method-to-save-Build-data-to-database.patch text/plain 6511 aakash_jain RnJvbSA3YzVlNjVjMTYwMGRjMTEzODk5NDkxNTliZGVlZThiNzIzOWNhMmIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBYWthc2ggSmFpbiA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgpE YXRlOiBTdW4sIDI3IEphbiAyMDE5IDIyOjMxOjE5IC0wNTAwClN1YmplY3Q6IFtQQVRDSCAzLzRd IFtld3MtYXBwXSBBZGQgbWV0aG9kIHRvIHNhdmUgQnVpbGQgZGF0YSB0byBkYXRhYmFzZQogaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzczNQoKUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCgoqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9i dWlsZC5weToKKEJ1aWxkLnNhdmVfYnVpbGQpOiBNZXRob2QgdG8gc2F2ZSBidWlsZCBpbmZvcm1h dGlvbiB0byBkYXRhYmFzZS4KKEJ1aWxkLmdldF9leGlzdGluZ19idWlsZCk6IE1ldGhvZCB0byBm ZXRjaCBleGlzdGluZyBidWlsZCBmcm9tIGRhdGFiYXNlLgooQnVpbGQuaXNfdmFsaWRfcmVzdWx0 KTogTWV0aG9kIHRvIHZhbGlkYXRlIGJ1aWxkIHJlc3VsdC4KKiBCdWlsZFNsYXZlU3VwcG9ydC9l d3MtYXBwL2V3cy9jb21tb24vdXRpbC5weToKKGlzX3ZhbGlkX2ludF9pZCk6IE1ldGhvZCB0byB2 YWxpZGF0ZSB2YWxpZCBpZC4KLS0tCiAuLi4vZXdzLWFwcC9ld3MvY29tbW9uL3V0aWwucHkgICAg ICAgICAgICAgICAgfCAxNSArKysrLQogLi4uL2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weSAg ICAgICAgICAgICAgIHwgNTcgKysrKysrKysrKysrKysrKysrKwogVG9vbHMvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTQgKysrKysKIDMgZmlsZXMgY2hhbmdlZCwg ODUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL2NvbW1vbi91dGlsLnB5IGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWFwcC9ld3MvY29tbW9uL3V0aWwucHkKaW5kZXggMjE5OTEzODM1MzAuLjE1 ZjFjZWEzMGM2IDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9jb21tb24vdXRpbC5weQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy9jb21tb24vdXRpbC5weQpAQCAtMSw0ICsxLDQgQEAKLSMgQ29weXJpZ2h0IChDKSAyMDE4IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDE4LTIwMTkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC00MSwzICs0MSwxNiBAQCBkZWYgZmV0Y2hfZGF0YV9mcm9tX3VybCh1cmwpOgogICAg ICAgICBfbG9nLmVycm9yKCdBY2Nlc3NlZCB7dXJsfSB3aXRoIHVuZXhwZWN0ZWQgc3RhdHVzIGNv ZGUge3N0YXR1c19jb2RlfS4nLmZvcm1hdCh1cmw9dXJsLCBzdGF0dXNfY29kZT1yZXNwb25zZS5z dGF0dXNfY29kZSkpCiAgICAgICAgIHJldHVybiBOb25lCiAgICAgcmV0dXJuIHJlc3BvbnNlCisK KworZGVmIGlzX3ZhbGlkX2lkKGlkLCBleHBlY3RlZF9kYXRhX3R5cGU9aW50KToKKyAgICBpZiBu b3QgaWQ6CisgICAgICAgIF9sb2cud2FybignSW52YWxpZCBpZDoge30nLmZvcm1hdChpZCkpCisg ICAgICAgIHJldHVybiBGYWxzZQorICAgIGlmIHR5cGUoaWQpICE9IGV4cGVjdGVkX2RhdGFfdHlw ZToKKyAgICAgICAgX2xvZy53YXJuKCdJbnZhbGlkIHR5cGUge30gZm9yIGlkOiB7fSwgZXhwZWN0 ZWQ6IHt9Jy5mb3JtYXQodHlwZShpZCksIGlkLCBleHBlY3RlZF9kYXRhX3R5cGUpKQorICAgICAg ICByZXR1cm4gRmFsc2UKKyAgICBpZiBleHBlY3RlZF9kYXRhX3R5cGUgPT0gaW50IGFuZCBpZCA8 IDA6CisgICAgICAgIF9sb2cud2FybignSW52YWxpZCBpZDoge30sIGlkIHNob3VsZCBiZSBwb3Np dGl2ZSBpbnRlZ2VyLicuZm9ybWF0KGlkKSkKKyAgICAgICAgcmV0dXJuIEZhbHNlCisgICAgcmV0 dXJuIFRydWUKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdz L21vZGVscy9idWlsZC5weSBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21v ZGVscy9idWlsZC5weQppbmRleCA3Y2Y3YWM4Y2ZkZi4uNWZkZDBjZjQxYjYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21vZGVscy9idWlsZC5weQorKysg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9tb2RlbHMvYnVpbGQucHkKQEAg LTIyLDggKzIyLDE0IEBACiAKIGZyb20gX19mdXR1cmVfXyBpbXBvcnQgdW5pY29kZV9saXRlcmFs cwogCitpbXBvcnQgbG9nZ2luZworCiBmcm9tIGRqYW5nby5kYiBpbXBvcnQgbW9kZWxzCitmcm9t IGV3cy5jb25maWcgaW1wb3J0IEVSUl9VTkVYUEVDVEVELCBTVUNDRVNTCiBmcm9tIGV3cy5tb2Rl bHMucGF0Y2ggaW1wb3J0IFBhdGNoCitpbXBvcnQgZXdzLmNvbW1vbi51dGlsIGFzIHV0aWwKKwor X2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNzIEJ1aWxkKG1vZGVs cy5Nb2RlbCk6CkBAIC00MCwzICs0Niw1NCBAQCBjbGFzcyBCdWlsZChtb2RlbHMuTW9kZWwpOgog CiAgICAgZGVmIF9fc3RyX18oc2VsZik6CiAgICAgICAgIHJldHVybiBzdHIoc2VsZi5idWlsZF9p ZCkKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBzYXZlX2J1aWxkKGNscywgcGF0Y2hfaWQs IGJ1aWxkX2lkLCBidWlsZGVyX2lkLCBudW1iZXIsIHJlc3VsdCwgc3RhdGVfc3RyaW5nLCBzdGFy dGVkX2F0LCBjb21wbGV0ZV9hdD1Ob25lKToKKyAgICAgICAgaWYgbm90IEJ1aWxkLmlzX3ZhbGlk X3Jlc3VsdChwYXRjaF9pZCwgYnVpbGRfaWQsIGJ1aWxkZXJfaWQsIG51bWJlciwgcmVzdWx0LCBz dGF0ZV9zdHJpbmcsIHN0YXJ0ZWRfYXQsIGNvbXBsZXRlX2F0KToKKyAgICAgICAgICAgIHJldHVy biBFUlJfVU5FWFBFQ1RFRAorCisgICAgICAgIGJ1aWxkID0gQnVpbGQuZ2V0X2V4aXN0aW5nX2J1 aWxkKGJ1aWxkX2lkKQorICAgICAgICBpZiBidWlsZDoKKyAgICAgICAgICAgICMgSWYgdGhlIGJ1 aWxkIGRhdGEgaXMgYWxyZWFkeSBwcmVzZW50IGluIGRhdGFiYXNlLCB1cGRhdGUgaXQsIGUuZy46 IGJ1aWxkIGNvbXBsZXRlIGV2ZW50LgorICAgICAgICAgICAgcmV0dXJuIEJ1aWxkLnVwZGF0ZV9i dWlsZChidWlsZCwgcGF0Y2hfaWQsIGJ1aWxkX2lkLCBidWlsZGVyX2lkLCBudW1iZXIsIHJlc3Vs dCwgc3RhdGVfc3RyaW5nLCBzdGFydGVkX2F0LCBjb21wbGV0ZV9hdCkKKworICAgICAgICAjIFNh dmUgdGhlIG5ldyBidWlsZCBkYXRhLCBlLmcuOiBidWlsZCBzdGFydCBldmVudC4KKyAgICAgICAg QnVpbGQocGF0Y2hfaWQsIGJ1aWxkX2lkLCBidWlsZGVyX2lkLCBudW1iZXIsIHJlc3VsdCwgc3Rh dGVfc3RyaW5nLCBzdGFydGVkX2F0LCBjb21wbGV0ZV9hdCkuc2F2ZSgpCisgICAgICAgIF9sb2cu aW5mbygnU2F2ZWQgYnVpbGQge30gaW4gZGF0YWJhc2UgZm9yIHBhdGNoX2lkOiB7fScuZm9ybWF0 KGJ1aWxkX2lkLCBwYXRjaF9pZCkpCisgICAgICAgIHJldHVybiBTVUNDRVNTCisKKyAgICBAY2xh c3NtZXRob2QKKyAgICBkZWYgdXBkYXRlX2J1aWxkKGNscywgYnVpbGQsIHBhdGNoX2lkLCBidWls ZF9pZCwgYnVpbGRlcl9pZCwgbnVtYmVyLCByZXN1bHQsIHN0YXRlX3N0cmluZywgc3RhcnRlZF9h dCwgY29tcGxldGVfYXQpOgorICAgICAgICBpZiBidWlsZC5wYXRjaF9pZCAhPSBwYXRjaF9pZDoK KyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ3BhdGNoX2lkIHt9IGRvZXMgbm90IG1hdGNoIHdpdGgg cGF0Y2hfaWQge30uIElnbm9yaW5nIG5ldyBkYXRhLicuZm9ybWF0KGJ1aWxkLnBhdGNoX2lkLCBw YXRjaF9pZCkpCisgICAgICAgICAgICByZXR1cm4gRVJSX1VORVhQRUNURUQKKyAgICAgICAgaWYg YnVpbGQuYnVpbGRfaWQgIT0gYnVpbGRfaWQ6CisgICAgICAgICAgICBfbG9nLmVycm9yKCdidWls ZF9pZCB7fSBkb2VzIG5vdCBtYXRjaCB3aXRoIGJ1aWxkX2lkIHt9LiBJZ25vcmluZyBuZXcgZGF0 YS4nLmZvcm1hdChidWlsZC5idWlsZF9pZCwgYnVpbGRfaWQpKQorICAgICAgICAgICAgcmV0dXJu IEVSUl9VTkVYUEVDVEVECisgICAgICAgIGlmIGJ1aWxkLmJ1aWxkZXJfaWQgIT0gYnVpbGRlcl9p ZDoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ2J1aWxkZXJfaWQge30gZG9lcyBub3QgbWF0Y2gg d2l0aCBidWlsZGVyX2lkIHt9LiBJZ25vcmluZyBuZXcgZGF0YS4nLmZvcm1hdChidWlsZC5idWls ZGVyX2lkLCBidWlsZGVyX2lkKSkKKyAgICAgICAgICAgIHJldHVybiBFUlJfVU5FWFBFQ1RFRAor ICAgICAgICBpZiBidWlsZC5udW1iZXIgIT0gbnVtYmVyOgorICAgICAgICAgICAgX2xvZy5lcnJv cignYnVpbGQgbnVtYmVyIHt9IGRvZXMgbm90IG1hdGNoIHdpdGggbnVtYmVyIHt9LiBJZ25vcmlu ZyBuZXcgZGF0YS4nLmZvcm1hdChidWlsZC5udW1iZXIsIG51bWJlcikpCisgICAgICAgICAgICBy ZXR1cm4gRVJSX1VORVhQRUNURUQKKyAgICAgICAgYnVpbGQucmVzdWx0ID0gcmVzdWx0CisgICAg ICAgIGJ1aWxkLnN0YXRlX3N0cmluZyA9IHN0YXRlX3N0cmluZworICAgICAgICBidWlsZC5zdGFy dGVkX2F0ID0gc3RhcnRlZF9hdAorICAgICAgICBidWlsZC5jb21wbGV0ZV9hdCA9IGNvbXBsZXRl X2F0CisgICAgICAgIGJ1aWxkLnNhdmUodXBkYXRlX2ZpZWxkcz1bJ3Jlc3VsdCcsICdzdGF0ZV9z dHJpbmcnLCAnc3RhcnRlZF9hdCcsICdjb21wbGV0ZV9hdCddKQorICAgICAgICBfbG9nLmluZm8o J1VwZGF0ZWQgYnVpbGQge30gaW4gZGF0YWJhc2UgZm9yIHBhdGNoX2lkOiB7fScuZm9ybWF0KGJ1 aWxkX2lkLCBwYXRjaF9pZCkpCisgICAgICAgIHJldHVybiBTVUNDRVNTCisKKyAgICBAY2xhc3Nt ZXRob2QKKyAgICBkZWYgZ2V0X2V4aXN0aW5nX2J1aWxkKGNscywgYnVpbGRfaWQpOgorICAgICAg ICB0cnk6CisgICAgICAgICAgICByZXR1cm4gQnVpbGQub2JqZWN0cy5nZXQoYnVpbGRfaWQ9YnVp bGRfaWQpCisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisKKyAgICBA Y2xhc3NtZXRob2QKKyAgICBkZWYgaXNfdmFsaWRfcmVzdWx0KGNscywgcGF0Y2hfaWQsIGJ1aWxk X2lkLCBidWlsZGVyX2lkLCBudW1iZXIsIHJlc3VsdCwgc3RhdGVfc3RyaW5nLCBzdGFydGVkX2F0 LCBjb21wbGV0ZV9hdD1Ob25lKToKKyAgICAgICAgaWYgbm90ICh1dGlsLmlzX3ZhbGlkX2lkKHBh dGNoX2lkKSBhbmQgdXRpbC5pc192YWxpZF9pZChidWlsZF9pZCkgYW5kIHV0aWwuaXNfdmFsaWRf aWQoYnVpbGRlcl9pZCkgYW5kIHV0aWwuaXNfdmFsaWRfaWQobnVtYmVyKSk6CisgICAgICAgICAg ICByZXR1cm4gRmFsc2UKKworICAgICAgICByZXR1cm4gVHJ1ZQpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDA3MzZlZjU0OGE0Li5lMDVjMGI2NjJh MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt OCw2ICs4LDIwIEBACiAgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvbW9k ZWxzL2J1aWxkLnB5OgogICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL21v ZGVscy9zdGVwLnB5OgogCisyMDE5LTAxLTI3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFw cGxlLmNvbT4KKworICAgICAgICBbZXdzLWFwcF0gQWRkIG1ldGhvZCB0byBzYXZlIEJ1aWxkIGRh dGEgdG8gZGF0YWJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5MzczNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3MvbW9kZWxzL2J1aWxkLnB5Ogor ICAgICAgICAoQnVpbGQuc2F2ZV9idWlsZCk6IE1ldGhvZCB0byBzYXZlIGJ1aWxkIGluZm9ybWF0 aW9uIHRvIGRhdGFiYXNlLgorICAgICAgICAoQnVpbGQuZ2V0X2V4aXN0aW5nX2J1aWxkX2luZm8p OiBNZXRob2QgdG8gZmV0Y2ggZXhpc3RpbmcgYnVpbGQgaW5mbyBmcm9tIGRhdGFiYXNlLgorICAg ICAgICAoQnVpbGQuaXNfdmFsaWRfcmVzdWx0KTogTWV0aG9kIHRvIHZhbGlkYXRlIGJ1aWxkIHJl c3VsdC4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3cy9jb21tb24vdXRp bC5weToKKyAgICAgICAgKGlzX3ZhbGlkX2ludF9pZCk6IE1ldGhvZCB0byB2YWxpZGF0ZSB2YWxp ZCBpZC4KKwogMjAxOS0wMS0yNyAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW2V3cy1hcHBdIFJlbmFtZSBpZCB2YXJpYWJsZXMKLS0gCjIuMTcuMiAoQXBw bGUgR2l0LTExMykKCg==