Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1er66R-0007Qo-8d for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 18:05:19 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1er66P-0006ZS-4p for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 18:05:17 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1er66O-0006ZC-N8 for pgadmin-hackers@lists.postgresql.org; Wed, 28 Feb 2018 18:05:17 +0000 Received: from mail-oi0-x235.google.com ([2607:f8b0:4003:c06::235]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1er66G-0006Rd-0P for pgadmin-hackers@postgresql.org; Wed, 28 Feb 2018 18:05:15 +0000 Received: by mail-oi0-x235.google.com with SMTP id t185so2441386oif.6 for ; Wed, 28 Feb 2018 10:05:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=cTQ9KTyar0wEg9XzkZWzFF4LoNKHjsdE/pP7iOxHL10=; b=w9/BqSyc4u3/Qm9h0Luf96+XCF7oP+w+dK4Q6ZugTX7UdwWvPWW9/Pkp7AMkBnVL3m d4WGPhWHeoFE2EKlQNIgBASR9bQA4zkzP/G0Pqy5U6fKXt1+KAs//lzxatBxlxWhN9d6 iSn9qwC2kDF/0groHUhlWq+skwgpNShCtGMlGJDxq6PlmvyqB6nwgmTO0cCb/O0XGYB+ ERg4ApiC+08MWMBhv1hqKJehZ8nDlCDN5TTVg84vDWYloOkJ4UuYvPWCQ4UC7nnYcFlQ 6LWRERh8M5vTmnTutFhmg+vcIIHAU1wNIf6JyxnVKKOUixYMjfGsub0xWNVbAGuerV00 y3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=cTQ9KTyar0wEg9XzkZWzFF4LoNKHjsdE/pP7iOxHL10=; b=Yu5s1anUBGKp2zI0IDrVxkl+z6as32iZWq14xcIzmz1yc/dWcTy/z4tvGQd2Bqcxii FtP0gV8WXMmVSCWEm+ez2/EMNClooDCHhtj/lSv/6xlXHmfu2/BFxoEN5JpxIQCTLW1u c/3jKOvHh33EYUoQ1hsk2VgOpN04vct+EtKoD6629GW7b1CAqPl1r7tITHXp+3GS+PaR iHgjcpTsY73trO+A4+C/yXvJMR6QooPz4amAK3/iLn2G/arYhCWJ9bY1BR40rA/GeghI yWih0+mkFN+FXOLozNAAH5hS3T3pMYHfzgCe/ln0LhZSTExowbazbR4BjOJNBk8oHHcZ vWGA== X-Gm-Message-State: APf1xPD3Av+TbG3R3tTmeBqeGL+CPziltZj6vLOgTeYOzO9YQF5X8T4x 9T3aYwbcWH7g0LS232puasmOTdiD/pJR3kPvxldIo/yV X-Google-Smtp-Source: AG47ELt3SZ2hFZLzS9MztwzupoveV6bIqBL22/i2FgPOm5yAS45wiTYsIrFw11kI/dSIZ/CwYspWOt4hwHIZi1PNchE= X-Received: by 10.202.5.132 with SMTP id 126mr12463074oif.238.1519841104056; Wed, 28 Feb 2018 10:05:04 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.8.150 with HTTP; Wed, 28 Feb 2018 10:04:43 -0800 (PST) From: Murtuza Zabuawala Date: Wed, 28 Feb 2018 23:34:43 +0530 Message-ID: Subject: [pgAdmin4][RM#3161] Fix PEP-8 issues To: pgadmin-hackers Content-Type: multipart/mixed; boundary="94eb2c18d6181fe39a0566499539" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --94eb2c18d6181fe39a0566499539 Content-Type: multipart/alternative; boundary="94eb2c18d6181fe3960566499537" --94eb2c18d6181fe3960566499537 Content-Type: text/plain; charset="UTF-8" Hi, PFA patch to fix the PEP8 issues in Casts, Event triggers, Extensions and Languages module. pycodestyle --config=.pycodestyle pgadmin/browser/server_groups/servers/databases/languages/ pycodestyle --config=.pycodestyle pgadmin/browser/server_groups/servers/databases/extensions/ pycodestyle --config=.pycodestyle pgadmin/browser/server_groups/servers/databases/event_triggers/ pycodestyle --config=.pycodestyle pgadmin/browser/server_groups/servers/databases/casts/ -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --94eb2c18d6181fe3960566499537 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the PEP8 issues in=C2=A0Casts, Event triggers, Exten= sions and Languages module.

pycodestyle --config=3D.pycodestyle pgadm= in/browser/server_groups/servers/databases/languages/
pycodestyle --config=3D.pycodesty= le pgadmin/browser/server_groups/servers/databases/extensions/
=
pycodestyle --config=3D.= pycodestyle pgadmin/browser/server_groups/servers/databases/event_triggers/=
pycod= estyle --config=3D.pycodestyle pgadmin/browser/server_groups/servers/databa= ses/casts/

= --Regards,=
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.c= om
The Enterprise PostgreSQL Company
<= font size=3D"2">
<= /font>
--94eb2c18d6181fe3960566499537-- --94eb2c18d6181fe39a0566499539 Content-Type: text/plain; charset="US-ASCII"; name="RM_3161.diff" Content-Disposition: attachment; filename="RM_3161.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_je7e4xbt0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9jYXN0cy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0cy9fX2luaXRfXy5weQppbmRleCBlOWVmOGFjLi4y ZWExNzhlIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3RzL19faW5pdF9fLnB5CkBAIC0y Niw2ICsyNiw3IEBAIGZyb20gcGdhZG1pbi51dGlscyBpbXBvcnQgSVNfUFkyCiBpZiBub3QgSVNf UFkyOgogICAgIHVuaWNvZGUgPSBzdHIKIAorCiBjbGFzcyBDYXN0TW9kdWxlKENvbGxlY3Rpb25O b2RlTW9kdWxlKToKICAgICAiIiIKICAgICAgY2xhc3MgQ2FzdE1vZHVsZShDb2xsZWN0aW9uTm9k ZU1vZHVsZSkKQEAgLTk2LDggKzk3LDkgQEAgY2xhc3MgQ2FzdFZpZXcoUEdDaGlsZE5vZGVWaWV3 KToKICAgICBjbGFzcyBDYXN0VmlldyhQR0NoaWxkTm9kZVZpZXcpCiAKICAgICAgICAgQSB2aWV3 IGNsYXNzIGZvciBjYXN0IG5vZGUgZGVyaXZlZCBmcm9tIFBHQ2hpbGROb2RlVmlldy4gVGhpcyBj bGFzcyBpcwotICAgICAgICByZXNwb25zaWJsZSBmb3IgYWxsIHRoZSBzdHVmZiByZWxhdGVkIHRv IHZpZXcgbGlrZSBjcmVhdGUvdXBkYXRlL2RlbGV0ZSBjYXN0LAotICAgICAgICBzaG93aW5nIHBy b3BlcnRpZXMgb2YgY2FzdCBub2RlLCBzaG93aW5nIHNxbCBpbiBzcWwgcGFuZS4KKyAgICAgICAg cmVzcG9uc2libGUgZm9yIGFsbCB0aGUgc3R1ZmYgcmVsYXRlZCB0byB2aWV3IGxpa2UKKyAgICAg ICAgY3JlYXRlL3VwZGF0ZS9kZWxldGUgY2FzdCwgc2hvd2luZyBwcm9wZXJ0aWVzIG9mIGNhc3Qg bm9kZSwKKyAgICAgICAgc2hvd2luZyBzcWwgaW4gc3FsIHBhbmUuCiAKICAgICBNZXRob2RzOgog ICAgIC0tLS0tLS0KQEAgLTExMCwxMSArMTEyLDEyIEBAIGNsYXNzIENhc3RWaWV3KFBHQ2hpbGRO b2RlVmlldyk6CiAgICAgICAgIG1hbmFnZXIsY29ubiAmIHRlbXBsYXRlX3BhdGggcHJvcGVydGll cyB0byBzZWxmCiAKICAgICAqIGxpc3QoKQotICAgICAgLSBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQg dG8gbGlzdCBhbGwgdGhlIGNhc3Qgbm9kZXMgd2l0aGluIHRoYXQgY29sbGVjdGlvbi4KKyAgICAg IC0gVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGxpc3QgYWxsIHRoZSBjYXN0IG5vZGVzIHdpdGhp biB0aGF0CisgICAgICBjb2xsZWN0aW9uLgogCiAgICAgKiBub2RlcygpCi0gICAgICAtIFRoaXMg ZnVuY3Rpb24gd2lsbCB1c2VkIHRvIGNyZWF0ZSBhbGwgdGhlIGNoaWxkIG5vZGUgd2l0aGluIHRo YXQgY29sbGVjdGlvbi4KLSAgICAgICAgSGVyZSBpdCB3aWxsIGNyZWF0ZSBhbGwgdGhlIGNhc3Qg bm9kZXMuCisgICAgICAtIFRoaXMgZnVuY3Rpb24gd2lsbCB1c2VkIHRvIGNyZWF0ZSBhbGwgdGhl IGNoaWxkIG5vZGUgd2l0aGluIHRoYXQKKyAgICAgIGNvbGxlY3Rpb24uIEhlcmUgaXQgd2lsbCBj cmVhdGUgYWxsIHRoZSBjYXN0IG5vZGVzLgogCiAgICAgKiBwcm9wZXJ0aWVzKGdpZCwgc2lkLCBk aWQsIHJnX2lkKQogICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwgc2hvdyB0aGUgcHJvcGVydGll cyBvZiB0aGUgc2VsZWN0ZWQgY2FzdCBub2RlCkBAIC0xMzUsMTQgKzEzOCwxNiBAQCBjbGFzcyBD YXN0VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwgZ2Vu ZXJhdGUgc3FsIGZyb20gbW9kZWwgZGF0YQogCiAgICAgKiBzcWwoZ2lkLCBzaWQsIGRpZCwgcmdf aWQpOgotICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwgZ2VuZXJhdGUgc3FsIHRvIHNob3cgaW4g c3FsIHBhbmUgZm9yIHRoZSBzZWxlY3RlZCBjYXN0IG5vZGUuCisgICAgICAtIFRoaXMgZnVuY3Rp b24gd2lsbCBnZW5lcmF0ZSBzcWwgdG8gc2hvdyBpbiBzcWwgcGFuZSBmb3IgdGhlIHNlbGVjdGVk CisgICAgICBjYXN0IG5vZGUuCiAKICAgICAqIGdldF90eXBlKCk6Ci0gICAgICAtIFRoaXMgZnVu Y3Rpb24gd2lsbCBmZXRjaCBhbGwgdGhlIHR5cGVzIGZvciBzb3VyY2UgYW5kIHRhcmdldCB0eXBl cyBzZWxlY3QgY29udHJvbC4KKyAgICAgIC0gVGhpcyBmdW5jdGlvbiB3aWxsIGZldGNoIGFsbCB0 aGUgdHlwZXMgZm9yIHNvdXJjZSBhbmQgdGFyZ2V0IHR5cGVzCisgICAgICBzZWxlY3QgY29udHJv bC4KIAogICAgICogZ2V0X2Z1bmN0aW9ucygpOgotICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwg ZmV0Y2ggYXNzb2NpYXRlZCBmdW5jdGlvbnMgbGlzdCBkZXBlbmRpbmcgb24gc2VsZWN0ZWQgc291 cmNlCi0gICAgICAgIGFuZCB0YXJnZXQgdHlwZXMgd2hpbGUgY3JlYXRpbmcgYSBuZXcgY2FzdCBu b2RlLgorICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwgZmV0Y2ggYXNzb2NpYXRlZCBmdW5jdGlv bnMgbGlzdCBkZXBlbmRpbmcgb24KKyAgICAgIHNlbGVjdGVkIHNvdXJjZSBhbmQgdGFyZ2V0IHR5 cGVzIHdoaWxlIGNyZWF0aW5nIGEgbmV3IGNhc3Qgbm9kZS4KICAgICAiIiIKIAogICAgIG5vZGVf dHlwZSA9IGJsdWVwcmludC5ub2RlX3R5cGUKQEAgLTE3MSw4ICsxNzYsMTQgQEAgY2xhc3MgQ2Fz dFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgJ3N0YXRzJzogW3snZ2V0JzogJ3N0YXRp c3RpY3MnfV0sCiAgICAgICAgICdkZXBlbmRlbmN5JzogW3snZ2V0JzogJ2RlcGVuZGVuY2llcyd9 XSwKICAgICAgICAgJ2RlcGVuZGVudCc6IFt7J2dldCc6ICdkZXBlbmRlbnRzJ31dLAotICAgICAg ICAnZ2V0X3R5cGUnOiBbeydnZXQnOiAnZ2V0X3NyY19hbmRfdHJnX3R5cGUnfSwgeydnZXQnOiAn Z2V0X3NyY19hbmRfdHJnX3R5cGUnfV0sCi0gICAgICAgICdnZXRfZnVuY3Rpb25zJzogW3sncG9z dCc6ICdnZXRfZnVuY3Rpb25zJ30sIHsncG9zdCc6ICdnZXRfZnVuY3Rpb25zJ31dCisgICAgICAg ICdnZXRfdHlwZSc6IFsKKyAgICAgICAgICAgIHsnZ2V0JzogJ2dldF9zcmNfYW5kX3RyZ190eXBl J30sCisgICAgICAgICAgICB7J2dldCc6ICdnZXRfc3JjX2FuZF90cmdfdHlwZSd9CisgICAgICAg IF0sCisgICAgICAgICdnZXRfZnVuY3Rpb25zJzogWworICAgICAgICAgICAgeydwb3N0JzogJ2dl dF9mdW5jdGlvbnMnfSwKKyAgICAgICAgICAgIHsncG9zdCc6ICdnZXRfZnVuY3Rpb25zJ30KKyAg ICAgICAgXQogICAgIH0pCiAKICAgICBkZWYgX2luaXRfKHNlbGYsICoqa3dhcmdzKToKQEAgLTE5 Miw3ICsyMDMsOSBAQCBjbGFzcyBDYXN0VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBk ZWYgd3JhcCgqYXJncywgKiprd2FyZ3MpOgogICAgICAgICAgICAgIyBIZXJlIGFyZ3NbMF0gd2ls bCBob2xkIHNlbGYgJiBrd2FyZ3Mgd2lsbCBob2xkIGdpZCxzaWQsZGlkCiAgICAgICAgICAgICBz ZWxmID0gYXJnc1swXQotICAgICAgICAgICAgc2VsZi5tYW5hZ2VyID0gZ2V0X2RyaXZlcihQR19E RUZBVUxUX0RSSVZFUikuY29ubmVjdGlvbl9tYW5hZ2VyKGt3YXJnc1snc2lkJ10pCisgICAgICAg ICAgICBzZWxmLm1hbmFnZXIgPSBnZXRfZHJpdmVyKAorICAgICAgICAgICAgICAgIFBHX0RFRkFV TFRfRFJJVkVSCisgICAgICAgICAgICApLmNvbm5lY3Rpb25fbWFuYWdlcihrd2FyZ3NbJ3NpZCdd KQogICAgICAgICAgICAgc2VsZi5jb25uID0gc2VsZi5tYW5hZ2VyLmNvbm5lY3Rpb24oZGlkPWt3 YXJnc1snZGlkJ10pCiAgICAgICAgICAgICAjIFNldCB0ZW1wbGF0ZSBwYXRoIGZvciB0aGUgU1FM IHNjcmlwdHMKICAgICAgICAgICAgIHNlbGYudGVtcGxhdGVfcGF0aCA9ICdjYXN0L3NxbC8jezB9 IycuZm9ybWF0KHNlbGYubWFuYWdlci52ZXJzaW9uKQpAQCAtMjI1LDcgKzIzOCw4IEBAIGNsYXNz IENhc3RWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICByZXR1cm4gaW50ZXJuYWxf c2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKIAogICAgICAgICBmb3Igcm93IGluIHJlc1sncm93 cyddOgotICAgICAgICAgICAgcm93WydjYXN0Y29udGV4dCddID0gVHJ1ZSBpZiByb3dbJ2Nhc3Rj b250ZXh0J10gPT0gJ0lNUExJQ0lUJyBlbHNlIEZhbHNlCisgICAgICAgICAgICByb3dbJ2Nhc3Rj b250ZXh0J10gPSBUcnVlIGlmIHJvd1snY2FzdGNvbnRleHQnXSA9PSAnSU1QTElDSVQnIFwKKyAg ICAgICAgICAgICAgICBlbHNlIEZhbHNlCiAKICAgICAgICAgcmV0dXJuIGFqYXhfcmVzcG9uc2Uo CiAgICAgICAgICAgICByZXNwb25zZT1yZXNbJ3Jvd3MnXSwKQEAgLTIzNSw4ICsyNDksOCBAQCBj bGFzcyBDYXN0VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgIEBjaGVja19wcmVjb25kaXRpb24K ICAgICBkZWYgbm9kZXMoc2VsZiwgZ2lkLCBzaWQsIGRpZCk6CiAgICAgICAgICIiIgotICAgICAg ICBUaGlzIGZ1bmN0aW9uIHdpbGwgdXNlZCB0byBjcmVhdGUgYWxsIHRoZSBjaGlsZCBub2RlcyB3 aXRoaW4gdGhlIGNvbGxlY3Rpb24uCi0gICAgICAgIEhlcmUgaXQgd2lsbCBjcmVhdGUgYWxsIHRo ZSBjYXN0IG5vZGVzLgorICAgICAgICBUaGlzIGZ1bmN0aW9uIHdpbGwgdXNlZCB0byBjcmVhdGUg YWxsIHRoZSBjaGlsZCBub2RlcyB3aXRoaW4gdGhlCisgICAgICAgIGNvbGxlY3Rpb24uIEhlcmUg aXQgd2lsbCBjcmVhdGUgYWxsIHRoZSBjYXN0IG5vZGVzLgogICAgICAgICA6cGFyYW0gZ2lkOiBn cm91cCBpZAogICAgICAgICA6cGFyYW0gc2lkOiBzZXJ2ZXIgaWQKICAgICAgICAgOnBhcmFtIGRp ZDogZGF0YWJhc2UgaWQKQEAgLTM2NiwxNyArMzgwLDE5IEBAIGNsYXNzIENhc3RWaWV3KFBHQ2hp bGROb2RlVmlldyk6CiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgICAg IHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQogCi0gICAgICAgICAg ICAjIHdlIG5lZWQgb2lkIHRvIHRvIGFkZCBvYmplY3QgaW4gdHJlZSBhdCBicm93c2VyLCBiZWxv dyBzcWwgd2lsbCBnaXZlcyB0aGUgc2FtZQorICAgICAgICAgICAgIyB3ZSBuZWVkIG9pZCB0byB0 byBhZGQgb2JqZWN0IGluIHRyZWUgYXQgYnJvd3NlciwgYmVsb3cgc3FsIHdpbGwKKyAgICAgICAg ICAgICMgZ2l2ZXMgdGhlIHNhbWUKICAgICAgICAgICAgIGxhc3Rfc3lzdGVtX29pZCA9IDAgaWYg c2VsZi5ibHVlcHJpbnQuc2hvd19zeXN0ZW1fb2JqZWN0cyBlbHNlIFwKICAgICAgICAgICAgICAg ICAoc2VsZi5tYW5hZ2VyLmRiX2luZm9bZGlkXSlbJ2RhdGxhc3RzeXNvaWQnXSBcCiAgICAgICAg ICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyLmRiX2luZm8gaXMgbm90IE5vbmUgYW5kIFwKICAgICAg ICAgICAgICAgICBkaWQgaW4gc2VsZi5tYW5hZ2VyLmRiX2luZm8gZWxzZSAwCi0gICAgICAgICAg ICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ3By b3BlcnRpZXMuc3FsJ10pLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNyY3R5 cD1kYXRhWydzcmN0eXAnXSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cmd0 eXA9ZGF0YVsndHJndHlwJ10sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0 bGFzdHN5c29pZD1sYXN0X3N5c3RlbV9vaWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2hvd3N5c29iaj1zZWxmLmJsdWVwcmludC5zaG93X3N5c3RlbV9vYmplY3RzCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgc3FsID0gcmVuZGVy X3RlbXBsYXRlKAorICAgICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgs ICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAgICAgICAgICAgICBzcmN0eXA9ZGF0YVsnc3JjdHlw J10sCisgICAgICAgICAgICAgICAgdHJndHlwPWRhdGFbJ3RyZ3R5cCddLAorICAgICAgICAgICAg ICAgIGRhdGxhc3RzeXNvaWQ9bGFzdF9zeXN0ZW1fb2lkLAorICAgICAgICAgICAgICAgIHNob3dz eXNvYmo9c2VsZi5ibHVlcHJpbnQuc2hvd19zeXN0ZW1fb2JqZWN0cworICAgICAgICAgICAgKQog ICAgICAgICAgICAgc3RhdHVzLCBjaWQgPSBzZWxmLmNvbm4uZXhlY3V0ZV9zY2FsYXIoc3FsKQog ICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgICAgICByZXR1cm4gaW50ZXJu YWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPWNpZCkKQEAgLTUyNywxMCArNTQzLDEyIEBAIGNsYXNz IENhc3RWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgKHNlbGYubWFuYWdl ci5kYl9pbmZvW2RpZF0pWydkYXRsYXN0c3lzb2lkJ10gXAogICAgICAgICAgICAgICAgIGlmIHNl bGYubWFuYWdlci5kYl9pbmZvIGlzIG5vdCBOb25lIGFuZCBcCiAgICAgICAgICAgICAgICAgZGlk IGluIHNlbGYubWFuYWdlci5kYl9pbmZvIGVsc2UgMAotICAgICAgICAgICAgc3FsID0gcmVuZGVy X3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCdd KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaWQ9Y2lkLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGxhc3RzeXNvaWQ9bGFzdF9zeXN0ZW1fb2lkLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNob3dzeXNvYmo9c2VsZi5ibHVlcHJp bnQuc2hvd19zeXN0ZW1fb2JqZWN0cykKKyAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0 ZSgKKyAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAncHJvcGVy dGllcy5zcWwnXSksCisgICAgICAgICAgICAgICAgY2lkPWNpZCwKKyAgICAgICAgICAgICAgICBk YXRsYXN0c3lzb2lkPWxhc3Rfc3lzdGVtX29pZCwKKyAgICAgICAgICAgICAgICBzaG93c3lzb2Jq PXNlbGYuYmx1ZXByaW50LnNob3dfc3lzdGVtX29iamVjdHMKKyAgICAgICAgICAgICkKICAgICAg ICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChzcWwpCiAKICAgICAg ICAgICAgIGlmIG5vdCBzdGF0dXM6CkBAIC01NDksNyArNTY3LDEwIEBAIGNsYXNzIENhc3RWaWV3 KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICByZXR1cm4gc3FsLCBkYXRhWyduYW1lJ10g aWYgJ25hbWUnIGluIGRhdGEgZWxzZSBvbGRfZGF0YVsnbmFtZSddCiAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICBpZiAnc3JjdHlwJyBpbiBkYXRhIGFuZCAndHJndHlwJyBpbiBkYXRhOgotICAg ICAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0 ZV9wYXRoLCAnY3JlYXRlLnNxbCddKSwgZGF0YT1kYXRhLCBjb25uPXNlbGYuY29ubikKKyAgICAg ICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAgICAgICAgICIv Ii5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdjcmVhdGUuc3FsJ10pLAorICAgICAgICAgICAg ICAgICAgICBkYXRhPWRhdGEsIGNvbm49c2VsZi5jb25uCisgICAgICAgICAgICAgICAgKQogICAg ICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByZXR1cm4gdSItLSBkZWZpbml0aW9uIGlu Y29tcGxldGUiLCBOb25lCiAgICAgICAgICAgICByZXR1cm4gc3FsLCBkYXRhWydzcmN0eXAnXSAr ICItPiIgKyBkYXRhWyJ0cmd0eXAiXQpAQCAtNjM4LDE0ICs2NTksMTQgQEAgY2xhc3MgQ2FzdFZp ZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25u LmV4ZWN1dGVfc2NhbGFyKHNxbCkKICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAg ICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcigKLSAgICAgICAgICAgICAgICAg ICAgXygiQ291bGQgbm90IGdlbmVyYXRlIHJldmVyc2VkIGVuZ2luZWVyZWQgU1FMIGZvciB0aGUg Y2FzdC5cblxuezB9IikuZm9ybWF0KAotICAgICAgICAgICAgICAgICAgICAgICAgcmVzCi0gICAg ICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAgXygiQ291bGQgbm90IGdlbmVy YXRlIHJldmVyc2VkIGVuZ2luZWVyZWQgU1FMIGZvciB0aGUgIgorICAgICAgICAgICAgICAgICAg ICAgICJjYXN0LlxuXG57MH0iKS5mb3JtYXQocmVzKQogICAgICAgICAgICAgICAgICkKIAogICAg ICAgICAgICAgaWYgcmVzIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGdvbmUoCi0g ICAgICAgICAgICAgICAgICAgIF8oIkNvdWxkIG5vdCBnZW5lcmF0ZSByZXZlcnNlZCBlbmdpbmVl cmVkIFNRTCBmb3IgdGhlIGNhc3Qgbm9kZS5cbiIpCisgICAgICAgICAgICAgICAgICAgIF8oIkNv dWxkIG5vdCBnZW5lcmF0ZSByZXZlcnNlZCBlbmdpbmVlcmVkIFNRTCBmb3IgdGhlICIKKyAgICAg ICAgICAgICAgICAgICAgICAiY2FzdCBub2RlLlxuIikKICAgICAgICAgICAgICAgICApCiAKICAg ICAgICAgICAgIHJldHVybiBhamF4X3Jlc3BvbnNlKHJlc3BvbnNlPXJlcykKZGlmZiAtLWdpdCBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0 cy90ZXN0cy91dGlscy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9jYXN0cy90ZXN0cy91dGlscy5weQppbmRleCAwYjZhOWVmLi44NGIyYjhk IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvY2FzdHMvdGVzdHMvdXRpbHMucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3RzL3Rlc3RzL3V0aWxzLnB5CkBAIC01 Niw3ICs1Niw4IEBAIGRlZiBjcmVhdGVfY2FzdChzZXJ2ZXIsIHNvdXJjZV90eXBlLCB0YXJnZXRf dHlwZSk6CiAgICAgICAgICMgR2V0ICdvaWQnIGZyb20gbmV3bHkgY3JlYXRlZCBjYXN0CiAgICAg ICAgIHBnX2N1cnNvci5leGVjdXRlKAogICAgICAgICAgICAgIlNFTEVDVCBjYS5vaWQgRlJPTSBw Z19jYXN0IGNhIFdIRVJFIGNhLmNhc3Rzb3VyY2UgPSAiCi0gICAgICAgICAgICAiKFNFTEVDVCB0 Lm9pZCBGUk9NIHBnX3R5cGUgdCBXSEVSRSBmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCk9JyVzJykg IgorICAgICAgICAgICAgIihTRUxFQ1QgdC5vaWQgRlJPTSBwZ190eXBlIHQgIgorICAgICAgICAg ICAgIldIRVJFIGZvcm1hdF90eXBlKHQub2lkLCBOVUxMKT0nJXMnKSAiCiAgICAgICAgICAgICAi QU5EIGNhLmNhc3R0YXJnZXQgPSAoU0VMRUNUIHQub2lkIEZST00gcGdfdHlwZSB0IFdIRVJFICIK ICAgICAgICAgICAgICJmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCkgPSAnJXMnKSIgJSAoc291cmNl X3R5cGUsIHRhcmdldF90eXBlKSkKICAgICAgICAgb2lkID0gcGdfY3Vyc29yLmZldGNob25lKCkK QEAgLTc1LDcgKzc2LDggQEAgZGVmIHZlcmlmeV9jYXN0KGNvbm5lY3Rpb24sIHNvdXJjZV90eXBl LCB0YXJnZXRfdHlwZSk6CiAgICAgICAgIHBnX2N1cnNvciA9IGNvbm5lY3Rpb24uY3Vyc29yKCkK ICAgICAgICAgcGdfY3Vyc29yLmV4ZWN1dGUoCiAgICAgICAgICAgICAiU0VMRUNUICogRlJPTSBw Z19jYXN0IGNhIFdIRVJFIGNhLmNhc3Rzb3VyY2UgPSAiCi0gICAgICAgICAgICAiKFNFTEVDVCB0 Lm9pZCBGUk9NIHBnX3R5cGUgdCBXSEVSRSBmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCk9JyVzJykg IgorICAgICAgICAgICAgIihTRUxFQ1QgdC5vaWQgRlJPTSBwZ190eXBlIHQgIgorICAgICAgICAg ICAgIldIRVJFIGZvcm1hdF90eXBlKHQub2lkLCBOVUxMKT0nJXMnKSAiCiAgICAgICAgICAgICAi QU5EIGNhLmNhc3R0YXJnZXQgPSAoU0VMRUNUIHQub2lkIEZST00gcGdfdHlwZSB0IFdIRVJFICIK ICAgICAgICAgICAgICJmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCkgPSAnJXMnKSIgJSAoc291cmNl X3R5cGUsIHRhcmdldF90eXBlKSkKICAgICAgICAgY2FzdHMgPSBwZ19jdXJzb3IuZmV0Y2hhbGwo KQpAQCAtOTIsNyArOTQsOCBAQCBkZWYgZHJvcF9jYXN0KGNvbm5lY3Rpb24sIHNvdXJjZV90eXBl LCB0YXJnZXRfdHlwZSk6CiAgICAgICAgIHBnX2N1cnNvciA9IGNvbm5lY3Rpb24uY3Vyc29yKCkK ICAgICAgICAgcGdfY3Vyc29yLmV4ZWN1dGUoCiAgICAgICAgICAgICAiU0VMRUNUICogRlJPTSBw Z19jYXN0IGNhIFdIRVJFIGNhLmNhc3Rzb3VyY2UgPSAiCi0gICAgICAgICAgICAiKFNFTEVDVCB0 Lm9pZCBGUk9NIHBnX3R5cGUgdCBXSEVSRSBmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCk9JyVzJykg IgorICAgICAgICAgICAgIihTRUxFQ1QgdC5vaWQgRlJPTSBwZ190eXBlIHQgIgorICAgICAgICAg ICAgIldIRVJFIGZvcm1hdF90eXBlKHQub2lkLCBOVUxMKT0nJXMnKSAiCiAgICAgICAgICAgICAi QU5EIGNhLmNhc3R0YXJnZXQgPSAoU0VMRUNUIHQub2lkIEZST00gcGdfdHlwZSB0IFdIRVJFICIK ICAgICAgICAgICAgICJmb3JtYXRfdHlwZSh0Lm9pZCwgTlVMTCkgPSAnJXMnKSIgJSAoc291cmNl X3R5cGUsIHRhcmdldF90eXBlKSkKICAgICAgICAgaWYgcGdfY3Vyc29yLmZldGNoYWxsKCk6CmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkK aW5kZXggMzNlZjg5NC4uMWZhOGIyNiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19faW5pdF9fLnB5 CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQpAQCAtMzAsNyArMzAsOCBAQCBjbGFzcyBFdmVu dFRyaWdnZXJNb2R1bGUoQ29sbGVjdGlvbk5vZGVNb2R1bGUpOgogICAgICIiIgogICAgIGNsYXNz IEV2ZW50VHJpZ2dlck1vZHVsZShDb2xsZWN0aW9uTm9kZU1vZHVsZSkKIAotICAgICAgICBBIG1v ZHVsZSBjbGFzcyBmb3IgRXZlbnQgdHJpZ2dlciBub2RlIGRlcml2ZWQgZnJvbSBDb2xsZWN0aW9u Tm9kZU1vZHVsZS4KKyAgICAgICAgQSBtb2R1bGUgY2xhc3MgZm9yIEV2ZW50IHRyaWdnZXIgbm9k ZSBkZXJpdmVkIGZyb20KKyAgICAgICAgQ29sbGVjdGlvbk5vZGVNb2R1bGUuCiAKICAgICBNZXRo b2RzOgogICAgIC0tLS0tLS0KQEAgLTUxLDcgKzUyLDggQEAgY2xhc3MgRXZlbnRUcmlnZ2VyTW9k dWxlKENvbGxlY3Rpb25Ob2RlTW9kdWxlKToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqYXJn cywgKiprd2FyZ3MpOgogICAgICAgICAiIiIKLSAgICAgICAgTWV0aG9kIGlzIHVzZWQgdG8gaW5p dGlhbGl6ZSB0aGUgRXZlbnRUcmlnZ2VyTW9kdWxlIGFuZCBpdCdzIGJhc2UgbW9kdWxlLgorICAg ICAgICBNZXRob2QgaXMgdXNlZCB0byBpbml0aWFsaXplIHRoZSBFdmVudFRyaWdnZXJNb2R1bGUg YW5kIGl0J3MgYmFzZQorICAgICAgICBtb2R1bGUuCiAKICAgICAgICAgQXJnczoKICAgICAgICAg ICAgICphcmdzOgpAQCAtMTg0LDkgKzE4NiwxMiBAQCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBH Q2hpbGROb2RlVmlldyk6CiAgICAgICAgIEB3cmFwcyhmKQogICAgICAgICBkZWYgd3JhcCgqYXJn cywgKiprd2FyZ3MpOgogCi0gICAgICAgICAgICAjIEhlcmUgLSBhcmdzWzBdIHdpbGwgYWx3YXlz IGhvbGQgc2VsZiAmIGt3YXJncyB3aWxsIGhvbGQgZ2lkLCBzaWQsIGRpZAorICAgICAgICAgICAg IyBIZXJlIC0gYXJnc1swXSB3aWxsIGFsd2F5cyBob2xkIHNlbGYgJiBrd2FyZ3Mgd2lsbCBob2xk IGdpZCwKKyAgICAgICAgICAgICMgc2lkLCBkaWQKICAgICAgICAgICAgIHNlbGYgPSBhcmdzWzBd Ci0gICAgICAgICAgICBzZWxmLm1hbmFnZXIgPSBnZXRfZHJpdmVyKFBHX0RFRkFVTFRfRFJJVkVS KS5jb25uZWN0aW9uX21hbmFnZXIoa3dhcmdzWydzaWQnXSkKKyAgICAgICAgICAgIHNlbGYubWFu YWdlciA9IGdldF9kcml2ZXIoCisgICAgICAgICAgICAgICAgUEdfREVGQVVMVF9EUklWRVIKKyAg ICAgICAgICAgICkuY29ubmVjdGlvbl9tYW5hZ2VyKGt3YXJnc1snc2lkJ10pCiAgICAgICAgICAg ICBzZWxmLmNvbm4gPSBzZWxmLm1hbmFnZXIuY29ubmVjdGlvbihkaWQ9a3dhcmdzWydkaWQnXSkK ICAgICAgICAgICAgIHNlbGYudGVtcGxhdGVfcGF0aCA9ICdldmVudF90cmlnZ2Vycy9zcWwvOS4z X3BsdXMnCiAKQEAgLTIyMiw4ICsyMjcsOCBAQCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hp bGROb2RlVmlldyk6CiAgICAgQGNoZWNrX3ByZWNvbmRpdGlvbgogICAgIGRlZiBub2RlcyhzZWxm LCBnaWQsIHNpZCwgZGlkKToKICAgICAgICAgIiIiCi0gICAgICAgIFRoaXMgZnVuY3Rpb24gaXMg dXNlZCB0byBjcmVhdGUgYWxsIHRoZSBjaGlsZCBub2RlcyB3aXRoaW4gdGhlIGNvbGxlY3Rpb24u Ci0gICAgICAgIEhlcmUgaXQgd2lsbCBjcmVhdGUgYWxsIHRoZSBldmVudCB0cmlnZ2VyIG5vZGVz LgorICAgICAgICBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gY3JlYXRlIGFsbCB0aGUgY2hpbGQg bm9kZXMgd2l0aGluIHRoZQorICAgICAgICBjb2xsZWN0aW9uLiBIZXJlIGl0IHdpbGwgY3JlYXRl IGFsbCB0aGUgZXZlbnQgdHJpZ2dlciBub2Rlcy4KIAogICAgICAgICBBcmdzOgogICAgICAgICAg IGdpZDogU2VydmVyIEdyb3VwIElECkBAIC0zMTgsNyArMzIzLDEwIEBAIGNsYXNzIEV2ZW50VHJp Z2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgUmV0dXJuczoKIAogICAgICAgICAi IiIKLSAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRl X3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwgZXRpZD1ldGlkLCBjb25uPXNlbGYuY29ubikKKyAg ICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYu dGVtcGxhdGVfcGF0aCwgJ3Byb3BlcnRpZXMuc3FsJ10pLAorICAgICAgICAgICAgZXRpZD1ldGlk LCBjb25uPXNlbGYuY29ubgorICAgICAgICApCiAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5j b25uLmV4ZWN1dGVfZGljdChzcWwpCiAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAg ICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKQEAgLTM3NCwxOCAr MzgyLDI3IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAg ICAgICAgICAgICApCiAgICAgICAgICAgICApCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNx bCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnY3JlYXRl LnNxbCddKSwgZGF0YT1kYXRhLCBjb25uPXNlbGYuY29ubikKKyAgICAgICAgICAgIHNxbCA9IHJl bmRlcl90ZW1wbGF0ZSgKKyAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9w YXRoLCAnY3JlYXRlLnNxbCddKSwKKyAgICAgICAgICAgICAgICBkYXRhPWRhdGEsIGNvbm49c2Vs Zi5jb25uCisgICAgICAgICAgICApCiAgICAgICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29u bi5leGVjdXRlX3NjYWxhcihzcWwpCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAg ICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQotICAg ICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3Bh dGgsICdncmFudC5zcWwnXSksIGRhdGE9ZGF0YSwgY29ubj1zZWxmLmNvbm4pCisgICAgICAgICAg ICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYu dGVtcGxhdGVfcGF0aCwgJ2dyYW50LnNxbCddKSwKKyAgICAgICAgICAgICAgICBkYXRhPWRhdGEs IGNvbm49c2VsZi5jb25uCisgICAgICAgICAgICApCiAgICAgICAgICAgICBzcWwgPSBzcWwuc3Ry aXAoJ1xuJykuc3RyaXAoJyAnKQogCiAgICAgICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29u bi5leGVjdXRlX3NjYWxhcihzcWwpCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAg ICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQogCi0g ICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVf cGF0aCwgJ2dldF9vaWQuc3FsJ10pLCBkYXRhPWRhdGEpCisgICAgICAgICAgICBzcWwgPSByZW5k ZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0 aCwgJ2dldF9vaWQuc3FsJ10pLAorICAgICAgICAgICAgICAgIGRhdGE9ZGF0YQorICAgICAgICAg ICAgKQogICAgICAgICAgICAgc3RhdHVzLCBldGlkID0gc2VsZi5jb25uLmV4ZWN1dGVfc2NhbGFy KHNxbCkKICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAgICAgICAgcmV0dXJu IGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1ldGlkKQpAQCAtNDMxLDcgKzQ0OCwxMCBA QCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAg ICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3Nl cnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAKLSAgICAgICAgICAgICAgICBzcWwgPSByZW5kZXJf dGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2dldF9vaWQuc3FsJ10pLCBk YXRhPWRhdGEpCisgICAgICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAg ICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnZ2V0X29pZC5zcWwn XSksCisgICAgICAgICAgICAgICAgICAgIGRhdGE9ZGF0YQorICAgICAgICAgICAgICAgICkKICAg ICAgICAgICAgICAgICBzdGF0dXMsIGV0aWQgPSBzZWxmLmNvbm4uZXhlY3V0ZV9zY2FsYXIoc3Fs KQogCiAgICAgICAgICAgICAgICAgcmV0dXJuIGpzb25pZnkoCkBAIC00NzgsNyArNDk4LDEwIEBA IGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgZWxzZToK ICAgICAgICAgICAgIGNhc2NhZGUgPSBGYWxzZQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBz cWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2RlbGV0 ZS5zcWwnXSksIGV0aWQ9ZXRpZCkKKyAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgK KyAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnZGVsZXRlLnNx bCddKSwKKyAgICAgICAgICAgICAgICBldGlkPWV0aWQKKyAgICAgICAgICAgICkKICAgICAgICAg ICAgIHN0YXR1cywgbmFtZSA9IHNlbGYuY29ubi5leGVjdXRlX3NjYWxhcihzcWwpCiAgICAgICAg ICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2 ZXJfZXJyb3IoZXJyb3Jtc2c9bmFtZSkKQEAgLTQ5NSw3ICs1MTgsMTAgQEAgY2xhc3MgRXZlbnRU cmlnZ2VyVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICApCiAgICAg ICAgICAgICAgICAgKQogCi0gICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpv aW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2RlbGV0ZS5zcWwnXSksIG5hbWU9bmFtZSwgY2FzY2Fk ZT1jYXNjYWRlKQorICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAg ICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdkZWxldGUuc3FsJ10pLAorICAg ICAgICAgICAgICAgIG5hbWU9bmFtZSwgY2FzY2FkZT1jYXNjYWRlCisgICAgICAgICAgICApCiAg ICAgICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX3NjYWxhcihzcWwpCiAg ICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgICAgIHJldHVybiBpbnRlcm5h bF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQpAQCAtNTY4LDcgKzU5NCwxMCBAQCBjbGFzcyBF dmVudFRyaWdnZXJWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIF0KIAogICAgICAgICBp ZiBldGlkIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIv Ii5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwgZXRpZD1ldGlk KQorICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgICAgICIv Ii5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAgICAg ICAgICAgICBldGlkPWV0aWQKKyAgICAgICAgICAgICkKICAgICAgICAgICAgIHN0YXR1cywgcmVz ID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChzcWwpCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVz OgogICAgICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9 cmVzKQpAQCAtNTg0LDcgKzYxMywxMCBAQCBjbGFzcyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hpbGRO b2RlVmlldyk6CiAgICAgICAgICAgICBmb3IgYXJnIGluIHJlcXVpcmVkX2FyZ3M6CiAgICAgICAg ICAgICAgICAgaWYgYXJnIG5vdCBpbiBkYXRhOgogICAgICAgICAgICAgICAgICAgICBkYXRhW2Fy Z10gPSBvbGRfZGF0YVthcmddCi0gICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8i LmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ3VwZGF0ZS5zcWwnXSksIGRhdGE9ZGF0YSwgb19k YXRhPW9sZF9kYXRhKQorICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAg ICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICd1cGRhdGUuc3FsJ10pLAor ICAgICAgICAgICAgICAgIGRhdGE9ZGF0YSwgb19kYXRhPW9sZF9kYXRhCisgICAgICAgICAgICAp CiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICByZXF1aXJlZF9hcmdzID0gewogICAgICAgICAg ICAgICAgICduYW1lJzogJ05hbWUnLApAQCAtNjA1LDE2ICs2MzcsMjIgQEAgY2xhc3MgRXZlbnRU cmlnZ2VyVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICAgICAgIkNv dWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgJXMuIiAlIGVycgogICAgICAgICAg ICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgKQotICAgICAgICAgICAgc3FsID0gcmVuZGVy X3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdjcmVhdGUuc3FsJ10pLCBk YXRhPWRhdGEpCisgICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAg ICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2NyZWF0ZS5zcWwnXSksCisgICAg ICAgICAgICAgICAgZGF0YT1kYXRhCisgICAgICAgICAgICApCiAgICAgICAgICAgICBzcWwgKz0g IlxuIgotICAgICAgICAgICAgc3FsICs9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50 ZW1wbGF0ZV9wYXRoLCAnZ3JhbnQuc3FsJ10pLCBkYXRhPWRhdGEpCisgICAgICAgICAgICBzcWwg Kz0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBs YXRlX3BhdGgsICdncmFudC5zcWwnXSksCisgICAgICAgICAgICAgICAgZGF0YT1kYXRhCisgICAg ICAgICAgICApCiAgICAgICAgIHJldHVybiBzcWwKIAogICAgIEBjaGVja19wcmVjb25kaXRpb24K ICAgICBkZWYgc3FsKHNlbGYsIGdpZCwgc2lkLCBkaWQsIGV0aWQpOgogICAgICAgICAiIiIKLSAg ICAgICAgVGhpcyBmdW5jdGlvbiB3aWxsIGdlbmVyYXRlIHNxbCB0byBzaG93IGluIHRoZSBzcWwg cGFuZSBmb3IgdGhlIHNlbGVjdGVkCi0gICAgICAgIGV2ZW50IHRyaWdnZXIgbm9kZS4KKyAgICAg ICAgVGhpcyBmdW5jdGlvbiB3aWxsIGdlbmVyYXRlIHNxbCB0byBzaG93IGluIHRoZSBzcWwgcGFu ZSBmb3IgdGhlCisgICAgICAgIHNlbGVjdGVkIGV2ZW50IHRyaWdnZXIgbm9kZS4KIAogICAgICAg ICBBcmdzOgogICAgICAgICAgIGdpZDogU2VydmVyIEdyb3VwIElECkBAIC02MjUsNyArNjYzLDEw IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgUmV0 dXJuczoKIAogICAgICAgICAiIiIKLSAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5q b2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwgZXRpZD1ldGlkKQor ICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAiLyIuam9pbihbc2Vs Zi50ZW1wbGF0ZV9wYXRoLCAncHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICBldGlkPWV0 aWQKKyAgICAgICAgKQogICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2Rp Y3Qoc3FsKQogICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgcmV0dXJuIGludGVy bmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCkBAIC02MzgsMTYgKzY3OSwyNyBAQCBjbGFz cyBFdmVudFRyaWdnZXJWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIHJlc3VsdCA9IHJl c1sncm93cyddWzBdCiAgICAgICAgIHJlc3VsdCA9IHNlbGYuX2Zvcm1hdHRlcihyZXN1bHQpCiAK LSAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3Bh dGgsICdjcmVhdGUuc3FsJ10pLCBkYXRhPXJlc3VsdCwgY29ubj1zZWxmLmNvbm4pCisgICAgICAg IHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKKyAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBs YXRlX3BhdGgsICdjcmVhdGUuc3FsJ10pLAorICAgICAgICAgICAgZGF0YT1yZXN1bHQsIGNvbm49 c2VsZi5jb25uCisgICAgICAgICkKICAgICAgICAgc3FsICs9ICJcblxuIgotICAgICAgICBzcWwg Kz0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdncmFudC5z cWwnXSksIGRhdGE9cmVzdWx0LCBjb25uPXNlbGYuY29ubikKKyAgICAgICAgc3FsICs9IHJlbmRl cl90ZW1wbGF0ZSgKKyAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdn cmFudC5zcWwnXSksCisgICAgICAgICAgICBkYXRhPXJlc3VsdCwgY29ubj1zZWxmLmNvbm4KKyAg ICAgICAgKQogCi0gICAgICAgIGRiX3NxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2Vs Zi50ZW1wbGF0ZV9wYXRoLCAnZ2V0X2RiLnNxbCddKSwgZGlkPWRpZCkKKyAgICAgICAgZGJfc3Fs ID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVf cGF0aCwgJ2dldF9kYi5zcWwnXSksCisgICAgICAgICAgICBkaWQ9ZGlkCisgICAgICAgICkKICAg ICAgICAgc3RhdHVzLCBkYl9uYW1lID0gc2VsZi5jb25uLmV4ZWN1dGVfc2NhbGFyKGRiX3NxbCkK ICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2 ZXJfZXJyb3IoZXJyb3Jtc2c9ZGJfbmFtZSkKIAotICAgICAgICBzcWxfaGVhZGVyID0gdSItLSBF dmVudCBUcmlnZ2VyOiB7MH0gb24gZGF0YWJhc2UgezF9XG5cbi0tICIuZm9ybWF0KHJlc3VsdFsn bmFtZSddLCBkYl9uYW1lKQorICAgICAgICBzcWxfaGVhZGVyID0gdSItLSBFdmVudCBUcmlnZ2Vy OiB7MH0gb24gZGF0YWJhc2UgezF9XG5cbi0tICIuZm9ybWF0KAorICAgICAgICAgICAgcmVzdWx0 WyduYW1lJ10sIGRiX25hbWUKKyAgICAgICAgKQogCiAgICAgICAgIHNxbF9oZWFkZXIgKz0gcmVu ZGVyX3RlbXBsYXRlKAogICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwg J2RlbGV0ZS5zcWwnXSksCkBAIC02NzUsNyArNzI3LDkgQEAgY2xhc3MgRXZlbnRUcmlnZ2VyVmll dyhQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAgICIiIgogICAgICAgICByZXMgPSBbeydsYWJl bCc6ICcnLCAndmFsdWUnOiAnJ31dCi0gICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIu am9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnZXZlbnRmdW5jdGlvbnMuc3FsJ10pKQorICAgICAg ICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1w bGF0ZV9wYXRoLCAnZXZlbnRmdW5jdGlvbnMuc3FsJ10pCisgICAgICAgICkKICAgICAgICAgc3Rh dHVzLCByZXN0ID0gc2VsZi5jb25uLmV4ZWN1dGVfMmRhcnJheShzcWwpCiAgICAgICAgIGlmIG5v dCBzdGF0dXM6CiAgICAgICAgICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9y bXNnPXJlc3QpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvZXZlbnRfdHJpZ2dlcnMvdGVzdHMvdGVzdF9ldmVudF90cmlnZ2Vy X2dldC5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9ldmVudF90cmlnZ2Vycy90ZXN0cy90ZXN0X2V2ZW50X3RyaWdnZXJfZ2V0LnB5CmluZGV4 IDY0N2U2YjEuLmIwN2U3ZDUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy90ZXN0cy90ZXN0X2V2ZW50 X3RyaWdnZXJfZ2V0LnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy90ZXN0cy90ZXN0X2V2ZW50X3RyaWdnZXJf Z2V0LnB5CkBAIC03NywxMCArNzcsMTEgQEAgY2xhc3MgRXZlbnRUcmlnZ2VyR2V0VGVzdENhc2Uo QmFzZVRlc3RHZW5lcmF0b3IpOgogICAgICAgICBpZiBub3QgZnVuY19yZXNwb25zZToKICAgICAg ICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiQ291bGQgbm90IGZpbmQgdGhlIHRyaWdnZXIgZnVuY3Rp b24uIikKICAgICAgICAgcmVzcG9uc2UgPSBzZWxmLnRlc3Rlci5nZXQoCi0gICAgICAgICAgICBz ZWxmLnVybCArIHN0cih1dGlscy5TRVJWRVJfR1JPVVApICsgJy8nCi0gICAgICAgICAgICArIHN0 cihzZWxmLnNlcnZlcl9pZCkgKyAnLycgKyBzdHIoc2VsZi5kYl9pZCkgKyAnLycgKwotICAgICAg ICAgICAgc3RyKHNlbGYuZXZlbnRfdHJpZ2dlcl9pZCksCi0gICAgICAgICAgICBjb250ZW50X3R5 cGU9J2h0bWwvanNvbicpCisgICAgICAgICAgICBzZWxmLnVybCArCisgICAgICAgICAgICBzdHIo dXRpbHMuU0VSVkVSX0dST1VQKSArICcvJyArIHN0cihzZWxmLnNlcnZlcl9pZCkgKyAnLycgKwor ICAgICAgICAgICAgc3RyKHNlbGYuZGJfaWQpICsgJy8nICsgc3RyKHNlbGYuZXZlbnRfdHJpZ2dl cl9pZCksCisgICAgICAgICAgICBjb250ZW50X3R5cGU9J2h0bWwvanNvbicKKyAgICAgICAgKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhyZXNwb25zZS5zdGF0dXNfY29kZSwgMjAwKQogCiAg ICAgZGVmIHRlYXJEb3duKHNlbGYpOgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVuc2lvbnMvX19pbml0X18ucHkgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5z aW9ucy9fX2luaXRfXy5weQppbmRleCBhYmI5NjMxLi5hYmVmMGQyIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9u cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9fX2luaXRfXy5weQpAQCAtNzgsOCArNzgsOCBAQCBj bGFzcyBFeHRlbnNpb25Nb2R1bGUoQ29sbGVjdGlvbk5vZGVNb2R1bGUpOgogICAgIEBwcm9wZXJ0 eQogICAgIGRlZiBzY3JpcHRfbG9hZChzZWxmKToKICAgICAgICAgIiIiCi0gICAgICAgIExvYWQg dGhlIG1vZHVsZSBzY3JpcHQgZm9yIGV4dGVuc2lvbiwgd2hlbiBhbnkgb2YgdGhlIGRhdGFiYXNl IG5vZGVzIGFyZQotICAgICAgICBpbml0aWFsaXplZC4KKyAgICAgICAgTG9hZCB0aGUgbW9kdWxl IHNjcmlwdCBmb3IgZXh0ZW5zaW9uLCB3aGVuIGFueSBvZiB0aGUgZGF0YWJhc2Ugbm9kZXMKKyAg ICAgICAgYXJlIGluaXRpYWxpemVkLgogICAgICAgICAiIiIKICAgICAgICAgcmV0dXJuIGRhdGFi YXNlcy5EYXRhYmFzZU1vZHVsZS5OT0RFX1RZUEUKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9fX2luaXRf Xy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9sYW5ndWFnZXMvX19pbml0X18ucHkKaW5kZXggYTUxNmQxZS4uOTBhY2FlMyAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xh bmd1YWdlcy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvbGFuZ3VhZ2VzL19faW5pdF9fLnB5CkBAIC05MCw3ICs5MCw4 IEBAIGNsYXNzIExhbmd1YWdlTW9kdWxlKENvbGxlY3Rpb25Ob2RlTW9kdWxlKToKICAgICBAcHJv cGVydHkKICAgICBkZWYgc2NyaXB0X2xvYWQoc2VsZik6CiAgICAgICAgICIiIgotICAgICAgICBM b2FkIHRoZSBtb2R1bGUgc2NyaXB0IGZvciBsYW5ndWFnZSwgd2hlbiBhbnkgb2YgdGhlIGRhdGFi YXNlIG5vZGVzIGFyZSBpbml0aWFsaXplZC4KKyAgICAgICAgTG9hZCB0aGUgbW9kdWxlIHNjcmlw dCBmb3IgbGFuZ3VhZ2UsIHdoZW4gYW55IG9mIHRoZSBkYXRhYmFzZSBub2RlcworICAgICAgICBh cmUgaW5pdGlhbGl6ZWQuCiAKICAgICAgICAgUmV0dXJuczogbm9kZSB0eXBlIG9mIHRoZSBzZXJ2 ZXIgbW9kdWxlLgogICAgICAgICAiIiIKQEAgLTExMiw5ICsxMTMsOSBAQCBjbGFzcyBMYW5ndWFn ZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAiIiIKICAgICBjbGFzcyBMYW5ndWFnZVZpZXco UEdDaGlsZE5vZGVWaWV3KQogCi0gICAgICAgIEEgdmlldyBjbGFzcyBmb3IgTGFuZ3VhZ2Ugbm9k ZSBkZXJpdmVkIGZyb20gUEdDaGlsZE5vZGVWaWV3LiBUaGlzIGNsYXNzIGlzCi0gICAgICAgIHJl c3BvbnNpYmxlIGZvciBhbGwgdGhlIHN0dWZmIHJlbGF0ZWQgdG8gdmlldyBsaWtlIHVwZGF0aW5n IGxhbmd1YWdlCi0gICAgICAgIG5vZGUsIHNob3dpbmcgcHJvcGVydGllcywgc2hvd2luZyBzcWwg aW4gc3FsIHBhbmUuCisgICAgICAgIEEgdmlldyBjbGFzcyBmb3IgTGFuZ3VhZ2Ugbm9kZSBkZXJp dmVkIGZyb20gUEdDaGlsZE5vZGVWaWV3LgorICAgICAgICBUaGlzIGNsYXNzIGlzIHJlc3BvbnNp YmxlIGZvciBhbGwgdGhlIHN0dWZmIHJlbGF0ZWQgdG8gdmlldyBsaWtlCisgICAgICAgIHVwZGF0 aW5nIGxhbmd1YWdlIG5vZGUsIHNob3dpbmcgcHJvcGVydGllcywgc2hvd2luZyBzcWwgaW4gc3Fs IHBhbmUuCiAKICAgICBNZXRob2RzOgogICAgIC0tLS0tLS0KQEAgLTEyNywxMSArMTI4LDEyIEBA IGNsYXNzIExhbmd1YWdlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBtYW5hZ2VyLGNv bm4gJiB0ZW1wbGF0ZV9wYXRoIHByb3BlcnRpZXMgdG8gc2VsZgogCiAgICAgKiBsaXN0KCkKLSAg ICAgIC0gVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGxpc3QgYWxsIHRoZSBsYW5ndWFnZSBub2Rl cyB3aXRoaW4gdGhhdCBjb2xsZWN0aW9uLgorICAgICAgLSBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQg dG8gbGlzdCBhbGwgdGhlIGxhbmd1YWdlIG5vZGVzIHdpdGhpbiB0aGF0CisgICAgICBjb2xsZWN0 aW9uLgogCiAgICAgKiBub2RlcygpCi0gICAgICAtIFRoaXMgZnVuY3Rpb24gd2lsbCB1c2VkIHRv IGNyZWF0ZSBhbGwgdGhlIGNoaWxkIG5vZGUgd2l0aGluIHRoYXQgY29sbGVjdGlvbi4KLSAgICAg ICAgSGVyZSBpdCB3aWxsIGNyZWF0ZSBhbGwgdGhlIGxhbmd1YWdlIG5vZGUuCisgICAgICAtIFRo aXMgZnVuY3Rpb24gd2lsbCB1c2VkIHRvIGNyZWF0ZSBhbGwgdGhlIGNoaWxkIG5vZGUgd2l0aGlu IHRoYXQKKyAgICAgIGNvbGxlY3Rpb24uIEhlcmUgaXQgd2lsbCBjcmVhdGUgYWxsIHRoZSBsYW5n dWFnZSBub2RlLgogCiAgICAgKiBwcm9wZXJ0aWVzKGdpZCwgc2lkLCBkaWQsIGxpZCkKICAgICAg IC0gVGhpcyBmdW5jdGlvbiB3aWxsIHNob3cgdGhlIHByb3BlcnRpZXMgb2YgdGhlIHNlbGVjdGVk IGxhbmd1YWdlIG5vZGUKQEAgLTE0NiwyNSArMTQ4LDMwIEBAIGNsYXNzIExhbmd1YWdlVmlldyhQ R0NoaWxkTm9kZVZpZXcpOgogICAgICAgLSBUaGlzIGZ1bmN0aW9uIHdpbGwgZGVsZXRlIHRoZSBz ZWxlY3RlZCBsYW5ndWFnZSBub2RlCiAKICAgICAqIG1zcWwoZ2lkLCBzaWQsIGRpZCwgbGlkKQot ICAgICAgLSBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gcmV0dXJuIG1vZGlmaWVkIFNRTCBmb3Ig dGhlIHNlbGVjdGVkIGxhbmd1YWdlIG5vZGUKKyAgICAgIC0gVGhpcyBmdW5jdGlvbiBpcyB1c2Vk IHRvIHJldHVybiBtb2RpZmllZCBTUUwgZm9yIHRoZSBzZWxlY3RlZAorICAgICAgbGFuZ3VhZ2Ug bm9kZQogCiAgICAgKiBnZXRfc3FsKGRhdGEsIGxpZCkKICAgICAgIC0gVGhpcyBmdW5jdGlvbiB3 aWxsIGdlbmVyYXRlIHNxbCBmcm9tIG1vZGVsIGRhdGEKIAogICAgICogZ2V0X2Z1bmN0aW9ucyhn aWQsIHNpZCwgZGlkKQotICAgICAgLSBUaGlzIGZ1bmN0aW9uIHJldHVybnMgdGhlIGhhbmRsZXIg YW5kIGlubGluZSBmdW5jdGlvbnMgZm9yIHRoZSBzZWxlY3RlZCBsYW5ndWFnZSBub2RlCisgICAg ICAtIFRoaXMgZnVuY3Rpb24gcmV0dXJucyB0aGUgaGFuZGxlciBhbmQgaW5saW5lIGZ1bmN0aW9u cyBmb3IgdGhlCisgICAgICBzZWxlY3RlZCBsYW5ndWFnZSBub2RlCiAKICAgICAqIGdldF90ZW1w bGF0ZXMoZ2lkLCBzaWQsIGRpZCkKICAgICAgIC0gVGhpcyBmdW5jdGlvbiByZXR1cm5zIGxhbmd1 YWdlIHRlbXBsYXRlcy4KIAogICAgICogc3FsKGdpZCwgc2lkLCBkaWQsIGxpZCk6Ci0gICAgICAt IFRoaXMgZnVuY3Rpb24gd2lsbCBnZW5lcmF0ZSBzcWwgdG8gc2hvdyBpdCBpbiBzcWwgcGFuZSBm b3IgdGhlIHNlbGVjdGVkIGxhbmd1YWdlIG5vZGUuCisgICAgICAtIFRoaXMgZnVuY3Rpb24gd2ls bCBnZW5lcmF0ZSBzcWwgdG8gc2hvdyBpdCBpbiBzcWwgcGFuZSBmb3IgdGhlCisgICAgICBzZWxl Y3RlZCBsYW5ndWFnZSBub2RlLgogCiAgICAgKiBkZXBlbmRlbnRzKGdpZCwgc2lkLCBkaWQsIGxp ZCk6Ci0gICAgICAtIFRoaXMgZnVuY3Rpb24gZ2V0IHRoZSBkZXBlbmRlbnRzIGFuZCByZXR1cm4g YWpheCByZXNwb25zZSBmb3IgdGhlIGxhbmd1YWdlIG5vZGUuCisgICAgICAtIFRoaXMgZnVuY3Rp b24gZ2V0IHRoZSBkZXBlbmRlbnRzIGFuZCByZXR1cm4gYWpheCByZXNwb25zZSBmb3IgdGhlCisg ICAgICBsYW5ndWFnZSBub2RlLgogCiAgICAgKiBkZXBlbmRlbmNpZXMoc2VsZiwgZ2lkLCBzaWQs IGRpZCwgbGlkKToKLSAgICAgIC0gVGhpcyBmdW5jdGlvbiBnZXQgdGhlIGRlcGVuZGVuY2llcyBh bmQgcmV0dXJuIGFqYXggcmVzcG9uc2UgZm9yIHRoZSBsYW5ndWFnZSBub2RlLgorICAgICAgLSBU aGlzIGZ1bmN0aW9uIGdldCB0aGUgZGVwZW5kZW5jaWVzIGFuZCByZXR1cm4gYWpheCByZXNwb25z ZSBmb3IgdGhlCisgICAgICBsYW5ndWFnZSBub2RlLgogICAgICIiIgogCiAgICAgbm9kZV90eXBl ID0gYmx1ZXByaW50Lm5vZGVfdHlwZQpAQCAtMTk3LDcgKzIwNCw4IEBAIGNsYXNzIExhbmd1YWdl VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgIGRlZiBfaW5pdF8oc2VsZiwgKiprd2FyZ3MpOgog ICAgICAgICAiIiIKICAgICAgICAgTWV0aG9kIGlzIHVzZWQgdG8gaW5pdGlhbGl6ZSB0aGUgTGFu Z3VhZ2VWaWV3IGFuZCBpdHMgYmFzZSB2aWV3LgotICAgICAgICBJbml0aWFsaXplIGFsbCB0aGUg dmFyaWFibGVzIGNyZWF0ZS91c2VkIGR5bmFtaWNhbGx5IGxpa2UgY29ubiwgdGVtcGxhdGVfcGF0 aC4KKyAgICAgICAgSW5pdGlhbGl6ZSBhbGwgdGhlIHZhcmlhYmxlcyBjcmVhdGUvdXNlZCBkeW5h bWljYWxseSBsaWtlIGNvbm4sCisgICAgICAgIHRlbXBsYXRlX3BhdGguCiAKICAgICAgICAgQXJn czoKICAgICAgICAgICAgICoqa3dhcmdzOgpAQCAtMjIzLDkgKzIzMSwxMSBAQCBjbGFzcyBMYW5n dWFnZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIHNlbGYubWFuYWdlciA9IHNl bGYuZHJpdmVyLmNvbm5lY3Rpb25fbWFuYWdlcihrd2FyZ3NbJ3NpZCddKQogICAgICAgICAgICAg c2VsZi5jb25uID0gc2VsZi5tYW5hZ2VyLmNvbm5lY3Rpb24oZGlkPWt3YXJnc1snZGlkJ10pCiAg ICAgICAgICAgICAjIFNldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3IgdGhlIFNRTCBzY3JpcHRzCi0g ICAgICAgICAgICBzZWxmLnRlbXBsYXRlX3BhdGggPSAoImxhbmd1YWdlcy9zcWwvI2dwZGIjezB9 IyIuZm9ybWF0KHNlbGYubWFuYWdlci52ZXJzaW9uKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiBzZWxmLm1hbmFnZXIuc2VydmVyX3R5cGUgPT0gJ2dwZGInCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGVsc2UgImxhbmd1YWdlcy9zcWwvI3swfSMiLmZvcm1hdChz ZWxmLm1hbmFnZXIudmVyc2lvbikpCisgICAgICAgICAgICBzZWxmLnRlbXBsYXRlX3BhdGggPSAo CisgICAgICAgICAgICAgICAgImxhbmd1YWdlcy9zcWwvI2dwZGIjezB9IyIuZm9ybWF0KHNlbGYu bWFuYWdlci52ZXJzaW9uKSBpZgorICAgICAgICAgICAgICAgIHNlbGYubWFuYWdlci5zZXJ2ZXJf dHlwZSA9PSAnZ3BkYicgZWxzZQorICAgICAgICAgICAgICAgICJsYW5ndWFnZXMvc3FsLyN7MH0j Ii5mb3JtYXQoc2VsZi5tYW5hZ2VyLnZlcnNpb24pCisgICAgICAgICAgICApCiAKICAgICAgICAg ICAgIHJldHVybiBmKCphcmdzLCAqKmt3YXJncykKIApAQCAtMjM0LDcgKzI0NCw4IEBAIGNsYXNz IExhbmd1YWdlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgIEBjaGVja19wcmVjb25kaXRpb24K ICAgICBkZWYgbGlzdChzZWxmLCBnaWQsIHNpZCwgZGlkKToKICAgICAgICAgIiIiCi0gICAgICAg IFRoaXMgZnVuY3Rpb24gaXMgdXNlZCB0byBsaXN0IGFsbCB0aGUgbGFuZ3VhZ2Ugbm9kZXMgd2l0 aGluIHRoYXQgY29sbGVjdGlvbi4KKyAgICAgICAgVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGxp c3QgYWxsIHRoZSBsYW5ndWFnZSBub2RlcyB3aXRoaW4gdGhhdAorICAgICAgICBjb2xsZWN0aW9u LgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgICBnaWQ6IFNlcnZlciBHcm91cCBJRApAQCAt MjU0LDggKzI2NSw4IEBAIGNsYXNzIExhbmd1YWdlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAg IEBjaGVja19wcmVjb25kaXRpb24KICAgICBkZWYgbm9kZXMoc2VsZiwgZ2lkLCBzaWQsIGRpZCk6 CiAgICAgICAgICIiIgotICAgICAgICBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gY3JlYXRlIGFs bCB0aGUgY2hpbGQgbm9kZXMgd2l0aGluIHRoZSBjb2xsZWN0aW9uLgotICAgICAgICBIZXJlIGl0 IHdpbGwgY3JlYXRlIGFsbCB0aGUgbGFuZ3VhZ2Ugbm9kZXMuCisgICAgICAgIFRoaXMgZnVuY3Rp b24gaXMgdXNlZCB0byBjcmVhdGUgYWxsIHRoZSBjaGlsZCBub2RlcyB3aXRoaW4gdGhlCisgICAg ICAgIGNvbGxlY3Rpb24uIEhlcmUgaXQgd2lsbCBjcmVhdGUgYWxsIHRoZSBsYW5ndWFnZSBub2Rl cy4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgICAgZ2lkOiBTZXJ2ZXIgR3JvdXAgSUQKQEAg LTMyMyw3ICszMzQsMTAgQEAgY2xhc3MgTGFuZ3VhZ2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAg ICAgICAgICAgICBkaWQ6IERhdGFiYXNlIElECiAgICAgICAgICAgICBsaWQ6IExhbmd1YWdlIElE CiAgICAgICAgICIiIgotICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3Nl bGYudGVtcGxhdGVfcGF0aCwgJ3Byb3BlcnRpZXMuc3FsJ10pLCBsaWQ9bGlkKQorICAgICAgICBz cWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0 ZV9wYXRoLCAncHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICBsaWQ9bGlkCisgICAgICAg ICkKICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KHNxbCkKIAog ICAgICAgICBpZiBub3Qgc3RhdHVzOgpAQCAtMzM0LDcgKzM0OCwxMCBAQCBjbGFzcyBMYW5ndWFn ZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICBnZXR0ZXh0KCJDb3VsZCBu b3QgZmluZCB0aGUgbGFuZ3VhZ2UgaW5mb3JtYXRpb24uIikKICAgICAgICAgICAgICkKIAotICAg ICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwg J2FjbC5zcWwnXSksIGxpZD1saWQpCisgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKKyAg ICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdhY2wuc3FsJ10pLAorICAg ICAgICAgICAgbGlkPWxpZAorICAgICAgICApCiAgICAgICAgIHN0YXR1cywgcmVzdWx0ID0gc2Vs Zi5jb25uLmV4ZWN1dGVfZGljdChzcWwpCiAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAg ICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlc3VsdCkKQEAgLTM0 NCw3ICszNjEsMTMgQEAgY2xhc3MgTGFuZ3VhZ2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAg ICAgICAgICByZXNbJ3Jvd3MnXVswXVsnbGFuYWNsJ10gPSBkaWN0KCkKICAgICAgICAgICAgIHJl c1sncm93cyddWzBdWydsYW5hY2wnXVsnZ3JhbnRlZSddID0gJ1BVQkxJQycKICAgICAgICAgICAg IHJlc1sncm93cyddWzBdWydsYW5hY2wnXVsnZ3JhbnRvciddID0gcmVzWydyb3dzJ11bMF1bJ2xh bm93bmVyJ10KLSAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydsYW5hY2wnXVsncHJpdmlsZWdl cyddID0gW3sncHJpdmlsZWdlX3R5cGUnOiAnVScsICdwcml2aWxlZ2UnOiBUcnVlLCAnd2l0aF9n cmFudCc6IEZhbHNlfV0KKyAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydsYW5hY2wnXVsncHJp dmlsZWdlcyddID0gWworICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgJ3By aXZpbGVnZV90eXBlJzogJ1UnLAorICAgICAgICAgICAgICAgICAgICAncHJpdmlsZWdlJzogVHJ1 ZSwKKyAgICAgICAgICAgICAgICAgICAgJ3dpdGhfZ3JhbnQnOiBGYWxzZQorICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIF0KICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGZvciByb3cg aW4gcmVzdWx0Wydyb3dzJ106CiAgICAgICAgICAgICAgICAgcHJpdiA9IHBhcnNlX3ByaXZfZnJv bV9kYihyb3cpCkBAIC0zNTQsNyArMzc3LDggQEAgY2xhc3MgTGFuZ3VhZ2VWaWV3KFBHQ2hpbGRO b2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHJlc1sncm93cyddWzBdW3Jvd1snZGVmdHlw ZSddXSA9IFtwcml2XQogCiAgICAgICAgIHNlY2xhYmVscyA9IFtdCi0gICAgICAgIGlmICdzZWNs YWJlbHMnIGluIHJlc1sncm93cyddWzBdIGFuZCByZXNbJ3Jvd3MnXVswXVsnc2VjbGFiZWxzJ10g aXMgbm90IE5vbmU6CisgICAgICAgIGlmICdzZWNsYWJlbHMnIGluIHJlc1sncm93cyddWzBdIGFu ZCBcCisgICAgICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ3NlY2xhYmVscyddIGlzIG5vdCBO b25lOgogICAgICAgICAgICAgaW1wb3J0IHJlCiAgICAgICAgICAgICBmb3Igc2VjIGluIHJlc1sn cm93cyddWzBdWydzZWNsYWJlbHMnXToKICAgICAgICAgICAgICAgICBzZWMgPSByZS5zZWFyY2go cicoW149XSspPSguKiQpJywgc2VjKQpAQCAtNDQzLDggKzQ2NywxMCBAQCBjbGFzcyBMYW5ndWFn ZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAg ICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAK LSAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0 ZV9wYXRoLCAncHJvcGVydGllcy5zcWwnXSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbGFubmFtZT1kYXRhWyduYW1lJ10sIGNvbm49c2VsZi5jb25uKQorICAgICAgICAgICAg c3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRl bXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAgICAgICAgICAgICBsYW5uYW1l PWRhdGFbJ25hbWUnXSwgY29ubj1zZWxmLmNvbm4KKyAgICAgICAgICAgICkKIAogICAgICAgICAg ICAgc3RhdHVzLCByX3NldCA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3Qoc3FsKQogICAgICAgICAg ICAgaWYgbm90IHN0YXR1czoKQEAgLTQ4MiwxNSArNTA4LDIwIEBAIGNsYXNzIExhbmd1YWdlVmll dyhQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAgIHRyeToKICAgICAgICAgICAgICMgR2V0IG5h bWUgZm9yIGxhbmd1YWdlIGZyb20gbGlkCi0gICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxh dGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2RlbGV0ZS5zcWwnXSksIGxpZD1saWQs IGNvbm49c2VsZi5jb25uKQorICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAg ICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdkZWxldGUuc3FsJ10p LAorICAgICAgICAgICAgICAgIGxpZD1saWQsIGNvbm49c2VsZi5jb25uCisgICAgICAgICAgICAp CiAgICAgICAgICAgICBzdGF0dXMsIGxuYW1lID0gc2VsZi5jb25uLmV4ZWN1dGVfc2NhbGFyKHNx bCkKIAogICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgICAgICByZXR1cm4g aW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPWxuYW1lKQogCiAgICAgICAgICAgICAjIGRy b3AgbGFuZ3VhZ2UKLSAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihb c2VsZi50ZW1wbGF0ZV9wYXRoLCAnZGVsZXRlLnNxbCddKSwgbG5hbWU9bG5hbWUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FzY2FkZT1jYXNjYWRlLCBjb25uPXNlbGYuY29u bikKKyAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKKyAgICAgICAgICAgICAgICAi LyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnZGVsZXRlLnNxbCddKSwKKyAgICAgICAgICAg ICAgICBsbmFtZT1sbmFtZSwgY2FzY2FkZT1jYXNjYWRlLCBjb25uPXNlbGYuY29ubgorICAgICAg ICAgICAgKQogICAgICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9zY2Fs YXIoc3FsKQogCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgpAQCAtNTEzLDcgKzU0NCw4IEBA IGNsYXNzIExhbmd1YWdlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgIEBjaGVja19wcmVjb25k aXRpb24KICAgICBkZWYgbXNxbChzZWxmLCBnaWQsIHNpZCwgZGlkLCBsaWQ9Tm9uZSk6CiAgICAg ICAgICIiIgotICAgICAgICBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gcmV0dXJuIG1vZGlmaWVk IFNRTCBmb3IgdGhlIHNlbGVjdGVkIGxhbmd1YWdlIG5vZGUuCisgICAgICAgIFRoaXMgZnVuY3Rp b24gaXMgdXNlZCB0byByZXR1cm4gbW9kaWZpZWQgU1FMIGZvciB0aGUgc2VsZWN0ZWQKKyAgICAg ICAgbGFuZ3VhZ2Ugbm9kZS4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgICAgZ2lkOiBTZXJ2 ZXIgR3JvdXAgSUQKQEAgLTUzOCw3ICs1NzAsNyBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdDaGls ZE5vZGVWaWV3KToKICAgICAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAg ICAgICAgICAgICAgZGF0YT1zcWwsCiAgICAgICAgICAgICAgICAgc3RhdHVzPTIwMAotICAgICAg ICAgICAgICAgICkKKyAgICAgICAgICAgICkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBl OgogICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1zdHIo ZSkpCiAKQEAgLTU1NSw3ICs1ODcsOSBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdDaGlsZE5vZGVW aWV3KToKICAgICAgICAgXQogCiAgICAgICAgIGlmIGxpZCBpcyBub3QgTm9uZToKLSAgICAgICAg ICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAn cHJvcGVydGllcy5zcWwnXSksIGxpZD1saWQpCisgICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVt cGxhdGUoCisgICAgICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ3By b3BlcnRpZXMuc3FsJ10pLCBsaWQ9bGlkCisgICAgICAgICAgICApCiAgICAgICAgICAgICBzdGF0 dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3Qoc3FsKQogICAgICAgICAgICAgaWYgbm90 IHN0YXR1czoKICAgICAgICAgICAgICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVy cm9ybXNnPXJlcykKQEAgLTU2OCwxOSArNjAyLDI4IEBAIGNsYXNzIExhbmd1YWdlVmlldyhQR0No aWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgZm9yIGtleSBpbiBbJ2xhbmFjbCddOgogICAgICAg ICAgICAgICAgIGlmIGtleSBpbiBkYXRhIGFuZCBkYXRhW2tleV0gaXMgbm90IE5vbmU6CiAgICAg ICAgICAgICAgICAgICAgIGlmICdhZGRlZCcgaW4gZGF0YVtrZXldOgotICAgICAgICAgICAgICAg ICAgICAgICAgZGF0YVtrZXldWydhZGRlZCddID0gcGFyc2VfcHJpdl90b19kYihkYXRhW2tleV1b J2FkZGVkJ10sIFsiVSJdKQorICAgICAgICAgICAgICAgICAgICAgICAgZGF0YVtrZXldWydhZGRl ZCddID0gcGFyc2VfcHJpdl90b19kYigKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRh W2tleV1bJ2FkZGVkJ10sIFsiVSJdCisgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAg ICAgICAgICAgICAgIGlmICdjaGFuZ2VkJyBpbiBkYXRhW2tleV06Ci0gICAgICAgICAgICAgICAg ICAgICAgICBkYXRhW2tleV1bJ2NoYW5nZWQnXSA9IHBhcnNlX3ByaXZfdG9fZGIoZGF0YVtrZXld WydjaGFuZ2VkJ10sIFsiVSJdKQorICAgICAgICAgICAgICAgICAgICAgICAgZGF0YVtrZXldWydj aGFuZ2VkJ10gPSBwYXJzZV9wcml2X3RvX2RiKAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRhdGFba2V5XVsnY2hhbmdlZCddLCBbIlUiXQorICAgICAgICAgICAgICAgICAgICAgICAgKQog ICAgICAgICAgICAgICAgICAgICBpZiAnZGVsZXRlZCcgaW4gZGF0YVtrZXldOgotICAgICAgICAg ICAgICAgICAgICAgICAgZGF0YVtrZXldWydkZWxldGVkJ10gPSBwYXJzZV9wcml2X3RvX2RiKGRh dGFba2V5XVsnZGVsZXRlZCddLCBbIlUiXSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFb a2V5XVsnZGVsZXRlZCddID0gcGFyc2VfcHJpdl90b19kYigKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkYXRhW2tleV1bJ2RlbGV0ZWQnXSwgWyJVIl0KKyAgICAgICAgICAgICAgICAgICAg ICAgICkKIAogICAgICAgICAgICAgb2xkX2RhdGEgPSByZXNbJ3Jvd3MnXVswXQogICAgICAgICAg ICAgZm9yIGFyZyBpbiByZXF1aXJlZF9hcmdzOgogICAgICAgICAgICAgICAgIGlmIGFyZyBub3Qg aW4gZGF0YToKICAgICAgICAgICAgICAgICAgICAgZGF0YVthcmddID0gb2xkX2RhdGFbYXJnXQot ICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRl X3BhdGgsICd1cGRhdGUuc3FsJ10pLCBkYXRhPWRhdGEsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgb19kYXRhPW9sZF9kYXRhLCBjb25uPXNlbGYuY29ubikKLSAgICAgICAgICAg IHJldHVybiBzcWwuc3RyaXAoJ1xuJyksIGRhdGFbJ25hbWUnXSBpZiAnbmFtZScgaW4gZGF0YSBl bHNlIG9sZF9kYXRhWyduYW1lJ10KKyAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgK KyAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAndXBkYXRlLnNx bCddKSwKKyAgICAgICAgICAgICAgICBkYXRhPWRhdGEsIG9fZGF0YT1vbGRfZGF0YSwgY29ubj1z ZWxmLmNvbm4KKyAgICAgICAgICAgICkKKyAgICAgICAgICAgIHJldHVybiBzcWwuc3RyaXAoJ1xu JyksIGRhdGFbJ25hbWUnXSBpZiAnbmFtZScgaW4gZGF0YSBcCisgICAgICAgICAgICAgICAgZWxz ZSBvbGRfZGF0YVsnbmFtZSddCiAgICAgICAgIGVsc2U6CiAKICAgICAgICAgICAgIGlmICdsYW5h Y2wnIGluIGRhdGE6CkBAIC01OTAsMTEgKzYzMywxMSBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdD aGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhPWRh dGEsIGNvbm49c2VsZi5jb25uKQogICAgICAgICAgICAgcmV0dXJuIHNxbC5zdHJpcCgnXG4nKSwg ZGF0YVsnbmFtZSddCiAKLQogICAgIEBjaGVja19wcmVjb25kaXRpb24KICAgICBkZWYgZ2V0X2Z1 bmN0aW9ucyhzZWxmLCBnaWQsIHNpZCwgZGlkKToKICAgICAgICAgIiIiCi0gICAgICAgIFRoaXMg ZnVuY3Rpb24gcmV0dXJucyB0aGUgaGFuZGxlciBhbmQgaW5saW5lIGZ1bmN0aW9ucyBmb3IgdGhl IHNlbGVjdGVkIGxhbmd1YWdlIG5vZGUuCisgICAgICAgIFRoaXMgZnVuY3Rpb24gcmV0dXJucyB0 aGUgaGFuZGxlciBhbmQgaW5saW5lIGZ1bmN0aW9ucyBmb3IgdGhlCisgICAgICAgIHNlbGVjdGVk IGxhbmd1YWdlIG5vZGUuCiAKICAgICAgICAgQXJnczoKICAgICAgICAgICAgIGdpZDogU2VydmVy IEdyb3VwIElECkBAIC02MzIsNyArNjc1LDggQEAgY2xhc3MgTGFuZ3VhZ2VWaWV3KFBHQ2hpbGRO b2RlVmlldyk6CiAgICAgQGNoZWNrX3ByZWNvbmRpdGlvbgogICAgIGRlZiBzcWwoc2VsZiwgZ2lk LCBzaWQsIGRpZCwgbGlkKToKICAgICAgICAgIiIiCi0gICAgICAgIFRoaXMgZnVuY3Rpb24gd2ls bCBnZW5lcmF0ZSBzcWwgdG8gc2hvdyBpbiB0aGUgc3FsIHBhbmUgZm9yIHRoZSBzZWxlY3RlZCBs YW5ndWFnZSBub2RlLgorICAgICAgICBUaGlzIGZ1bmN0aW9uIHdpbGwgZ2VuZXJhdGUgc3FsIHRv IHNob3cgaW4gdGhlIHNxbCBwYW5lIGZvciB0aGUKKyAgICAgICAgc2VsZWN0ZWQgbGFuZ3VhZ2Ug bm9kZS4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgICAgZ2lkOiBTZXJ2ZXIgR3JvdXAgSUQK QEAgLTY0MCw3ICs2ODQsMTAgQEAgY2xhc3MgTGFuZ3VhZ2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6 CiAgICAgICAgICAgICBkaWQ6IERhdGFiYXNlIElECiAgICAgICAgICAgICBsaWQ6IExhbmd1YWdl IElECiAgICAgICAgICIiIgotICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4o W3NlbGYudGVtcGxhdGVfcGF0aCwgJ3Byb3BlcnRpZXMuc3FsJ10pLCBsaWQ9bGlkKQorICAgICAg ICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoCisgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1w bGF0ZV9wYXRoLCAncHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICBsaWQ9bGlkCisgICAg ICAgICkKICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KHNxbCkK ICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2 ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQpAQCAtNjUzLDcgKzcwMCwxMCBAQCBjbGFzcyBMYW5ndWFn ZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgIyBNYWtpbmcgY29weSBvZiBvdXRwdXQg Zm9yIGZ1dHVyZSB1c2UKICAgICAgICAgb2xkX2RhdGEgPSBkaWN0KHJlc1sncm93cyddWzBdKQog Ci0gICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9w YXRoLCAnYWNsLnNxbCddKSwgbGlkPWxpZCkKKyAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRl KAorICAgICAgICAgICAgIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ2FjbC5zcWwnXSks CisgICAgICAgICAgICBsaWQ9bGlkCisgICAgICAgICkKICAgICAgICAgc3RhdHVzLCByZXN1bHQg PSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KHNxbCkKICAgICAgICAgaWYgbm90IHN0YXR1czoKICAg ICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzdWx0KQpA QCAtNjc2LDcgKzcyNiwxMCBAQCBjbGFzcyBMYW5ndWFnZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToK ICAgICAgICAgICAgICAgICB9KQogCiAgICAgICAgIG9sZF9kYXRhWydzZWNsYWJlbHMnXSA9IHNl Y2xhYmVscwotICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVt cGxhdGVfcGF0aCwgJ3NxbHBhbmUuc3FsJ10pLCBkYXRhPW9sZF9kYXRhLCBjb25uPXNlbGYuY29u bikKKyAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKAorICAgICAgICAgICAgIi8iLmpvaW4o W3NlbGYudGVtcGxhdGVfcGF0aCwgJ3NxbHBhbmUuc3FsJ10pLAorICAgICAgICAgICAgZGF0YT1v bGRfZGF0YSwgY29ubj1zZWxmLmNvbm4KKyAgICAgICAgKQogCiAgICAgICAgIHJldHVybiBhamF4 X3Jlc3BvbnNlKHJlc3BvbnNlPXNxbC5zdHJpcCgnXG4nKSkKIApkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy90 ZXN0cy90ZXN0X2xhbmd1YWdlX2FkZC5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9sYW5ndWFnZXMvdGVzdHMvdGVzdF9sYW5ndWFnZV9hZGQu cHkKaW5kZXggMGY3NmNjNi4uNGM2ZjljMCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy90ZXN0cy90ZXN0X2xh bmd1YWdlX2FkZC5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvbGFuZ3VhZ2VzL3Rlc3RzL3Rlc3RfbGFuZ3VhZ2VfYWRkLnB5CkBAIC01 MCwyMyArNTAsMjEgQEAgY2xhc3MgTGFuZ3VhZ2VzQWRkVGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0 b3IpOgogICAgICAgICAgICAgImxhbnZhbCI6ICJmbWdyX2NfdmFsaWRhdG9yIiwKICAgICAgICAg ICAgICJuYW1lIjogImxhbmd1YWdlXyVzIiAlIHN0cih1dWlkLnV1aWQ0KCkpWzE6OF0sCiAgICAg ICAgICAgICAic2VjbGFiZWxzIjogW10sCi0gICAgICAgICAgICAidGVtcGxhdGVfbGlzdCI6Ci0g ICAgICAgICAgICAgICAgWwotICAgICAgICAgICAgICAgICAgICAicGxwZXJsIiwKLSAgICAgICAg ICAgICAgICAgICAgInBscGVybHUiLAotICAgICAgICAgICAgICAgICAgICAicGxweXRob24ydSIs Ci0gICAgICAgICAgICAgICAgICAgICJwbHB5dGhvbjN1IiwKLSAgICAgICAgICAgICAgICAgICAg InBscHl0aG9udSIsCi0gICAgICAgICAgICAgICAgICAgICJwbHRjbCIsCi0gICAgICAgICAgICAg ICAgICAgICJwbHRjbHUiCi0gICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICJ0ZW1wbGF0 ZV9saXN0IjogWworICAgICAgICAgICAgICAgICJwbHBlcmwiLAorICAgICAgICAgICAgICAgICJw bHBlcmx1IiwKKyAgICAgICAgICAgICAgICAicGxweXRob24ydSIsCisgICAgICAgICAgICAgICAg InBscHl0aG9uM3UiLAorICAgICAgICAgICAgICAgICJwbHB5dGhvbnUiLAorICAgICAgICAgICAg ICAgICJwbHRjbCIsCisgICAgICAgICAgICAgICAgInBsdGNsdSIKKyAgICAgICAgICAgIF0sCiAg ICAgICAgICAgICAidHJ1c3RlZCI6ICJ0cnVlIgotICAgICAgICAgICAgICAgIH0KKyAgICAgICAg fQogCiAgICAgICAgIHJlc3BvbnNlID0gc2VsZi50ZXN0ZXIucG9zdCgKICAgICAgICAgICAgIHNl bGYudXJsICsgc3RyKHV0aWxzLlNFUlZFUl9HUk9VUCkgKyAnLycgKwotICAgICAgICAgICAgc3Ry KHNlbGYuc2VydmVyX2lkKSArICcvJyArIHN0cigKLSAgICAgICAgICAgICAgICBzZWxmLmRiX2lk KSArICcvJywKKyAgICAgICAgICAgIHN0cihzZWxmLnNlcnZlcl9pZCkgKyAnLycgKyBzdHIoc2Vs Zi5kYl9pZCkgKyAnLycsCiAgICAgICAgICAgICBkYXRhPWpzb24uZHVtcHMoc2VsZi5kYXRhKSwK ICAgICAgICAgICAgIGNvbnRlbnRfdHlwZT0naHRtbC9qc29uJykKIApAQCAtNzYsNyArNzQsNyBA QCBjbGFzcyBMYW5ndWFnZXNBZGRUZXN0Q2FzZShCYXNlVGVzdEdlbmVyYXRvcik6CiAgICAgICAg ICIiIlRoaXMgZnVuY3Rpb24gZGVsZXRlIGFkZGVkIGxhbmd1YWdlIGFuZAogICAgICAgICBkaXNj b25uZWN0IHRoZSB0ZXN0IGRhdGFiYXNlLiIiIgogCi0gICAgICAgIGxhbmd1YWdlX3V0aWxzLmRl bGV0ZV9sYW5ndWFnZShzZWxmLnNlcnZlciwgc2VsZi5kYl9uYW1lLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5kYXRhWyduYW1lJ10pCisgICAgICAgIGxhbmd1 YWdlX3V0aWxzLmRlbGV0ZV9sYW5ndWFnZSgKKyAgICAgICAgICAgIHNlbGYuc2VydmVyLCBzZWxm LmRiX25hbWUsIHNlbGYuZGF0YVsnbmFtZSddCisgICAgICAgICkKICAgICAgICAgZGF0YWJhc2Vf dXRpbHMuZGlzY29ubmVjdF9kYXRhYmFzZShzZWxmLCBzZWxmLnNlcnZlcl9pZCwgc2VsZi5kYl9p ZCkKLQo= --94eb2c18d6181fe39a0566499539--