234848 2022-01-04 09:27:17 -0800 [EWS] Support pull-requests in ConfigureBuild 2022-03-28 17:17:33 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=234847 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ews-watchlist webkit-bug-importer oldest_to_newest 1827970 0 jbedard 2022-01-04 09:27:17 -0800 The ConfigureBuild step should support GitHub pull-requests. 1827972 1 webkit-bug-importer 2022-01-04 09:28:16 -0800 <rdar://problem/87094989> 1827973 2 jbedard 2022-01-04 09:31:09 -0800 PR: https://github.com/WebKit/WebKit/pull/61 1827996 3 448307 jbedard 2022-01-04 10:12:36 -0800 Created attachment 448307 Patch 1828007 4 448309 jbedard 2022-01-04 10:39:21 -0800 Created attachment 448309 Patch 1828030 5 448309 aakash_jain 2022-01-04 12:13:30 -0800 Comment on attachment 448309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=448309&action=review > Tools/CISupport/ews-build/steps.py:79 > + return '{}/pull/{}'.format(GITHUB_URL, pr_number) pr_number isn't defined in this method > Tools/CISupport/ews-build/steps.py:83 > + def pull_request(self): method name seems too generic and doesn't indicate what it might be doing, maybe something like get_pull_request_number might be more informative. > Tools/CISupport/ews-build/steps.py:86 > + return int(pull_request) better to call this pr_number to indicate that it is an integer rather than an object. Also, probably need to gracefully handle the case when conversion to int raises an exception > Tools/CISupport/ews-build/steps.py:88 > + if self.getProperty('event') != 'pull_request': who is setting these 'event' and 'branch' properties? > Tools/CISupport/ews-build/steps.py:93 > + self.setProperty('pull_request', match.group('id')) Is the regex guaranteed to contain the PR number and that would be guaranteed to be integer? It might be good idea to validate that this can be cast to an int before setting the property (since we will try to read it as a int later on) > Tools/CISupport/ews-build/steps.py:150 > + self.addURL('Pull-request {}'.format(pr_number), GitHub.pr_url(pr_number)) I think it would be better to display "Pull Request" instead of "Pull-reqeust" 1828046 6 448309 jbedard 2022-01-04 12:50:35 -0800 Comment on attachment 448309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=448309&action=review >> Tools/CISupport/ews-build/steps.py:88 >> + if self.getProperty('event') != 'pull_request': > > who is setting these 'event' and 'branch' properties? That comes from buildbot's digestion of GitHub hooks. http://docs.buildbot.net/current/manual/configuration/wwwhooks.html outlines some of the basics >> Tools/CISupport/ews-build/steps.py:93 >> + self.setProperty('pull_request', match.group('id')) > > Is the regex guaranteed to contain the PR number and that would be guaranteed to be integer? > It might be good idea to validate that this can be cast to an int before setting the property (since we will try to read it as a int later on) The regex forces id to be an integer, so we wouldn't have a match if it wasn't an integer. I was under the impression properties needed to be strings, but looking at some other builds, that doesn't look to be true. 1828079 7 448332 jbedard 2022-01-04 13:34:34 -0800 Created attachment 448332 Patch 1828116 8 448340 jbedard 2022-01-04 15:08:29 -0800 Created attachment 448340 Patch 1829837 9 jbedard 2022-01-11 10:08:51 -0800 Landed 245802@main (r287719) 448307 2022-01-04 10:12:36 -0800 2022-01-04 10:39:18 -0800 Patch bug-234848-20220104101235.patch text/plain 3473 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTY4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJiNTIxNjUxYWFkYzRjNGVkMmI4NTZiOGIwYjA2ZTc1 OWE4NGY3Zi4uYzQwMDI1OGYyNmMzNDU1NGNlZWVkZTkxMmFlMjgwNDNmN2I3NDRjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIyLTAxLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBTdXBwb3J0IHB1bGwtcmVxdWVzdHMgaW4gQ29uZmlndXJlQnVpbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDg0OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODcwOTQ5ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoR2l0SHViTWl4aW4pOgorICAgICAgICAoR2l0SHViTWl4aW4ucHVsbF9yZXF1ZXN0 KTogQ2hlY2sgaWYgdGhlIGV2ZW50IHRyaWdnZXJpbmcgdGhpcyB3YXMgYQorICAgICAgICBwdWxs X3JlcXVlc3QsIGFuZCB0aGUgc3BlY2lmaWVkIGJyYW5jaCBjYW4gYmUgbWFwcGVkIHRvIGEgcHVs bC1yZXF1ZXN0LgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuc3RhcnQpOiBBZGQgcHVsbC1yZXF1 ZXN0IGRldGFpbHMuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5hZGRfcHJfZGV0YWlscyk6IERp dHRvLgorCiAyMDIyLTAxLTAzICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGQgcmVzb2x2ZWQvdW5yZXNvbHZlZCBjb2xvciB0eXBlIGFjY2Vzc29ycyB0byByZXF1 aXJlIHVzZXJzIHRvIGJlIGV4cGxpY2l0IGFib3V0IHdoZXRoZXIgdGhleSB3aWxsIGhhbmRsZSBt aXNzaW5nL25vbmUgY29sb3IgY29tcG9uZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK aW5kZXggOTUzYjM0NjZiYzEzMTY2NjMzNmRkYjk4MTUwZmNmMjM3ZjAzMzM0MC4uNjdhMTU1NjZl YTY0OGQ0Njc0YmY0YmJiOWE0ZjIyNDM3MzlhNWQ4NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBw b3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5CkBAIC00NSw2ICs0NSw3IEBAIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywgNSk6CiAg ICAgc3lzLmV4aXQoMSkKIAogQlVHX1NFUlZFUl9VUkwgPSAnaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvJworR0lUSFVCX1VSTCA9ICdodHRwczovL2dpdGh1Yi5jb20vV2ViS2l0L1dlYktpdCcKIENP TU1JVFNfSU5GT19VUkwgPSAnaHR0cHM6Ly9jb21taXRzLndlYmtpdC5vcmcvJwogUzNVUkwgPSAn aHR0cHM6Ly9zMy11cy13ZXN0LTIuYW1hem9uYXdzLmNvbS8nCiBTM19SRVNVTFRTX1VSTCA9ICdo dHRwczovL2V3cy1idWlsZC5zMy11cy13ZXN0LTIuYW1hem9uYXdzLmNvbS8nCkBAIC01NCw2ICs1 NSw3IEBAIEVXU19VUkwgPSAnaHR0cHM6Ly9ld3Mud2Via2l0Lm9yZy8nCiBSRVNVTFRTX0RCX1VS TCA9ICdodHRwczovL3Jlc3VsdHMud2Via2l0Lm9yZy8nCiBXaXRoUHJvcGVydGllcyA9IHByb3Bl cnRpZXMuV2l0aFByb3BlcnRpZXMKIEludGVycG9sYXRlID0gcHJvcGVydGllcy5JbnRlcnBvbGF0 ZQorQlJBTkNIX1BSX1JFID0gcmUuY29tcGlsZShyJ15yZWZzL3B1bGwvKD9QPGlkPlxkKykvbWVy Z2UkJykKIAogCiBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZm ZXJMb2dPYnNlcnZlcik6CkBAIC02OSw3ICs3MSwyMiBAQCBjbGFzcyBCdWZmZXJMb2dIZWFkZXJP YnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CiAgICAgICAgIHJldHVybiBz ZWxmLl9nZXQoc2VsZi5oZWFkZXJzKQogCiAKLWNsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3Rl cC5CdWlsZFN0ZXApOgorY2xhc3MgR2l0SHViTWl4aW4ob2JqZWN0KToKKyAgICBkZWYgcHVsbF9y ZXF1ZXN0KHNlbGYpOgorICAgICAgICBwdWxsX3JlcXVlc3QgPSBzZWxmLmdldFByb3BlcnR5KCdw dWxsX3JlcXVlc3QnKQorICAgICAgICBpZiBwdWxsX3JlcXVlc3Q6CisgICAgICAgICAgICByZXR1 cm4gaW50KHB1bGxfcmVxdWVzdCkKKworICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdldmVu dCcpICE9ICdwdWxsX3JlcXVlc3QnOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAg bWF0Y2ggPSBCUkFOQ0hfUFJfUkUubWF0Y2goc2VsZi5nZXRQcm9wZXJ0eSgnYnJhbmNoJywgJycp KQorICAgICAgICBpZiBub3QgbWF0Y2g6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnLCBtYXRjaC5ncm91cCgnaWQnKSkKKyAg ICAgICAgcmV0dXJuIGludChtYXRjaC5ncm91cCgnaWQnKSkKKworCitjbGFzcyBDb25maWd1cmVC dWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwLCBHaXRIdWJNaXhpbik6CiAgICAgbmFtZSA9ICdjb25m aWd1cmUtYnVpbGQnCiAgICAgZGVzY3JpcHRpb24gPSBbJ2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZpZ3VyZWQgYnVpbGQnXQpAQCAtMTA5LDYgKzEyNiw4 IEBAIGNsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgnYWRkaXRpb25hbEFyZ3VtZW50cycsIHNlbGYuYWRkaXRpb25h bEFyZ3VtZW50cywgJ2NvbmZpZy5qc29uJykKIAogICAgICAgICBzZWxmLmFkZF9wYXRjaF9pZF91 cmwoKQorICAgICAgICBzZWxmLmFkZF9wcl9kZXRhaWxzKCkKKwogICAgICAgICBzZWxmLmZpbmlz aGVkKFNVQ0NFU1MpCiAgICAgICAgIHJldHVybiBkZWZlci5zdWNjZWVkKE5vbmUpCiAKQEAgLTEx Nyw2ICsxMzYsMTEgQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6 CiAgICAgICAgIGlmIHBhdGNoX2lkOgogICAgICAgICAgICAgc2VsZi5hZGRVUkwoJ1BhdGNoIHt9 Jy5mb3JtYXQocGF0Y2hfaWQpLCBCdWd6aWxsYS5wYXRjaF91cmwocGF0Y2hfaWQpKQogCisgICAg ZGVmIGFkZF9wcl9kZXRhaWxzKHNlbGYpOgorICAgICAgICBwcl9udW1iZXIgPSBzZWxmLnB1bGxf cmVxdWVzdCgpCisgICAgICAgIGlmIHByX251bWJlcjoKKyAgICAgICAgICAgIHNlbGYuYWRkVVJM KCdQdWxsLXJlcXVlc3Qge30nLmZvcm1hdChwcl9udW1iZXIpLCAne30vcHVsbC97fScuZm9ybWF0 KEdJVEhVQl9VUkwsIHByX251bWJlcikpCisKIAogY2xhc3MgQ2hlY2tPdXRTb3VyY2UoZ2l0Lkdp dCk6CiAgICAgbmFtZSA9ICdjbGVhbi1hbmQtdXBkYXRlLXdvcmtpbmctZGlyZWN0b3J5Jwo= 448309 2022-01-04 10:39:21 -0800 2022-01-04 13:34:32 -0800 Patch bug-234848-20220104103920.patch text/plain 3624 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjk2ODY5MDg1YzFiYmQyMWFmNzMwOTc4Y2M4YmZiYzQy Y2U2ZWVjYS4uYjg0MGRmZDdkOTYwODBmMGFlZWFkYmJmYWJjYjVkNjYzNmY1OThlMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIyLTAxLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBTdXBwb3J0IHB1bGwtcmVxdWVzdHMgaW4gQ29uZmlndXJlQnVpbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDg0OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODcwOTQ5ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoR2l0SHViLnByX3VybCk6IE1hcCBwdWxsLXJlcXVlc3QgbnVtYmVyIHRvIFVSTC4K KyAgICAgICAgKEdpdEh1Yk1peGluKToKKyAgICAgICAgKEdpdEh1Yk1peGluLnB1bGxfcmVxdWVz dCk6IENoZWNrIGlmIHRoZSBldmVudCB0cmlnZ2VyaW5nIHRoaXMgd2FzIGEKKyAgICAgICAgcHVs bF9yZXF1ZXN0LCBhbmQgdGhlIHNwZWNpZmllZCBicmFuY2ggY2FuIGJlIG1hcHBlZCB0byBhIHB1 bGwtcmVxdWVzdC4KKyAgICAgICAgKENvbmZpZ3VyZUJ1aWxkLnN0YXJ0KTogQWRkIHB1bGwtcmVx dWVzdCBkZXRhaWxzLgorICAgICAgICAoQ29uZmlndXJlQnVpbGQuYWRkX3ByX2RldGFpbHMpOiBE aXR0by4KKwogMjAyMi0wMS0wNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJlLWVuYWJsZSBVUkxTY2hlbWVIYW5kbGVyLkxlYWtzMSBBUEkg dGVzdApkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weSBiL1Rv b2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggOTUzYjM0NjZiYzEzMTY2NjMz NmRkYjk4MTUwZmNmMjM3ZjAzMzM0MC4uZjVjMDY2YzhhYzgwODdjN2Q1M2NhNDRjYzJmY2FjYjM4 M2JkZjg3NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQor KysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC00NSw2ICs0NSw3IEBA IGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywgNSk6CiAgICAgc3lzLmV4aXQoMSkKIAogQlVHX1NF UlZFUl9VUkwgPSAnaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvJworR0lUSFVCX1VSTCA9ICdodHRw czovL2dpdGh1Yi5jb20vV2ViS2l0L1dlYktpdCcKIENPTU1JVFNfSU5GT19VUkwgPSAnaHR0cHM6 Ly9jb21taXRzLndlYmtpdC5vcmcvJwogUzNVUkwgPSAnaHR0cHM6Ly9zMy11cy13ZXN0LTIuYW1h em9uYXdzLmNvbS8nCiBTM19SRVNVTFRTX1VSTCA9ICdodHRwczovL2V3cy1idWlsZC5zMy11cy13 ZXN0LTIuYW1hem9uYXdzLmNvbS8nCkBAIC01NCw2ICs1NSw3IEBAIEVXU19VUkwgPSAnaHR0cHM6 Ly9ld3Mud2Via2l0Lm9yZy8nCiBSRVNVTFRTX0RCX1VSTCA9ICdodHRwczovL3Jlc3VsdHMud2Vi a2l0Lm9yZy8nCiBXaXRoUHJvcGVydGllcyA9IHByb3BlcnRpZXMuV2l0aFByb3BlcnRpZXMKIElu dGVycG9sYXRlID0gcHJvcGVydGllcy5JbnRlcnBvbGF0ZQorQlJBTkNIX1BSX1JFID0gcmUuY29t cGlsZShyJ15yZWZzL3B1bGwvKD9QPGlkPlxkKykvbWVyZ2UkJykKIAogCiBjbGFzcyBCdWZmZXJM b2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CkBAIC02OSw3 ICs3MSwzMCBAQCBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZm ZXJMb2dPYnNlcnZlcik6CiAgICAgICAgIHJldHVybiBzZWxmLl9nZXQoc2VsZi5oZWFkZXJzKQog CiAKLWNsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgorY2xhc3MgR2l0 SHViKG9iamVjdCk6CisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHByX3VybChjbHMsIHB1bGxf cmVxdWVzdCk6CisgICAgICAgIGlmIG5vdCBwdWxsX3JlcXVlc3Q6CisgICAgICAgICAgICByZXR1 cm4gJycKKyAgICAgICAgcmV0dXJuICd7fS9wdWxsL3t9Jy5mb3JtYXQoR0lUSFVCX1VSTCwgcHJf bnVtYmVyKQorCisKK2NsYXNzIEdpdEh1Yk1peGluKG9iamVjdCk6CisgICAgZGVmIHB1bGxfcmVx dWVzdChzZWxmKToKKyAgICAgICAgcHVsbF9yZXF1ZXN0ID0gc2VsZi5nZXRQcm9wZXJ0eSgncHVs bF9yZXF1ZXN0JykKKyAgICAgICAgaWYgcHVsbF9yZXF1ZXN0OgorICAgICAgICAgICAgcmV0dXJu IGludChwdWxsX3JlcXVlc3QpCisKKyAgICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnZXZlbnQn KSAhPSAncHVsbF9yZXF1ZXN0JzoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIG1h dGNoID0gQlJBTkNIX1BSX1JFLm1hdGNoKHNlbGYuZ2V0UHJvcGVydHkoJ2JyYW5jaCcsICcnKSkK KyAgICAgICAgaWYgbm90IG1hdGNoOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAg c2VsZi5zZXRQcm9wZXJ0eSgncHVsbF9yZXF1ZXN0JywgbWF0Y2guZ3JvdXAoJ2lkJykpCisgICAg ICAgIHJldHVybiBpbnQobWF0Y2guZ3JvdXAoJ2lkJykpCisKKworY2xhc3MgQ29uZmlndXJlQnVp bGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCwgR2l0SHViTWl4aW4pOgogICAgIG5hbWUgPSAnY29uZmln dXJlLWJ1aWxkJwogICAgIGRlc2NyaXB0aW9uID0gWydjb25maWd1cmluZyBidWlsZCddCiAgICAg ZGVzY3JpcHRpb25Eb25lID0gWydDb25maWd1cmVkIGJ1aWxkJ10KQEAgLTEwOSw2ICsxMzQsOCBA QCBjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAgICAgICAg IHNlbGYuc2V0UHJvcGVydHkoJ2FkZGl0aW9uYWxBcmd1bWVudHMnLCBzZWxmLmFkZGl0aW9uYWxB cmd1bWVudHMsICdjb25maWcuanNvbicpCiAKICAgICAgICAgc2VsZi5hZGRfcGF0Y2hfaWRfdXJs KCkKKyAgICAgICAgc2VsZi5hZGRfcHJfZGV0YWlscygpCisKICAgICAgICAgc2VsZi5maW5pc2hl ZChTVUNDRVNTKQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCkBAIC0xMTcs NiArMTQ0LDExIEBAIGNsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgog ICAgICAgICBpZiBwYXRjaF9pZDoKICAgICAgICAgICAgIHNlbGYuYWRkVVJMKCdQYXRjaCB7fScu Zm9ybWF0KHBhdGNoX2lkKSwgQnVnemlsbGEucGF0Y2hfdXJsKHBhdGNoX2lkKSkKIAorICAgIGRl ZiBhZGRfcHJfZGV0YWlscyhzZWxmKToKKyAgICAgICAgcHJfbnVtYmVyID0gc2VsZi5wdWxsX3Jl cXVlc3QoKQorICAgICAgICBpZiBwcl9udW1iZXI6CisgICAgICAgICAgICBzZWxmLmFkZFVSTCgn UHVsbC1yZXF1ZXN0IHt9Jy5mb3JtYXQocHJfbnVtYmVyKSwgR2l0SHViLnByX3VybChwcl9udW1i ZXIpKQorCiAKIGNsYXNzIENoZWNrT3V0U291cmNlKGdpdC5HaXQpOgogICAgIG5hbWUgPSAnY2xl YW4tYW5kLXVwZGF0ZS13b3JraW5nLWRpcmVjdG9yeScK 448332 2022-01-04 13:34:34 -0800 2022-01-04 15:08:27 -0800 Patch bug-234848-20220104133433.patch text/plain 3392 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjk2ODY5MDg1YzFiYmQyMWFmNzMwOTc4Y2M4YmZiYzQy Y2U2ZWVjYS4uNWIzMTRhYzExNjA2MDU2MDVmNGRlOTVkMGU5OWQ4NDlmY2MxZWE0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIyLTAxLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBTdXBwb3J0IHB1bGwtcmVxdWVzdHMgaW4gQ29uZmlndXJlQnVpbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDg0OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODcwOTQ5ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoR2l0SHViTWl4aW4ucHJfdXJsKTogTWFwIHB1bGwtcmVxdWVzdCBudW1iZXIgdG8g VVJMLgorICAgICAgICAoR2l0SHViTWl4aW4uZ2V0X3B1bGxfcmVxdWVzdF9udW1iZXIpOiBDaGVj ayBpZiB0aGUgZXZlbnQgdHJpZ2dlcmluZworICAgICAgICB0aGlzIHdhcyBhIHB1bGxfcmVxdWVz dCwgYW5kIHRoZSBzcGVjaWZpZWQgYnJhbmNoIGNhbiBiZSBtYXBwZWQgdG8gYQorICAgICAgICBw dWxsLXJlcXVlc3QuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5zdGFydCk6IEFkZCBwdWxsLXJl cXVlc3QgZGV0YWlscy4KKyAgICAgICAgKENvbmZpZ3VyZUJ1aWxkLmFkZF9wcl9kZXRhaWxzKTog RGl0dG8uCisKIDIwMjItMDEtMDQgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZS1lbmFibGUgVVJMU2NoZW1lSGFuZGxlci5MZWFrczEgQVBJ IHRlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9U b29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IDk1M2IzNDY2YmMxMzE2NjYz MzZkZGI5ODE1MGZjZjIzN2YwMzMzNDAuLjgyMTU2NTQ1ZTVkODQ1Nzg4ZThmM2EwMDEwMWIxMjI0 MTMzNDk0MDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK KysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtNTQsNiArNTQsNyBA QCBFV1NfVVJMID0gJ2h0dHBzOi8vZXdzLndlYmtpdC5vcmcvJwogUkVTVUxUU19EQl9VUkwgPSAn aHR0cHM6Ly9yZXN1bHRzLndlYmtpdC5vcmcvJwogV2l0aFByb3BlcnRpZXMgPSBwcm9wZXJ0aWVz LldpdGhQcm9wZXJ0aWVzCiBJbnRlcnBvbGF0ZSA9IHByb3BlcnRpZXMuSW50ZXJwb2xhdGUKK0JS QU5DSF9QUl9SRSA9IHJlLmNvbXBpbGUocidecmVmcy9wdWxsLyg/UDxpZD5cZCspL21lcmdlJCcp CiAKIAogY2xhc3MgQnVmZmVyTG9nSGVhZGVyT2JzZXJ2ZXIobG9nb2JzZXJ2ZXIuQnVmZmVyTG9n T2JzZXJ2ZXIpOgpAQCAtNjksNyArNzAsMjkgQEAgY2xhc3MgQnVmZmVyTG9nSGVhZGVyT2JzZXJ2 ZXIobG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIpOgogICAgICAgICByZXR1cm4gc2VsZi5f Z2V0KHNlbGYuaGVhZGVycykKIAogCi1jbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVp bGRTdGVwKToKK2NsYXNzIEdpdEh1Yk1peGluKG9iamVjdCk6CisgICAgZGVmIHByX3VybChzZWxm LCBwcl9udW1iZXI9Tm9uZSk6CisgICAgICAgIHByX251bWJlciA9IHByX251bWJlciBvciBzZWxm LmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKKyAgICAgICAgaWYgbm90IHByX251bWJlcjoKKyAg ICAgICAgICAgIHJldHVybiAnJworICAgICAgICByZXR1cm4gJ3t9L3B1bGwve30nLmZvcm1hdChz ZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5JywgJy0nKSwgcHJfbnVtYmVyKQorCisgICAgZGVm IGdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKHNlbGYpOgorICAgICAgICBwcl9udW1iZXIgPSBzZWxm LmdldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnKQorICAgICAgICBpZiBwcl9udW1iZXI6CisgICAg ICAgICAgICByZXR1cm4gaW50KHByX251bWJlcikKKworICAgICAgICBpZiBzZWxmLmdldFByb3Bl cnR5KCdldmVudCcpICE9ICdwdWxsX3JlcXVlc3QnOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUK KyAgICAgICAgbWF0Y2ggPSBCUkFOQ0hfUFJfUkUubWF0Y2goc2VsZi5nZXRQcm9wZXJ0eSgnYnJh bmNoJywgJycpKQorICAgICAgICBpZiBub3QgbWF0Y2g6CisgICAgICAgICAgICByZXR1cm4gTm9u ZQorICAgICAgICBwcl9udW1iZXIgPSBpbnQobWF0Y2guZ3JvdXAoJ2lkJykpCisgICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ3B1bGxfcmVxdWVzdCcsIHByX251bWJlcikKKyAgICAgICAgcmV0dXJu IHByX251bWJlcgorCisKK2NsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1aWxkc3RlcC5CdWlsZFN0ZXAs IEdpdEh1Yk1peGluKToKICAgICBuYW1lID0gJ2NvbmZpZ3VyZS1idWlsZCcKICAgICBkZXNjcmlw dGlvbiA9IFsnY29uZmlndXJpbmcgYnVpbGQnXQogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ29u ZmlndXJlZCBidWlsZCddCkBAIC0xMDksNiArMTMyLDggQEAgY2xhc3MgQ29uZmlndXJlQnVpbGQo YnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhZGRp dGlvbmFsQXJndW1lbnRzJywgc2VsZi5hZGRpdGlvbmFsQXJndW1lbnRzLCAnY29uZmlnLmpzb24n KQogCiAgICAgICAgIHNlbGYuYWRkX3BhdGNoX2lkX3VybCgpCisgICAgICAgIHNlbGYuYWRkX3By X2RldGFpbHMoKQorCiAgICAgICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKICAgICAgICAgcmV0 dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKIApAQCAtMTE3LDYgKzE0MiwxMSBAQCBjbGFzcyBDb25m aWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwKToKICAgICAgICAgaWYgcGF0Y2hfaWQ6CiAg ICAgICAgICAgICBzZWxmLmFkZFVSTCgnUGF0Y2gge30nLmZvcm1hdChwYXRjaF9pZCksIEJ1Z3pp bGxhLnBhdGNoX3VybChwYXRjaF9pZCkpCiAKKyAgICBkZWYgYWRkX3ByX2RldGFpbHMoc2VsZik6 CisgICAgICAgIHByX251bWJlciA9IHNlbGYuZ2V0X3B1bGxfcmVxdWVzdF9udW1iZXIoKQorICAg ICAgICBpZiBwcl9udW1iZXI6CisgICAgICAgICAgICBzZWxmLmFkZFVSTCgnUHVsbCByZXF1ZXN0 IHt9Jy5mb3JtYXQocHJfbnVtYmVyKSwgc2VsZi5wcl91cmwocHJfbnVtYmVyPXByX251bWJlcikp CisKIAogY2xhc3MgQ2hlY2tPdXRTb3VyY2UoZ2l0LkdpdCk6CiAgICAgbmFtZSA9ICdjbGVhbi1h bmQtdXBkYXRlLXdvcmtpbmctZGlyZWN0b3J5Jwo= 448340 2022-01-04 15:08:29 -0800 2022-01-04 19:39:30 -0800 Patch bug-234848-20220104150828.patch text/plain 3561 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjViMDc2NzY1YzI0YTNiMzY2M2VlYjhjYzEyZWQ0MmVh NjJhNjI1OC4uMWVmZGY4NGI4ZDhlYmViMmVkMTA1YzVmZDg5NmM3NWE4ZGU5NDAxNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIyLTAxLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbRVdTXSBTdXBwb3J0IHB1bGwtcmVxdWVzdHMgaW4gQ29uZmlndXJlQnVpbGQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDg0OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODcwOTQ5ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoR2l0SHViTWl4aW4ucHJfdXJsKTogTWFwIHB1bGwtcmVxdWVzdCBudW1iZXIgdG8g VVJMLgorICAgICAgICAoR2l0SHViTWl4aW4uZ2V0X3B1bGxfcmVxdWVzdF9udW1iZXIpOiBDaGVj ayBpZiB0aGUgZXZlbnQgdHJpZ2dlcmluZworICAgICAgICB0aGlzIHdhcyBhIHB1bGxfcmVxdWVz dCwgYW5kIHRoZSBzcGVjaWZpZWQgYnJhbmNoIGNhbiBiZSBtYXBwZWQgdG8gYQorICAgICAgICBw dWxsLXJlcXVlc3QuCisgICAgICAgIChDb25maWd1cmVCdWlsZC5zdGFydCk6IEFkZCBwdWxsLXJl cXVlc3QgZGV0YWlscy4KKyAgICAgICAgKENvbmZpZ3VyZUJ1aWxkLmFkZF9wcl9kZXRhaWxzKTog RGl0dG8uCisKIDIwMjItMDEtMDQgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgTW9kYWxDb250YWluZXJPYnNlcnZlciBzaG91bGQgc2VhcmNoIGZvciB0 ZXh0IGluIHN1YmZyYW1lcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9z dGVwcy5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggOTUzYjM0 NjZiYzEzMTY2NjMzNmRkYjk4MTUwZmNmMjM3ZjAzMzM0MC4uNDJlZTI2YTRmYTVjNzhhYmFiNTU4 YWZkNmZlOTA4MzJhMTNiNWE2NiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC01 NCw2ICs1NCw4IEBAIEVXU19VUkwgPSAnaHR0cHM6Ly9ld3Mud2Via2l0Lm9yZy8nCiBSRVNVTFRT X0RCX1VSTCA9ICdodHRwczovL3Jlc3VsdHMud2Via2l0Lm9yZy8nCiBXaXRoUHJvcGVydGllcyA9 IHByb3BlcnRpZXMuV2l0aFByb3BlcnRpZXMKIEludGVycG9sYXRlID0gcHJvcGVydGllcy5JbnRl cnBvbGF0ZQorQlJBTkNIX1BSX1JFID0gcmUuY29tcGlsZShyJ15yZWZzL3B1bGwvKD9QPGlkPlxk KykvbWVyZ2UkJykKK0dJVEhVQl9SRVBPU0lUT1JJRVMgPSBbJ2h0dHBzOi8vZ2l0aHViLmNvbS9X ZWJLaXQvV2ViS2l0J10KIAogCiBjbGFzcyBCdWZmZXJMb2dIZWFkZXJPYnNlcnZlcihsb2dvYnNl cnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CkBAIC02OSw3ICs3MSwzMiBAQCBjbGFzcyBCdWZmZXJM b2dIZWFkZXJPYnNlcnZlcihsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcik6CiAgICAgICAg IHJldHVybiBzZWxmLl9nZXQoc2VsZi5oZWFkZXJzKQogCiAKLWNsYXNzIENvbmZpZ3VyZUJ1aWxk KGJ1aWxkc3RlcC5CdWlsZFN0ZXApOgorY2xhc3MgR2l0SHViTWl4aW4ob2JqZWN0KToKKyAgICBk ZWYgcHJfdXJsKHNlbGYsIHByX251bWJlcj1Ob25lKToKKyAgICAgICAgcHJfbnVtYmVyID0gcHJf bnVtYmVyIG9yIHNlbGYuZ2V0X3B1bGxfcmVxdWVzdF9udW1iZXIoKQorICAgICAgICBpZiBub3Qg cHJfbnVtYmVyOgorICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIHJldHVybiAne30vcHVs bC97fScuZm9ybWF0KHNlbGYuZ2V0UHJvcGVydHkoJ3JlcG9zaXRvcnknLCAnLScpLCBwcl9udW1i ZXIpCisKKyAgICBkZWYgZ2V0X3B1bGxfcmVxdWVzdF9udW1iZXIoc2VsZik6CisgICAgICAgIHBy X251bWJlciA9IHNlbGYuZ2V0UHJvcGVydHkoJ3B1bGxfcmVxdWVzdCcpCisgICAgICAgIGlmIHBy X251bWJlcjoKKyAgICAgICAgICAgIHJldHVybiBpbnQocHJfbnVtYmVyKQorCisgICAgICAgIGlm IHNlbGYuZ2V0UHJvcGVydHkoJ2V2ZW50JykgIT0gJ3B1bGxfcmVxdWVzdCc6CisgICAgICAgICAg ICByZXR1cm4gTm9uZQorICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdyZXBvc2l0b3J5Jykg bm90IGluIEdJVEhVQl9SRVBPU0lUT1JJRVM6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisg ICAgICAgIG1hdGNoID0gQlJBTkNIX1BSX1JFLm1hdGNoKHNlbGYuZ2V0UHJvcGVydHkoJ2JyYW5j aCcsICcnKSkKKyAgICAgICAgaWYgbm90IG1hdGNoOgorICAgICAgICAgICAgcmV0dXJuIE5vbmUK KyAgICAgICAgcHJfbnVtYmVyID0gaW50KG1hdGNoLmdyb3VwKCdpZCcpKQorICAgICAgICBzZWxm LnNldFByb3BlcnR5KCdwdWxsX3JlcXVlc3QnLCBwcl9udW1iZXIpCisgICAgICAgIHJldHVybiBw cl9udW1iZXIKKworCitjbGFzcyBDb25maWd1cmVCdWlsZChidWlsZHN0ZXAuQnVpbGRTdGVwLCBH aXRIdWJNaXhpbik6CiAgICAgbmFtZSA9ICdjb25maWd1cmUtYnVpbGQnCiAgICAgZGVzY3JpcHRp b24gPSBbJ2NvbmZpZ3VyaW5nIGJ1aWxkJ10KICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0NvbmZp Z3VyZWQgYnVpbGQnXQpAQCAtMTA5LDYgKzEzNiw4IEBAIGNsYXNzIENvbmZpZ3VyZUJ1aWxkKGJ1 aWxkc3RlcC5CdWlsZFN0ZXApOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYWRkaXRp b25hbEFyZ3VtZW50cycsIHNlbGYuYWRkaXRpb25hbEFyZ3VtZW50cywgJ2NvbmZpZy5qc29uJykK IAogICAgICAgICBzZWxmLmFkZF9wYXRjaF9pZF91cmwoKQorICAgICAgICBzZWxmLmFkZF9wcl9k ZXRhaWxzKCkKKwogICAgICAgICBzZWxmLmZpbmlzaGVkKFNVQ0NFU1MpCiAgICAgICAgIHJldHVy biBkZWZlci5zdWNjZWVkKE5vbmUpCiAKQEAgLTExNyw2ICsxNDYsMTEgQEAgY2xhc3MgQ29uZmln dXJlQnVpbGQoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CiAgICAgICAgIGlmIHBhdGNoX2lkOgogICAg ICAgICAgICAgc2VsZi5hZGRVUkwoJ1BhdGNoIHt9Jy5mb3JtYXQocGF0Y2hfaWQpLCBCdWd6aWxs YS5wYXRjaF91cmwocGF0Y2hfaWQpKQogCisgICAgZGVmIGFkZF9wcl9kZXRhaWxzKHNlbGYpOgor ICAgICAgICBwcl9udW1iZXIgPSBzZWxmLmdldF9wdWxsX3JlcXVlc3RfbnVtYmVyKCkKKyAgICAg ICAgaWYgcHJfbnVtYmVyOgorICAgICAgICAgICAgc2VsZi5hZGRVUkwoJ1B1bGwgcmVxdWVzdCB7 fScuZm9ybWF0KHByX251bWJlciksIHNlbGYucHJfdXJsKHByX251bWJlcj1wcl9udW1iZXIpKQor CiAKIGNsYXNzIENoZWNrT3V0U291cmNlKGdpdC5HaXQpOgogICAgIG5hbWUgPSAnY2xlYW4tYW5k LXVwZGF0ZS13b3JraW5nLWRpcmVjdG9yeScK