Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92) (envelope-from ) id 1jGcEy-0006He-Mn for pgadmin-hackers@arkaria.postgresql.org; Tue, 24 Mar 2020 05:36:41 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1jGcEx-0003oT-HO for pgadmin-hackers@arkaria.postgresql.org; Tue, 24 Mar 2020 05:36:39 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1jGcEw-0003io-OB for pgadmin-hackers@lists.postgresql.org; Tue, 24 Mar 2020 05:36:39 +0000 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jGcEt-0000U2-Qn for pgadmin-hackers@postgresql.org; Tue, 24 Mar 2020 05:36:37 +0000 Received: by mail-ed1-x541.google.com with SMTP id w26so13017319edu.7 for ; Mon, 23 Mar 2020 22:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Ur2M/K5LziGNl9XeFdL4ciFQHCH9WE6w9nOcArNP4g8=; b=fqh0efGw/clerBtDiNZIV4HKn7L/WivOI9ZoH0j4SmTuiZcZb10GFnj4xHC6L1FB47 THXwyhjpeWsOWeYW26ejBLNCTyAGYSPGYPHZgKkzJUjAIko8jfBAUH0rj1O7xt/ePYT2 vod49Vru9/TtJF0ow15NeXJHmMvWpPBPUBLWt0DHMGUonjfP2DBKyu6U+kxZArSXeZtb KkALF+P4/INx3aMqxTriiuJjilJE3v6JHL0ZJvF9w0JhwGJlTi0bcaajsMMRCeyX/C85 +YfOW5uq7j7VDvLvn/TzRtKeajE4c/gxY4iMwApAgQDWH/7FkKcZGIX56CLFNUcxxBHi pNAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ur2M/K5LziGNl9XeFdL4ciFQHCH9WE6w9nOcArNP4g8=; b=Pp2qHIWOJWWKACbqMrd8aqnqVfgQxbM8ZktK1BTkIvoiJg0UaPrNHGPhBDF5w64ww4 a7fr8E/dsvlyRaJjV21XvofR+btgnRbgJt/N9fvmj84w8yvabuVJnyDdiyBR/a3LbaSl 1ahljfgjim3uVuChcjZkiJW/GFTPzNa4W2fmUVu4Cv5u6SDswYiHTqWEjcSFbDSnhKOc yA5P5NqUsZchhtMt6mzQJv8JlwENePbhtFUVTBZ53fRLNYzUGwwxVfBfr2vdiD3tyfBy 5/QtubLuaSn7slwMpi+1+A6BEWwrysdRxCJ54WBYie8UwvL+JEa6Crdt6UG8X4qVIUHh Ok9g== X-Gm-Message-State: ANhLgQ30JI1gDloPrLZ8CI2E+Qw0ThXGrQCf11sYxHRY2PrJkFR0ZpOV 1/VKxJqBLqfeUlAPLAVdab5qz8atg1Jf1TZgYujl/MZXO89g8fdNP3OsWj/viwBxahD9OPK6jWg OZRS/kZRLbXexJ9N47o/4uM6g4phOQTukgCeD5oluttIjalnRrBaz6nYy9pkA0aD/bRMv0ct/4M WcRmr5hKUCkOdknrU1U2klUKzZXw96sb9KnyT0BQIOgGGD4F1HEYs= X-Google-Smtp-Source: ADFU+vvGxzEyjd0Bj7NE7zzbAbrLDzUvvqg6d5Mlb3j/CkghpFg2832QuEm1ZRT8nrycmPnXU4mJGtnt9JbPVryEcgU= X-Received: by 2002:a05:6402:1815:: with SMTP id g21mr3896182edy.373.1585028194140; Mon, 23 Mar 2020 22:36:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Tue, 24 Mar 2020 11:05:56 +0530 Message-ID: Subject: Re: pgAdmin 4 - gettext usage fixes To: "Libor M." Cc: pgadmin-hackers , Akshay Joshi Content-Type: multipart/mixed; boundary="00000000000078cc8005a193226c" X-CLOUD-SEC-AV-Info: edb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --00000000000078cc8005a193226c Content-Type: multipart/alternative; boundary="00000000000078cc7c05a193226a" --00000000000078cc7c05a193226a Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the updated patch with pep8, linter issues fixed. On Mon, Mar 23, 2020 at 8:31 PM Aditya Toshniwal < aditya.toshniwal@enterprisedb.com> wrote: > Hi Libor, > > Thank you for the patch. It is good clean up patch. > I've made a few changes in the patch. You've imported sprintf which was > not required since gettext also works as sprintf directly. > I've also created a housekeeping redmine ticket to track it - > https://redmine.postgresql.org/issues/5284 > > The messages compile fine. The patch can be committed. > Please find the attached updated patch. > > > > On Mon, Mar 23, 2020 at 4:00 PM Akshay Joshi < > akshay.joshi@enterprisedb.com> wrote: > >> Hi Aditya >> >> Can you please review this? >> >> On Mon, Mar 23, 2020 at 5:00 AM Libor M. wrote: >> >>> Hello, >>> I fixed using gettext function and add more usages for translations, >>> specifically: >>> >>> - fixed usage gettext('') instead of _('') in javascript files >>> - fixed usage gettext('') instead of `${gettext('')}` in javascript >>> files, because "pybabel extract" not support extracting from this >>> syntax >>> - added a lot of gettext for support translations >>> >>> Diff file is attached. >>> >>> Best regards, >>> >>> Libor M. >>> >>> E-mail: liborm85@gmail.com >>> GitHub: https://github.com/liborm85 >>> >> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> >> *Sr. Software Architect* >> *EnterpriseDB Software India Private Limited* >> *Mobile: +91 976-788-8246* >> > > > -- > Thanks and Regards, > Aditya Toshniwal > pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune > "Don't Complain about Heat, Plant a TREE" > -- Thanks and Regards, Aditya Toshniwal pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune "Don't Complain about Heat, Plant a TREE" --00000000000078cc7c05a193226a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Please f= ind the updated patch with pep8, linter issues fixed.


On Mon, Mar = 23, 2020 at 8:31 PM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:
Hi Libor,

Thank you for the patch. It is good clean=C2=A0up patch.
I've made a few changes in = the patch. You've imported sprintf which was not required since gettext= also works as sprintf directly.
I've also created a housekeeping redmine ticket to track it -= =C2=A0https://redmine.postgr= esql.org/issues/5284

The messages compi= le fine. The patch can be committed.
Please find the attached updated patch.



On Mon, Mar 23, 2020 at 4:00 PM Akshay Joshi <akshay.joshi@e= nterprisedb.com> wrote:
Hi Aditya

Can you please= review this?

On Mon, Mar 23, 2020 at 5:00 AM Libor M. <liborm85@gmail.com> wro= te:
Hello,
I fixed using gettext function and add more usages for translations,
specifically:

- fixed usage gettext('') instead of _('') in javascript fi= les
- fixed usage gettext('') instead of `${gettext('')}` in ja= vascript
files, because "pybabel extract" not support extracting from this=
syntax
- added a lot of gettext for support translations

Diff file is attached.

Best regards,

Libor M.

E-mail: liborm85@gm= ail.com
GitHub: https://github.com/liborm85


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks and Regards,
Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer |=C2=A0Ent= erpriseDB India |=C2=A0Pune<= /span>
"Don't Complain about Heat, Plant a TREE"=


--
Thanks and Regards,Aditya Toshniwal
pgAdmin Hacker | Sr. S= oftware Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain about Heat= , Plant a TREE"
=
--00000000000078cc7c05a193226a-- --00000000000078cc8005a193226c Content-Type: application/octet-stream; name="RM5284_v2.patch" Content-Disposition: attachment; filename="RM5284_v2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k85gu6ol0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19p bml0X18ucHkKaW5kZXggYmVhYTY1ZWI2Li4zYzk2YzEwNTEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19faW5pdF9fLnB5CkBAIC0xMjY2 LDEzICsxMjY2LDE0IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAg ICAgICAgICAgICAgICAgZGF0YT17CiAgICAgICAgICAgICAgICAgICAgICAgICAnc3RhdHVzJzog MSwKICAgICAgICAgICAgICAgICAgICAgICAgICdyZXN1bHQnOiBnZXR0ZXh0KAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdOYW1lZCByZXN0b3JlIHBvaW50IGNyZWF0ZWQ6IHswfScuZm9y bWF0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN0b3JlX3BvaW50X25hbWUp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICdOYW1lZCByZXN0b3JlIHBvaW50IGNyZWF0 ZWQ6IHswfScpLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdG9y ZV9wb2ludF9uYW1lKQogICAgICAgICAgICAgICAgICAgICB9KQogCiAgICAgICAgIGV4Y2VwdCBF eGNlcHRpb24gYXMgZToKLSAgICAgICAgICAgIGN1cnJlbnRfYXBwLmxvZ2dlci5lcnJvcigKLSAg ICAgICAgICAgICAgICAnTmFtZWQgcmVzdG9yZSBwb2ludCBjcmVhdGlvbiBmYWlsZWQgKHswfSkn LmZvcm1hdChzdHIoZSkpCisgICAgICAgICAgICBjdXJyZW50X2FwcC5sb2dnZXIuZXJyb3IoZ2V0 dGV4dCgKKyAgICAgICAgICAgICAgICAnTmFtZWQgcmVzdG9yZSBwb2ludCBjcmVhdGlvbiBmYWls ZWQgKHswfSknKS5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgIHN0cihlKSkKICAgICAgICAg ICAgICkKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9 c3RyKGUpKQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkKaW5kZXgg YzAxMmI5NTg2Li40MWNiMGQwYWMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0cy9fX2luaXRfXy5weQorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19p bml0X18ucHkKQEAgLTUwLDcgKzUwLDcgQEAgY2xhc3MgQ2FzdE1vZHVsZShDb2xsZWN0aW9uTm9k ZU1vZHVsZSk6CiAgICAgIiIiCiAKICAgICBOT0RFX1RZUEUgPSAnY2FzdCcKLSAgICBDT0xMRUNU SU9OX0xBQkVMID0gJ0Nhc3RzJworICAgIENPTExFQ1RJT05fTEFCRUwgPSBnZXR0ZXh0KCdDYXN0 cycpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKToKICAgICAgICAg c3VwZXIoQ2FzdE1vZHVsZSwgc2VsZikuX19pbml0X18oKmFyZ3MsICoqa3dhcmdzKQpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L2V2ZW50X3RyaWdnZXJzL3N0YXRpYy9qcy9ldmVudF90cmlnZ2VyLmpzIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL3N0 YXRpYy9qcy9ldmVudF90cmlnZ2VyLmpzCmluZGV4IDk4MzM4OWRmNi4uYWRkMDhmMDhhIDEwMDY0 NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvZXZlbnRfdHJpZ2dlcnMvc3RhdGljL2pzL2V2ZW50X3RyaWdnZXIuanMKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdn ZXJzL3N0YXRpYy9qcy9ldmVudF90cmlnZ2VyLmpzCkBAIC0xMTEsMTAgKzExMSwxMCBAQCBkZWZp bmUoJ3BnYWRtaW4ubm9kZS5ldmVudF90cmlnZ2VyJywgWwogICAgICAgICAgIGlkOiAnZW5hYmxl ZCcsIGxhYmVsOiBnZXR0ZXh0KCdUcmlnZ2VyIGVuYWJsZWQ/JyksCiAgICAgICAgICAgZ3JvdXA6 IGdldHRleHQoJ0RlZmluaXRpb24nKSwgbW9kZTogWydwcm9wZXJ0aWVzJywgJ2VkaXQnLCdjcmVh dGUnXSwKICAgICAgICAgICBvcHRpb25zOiBbCi0gICAgICAgICAgICB7bGFiZWw6ICdFbmFibGUn LCB2YWx1ZTogJ08nfSwKLSAgICAgICAgICAgIHtsYWJlbDogJ0Rpc2FibGUnLCB2YWx1ZTogJ0Qn fSwKLSAgICAgICAgICAgIHtsYWJlbDogJ1JlcGxpY2EnLCB2YWx1ZTogJ1InfSwKLSAgICAgICAg ICAgIHtsYWJlbDogJ0Fsd2F5cycsIHZhbHVlOiAnQSd9LAorICAgICAgICAgICAge2xhYmVsOiBn ZXR0ZXh0KCdFbmFibGUnKSwgdmFsdWU6ICdPJ30sCisgICAgICAgICAgICB7bGFiZWw6IGdldHRl eHQoJ0Rpc2FibGUnKSwgdmFsdWU6ICdEJ30sCisgICAgICAgICAgICB7bGFiZWw6IGdldHRleHQo J1JlcGxpY2EnKSwgdmFsdWU6ICdSJ30sCisgICAgICAgICAgICB7bGFiZWw6IGdldHRleHQoJ0Fs d2F5cycpLCB2YWx1ZTogJ0EnfSwKICAgICAgICAgICBdLAogICAgICAgICAgIGNvbnRyb2w6ICdz ZWxlY3QyJywgc2VsZWN0MjogeyBhbGxvd0NsZWFyOiBmYWxzZSwgd2lkdGg6ICcxMDAlJyB9LAog ICAgICAgICB9LHsKQEAgLTEyNSw5ICsxMjUsOSBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5ldmVu dF90cmlnZ2VyJywgWwogICAgICAgICAgIGlkOiAnZXZlbnRuYW1lJywgbGFiZWw6IGdldHRleHQo J0V2ZW50JyksCiAgICAgICAgICAgZ3JvdXA6IGdldHRleHQoJ0RlZmluaXRpb24nKSwgY2VsbDog J3N0cmluZycsCiAgICAgICAgICAgb3B0aW9uczogWwotICAgICAgICAgICAge2xhYmVsOiAnRERM IENPTU1BTkQgU1RBUlQnLCB2YWx1ZTogJ0RETF9DT01NQU5EX1NUQVJUJ30sCi0gICAgICAgICAg ICB7bGFiZWw6ICdEREwgQ09NTUFORCBFTkQnLCB2YWx1ZTogJ0RETF9DT01NQU5EX0VORCd9LAot ICAgICAgICAgICAge2xhYmVsOiAnU1FMIERST1AnLCB2YWx1ZTogJ1NRTF9EUk9QJ30sCisgICAg ICAgICAgICB7bGFiZWw6IGdldHRleHQoJ0RETCBDT01NQU5EIFNUQVJUJyksIHZhbHVlOiAnRERM X0NPTU1BTkRfU1RBUlQnfSwKKyAgICAgICAgICAgIHtsYWJlbDogZ2V0dGV4dCgnRERMIENPTU1B TkQgRU5EJyksIHZhbHVlOiAnRERMX0NPTU1BTkRfRU5EJ30sCisgICAgICAgICAgICB7bGFiZWw6 IGdldHRleHQoJ1NRTCBEUk9QJyksIHZhbHVlOiAnU1FMX0RST1AnfSwKICAgICAgICAgICBdLAog ICAgICAgICAgIGNvbnRyb2w6ICdzZWxlY3QyJywgc2VsZWN0MjogeyBhbGxvd0NsZWFyOiBmYWxz ZSwgd2lkdGg6ICcxMDAlJyB9LAogICAgICAgICB9LHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlcm5hbF90YWJsZXMv cHJvcGVydGllcy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9leHRlcm5hbF90YWJsZXMvcHJvcGVydGllcy5weQppbmRleCA4OGYyMGExNWQu LmRhMWIyYzVmYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVybmFsX3RhYmxlcy9wcm9wZXJ0aWVzLnB5CisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlcm5h bF90YWJsZXMvcHJvcGVydGllcy5weQpAQCAtNTIsOCArNTIsOCBAQCBjbGFzcyBQcm9wZXJ0aWVz OgogICAgICAgICBleGVjdXRlX29uX3RleHQgPSBzZWxmLnRyYW5zbGF0ZV9leGVjdXRlX29uX3Rl eHQoZXhlY3V0ZV9vbikKICAgICAgICAgcmVzcG9uc2UgPSBkaWN0KAogICAgICAgICAgICAgbmFt ZT10YWJsZV9pbmZvcm1hdGlvbl9yZXN1bHRbJ25hbWUnXSwKLSAgICAgICAgICAgIHR5cGU9Z2V0 dGV4dCgncmVhZGFibGUnIGlmIG5vdCB0YWJsZV9pbmZvcm1hdGlvbl9yZXN1bHRbCi0gICAgICAg ICAgICAgICAgJ3dyaXRhYmxlJ10gZWxzZSAnd3JpdGFibGUnKSwKKyAgICAgICAgICAgIHR5cGU9 Z2V0dGV4dCgncmVhZGFibGUnKSBpZiBub3QgdGFibGVfaW5mb3JtYXRpb25fcmVzdWx0WworICAg ICAgICAgICAgICAgICd3cml0YWJsZSddIGVsc2UgZ2V0dGV4dCgnd3JpdGFibGUnKSwKICAgICAg ICAgICAgIGZvcm1hdF90eXBlPXRhYmxlX2luZm9ybWF0aW9uX3Jlc3VsdFsncGdfZW5jb2Rpbmdf dG9fY2hhciddLAogICAgICAgICAgICAgZm9ybWF0X29wdGlvbnM9dGFibGVfaW5mb3JtYXRpb25f cmVzdWx0WydmbXRvcHRzJ10sCiAgICAgICAgICAgICBleHRlcm5hbF9vcHRpb25zPXRhYmxlX2lu Zm9ybWF0aW9uX3Jlc3VsdFsnb3B0aW9ucyddLApAQCAtNjUsMTQgKzY1LDE0IEBAIGNsYXNzIFBy b3BlcnRpZXM6CiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiB0cmFuc2xhdGVfZXhlY3V0ZV9v bl90ZXh0KGV4ZWN1dGVfb24pOgogICAgICAgICBpZiBleGVjdXRlX29uWyd0eXBlJ10gPT0gJ2hv c3QnOgotICAgICAgICAgICAgcmV0dXJuICdob3N0ICVzJyAlIGV4ZWN1dGVfb25bJ3ZhbHVlJ10K KyAgICAgICAgICAgIHJldHVybiBnZXR0ZXh0KCdob3N0ICVzJykgJSBleGVjdXRlX29uWyd2YWx1 ZSddCiAgICAgICAgIGVsaWYgZXhlY3V0ZV9vblsndHlwZSddID09ICdwZXJfaG9zdCc6Ci0gICAg ICAgICAgICByZXR1cm4gJ3BlciBob3N0JworICAgICAgICAgICAgcmV0dXJuIGdldHRleHQoJ3Bl ciBob3N0JykKICAgICAgICAgZWxpZiBleGVjdXRlX29uWyd0eXBlJ10gPT0gJ21hc3Rlcl9vbmx5 JzoKLSAgICAgICAgICAgIHJldHVybiAnbWFzdGVyIHNlZ21lbnQnCisgICAgICAgICAgICByZXR1 cm4gZ2V0dGV4dCgnbWFzdGVyIHNlZ21lbnQnKQogICAgICAgICBlbGlmIGV4ZWN1dGVfb25bJ3R5 cGUnXSA9PSAnYWxsX3NlZ21lbnRzJzoKLSAgICAgICAgICAgIHJldHVybiAnYWxsIHNlZ21lbnRz JworICAgICAgICAgICAgcmV0dXJuIGdldHRleHQoJ2FsbCBzZWdtZW50cycpCiAgICAgICAgIGVs aWYgZXhlY3V0ZV9vblsndHlwZSddID09ICdzZWdtZW50JzoKLSAgICAgICAgICAgIHJldHVybiAn JXMgc2VnbWVudCcgJSBleGVjdXRlX29uWyd2YWx1ZSddCisgICAgICAgICAgICByZXR1cm4gZ2V0 dGV4dCgnJXMgc2VnbWVudCcpICUgZXhlY3V0ZV9vblsndmFsdWUnXQogICAgICAgICBlbGlmIGV4 ZWN1dGVfb25bJ3R5cGUnXSA9PSAnc2VnbWVudHMnOgotICAgICAgICAgICAgcmV0dXJuICclZCBz ZWdtZW50cycgJSBleGVjdXRlX29uWyd2YWx1ZSddCisgICAgICAgICAgICByZXR1cm4gZ2V0dGV4 dCgnJWQgc2VnbWVudHMnKSAlIGV4ZWN1dGVfb25bJ3ZhbHVlJ10KZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9jb25zdHJhaW50cy9leGNsdXNpb25fY29uc3RyYWludC9zdGF0aWMvanMvZXhjbHVzaW9u X2NvbnN0cmFpbnQuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFp bnQvc3RhdGljL2pzL2V4Y2x1c2lvbl9jb25zdHJhaW50LmpzCmluZGV4IGZkN2UwNmNmZi4uM2M1 YzA5MWJhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0 cmFpbnQvc3RhdGljL2pzL2V4Y2x1c2lvbl9jb25zdHJhaW50LmpzCisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9j b25zdHJhaW50cy9leGNsdXNpb25fY29uc3RyYWludC9zdGF0aWMvanMvZXhjbHVzaW9uX2NvbnN0 cmFpbnQuanMKQEAgLTQ1MCw3ICs0NTAsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5leGNsdXNp b25fY29uc3RyYWludCcsIFsKICAgICAgICAgICB0aXRsZVRtcGwgPSBfLnRlbXBsYXRlKFsKICAg ICAgICAgICAgICc8ZGl2IGNsYXNzPSJzdWJub2RlLWhlYWRlciI+JywKICAgICAgICAgICAgICcg IDxsYWJlbCBjbGFzcz0iY29udHJvbC1sYWJlbCBwZy1lbC1zbS0xMCI+PCUtbGFiZWwlPjwvbGFi ZWw+JywKLSAgICAgICAgICAgICcgIDxidXR0b24gY2xhc3M9ImJ0biBidG4tc20tc3EgYnRuLXNl Y29uZGFyeSBhZGQgZmEgZmEtcGx1cyIgPCU9Y2FuQWRkID8gIiIgOiAiZGlzYWJsZWQ9XCdkaXNh YmxlZFwnIiU+IHRpdGxlPSInICsgXygnQWRkIG5ldyByb3cnKSArICciPjwvYnV0dG9uPicsCisg ICAgICAgICAgICAnICA8YnV0dG9uIGNsYXNzPSJidG4gYnRuLXNtLXNxIGJ0bi1zZWNvbmRhcnkg YWRkIGZhIGZhLXBsdXMiIDwlPWNhbkFkZCA/ICIiIDogImRpc2FibGVkPVwnZGlzYWJsZWRcJyIl PiB0aXRsZT0iJyArIGdldHRleHQoJ0FkZCBuZXcgcm93JykgKyAnIj48L2J1dHRvbj4nLAogICAg ICAgICAgICAgJzwvZGl2PiddLmpvaW4oJ1xuJykpLAogICAgICAgICAgICRncmlkQm9keSA9CiAg ICAgICAgICAgJCgnPGRpdiBjbGFzcz1cJ3BnYWRtaW4tY29udHJvbC1ncm91cCBiYWNrZ3JpZCBm b3JtLWdyb3VwIGNvbC0xMiBvYmplY3Qgc3Vibm9kZVwnPjwvZGl2PicpLmFwcGVuZCgKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3JlaWduX2tleS9zdGF0aWMvanMvZm9yZWln bl9rZXkuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZm9yZWlnbl9rZXkvc3RhdGljL2pzL2Zv cmVpZ25fa2V5LmpzCmluZGV4IDg2OTVmOGJkMS4uNjYwODMxNTFmIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvY29uc3RyYWludHMvZm9yZWlnbl9rZXkvc3RhdGljL2pzL2ZvcmVpZ25fa2V5LmpzCisr KyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3JlaWduX2tleS9zdGF0aWMvanMvZm9yZWlnbl9r ZXkuanMKQEAgLTM3OCw3ICszNzgsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5mb3JlaWduX2tl eScsIFsKICAgICAgICAgICB0aXRsZVRtcGwgPSBfLnRlbXBsYXRlKFsKICAgICAgICAgICAgICc8 ZGl2IGNsYXNzPSJzdWJub2RlLWhlYWRlciI+JywKICAgICAgICAgICAgICcgIDxsYWJlbCBjbGFz cz0iY29udHJvbC1sYWJlbCBwZy1lbC1zbS0xMCI+PCUtbGFiZWwlPjwvbGFiZWw+JywKLSAgICAg ICAgICAgICcgIDxidXR0b24gY2xhc3M9ImJ0biBidG4tc20tc3EgYnRuLXNlY29uZGFyeSBhZGQg ZmEgZmEtcGx1cyIgPCU9Y2FuQWRkID8gIiIgOiAiZGlzYWJsZWQ9XCdkaXNhYmxlZFwnIiU+IHRp dGxlPSInICsgXygnQWRkIG5ldyByb3cnKSArICciPjwvYnV0dG9uPicsCisgICAgICAgICAgICAn ICA8YnV0dG9uIGNsYXNzPSJidG4gYnRuLXNtLXNxIGJ0bi1zZWNvbmRhcnkgYWRkIGZhIGZhLXBs dXMiIDwlPWNhbkFkZCA/ICIiIDogImRpc2FibGVkPVwnZGlzYWJsZWRcJyIlPiB0aXRsZT0iJyAr IGdldHRleHQoJ0FkZCBuZXcgcm93JykgKyAnIj48L2J1dHRvbj4nLAogICAgICAgICAgICAgJzwv ZGl2PiddLmpvaW4oJ1xuJykpLAogICAgICAgICAgICRncmlkQm9keSA9CiAgICAgICAgICAgJCgn PGRpdiBjbGFzcz1cJ3BnYWRtaW4tY29udHJvbC1ncm91cCBiYWNrZ3JpZCBmb3JtLWdyb3VwIGNv bC0xMiBvYmplY3Qgc3Vibm9kZVwnPjwvZGl2PicpLmFwcGVuZCgKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9wYXJ0aXRpb24uanMgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvcGFydGl0 aW9ucy9zdGF0aWMvanMvcGFydGl0aW9uLmpzCmluZGV4IDAwNTI0MmE0YS4uOTI4MzQyODk1IDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvcGFydGl0aW9ucy9zdGF0aWMvanMvcGFydGl0aW9uLmpzCisr KyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3RhYmxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9wYXJ0aXRpb24uanMKQEAgLTcxLDEy ICs3MSwxMiBAQCBmdW5jdGlvbigKICAgICAgICAgICAvLyBUbyBlbmFibGUvZGlzYWJsZSBhbGwg dHJpZ2dlcnMgZm9yIHRoZSB0YWJsZQogICAgICAgICAgIG5hbWU6ICdlbmFibGVfYWxsX3RyaWdn ZXJzJywgbm9kZTogJ3BhcnRpdGlvbicsIG1vZHVsZTogdGhpcywKICAgICAgICAgICBhcHBsaWVz OiBbJ29iamVjdCcsICdjb250ZXh0J10sIGNhbGxiYWNrOiAnZW5hYmxlX3RyaWdnZXJzX29uX3Rh YmxlJywKLSAgICAgICAgICBjYXRlZ29yeTogJ1RyaWdnZXIocyknLCBwcmlvcml0eTogNCwgbGFi ZWw6IGdldHRleHQoJ0VuYWJsZSBBbGwnKSwKKyAgICAgICAgICBjYXRlZ29yeTogZ2V0dGV4dCgn VHJpZ2dlcihzKScpLCBwcmlvcml0eTogNCwgbGFiZWw6IGdldHRleHQoJ0VuYWJsZSBBbGwnKSwK ICAgICAgICAgICBpY29uOiAnZmEgZmEtY2hlY2snLCBlbmFibGUgOiAnY2FuQ3JlYXRlX3dpdGhf dHJpZ2dlcl9lbmFibGUnLAogICAgICAgICB9LHsKICAgICAgICAgICBuYW1lOiAnZGlzYWJsZV9h bGxfdHJpZ2dlcnMnLCBub2RlOiAncGFydGl0aW9uJywgbW9kdWxlOiB0aGlzLAogICAgICAgICAg IGFwcGxpZXM6IFsnb2JqZWN0JywgJ2NvbnRleHQnXSwgY2FsbGJhY2s6ICdkaXNhYmxlX3RyaWdn ZXJzX29uX3RhYmxlJywKLSAgICAgICAgICBjYXRlZ29yeTogJ1RyaWdnZXIocyknLCBwcmlvcml0 eTogNCwgbGFiZWw6IGdldHRleHQoJ0Rpc2FibGUgQWxsJyksCisgICAgICAgICAgY2F0ZWdvcnk6 IGdldHRleHQoJ1RyaWdnZXIocyknKSwgcHJpb3JpdHk6IDQsIGxhYmVsOiBnZXR0ZXh0KCdEaXNh YmxlIEFsbCcpLAogICAgICAgICAgIGljb246ICdmYSBmYS10aW1lcycsIGVuYWJsZSA6ICdjYW5D cmVhdGVfd2l0aF90cmlnZ2VyX2Rpc2FibGUnLAogICAgICAgICB9LHsKICAgICAgICAgICBuYW1l OiAncmVzZXRfdGFibGVfc3RhdHMnLCBub2RlOiAncGFydGl0aW9uJywgbW9kdWxlOiB0aGlzLApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9qcy90YWJsZS5qcyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0 aWMvanMvdGFibGUuanMKaW5kZXggZjE5N2I2NTQ2Li42MTc2MTc5NGYgMTAwNjQ0Ci0tLSBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy9zdGF0aWMvanMvdGFibGUuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9qcy90YWJs ZS5qcwpAQCAtODIsMjMgKzgyLDIzIEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnRhYmxlJywgWwog ICAgICAgICB9LHsKICAgICAgICAgICBuYW1lOiAndHJ1bmNhdGVfdGFibGUnLCBub2RlOiAndGFi bGUnLCBtb2R1bGU6IHRoaXMsCiAgICAgICAgICAgYXBwbGllczogWydvYmplY3QnLCAnY29udGV4 dCddLCBjYWxsYmFjazogJ3RydW5jYXRlX3RhYmxlJywKLSAgICAgICAgICBjYXRlZ29yeTogJ1Ry dW5jYXRlJywgcHJpb3JpdHk6IDMsIGxhYmVsOiBnZXR0ZXh0KCdUcnVuY2F0ZScpLAorICAgICAg ICAgIGNhdGVnb3J5OiBnZXR0ZXh0KCdUcnVuY2F0ZScpLCBwcmlvcml0eTogMywgbGFiZWw6IGdl dHRleHQoJ1RydW5jYXRlJyksCiAgICAgICAgICAgaWNvbjogJ2ZhIGZhLWVyYXNlcicsIGVuYWJs ZSA6ICdjYW5DcmVhdGUnLAogICAgICAgICB9LHsKICAgICAgICAgICBuYW1lOiAndHJ1bmNhdGVf dGFibGVfY2FzY2FkZScsIG5vZGU6ICd0YWJsZScsIG1vZHVsZTogdGhpcywKICAgICAgICAgICBh cHBsaWVzOiBbJ29iamVjdCcsICdjb250ZXh0J10sIGNhbGxiYWNrOiAndHJ1bmNhdGVfdGFibGVf Y2FzY2FkZScsCi0gICAgICAgICAgY2F0ZWdvcnk6ICdUcnVuY2F0ZScsIHByaW9yaXR5OiAzLCBs YWJlbDogZ2V0dGV4dCgnVHJ1bmNhdGUgQ2FzY2FkZScpLAorICAgICAgICAgIGNhdGVnb3J5OiBn ZXR0ZXh0KCdUcnVuY2F0ZScpLCBwcmlvcml0eTogMywgbGFiZWw6IGdldHRleHQoJ1RydW5jYXRl IENhc2NhZGUnKSwKICAgICAgICAgICBpY29uOiAnZmEgZmEtZXJhc2VyJywgZW5hYmxlIDogJ2Nh bkNyZWF0ZScsCiAgICAgICAgIH0sewogICAgICAgICAgIC8vIFRvIGVuYWJsZS9kaXNhYmxlIGFs bCB0cmlnZ2VycyBmb3IgdGhlIHRhYmxlCiAgICAgICAgICAgbmFtZTogJ2VuYWJsZV9hbGxfdHJp Z2dlcnMnLCBub2RlOiAndGFibGUnLCBtb2R1bGU6IHRoaXMsCiAgICAgICAgICAgYXBwbGllczog WydvYmplY3QnLCAnY29udGV4dCddLCBjYWxsYmFjazogJ2VuYWJsZV90cmlnZ2Vyc19vbl90YWJs ZScsCi0gICAgICAgICAgY2F0ZWdvcnk6ICdUcmlnZ2VyKHMpJywgcHJpb3JpdHk6IDQsIGxhYmVs OiBnZXR0ZXh0KCdFbmFibGUgQWxsJyksCisgICAgICAgICAgY2F0ZWdvcnk6IGdldHRleHQoJ1Ry aWdnZXIocyknKSwgcHJpb3JpdHk6IDQsIGxhYmVsOiBnZXR0ZXh0KCdFbmFibGUgQWxsJyksCiAg ICAgICAgICAgaWNvbjogJ2ZhIGZhLWNoZWNrJywgZW5hYmxlIDogJ2NhbkNyZWF0ZV93aXRoX3Ry aWdnZXJfZW5hYmxlJywKICAgICAgICAgfSx7CiAgICAgICAgICAgbmFtZTogJ2Rpc2FibGVfYWxs X3RyaWdnZXJzJywgbm9kZTogJ3RhYmxlJywgbW9kdWxlOiB0aGlzLAogICAgICAgICAgIGFwcGxp ZXM6IFsnb2JqZWN0JywgJ2NvbnRleHQnXSwgY2FsbGJhY2s6ICdkaXNhYmxlX3RyaWdnZXJzX29u X3RhYmxlJywKLSAgICAgICAgICBjYXRlZ29yeTogJ1RyaWdnZXIocyknLCBwcmlvcml0eTogNCwg bGFiZWw6IGdldHRleHQoJ0Rpc2FibGUgQWxsJyksCisgICAgICAgICAgY2F0ZWdvcnk6IGdldHRl eHQoJ1RyaWdnZXIocyknKSwgcHJpb3JpdHk6IDQsIGxhYmVsOiBnZXR0ZXh0KCdEaXNhYmxlIEFs bCcpLAogICAgICAgICAgIGljb246ICdmYSBmYS10aW1lcycsIGVuYWJsZSA6ICdjYW5DcmVhdGVf d2l0aF90cmlnZ2VyX2Rpc2FibGUnLAogICAgICAgICB9LHsKICAgICAgICAgICBuYW1lOiAncmVz ZXRfdGFibGVfc3RhdHMnLCBub2RlOiAndGFibGUnLCBtb2R1bGU6IHRoaXMsCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvdmFy aWFibGUuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0 aWMvanMvdmFyaWFibGUuanMKaW5kZXggMzI5OTY3ZTA4Li45ODE1ODI5NDUgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3N0YXRpYy9qcy92YXJp YWJsZS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9z dGF0aWMvanMvdmFyaWFibGUuanMKQEAgLTMzOCw3ICszMzgsNyBAQCBmdW5jdGlvbihnZXR0ZXh0 LCBfLCAkLCBCYWNrYm9uZSwgQmFja2Zvcm0sIEJhY2tncmlkLCBBbGVydGlmeSwgcGdBZG1pbiwg cGdOb2RlKQogICAgICAgICAgICAgdGl0bGVUbXBsID0gXy50ZW1wbGF0ZShbCiAgICAgICAgICAg ICAgICc8ZGl2IGNsYXNzPVwnc3Vibm9kZS1oZWFkZXJcJz4nLAogICAgICAgICAgICAgICAnPHNw YW4gY2xhc3M9XCdjb250cm9sLWxhYmVsXCc+PCUtbGFiZWwlPjwvc3Bhbj4nLAotICAgICAgICAg ICAgICAnPGJ1dHRvbiBjbGFzcz1cJ2J0biBidG4tc20tc3EgYnRuLXNlY29uZGFyeSBhZGQgZmEg ZmEtcGx1c1wnIHRpdGxlPVwnJyArIF8oJ0FkZCBuZXcgcm93JykgKyAnXCcgPCU9Y2FuQWRkID8g XCdcJyA6IFwnZGlzYWJsZWQ9ImRpc2FibGVkIlwnJT4+PHNwYW4gY2xhc3M9InNyLW9ubHkiPkFk ZCBuZXcgcm93PC9zcGFuPjwvYnV0dG9uPicsCisgICAgICAgICAgICAgICc8YnV0dG9uIGNsYXNz PVwnYnRuIGJ0bi1zbS1zcSBidG4tc2Vjb25kYXJ5IGFkZCBmYSBmYS1wbHVzXCcgdGl0bGU9XCcn ICsgZ2V0dGV4dCgnQWRkIG5ldyByb3cnKSArICdcJyA8JT1jYW5BZGQgPyBcJ1wnIDogXCdkaXNh YmxlZD0iZGlzYWJsZWQiXCclPj48c3BhbiBjbGFzcz0ic3Itb25seSI+JyArIGdldHRleHQoJ0Fk ZCBuZXcgcm93JykgKyAnPC9zcGFuPjwvYnV0dG9uPicsCiAgICAgICAgICAgICAgICc8L2Rpdj4n XS5qb2luKCdcbicpKSwKICAgICAgICAgICAgICRncmlkQm9keSA9CiAgICAgICAgICAgICAkKCc8 ZGl2IGNsYXNzPVwncGdhZG1pbi1jb250cm9sLWdyb3VwIGJhY2tncmlkIGZvcm0tZ3JvdXAgY29s LTEyIG9iamVjdCBzdWJub2RlXCc+PC9kaXY+JykuYXBwZW5kKApkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvcGFz c3dvcmQuaHRtbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Rl bXBsYXRlcy9zZXJ2ZXJzL3Bhc3N3b3JkLmh0bWwKaW5kZXggYWZkZmJmZTk2Li45ZmMwYjM5NDUg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Rl bXBsYXRlcy9zZXJ2ZXJzL3Bhc3N3b3JkLmh0bWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvcGFzc3dvcmQuaHRtbApAQCAt MTUsNyArMTUsNyBAQAogICAgICAgICAgICAgICAgICAgICA8aW5wdXQgY2xhc3M9ImN1c3RvbS1j b250cm9sLWlucHV0IiBpZD0ic2F2ZV9wYXNzd29yZCIgbmFtZT0ic2F2ZV9wYXNzd29yZCIgdHlw ZT0iY2hlY2tib3giCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB7JSBpZiBub3QgY29uZmln LkFMTE9XX1NBVkVfUEFTU1dPUkQgICV9ZGlzYWJsZWR7JSBlbmRpZiAlfQogICAgICAgICAgICAg ICAgICAgICA+Ci0gICAgICAgICAgICAgICAgICAgIDxsYWJlbCBjbGFzcz0iY3VzdG9tLWNvbnRy b2wtbGFiZWwiIGZvcj0ic2F2ZV9wYXNzd29yZCI+U2F2ZSBQYXNzd29yZDwvbGFiZWw+CisgICAg ICAgICAgICAgICAgICAgIDxsYWJlbCBjbGFzcz0iY3VzdG9tLWNvbnRyb2wtbGFiZWwiIGZvcj0i c2F2ZV9wYXNzd29yZCI+e3sgXygnU2F2ZSBQYXNzd29yZCcpIH19PC9sYWJlbD4KICAgICAgICAg ICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICA8L2Rpdj4KZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRl cy9zZXJ2ZXJzL3R1bm5lbF9wYXNzd29yZC5odG1sIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvdHVubmVsX3Bhc3N3b3JkLmh0bWwK aW5kZXggNWFlN2QyZmRlLi44NzI0YzgwMzUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRlcy9zZXJ2ZXJzL3R1bm5lbF9wYXNzd29y ZC5odG1sCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Rl bXBsYXRlcy9zZXJ2ZXJzL3R1bm5lbF9wYXNzd29yZC5odG1sCkBAIC0zNSw3ICszNSw3IEBACiAg ICAgICAgICAgICAgICAgICAgIDxpbnB1dCBjbGFzcz0iY3VzdG9tLWNvbnRyb2wtaW5wdXQiIGlk PSJzYXZlX3Bhc3N3b3JkIiBuYW1lPSJzYXZlX3Bhc3N3b3JkIiB0eXBlPSJjaGVja2JveCIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHslIGlmIG5vdCBjb25maWcuQUxMT1dfU0FWRV9QQVNT V09SRCAgJX1kaXNhYmxlZHslIGVuZGlmICV9CiAgICAgICAgICAgICAgICAgICAgID4KLSAgICAg ICAgICAgICAgICAgICAgPGxhYmVsIGNsYXNzPSJjdXN0b20tY29udHJvbC1sYWJlbCIgZm9yPSJz YXZlX3Bhc3N3b3JkIiBjbGFzcz0ibWwtMSI+U2F2ZSBQYXNzd29yZDwvbGFiZWw+CisgICAgICAg ICAgICAgICAgICAgIDxsYWJlbCBjbGFzcz0iY3VzdG9tLWNvbnRyb2wtbGFiZWwiIGZvcj0ic2F2 ZV9wYXNzd29yZCIgY2xhc3M9Im1sLTEiPnt7IF8oJ1NhdmUgUGFzc3dvcmQnKSB9fTwvbGFiZWw+ CiAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgPC9k aXY+CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9jb2xsZWN0aW9u LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvY29sbGVjdGlvbi5qcwppbmRleCBl MmU5YzQ2MmUuLjJlYzRmZTFiNSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0 aWMvanMvY29sbGVjdGlvbi5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9j b2xsZWN0aW9uLmpzCkBAIC0xODMsNyArMTgzLDcgQEAgZGVmaW5lKFsKICAgICAgICAgfQogICAg ICAgICAvLyBJbml0aWFsaXplIGEgbmV3IEdyaWQgaW5zdGFuY2UKICAgICAgICAgdGhhdC5ncmlk ID0gbmV3IEJhY2tncmlkLkdyaWQoewotICAgICAgICAgIGVtcHR5VGV4dDogJ05vIGRhdGEgZm91 bmQnLAorICAgICAgICAgIGVtcHR5VGV4dDogZ2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAg ICAgICAgIGNvbHVtbnM6IGdyaWRTY2hlbWEuY29sdW1ucywKICAgICAgICAgICBjb2xsZWN0aW9u OiB0aGF0LmNvbGxlY3Rpb24sCiAgICAgICAgICAgY2xhc3NOYW1lOiAnYmFja2dyaWQgdGFibGUg cHJlc2VudGF0aW9uIHRhYmxlLWJvcmRlcmVkIHRhYmxlLW5vb3V0ZXItYm9yZGVyIHRhYmxlLWhv dmVyJywKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCmluZGV4IDIyNGNhYTMzYi4u MDI5YTI5ODE3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2Rl LmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKQEAgLTIxNiw3 ICsyMTYsNyBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2RlJywgWwogICAgICAgICAgICAg Y2FsbGJhY2s6ICdzaG93X3NjcmlwdCcsCiAgICAgICAgICAgICBwcmlvcml0eTogNCwKICAgICAg ICAgICAgIGxhYmVsOiB0eXBlX2xhYmVsLAotICAgICAgICAgICAgY2F0ZWdvcnk6ICdTY3JpcHRz JywKKyAgICAgICAgICAgIGNhdGVnb3J5OiBnZXR0ZXh0KCdTY3JpcHRzJyksCiAgICAgICAgICAg ICBkYXRhOiB7CiAgICAgICAgICAgICAgICdzY3JpcHQnOiBzdHlwZSwKICAgICAgICAgICAgIH0s CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLnVpLmpzIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9kZS51aS5qcwppbmRleCA4Nzg0OTcxNjUu LmQ4MWQ4NTQ4YiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9k ZS51aS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLnVpLmpzCkBA IC0xMTMsNyArMTEzLDcgQEAgZGVmaW5lKFsKICAgICAgICAgdXJsX3dpdGhfaWQ6IGZhbHNlLAog ICAgICAgICBzZWxlY3QyOiB7CiAgICAgICAgICAgYWxsb3dDbGVhcjogdHJ1ZSwKLSAgICAgICAg ICBwbGFjZWhvbGRlcjogJ1NlbGVjdCBhbiBpdGVtLi4uJywKKyAgICAgICAgICBwbGFjZWhvbGRl cjogZ2V0dGV4dCgnU2VsZWN0IGFuIGl0ZW0uLi4nKSwKICAgICAgICAgICB3aWR0aDogJ3N0eWxl JywKICAgICAgICAgfSwKICAgICAgIH0pLApAQCAtMjU2LDcgKzI1Niw3IEBAIGRlZmluZShbCiAg ICAgICB9LAogICAgICAgc2VsZWN0MjogewogICAgICAgICBhbGxvd0NsZWFyOiB0cnVlLAotICAg ICAgICBwbGFjZWhvbGRlcjogJ1NlbGVjdCBhbiBpdGVtLi4uJywKKyAgICAgICAgcGxhY2Vob2xk ZXI6IGdldHRleHQoJ1NlbGVjdCBhbiBpdGVtLi4uJyksCiAgICAgICAgIHdpZHRoOiAnc3R5bGUn LAogICAgICAgICB0ZW1wbGF0ZVJlc3VsdDogZm9ybWF0Tm9kZSwKICAgICAgICAgdGVtcGxhdGVT ZWxlY3Rpb246IGZvcm1hdE5vZGUsCkBAIC0zNzUsNyArMzc1LDcgQEAgZGVmaW5lKFsKICAgICAg IHVybF93aXRoX2lkOiBmYWxzZSwKICAgICAgIHNlbGVjdDI6IHsKICAgICAgICAgYWxsb3dDbGVh cjogdHJ1ZSwKLSAgICAgICAgcGxhY2Vob2xkZXI6ICdTZWxlY3QgYW4gaXRlbS4uLicsCisgICAg ICAgIHBsYWNlaG9sZGVyOiBnZXR0ZXh0KCdTZWxlY3QgYW4gaXRlbS4uLicpLAogICAgICAgICB3 aWR0aDogJ3N0eWxlJywKICAgICAgIH0sCiAgICAgICBvcHQ6IHsKQEAgLTUxMCw3ICs1MTAsNyBA QCBkZWZpbmUoWwogICAgICAgICByZXR1cm4gcmVzOwogICAgICAgfSwKICAgICAgIHNlbGVjdDI6 IHsKLSAgICAgICAgcGxhY2Vob2xkZXI6ICdTZWxlY3QgYW4gaXRlbS4uLicsCisgICAgICAgIHBs YWNlaG9sZGVyOiBnZXR0ZXh0KCdTZWxlY3QgYW4gaXRlbS4uLicpLAogICAgICAgICB3aWR0aDog J3N0eWxlJywKICAgICAgICAgdGVtcGxhdGVSZXN1bHQ6IGZvcm1hdE5vZGUsCiAgICAgICAgIHRl bXBsYXRlU2VsZWN0aW9uOiBmb3JtYXROb2RlLApAQCAtNTU1LDcgKzU1NSw3IEBAIGRlZmluZShb CiAgICAgICAgIHJldHVybiByZXM7CiAgICAgICB9LAogICAgICAgc2VsZWN0MjogewotICAgICAg ICBwbGFjZWhvbGRlcjogJ1NlbGVjdCBhbiBpdGVtLi4uJywKKyAgICAgICAgcGxhY2Vob2xkZXI6 IGdldHRleHQoJ1NlbGVjdCBhbiBpdGVtLi4uJyksCiAgICAgICAgIHdpZHRoOiAnc3R5bGUnLAog ICAgICAgICB0ZW1wbGF0ZVJlc3VsdDogZm9ybWF0Tm9kZSwKICAgICAgICAgdGVtcGxhdGVTZWxl Y3Rpb246IGZvcm1hdE5vZGUsCkBAIC01NzAsNyArNTcwLDcgQEAgZGVmaW5lKFsKICAgICAgIHVy bF93aXRoX2lkOiBmYWxzZSwKICAgICAgIHNlbGVjdDI6IHsKICAgICAgICAgYWxsb3dDbGVhcjog dHJ1ZSwKLSAgICAgICAgcGxhY2Vob2xkZXI6ICdTZWxlY3QgYW4gaXRlbS4uLicsCisgICAgICAg IHBsYWNlaG9sZGVyOiBnZXR0ZXh0KCdTZWxlY3QgYW4gaXRlbS4uLicpLAogICAgICAgICB3aWR0 aDogJ3N0eWxlJywKICAgICAgICAgbXVsdGlwbGU6IHRydWUsCiAgICAgICB9LApkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9tYXN0ZXJfcGFzc3dvcmQu aHRtbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jyb3dzZXIvbWFzdGVyX3Bhc3N3 b3JkLmh0bWwKaW5kZXggZTFiOTViMWUyLi43NjNhOWJjYjEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jyb3dzZXIvbWFzdGVyX3Bhc3N3b3JkLmh0bWwKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9tYXN0ZXJfcGFzc3dvcmQuaHRt bApAQCAtMiw3ICsyLDcgQEAKICAgICA8ZGl2PgogICAgICAgICA8ZGl2PjxiPnt7IGNvbnRlbnRf dGV4dHxzYWZlIH19PC9iPjwvZGl2PgogICAgICAgICA8ZGl2IGNsYXNzPSJpbnB1dC1ncm91cCBy b3cgcHktMiI+Ci0gICAgICAgICAgICA8bGFiZWwgZm9yPSJwYXNzd29yZCIgY2xhc3M9ImNvbC1z bS0yIGNvbC1mb3JtLWxhYmVsIj5QYXNzd29yZDwvbGFiZWw+CisgICAgICAgICAgICA8bGFiZWwg Zm9yPSJwYXNzd29yZCIgY2xhc3M9ImNvbC1zbS0yIGNvbC1mb3JtLWxhYmVsIj57eyBfKCdQYXNz d29yZCcpIH19PC9sYWJlbD4KICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImNvbC1zbS0xMCI+CiAg ICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJwYXNzd29yZCIgY2xhc3M9ImZvcm0tY29udHJvbCIg aWQ9InBhc3N3b3JkIiBuYW1lPSJwYXNzd29yZCI+CiAgICAgICAgICAgICA8L2Rpdj4KZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpzIGIvd2Vi L3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9kYXNoYm9hcmQuanMKaW5kZXggNjFlNzFmMDc2 Li42ZmM4MjU0NmMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMv ZGFzaGJvYXJkLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJv YXJkLmpzCkBAIC02NzMsNyArNjczLDcgQEAgZGVmaW5lKCdwZ2FkbWluLmRhc2hib2FyZCcsIFsK IAogICAgICAgLy8gU2V0IHVwIHRoZSBncmlkCiAgICAgICB2YXIgZ3JpZCA9IG5ldyBCYWNrZ3Jp ZC5HcmlkKHsKLSAgICAgICAgZW1wdHlUZXh0OiAnTm8gZGF0YSBmb3VuZCcsCisgICAgICAgIGVt cHR5VGV4dDogZ2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAgICAgICBjb2x1bW5zOiBjb2x1 bW5zLAogICAgICAgICBjb2xsZWN0aW9uOiBkYXRhLAogICAgICAgICBjbGFzc05hbWU6ICdiYWNr Z3JpZCBwcmVzZW50YXRpb24gdGFibGUgdGFibGUtYm9yZGVyZWQgdGFibGUtbm9vdXRlci1ib3Jk ZXIgdGFibGUtaG92ZXInLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3RlbXBs YXRlcy9kYXNoYm9hcmQvc2VydmVyX2Rhc2hib2FyZC5odG1sIGIvd2ViL3BnYWRtaW4vZGFzaGJv YXJkL3RlbXBsYXRlcy9kYXNoYm9hcmQvc2VydmVyX2Rhc2hib2FyZC5odG1sCmluZGV4IDQzN2Iw MWVhMC4uMmNjZWI0ZDg2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxh dGVzL2Rhc2hib2FyZC9zZXJ2ZXJfZGFzaGJvYXJkLmh0bWwKKysrIGIvd2ViL3BnYWRtaW4vZGFz aGJvYXJkL3RlbXBsYXRlcy9kYXNoYm9hcmQvc2VydmVyX2Rhc2hib2FyZC5odG1sCkBAIC04Nyw3 ICs4Nyw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iaW5wdXQt Z3JvdXAtcHJlcGVuZCI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNs YXNzPSJpbnB1dC1ncm91cC10ZXh0IGZhIGZhLXNlYXJjaCIgaWQ9ImxhYmVsU2VhcmNoIj48L3Nw YW4+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGlucHV0IHR5cGU9InNlYXJjaCIgY2xhc3M9ImZvcm0tY29udHJvbCIgaWQ9 InR4dEdyaWRTZWFyY2giIHBsYWNlaG9sZGVyPSJTZWFyY2giIGFyaWEtbGFiZWw9IlNlYXJjaCIg YXJpYS1kZXNjcmliZWRieT0ibGFiZWxTZWFyY2giPgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxpbnB1dCB0eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlk U2VhcmNoIiBwbGFjZWhvbGRlcj0ie3sgXygnU2VhcmNoJykgfX0iIGFyaWEtbGFiZWw9IlNlYXJj aCIgYXJpYS1kZXNjcmliZWRieT0ibGFiZWxTZWFyY2giPgogICAgICAgICAgICAgICAgICAgICAg ICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgICAgICAgICA8YnV0dG9uIGlkPSJidG5fcmVmcmVz aCIgdHlwZT0iYnV0dG9uIiBjbGFzcz0iYnRuIGJ0bi1zZWNvbmRhcnkgYnRuLW5hdnRhYi1pbmxp bmUiIHRpdGxlPSJ7eyBfKCdSZWZyZXNoJykgfX0iIGFyaWEtbGFiZWw9Int7IF8oJ1JlZnJlc2gn KSB9fSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLXJl ZnJlc2giIGFyaWEtaGlkZGVuPSJ0cnVlIj48L3NwYW4+CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9taXNjL2JncHJvY2Vzcy9zdGF0aWMvanMvYmdwcm9jZXNzLmpzIGIvd2ViL3BnYWRtaW4vbWlz Yy9iZ3Byb2Nlc3Mvc3RhdGljL2pzL2JncHJvY2Vzcy5qcwppbmRleCBlNjM0NjZhMGUuLmY4MGE0 MjU5OSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3Mvc3RhdGljL2pzL2Jn cHJvY2Vzcy5qcworKysgYi93ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9zdGF0aWMvanMvYmdw cm9jZXNzLmpzCkBAIC0zMTEsOCArMzExLDggQEAgZGVmaW5lKCdtaXNjLmJncHJvY2VzcycsIFsK ICAgICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0i cGctYmctZXRpbWUgbXktYXV0byBtci0yIj48L2Rpdj4KICAgICAgICAgICAgICAgICAgIDxkaXYg Y2xhc3M9Im1sLWF1dG8iPgotICAgICAgICAgICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJidG4g YnRuLXNlY29uZGFyeSBwZy1iZy1tb3JlLWRldGFpbHMiPjxzcGFuIGNsYXNzPSJmYSBmYS1pbmZv LWNpcmNsZSIgcm9sZT0iaW1nIj48L3NwYW4+Jm5ic3A7JHtnZXR0ZXh0KCdNb3JlIGRldGFpbHMu Li4nKX08L2J1dHRvbj4KLSAgICAgICAgICAgICAgICAgICAgPGJ1dHRvbiBjbGFzcz0iYnRuIGJ0 bi1kYW5nZXIgYmctcHJvY2Vzcy1zdG9wIj48c3BhbiBjbGFzcz0iZmEgZmEtdGltZXMtY2lyY2xl IiByb2xlPSJpbWciPjwvc3Bhbj4mbmJzcDske2dldHRleHQoJ1N0b3AgUHJvY2VzcycpfTwvYnV0 dG9uPgorICAgICAgICAgICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJidG4gYnRuLXNlY29uZGFy eSBwZy1iZy1tb3JlLWRldGFpbHMiPjxzcGFuIGNsYXNzPSJmYSBmYS1pbmZvLWNpcmNsZSIgcm9s ZT0iaW1nIj48L3NwYW4+Jm5ic3A7YCArIGdldHRleHQoJ01vcmUgZGV0YWlscy4uLicpICsgYDwv YnV0dG9uPgorICAgICAgICAgICAgICAgICAgICA8YnV0dG9uIGNsYXNzPSJidG4gYnRuLWRhbmdl ciBiZy1wcm9jZXNzLXN0b3AiPjxzcGFuIGNsYXNzPSJmYSBmYS10aW1lcy1jaXJjbGUiIHJvbGU9 ImltZyI+PC9zcGFuPiZuYnNwO2AgKyBnZXR0ZXh0KCdTdG9wIFByb2Nlc3MnKSArIGA8L2J1dHRv bj4KICAgICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgICAgIDwvZGl2PgogICAg ICAgICAgICAgICAgIDxkaXYgY2xhc3M9InBnLWJnLXN0YXR1cyBweS0xIj4KQEAgLTM5Myw3ICsz OTMsNyBAQCBkZWZpbmUoJ21pc2MuYmdwcm9jZXNzJywgWwogICAgICAgICAgIGlzX25ldyA9IHRy dWU7CiAgICAgICAgICAgcGFuZWwgPSB0aGlzLnBhbmVsID0KICAgICAgICAgICAgIHBnQnJvd3Nl ci5CYWNrZ3JvdW5kUHJvY2Vzc09ic29ydmVyLmNyZWF0ZV9wYW5lbCgpOwotICAgICAgICAgIHBh bmVsLnRpdGxlKCdQcm9jZXNzIFdhdGNoZXIgLSAnICsgc2VsZi50eXBlX2Rlc2MpOworICAgICAg ICAgIHBhbmVsLnRpdGxlKGdldHRleHQoJ1Byb2Nlc3MgV2F0Y2hlciAtICVzJywgc2VsZi50eXBl X2Rlc2MpKTsKICAgICAgICAgICBwYW5lbC5mb2N1cygpOwogICAgICAgICB9CiAKQEAgLTQxOSw3 ICs0MTksNyBAQCBkZWZpbmUoJ21pc2MuYmdwcm9jZXNzJywgWwogICAgICAgICAgIHNldFRpbWVv dXQoZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICBzZWxmLmxvZ3NbMF0uc2Nyb2xsVG9wID0gc2Vs Zi5sb2dzWzBdLnNjcm9sbEhlaWdodDsKICAgICAgICAgICB9KTsKLSAgICAgICAgICBzZWxmLmxv Z3NfbG9hZGluZyA9ICQoYDxsaSBjbGFzcz0icGctYmctcmVzLW91dCBsb2FkaW5nLWxvZ3MiPiR7 Z2V0dGV4dCgnTG9hZGluZyBwcm9jZXNzIGxvZ3MuLi4nKX08L2xpPmApOworICAgICAgICAgIHNl bGYubG9nc19sb2FkaW5nID0gJCgnPGxpIGNsYXNzPSJwZy1iZy1yZXMtb3V0IGxvYWRpbmctbG9n cyI+JyArIGdldHRleHQoJ0xvYWRpbmcgcHJvY2VzcyBsb2dzLi4uJykgKyAnPC9saT4nKTsKICAg ICAgICAgICBzZWxmLmxvZ3MuYXBwZW5kKHNlbGYubG9nc19sb2FkaW5nKTsKICAgICAgICAgICAv LyBzZXQgYmdwcm9jZXNzIGRldGFpbGVkIGRlc2NyaXB0aW9uCiAgICAgICAgICAgJGhlYWRlci5m aW5kKCcuYmctZGV0YWlsZWQtZGVzYycpLmh0bWwoc2VsZi5kZXRhaWxlZF9kZXNjKTsKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZGVwZW5kZW5jaWVzL3N0YXRpYy9qcy9kZXBlbmRlbmNp ZXMuanMgYi93ZWIvcGdhZG1pbi9taXNjL2RlcGVuZGVuY2llcy9zdGF0aWMvanMvZGVwZW5kZW5j aWVzLmpzCmluZGV4IGY1OWMyYzU2NS4uYmFiMjYwMTlmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9taXNjL2RlcGVuZGVuY2llcy9zdGF0aWMvanMvZGVwZW5kZW5jaWVzLmpzCisrKyBiL3dlYi9w Z2FkbWluL21pc2MvZGVwZW5kZW5jaWVzL3N0YXRpYy9qcy9kZXBlbmRlbmNpZXMuanMKQEAgLTc1 LDcgKzc1LDcgQEAgZGVmaW5lKCdtaXNjLmRlcGVuZGVuY2llcycsIFsKICAgICAgIHZhciAkY29u dGFpbmVyID0gdGhpcy5kZXBlbmRlbmNpZXNQYW5lbC5sYXlvdXQoKS5zY2VuZSgpLmZpbmQoJy5w Zy1wYW5lbC1jb250ZW50JyksCiAgICAgICAgICRncmlkQ29udGFpbmVyID0gJGNvbnRhaW5lci5m aW5kKCcucGctcGFuZWwtZGVwZW5kZW5jaWVzLWNvbnRhaW5lcicpLAogICAgICAgICBncmlkID0g bmV3IEJhY2tncmlkLkdyaWQoewotICAgICAgICAgIGVtcHR5VGV4dDogJ05vIGRhdGEgZm91bmQn LAorICAgICAgICAgIGVtcHR5VGV4dDogZ2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAgICAg ICAgIGNvbHVtbnM6IFt7CiAgICAgICAgICAgICBuYW1lOiAndHlwZScsCiAgICAgICAgICAgICBs YWJlbDogZ2V0dGV4dCgnVHlwZScpLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vbWlzYy9kZXBl bmRlbnRzL3N0YXRpYy9qcy9kZXBlbmRlbnRzLmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9kZXBlbmRl bnRzL3N0YXRpYy9qcy9kZXBlbmRlbnRzLmpzCmluZGV4IDM1NzE5ODA4NC4uNWY2MDA3ZjFkIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2RlcGVuZGVudHMvc3RhdGljL2pzL2RlcGVuZGVu dHMuanMKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9kZXBlbmRlbnRzL3N0YXRpYy9qcy9kZXBlbmRl bnRzLmpzCkBAIC03Niw3ICs3Niw3IEBAIGRlZmluZSgnbWlzYy5kZXBlbmRlbnRzJywgWwogICAg ICAgdmFyICRjb250YWluZXIgPSB0aGlzLmRlcGVuZGVudHNQYW5lbC5sYXlvdXQoKS5zY2VuZSgp LmZpbmQoJy5wZy1wYW5lbC1jb250ZW50JyksCiAgICAgICAgICRncmlkQ29udGFpbmVyID0gJGNv bnRhaW5lci5maW5kKCcucGctcGFuZWwtZGVwZW5kZW50cy1jb250YWluZXInKSwKICAgICAgICAg Z3JpZCA9IG5ldyBCYWNrZ3JpZC5HcmlkKHsKLSAgICAgICAgICBlbXB0eVRleHQ6ICdObyBkYXRh IGZvdW5kJywKKyAgICAgICAgICBlbXB0eVRleHQ6IGdldHRleHQoJ05vIGRhdGEgZm91bmQnKSwK ICAgICAgICAgICBjb2x1bW5zOiBbewogICAgICAgICAgICAgbmFtZTogJ3R5cGUnLAogICAgICAg ICAgICAgbGFiZWw6IGdldHRleHQoJ1R5cGUnKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21p c2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9m aWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMKaW5kZXggMmNjMWFiYTg3Li4wNDA2MGI3 N2QgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy91 dGlsaXR5LmpzCisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy91 dGlsaXR5LmpzCkBAIC0xMjU4LDEyICsxMjU4LDEyIEBAIGRlZmluZShbCiAgICAgICAgICAgfQog CiAgICAgICAgICAgc2VsZWN0X2JveCA9IGA8ZGl2IGNsYXNzPSdjaGFuZ2VfZmlsZV90eXBlcyBk LWZsZXggYWxpZ24taXRlbXMtY2VudGVyIHAtMSc+Ci0gICAgICAgICAgPGRpdj4KLSAgICAgICAg ICAgICR7Z2V0dGV4dCgnU2hvdyBoaWRkZW4gZmlsZXMgYW5kIGZvbGRlcnMnKX0/Ci0gICAgICAg ICAgICA8aW5wdXQgdHlwZT0nY2hlY2tib3gnIGlkPSdzaG93X2hpZGRlbicgb25jbGljaz0ncGdB ZG1pbi5GaWxlVXRpbHMuaGFuZGxlQ2xpY2sodGhpcyknIHRhYmluZGV4PScwJz4KKyAgICAgICAg ICA8ZGl2PmAgKworICAgICAgICAgICAgZ2V0dGV4dCgnU2hvdyBoaWRkZW4gZmlsZXMgYW5kIGZv bGRlcnM/JykgKworICAgICAgICAgICAgYDxpbnB1dCB0eXBlPSdjaGVja2JveCcgaWQ9J3Nob3df aGlkZGVuJyBvbmNsaWNrPSdwZ0FkbWluLkZpbGVVdGlscy5oYW5kbGVDbGljayh0aGlzKScgdGFi aW5kZXg9JzAnPgogICAgICAgICAgIDwvZGl2PgogICAgICAgICAgIDxkaXYgY2xhc3M9Im1sLWF1 dG8iPgotICAgICAgICAgICAgPGxhYmVsIGNsYXNzPSJteS1hdXRvIj4ke2dldHRleHQoJ0Zvcm1h dCcpfTwvbGFiZWw+CisgICAgICAgICAgICA8bGFiZWwgY2xhc3M9Im15LWF1dG8iPmAgKyBnZXR0 ZXh0KCdGb3JtYXQnKSArIGA8L2xhYmVsPgogICAgICAgICAgICAgPHNlbGVjdCBuYW1lPSd0eXBl JyB0YWJpbmRleD0nMCc+JHtmaWxlRm9ybWF0c308L3NlbGVjdD4KICAgICAgICAgICA8ZGl2PmA7 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGlzdGljcy9zdGF0 aWMvanMvc3RhdGlzdGljcy5qcyBiL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGlzdGljcy9zdGF0aWMv anMvc3RhdGlzdGljcy5qcwppbmRleCA2NTdkNDc0NjMuLmViY2U3OTI2NSAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vbWlzYy9zdGF0aXN0aWNzL3N0YXRpYy9qcy9zdGF0aXN0aWNzLmpzCisrKyBi L3dlYi9wZ2FkbWluL21pc2Mvc3RhdGlzdGljcy9zdGF0aWMvanMvc3RhdGlzdGljcy5qcwpAQCAt MjgyLDcgKzI4Miw3IEBAIGRlZmluZSgnbWlzYy5zdGF0aXN0aWNzJywgWwogICAgICAgICAgICAg ICAgICAgfQogCiAgICAgICAgICAgICAgICAgICBzZWxmLmdyaWQgPSBuZXcgQmFja2dyaWQuR3Jp ZCh7Ci0gICAgICAgICAgICAgICAgICAgIGVtcHR5VGV4dDogJ05vIGRhdGEgZm91bmQnLAorICAg ICAgICAgICAgICAgICAgICBlbXB0eVRleHQ6IGdldHRleHQoJ05vIGRhdGEgZm91bmQnKSwKICAg ICAgICAgICAgICAgICAgICAgY29sdW1uczogc2VsZi5jb2x1bW5zLAogICAgICAgICAgICAgICAg ICAgICBjb2xsZWN0aW9uOiBzZWxmLmNvbGxlY3Rpb24sCiAgICAgICAgICAgICAgICAgICAgIGNs YXNzTmFtZTogR1JJRF9DTEFTU0VTLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pz L2JhY2tmb3JtLnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdh ZG1pbi5qcwppbmRleCBhNDRkMWE4M2EuLmE1N2Y3MGViYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKQEAgLTYwOSwxMSArNjA5LDExIEBAIGRlZmluZShbCiAK ICAgICAgIGlmKHRoaXMuJGVsLmZpbmQoJy50b2dnbGUuYnRuJykuaGFzQ2xhc3MoJ29mZicpKSB7 CiAgICAgICAgIHRoaXMuJGVsLmZpbmQoJy5zci12YWx1ZScpLnRleHQoYAotICAgICAgICAgICR7 bGFiZWx9LCAke29mZlRleHR9LCAke2dldHRleHQoJ1RvZ2dsZSBidXR0b24nKX0KKyAgICAgICAg ICAke2xhYmVsfSwgJHtvZmZUZXh0fSwgYCArIGdldHRleHQoJ1RvZ2dsZSBidXR0b24nKSArIGAK ICAgICAgICAgYCk7CiAgICAgICB9IGVsc2UgewogICAgICAgICB0aGlzLiRlbC5maW5kKCcuc3It dmFsdWUnKS50ZXh0KGAKLSAgICAgICAgICAke2xhYmVsfSwgJHtvblRleHR9LCAke2dldHRleHQo J1RvZ2dsZSBidXR0b24nKX0KKyAgICAgICAgICAke2xhYmVsfSwgJHtvblRleHR9LCBgICsgZ2V0 dGV4dCgnVG9nZ2xlIGJ1dHRvbicpICsgYAogICAgICAgICBgKTsKICAgICAgIH0KICAgICB9LApA QCAtMTI5NSw3ICsxMjk1LDcgQEAgZGVmaW5lKFsKICAgICAgICAgZ3JpZEhlYWRlciA9IF8udGVt cGxhdGUoWwogICAgICAgICAgICc8ZGl2IGNsYXNzPSJzdWJub2RlLWhlYWRlciI+JywKICAgICAg ICAgICAnICA8c3BhbiAgY2xhc3M9ImNvbnRyb2wtbGFiZWwgcGctZWwtc20tMTAiIGlkPSI8JT1j SWQlPiI+PCUtbGFiZWwlPjwvc3Bhbj4nLAotICAgICAgICAgICcgIDxidXR0b24gYXJpYS1sYWJl bD0iJyArIF8oJ0FkZCBuZXcgcm93JykgKyAnIiBjbGFzcz0iYnRuIGJ0bi1zbS1zcSBidG4tc2Vj b25kYXJ5IGFkZCBmYSBmYS1wbHVzIiA8JT1jYW5BZGQgPyAiIiA6ICJkaXNhYmxlZD1cJ2Rpc2Fi bGVkXCciJT4gdGl0bGU9IicgKyBfKCdBZGQgbmV3IHJvdycpICsgJyI+PCUtYWRkX2xhYmVsJT48 L2J1dHRvbj4nLAorICAgICAgICAgICcgIDxidXR0b24gYXJpYS1sYWJlbD0iJyArIGdldHRleHQo J0FkZCBuZXcgcm93JykgKyAnIiBjbGFzcz0iYnRuIGJ0bi1zbS1zcSBidG4tc2Vjb25kYXJ5IGFk ZCBmYSBmYS1wbHVzIiA8JT1jYW5BZGQgPyAiIiA6ICJkaXNhYmxlZD1cJ2Rpc2FibGVkXCciJT4g dGl0bGU9IicgKyBnZXR0ZXh0KCdBZGQgbmV3IHJvdycpICsgJyI+PCUtYWRkX2xhYmVsJT48L2J1 dHRvbj4nLAogICAgICAgICAgICc8L2Rpdj4nLAogICAgICAgICBdLmpvaW4oJ1xuJykpLAogICAg ICAgICBncmlkQm9keSA9ICQoJzxkaXYgY2xhc3M9InBnYWRtaW4tY29udHJvbC1ncm91cCBiYWNr Z3JpZCBmb3JtLWdyb3VwIHBnLWVsLTEyIG9iamVjdCBzdWJub2RlICI+PC9kaXY+JykuYXBwZW5k KApAQCAtMTU4Miw3ICsxNTgyLDcgQEAgZGVmaW5lKFsKICAgICAgIHZhciBzZWxmID0gdGhpcywK ICAgICAgICAgZ3JpZEhlYWRlciA9IFsnPGRpdiBjbGFzcz1cJ3N1Ym5vZGUtaGVhZGVyXCc+JywK ICAgICAgICAgICAnICA8c3BhbiBjbGFzcz1cJ2NvbnRyb2wtbGFiZWwgcGctZWwtc20tMTBcJz4n ICsgZGF0YS5sYWJlbCArICc8L3NwYW4+JywKLSAgICAgICAgICAnICA8YnV0dG9uIGFyaWEtbGFi ZWw9IicgKyBfKCdBZGQnKSArICciIGNsYXNzPVwnYnRuIGJ0bi1zbS1zcSBidG4tc2Vjb25kYXJ5 IGFkZCBmYSBmYS1wbHVzXCcgdGl0bGU9XCcnICsgXygnQWRkIG5ldyByb3cnKSArICdcJz48L2J1 dHRvbj4nLAorICAgICAgICAgICcgIDxidXR0b24gYXJpYS1sYWJlbD0iJyArIGdldHRleHQoJ0Fk ZCcpICsgJyIgY2xhc3M9XCdidG4gYnRuLXNtLXNxIGJ0bi1zZWNvbmRhcnkgYWRkIGZhIGZhLXBs dXNcJyB0aXRsZT1cJycgKyBnZXR0ZXh0KCdBZGQgbmV3IHJvdycpICsgJ1wnPjwvYnV0dG9uPics CiAgICAgICAgICAgJzwvZGl2PicsCiAgICAgICAgIF0uam9pbignXG4nKSwKICAgICAgICAgZ3Jp ZEJvZHkgPSAkKCc8ZGl2IGNsYXNzPVwncGdhZG1pbi1jb250cm9sLWdyb3VwIGJhY2tncmlkIGZv cm0tZ3JvdXAgcGctZWwtMTIgb2JqZWN0IHN1Ym5vZGVcJz48L2Rpdj4nKS5hcHBlbmQoZ3JpZEhl YWRlcik7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2dyaWQucGdhZG1p bi5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZ3JpZC5wZ2FkbWluLmpzCmluZGV4IGE2 NDg5N2IyMC4uMjMwZDdjZTU2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFj a2dyaWQucGdhZG1pbi5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2dyaWQucGdh ZG1pbi5qcwpAQCAtNDMyLDcgKzQzMiw3IEBAIGRlZmluZShbCiAKICAgICAgICAgaWYgKGVkaXRh YmxlKSB7CiAgICAgICAgICAgdGhpcy4kZWwuaHRtbCgKLSAgICAgICAgICAgICc8aSBjbGFzcz1c J2ZhIGZhLXBlbmNpbC1zcXVhcmUgc3Vibm9kZS1lZGl0LWluLXByb2Nlc3NcJyB0aXRsZT1cJycg KyBfKCdFZGl0IHJvdycpICsgICdcJyBhcmlhLWxhYmVsPVwnJyArIF8oJ0VkaXQgcm93JykgKyAg J1wnPjwvaT4nCisgICAgICAgICAgICAnPGkgY2xhc3M9XCdmYSBmYS1wZW5jaWwtc3F1YXJlIHN1 Ym5vZGUtZWRpdC1pbi1wcm9jZXNzXCcgdGl0bGU9XCcnICsgZ2V0dGV4dCgnRWRpdCByb3cnKSAr ICAnXCcgYXJpYS1sYWJlbD1cJycgKyBnZXR0ZXh0KCdFZGl0IHJvdycpICsgICdcJz48L2k+Jwog ICAgICAgICAgICk7CiAgICAgICAgICAgbGV0IGJvZHkgPSAkKHRoaXMuJGVsKS5wYXJlbnRzKClb MV0sCiAgICAgICAgICAgICBjb250YWluZXIgPSAkKGJvZHkpLmZpbmQoJy50YWItY29udGVudDpm aXJzdCA+IC50YWItcGFuZS5hY3RpdmU6Zmlyc3QnKTsKQEAgLTQ1MSw3ICs0NTEsNyBAQCBkZWZp bmUoWwogICAgIH0sCiAgICAgcmVuZGVyOiBmdW5jdGlvbigpIHsKICAgICAgIHRoaXMuJGVsLmVt cHR5KCk7Ci0gICAgICB0aGlzLiRlbC5odG1sKCc8aSBjbGFzcz1cJ2ZhIGZhLXBlbmNpbC1zcXVh cmUtb1wnIHRpdGxlPVwnJyArIF8oJ0VkaXQgcm93JykgKyAnXCcgYXJpYS1sYWJlbD1cJycgKyBf KCdFZGl0IHJvdycpICsgICdcJz48L2k+Jyk7CisgICAgICB0aGlzLiRlbC5odG1sKCc8aSBjbGFz cz1cJ2ZhIGZhLXBlbmNpbC1zcXVhcmUtb1wnIHRpdGxlPVwnJyArIGdldHRleHQoJ0VkaXQgcm93 JykgKyAnXCcgYXJpYS1sYWJlbD1cJycgKyBnZXR0ZXh0KCdFZGl0IHJvdycpICsgICdcJz48L2k+ Jyk7CiAgICAgICB0aGlzLmRlbGVnYXRlRXZlbnRzKCk7CiAgICAgICBpZiAodGhpcy5ncmFiRm9j dXMpCiAgICAgICAgIHRoaXMuJGVsLnRyaWdnZXIoJ2ZvY3VzJyk7CkBAIC01NTUsNyArNTU1LDcg QEAgZGVmaW5lKFsKICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgIHRoaXMuJGVsLmVtcHR5 KCk7CiAgICAgICAkKHRoaXMuJGVsKS5hdHRyKCd0YWJpbmRleCcsIDApOwotICAgICAgdGhpcy4k ZWwuaHRtbCgnPGkgYXJpYS1sYWJlbD0iJyArIF8oJ0RlbGV0ZSByb3cnKSArICciIGNsYXNzPVwn ZmEgZmEtdHJhc2hcJyB0aXRsZT1cJycgKyBfKCdEZWxldGUgcm93JykgKyAnXCc+PC9pPicpOwor ICAgICAgdGhpcy4kZWwuaHRtbCgnPGkgYXJpYS1sYWJlbD0iJyArIGdldHRleHQoJ0RlbGV0ZSBy b3cnKSArICciIGNsYXNzPVwnZmEgZmEtdHJhc2hcJyB0aXRsZT1cJycgKyBnZXR0ZXh0KCdEZWxl dGUgcm93JykgKyAnXCc+PC9pPicpOwogICAgICAgLy8gTGlzdGVuIGZvciBUYWIvU2hpZnQtVGFi IGtleQogICAgICAgdGhpcy4kZWwub24oJ2tleWRvd24nLCBmdW5jdGlvbihlKSB7CiAgICAgICAg IC8vIHdpdGgga2V5Ym9hcmQgbmF2aWdhdGlvbiBvbiBzcGFjZSBrZXksIG1hcmsgcm93IGZvciBk ZWxldGlvbgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2tleWJvYXJkX3Nob3J0 Y3V0cy5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9rZXlib2FyZF9zaG9ydGN1dHMuanMKaW5k ZXggNWJhOWIyNzFhLi5mYmEzYzlmYjggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9q cy9rZXlib2FyZF9zaG9ydGN1dHMuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2tleWJv YXJkX3Nob3J0Y3V0cy5qcwpAQCAtODcsNyArODcsNyBAQCBmdW5jdGlvbiBzaG9ydGN1dF90aXRs ZSh0aXRsZSwgc2hvcnRjdXQpIHsKICAqIHNob3J0Y3V0IG9iamVjdCBpcyBicm93c2VyLmdldF9w cmVmZXJlbmNlKCkudmFsdWUKICAqLwogZnVuY3Rpb24gc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxl KHRpdGxlLCBzaG9ydGN1dCkgewotICByZXR1cm4gYCR7dGl0bGV9ICgke2dldHRleHQoJ2FjY2Vz c2tleScpfSArICR7c2hvcnRjdXRfa2V5KHNob3J0Y3V0KX0pYDsKKyAgcmV0dXJuIGAke3RpdGxl fSAoYCArIGdldHRleHQoJ2FjY2Vzc2tleScpICsgYCArICR7c2hvcnRjdXRfa2V5KHNob3J0Y3V0 KX0pYDsKIH0KIAogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y L2NhbGN1bGF0ZV9xdWVyeV9ydW5fdGltZS5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxl ZGl0b3IvY2FsY3VsYXRlX3F1ZXJ5X3J1bl90aW1lLmpzCmluZGV4IGY2NjYyOWU1NS4uNWM3NDc0 MzM5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2NhbGN1bGF0 ZV9xdWVyeV9ydW5fdGltZS5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y L2NhbGN1bGF0ZV9xdWVyeV9ydW5fdGltZS5qcwpAQCAtOCw2ICs4LDcgQEAKIC8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAKIGlt cG9ydCBtb21lbnQgZnJvbSAnbW9tZW50JzsKK2ltcG9ydCBnZXR0ZXh0IGZyb20gJ3NvdXJjZXMv Z2V0dGV4dCc7CiAKIGV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVRdWVyeVJ1blRpbWUoc3RhcnRU aW1lLCBlbmRUaW1lKSB7CiAgIGxldCB0b3RhbF9tcyA9IG1vbWVudChlbmRUaW1lKS5kaWZmKHN0 YXJ0VGltZSk7CkBAIC0yNiw5ICsyNyw5IEBAIGV4cG9ydCBmdW5jdGlvbiBjYWxjdWxhdGVRdWVy eVJ1blRpbWUoc3RhcnRUaW1lLCBlbmRUaW1lKSB7CiAgIGhycyA9IHBhcnNlSW50KG1pbnMvNjAp OwogICBtaW5zID0gbWlucyU2MDsKIAotICByZXN1bHQgPSAoaHJzPjAgPyBocnMgKyAnIGhyICc6 ICcnKQotICAgICAgICAgICsgKG1pbnM+MCA/IG1pbnMgKyAnIG1pbiAnOiAnJykKLSAgICAgICAg ICArIChocnM8PTAgJiYgc2Vjcz4wID8gc2VjcyArICcgc2VjcyAnOiAnJykKLSAgICAgICAgICAr IChocnM8PTAgJiYgbWluczw9MCA/IHRvdGFsX21zICsgJyBtc2VjICc6JycpOworICByZXN1bHQg PSAoaHJzPjAgPyBocnMgKyAnICcgKyBnZXR0ZXh0KCdocicpICsgJyAnOiAnJykKKyAgICAgICAg ICArIChtaW5zPjAgPyBtaW5zICsgJyAnICsgZ2V0dGV4dCgnbWluJykgKyAnICc6ICcnKQorICAg ICAgICAgICsgKGhyczw9MCAmJiBzZWNzPjAgPyBzZWNzICsgJyAnICsgZ2V0dGV4dCgnc2Vjcycp ICsgJyAnOiAnJykKKyAgICAgICAgICArIChocnM8PTAgJiYgbWluczw9MCA/IHRvdGFsX21zICsg JyAnICsgZ2V0dGV4dCgnbXNlYycpICsgJyAnOicnKTsKICAgcmV0dXJuIHJlc3VsdC50cmltKCk7 CiB9CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2ZpbHRlcl9k aWFsb2cuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2ZpbHRlcl9kaWFsb2cu anMKaW5kZXggYTA2MGNlNDg3Li4wY2ExZmVkNjYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0 YXRpYy9qcy9zcWxlZGl0b3IvZmlsdGVyX2RpYWxvZy5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvc3FsZWRpdG9yL2ZpbHRlcl9kaWFsb2cuanMKQEAgLTEzOSw3ICsxMzksNyBAQCBsZXQg RmlsdGVyRGlhbG9nID0gewogICAgICAgICAgICAgICAgIGA8ZGl2IGlkPSJzaG93X2ZpbHRlcl9w cm9ncmVzcyIgY2xhc3M9InBnLXNwLWNvbnRhaW5lciBzcWwtZWRpdG9yLWJ1c3ktZmV0Y2hpbmcg ZC1ub25lIj4KICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InBnLXNwLWNvbnRlbnQiPgog ICAgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9InJvdyI+PGRpdiBjbGFzcz0iY29sLTEy IHBnLXNwLWljb24gc3FsLWVkaXRvci1idXN5LWljb24iPjwvZGl2PjwvZGl2PgotICAgICAgICAg ICAgICAgICAgICAgIDxkaXYgY2xhc3M9InJvdyI+PGRpdiBjbGFzcz0iY29sLTEyIHBnLXNwLXRl eHQgc3FsLWVkaXRvci1idXN5LXRleHQiPiR7Z2V0dGV4dCgnTG9hZGluZyBkYXRhLi4uJyl9PC9k aXY+PC9kaXY+CisgICAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0icm93Ij48ZGl2IGNs YXNzPSJjb2wtMTIgcGctc3AtdGV4dCBzcWwtZWRpdG9yLWJ1c3ktdGV4dCI+YCArIGdldHRleHQo J0xvYWRpbmcgZGF0YS4uLicpICsgYDwvZGl2PjwvZGl2PgogICAgICAgICAgICAgICAgICAgPC9k aXY+CiAgICAgICAgICAgICAgIDwvZGl2PmAKICAgICAgICAgICAgICAgKS5hcHBlbmRUbygkY29u dGFpbmVyKTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvaGlz dG9yeS9xdWVyeV9oaXN0b3J5LmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9o aXN0b3J5L3F1ZXJ5X2hpc3RvcnkuanMKaW5kZXggMmU0MjI4MDU4Li5jMTcxZjdmYmUgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0 b3J5LmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVy eV9oaXN0b3J5LmpzCkBAIC01OSw5ICs1OSw5IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIFF1ZXJ5 SGlzdG9yeSB7CiAgICAgICB0aGlzLnBhcmVudE5vZGUuZW1wdHkoKQogICAgICAgICAucmVtb3Zl Q2xhc3MoJ2QtZmxleCcpCiAgICAgICAgIC5hcHBlbmQoCi0gICAgICAgICAgYDxkaXYgcm9sZT0i c3RhdHVzIiBjbGFzcz0ncGctcGFuZWwtbWVzc2FnZSc+JHtnZXR0ZXh0KAotICAgICAgICAgICAg J05vIGhpc3RvcnkgZm91bmQnCi0gICAgICAgICAgKX08L2Rpdj5gCisgICAgICAgICAgJzxkaXYg cm9sZT0ic3RhdHVzIiBjbGFzcz0icGctcGFuZWwtbWVzc2FnZSI+JyArCisgICAgICAgICAgICBn ZXR0ZXh0KCdObyBoaXN0b3J5IGZvdW5kJykgKworICAgICAgICAgICc8L2Rpdj4nCiAgICAgICAg ICk7CiAgICAgfSBlbHNlIHsKICAgICAgIHRoaXMucGFyZW50Tm9kZS5lbXB0eSgpLmFkZENsYXNz KCdkLWZsZXgnKTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3Iv aGlzdG9yeS9xdWVyeV9oaXN0b3J5X2RldGFpbHMuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMv c3FsZWRpdG9yL2hpc3RvcnkvcXVlcnlfaGlzdG9yeV9kZXRhaWxzLmpzCmluZGV4IDYyNmU4OWI1 YS4uOGE4ODRkYTAwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y L2hpc3RvcnkvcXVlcnlfaGlzdG9yeV9kZXRhaWxzLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRp Yy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0b3J5X2RldGFpbHMuanMKQEAgLTg3LDEw ICs4NywxMCBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBRdWVyeUhpc3RvcnlEZXRhaWxzIHsKICAg dXBkYXRlQ29weUJ1dHRvbihjb3BpZWQpIHsKICAgICBpZiAoY29waWVkKSB7CiAgICAgICB0aGlz LiRjb3B5QnRuLmFkZENsYXNzKCd3YXMtY29waWVkJykucmVtb3ZlQ2xhc3MoJ2NvcHktYWxsJyk7 Ci0gICAgICB0aGlzLiRjb3B5QnRuLnRleHQoJ0NvcGllZCEnKTsKKyAgICAgIHRoaXMuJGNvcHlC dG4udGV4dChnZXR0ZXh0KCdDb3BpZWQhJykpOwogICAgIH0gZWxzZSB7CiAgICAgICB0aGlzLiRj b3B5QnRuLmFkZENsYXNzKCdjb3B5LWFsbCcpLnJlbW92ZUNsYXNzKCd3YXMtY29waWVkJyk7Ci0g ICAgICB0aGlzLiRjb3B5QnRuLnRleHQoJ0NvcHknKTsKKyAgICAgIHRoaXMuJGNvcHlCdG4udGV4 dChnZXR0ZXh0KCdDb3B5JykpOwogICAgIH0KICAgfQogCkBAIC0xMDYsMTQgKzEwNiwxNCBAQCBl eHBvcnQgZGVmYXVsdCBjbGFzcyBRdWVyeUhpc3RvcnlEZXRhaWxzIHsKICAgICB9OwogCiAgICAg dGhpcy4kbWV0YURhdGEuZW1wdHkoKS5hcHBlbmQoCi0gICAgICBgPGRpdiBjbGFzcz0nbWV0YWRh dGEnPgotICAgICAgICAgICAgICAgICR7aXRlbVRlbXBsYXRlKHRoaXMuZm9ybWF0RGF0ZSh0aGlz LmVudHJ5LnN0YXJ0X3RpbWUpLCAnRGF0ZScpfQotICAgICAgICAgICAgICAgICR7aXRlbVRlbXBs YXRlKAotICAgIHRoaXMuZW50cnkucm93X2FmZmVjdGVkLnRvTG9jYWxlU3RyaW5nKCksCi0gICAg J1Jvd3MgQWZmZWN0ZWQnCi0gICl9Ci0gICAgICAgICAgICAgICAgJHtpdGVtVGVtcGxhdGUodGhp cy5lbnRyeS50b3RhbF90aW1lLCAnRHVyYXRpb24nKX0KLSAgICAgICAgICAgIDwvZGl2PmAKKyAg ICAgICc8ZGl2IGNsYXNzPSJtZXRhZGF0YSI+JyArCisgICAgICBpdGVtVGVtcGxhdGUodGhpcy5m b3JtYXREYXRlKHRoaXMuZW50cnkuc3RhcnRfdGltZSksIGdldHRleHQoJ0RhdGUnKSkgKworICAg ICAgaXRlbVRlbXBsYXRlKAorICAgICAgICB0aGlzLmVudHJ5LnJvd19hZmZlY3RlZC50b0xvY2Fs ZVN0cmluZygpLAorICAgICAgICBnZXR0ZXh0KCdSb3dzIEFmZmVjdGVkJykKKyAgICAgICkgKwor ICAgICAgaXRlbVRlbXBsYXRlKHRoaXMuZW50cnkudG90YWxfdGltZSwgZ2V0dGV4dCgnRHVyYXRp b24nKSkgKworICAgICAgJzwvZGl2PicKICAgICApOwogICB9CiAKQEAgLTE3OSw3ICsxNzksNyBA QCBleHBvcnQgZGVmYXVsdCBjbGFzcyBRdWVyeUhpc3RvcnlEZXRhaWxzIHsKICAgICAgICAgICAg IDwvZGl2PgogICAgICAgICAgICAgPGRpdiBjbGFzcz0nbWVzc2FnZS1ibG9jayc+CiAgICAgICAg ICAgICAgIDxkaXYgY2xhc3M9J21lc3NhZ2UnPgotICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9 J21lc3NhZ2UtaGVhZGVyJz5NZXNzYWdlczwvZGl2PgorICAgICAgICAgICAgICAgIDxkaXYgY2xh c3M9J21lc3NhZ2UtaGVhZGVyJz5gICsgZ2V0dGV4dCgnTWVzc2FnZXMnKSArIGA8L2Rpdj4KICAg ICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSdjb250ZW50Jz48L2Rpdj4KICAgICAgICAgICAgICAg PC9kaXY+CiAgICAgICAgICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRp Yy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0b3J5X2VudHJpZXMuanMgYi93ZWIvcGdh ZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2hpc3RvcnkvcXVlcnlfaGlzdG9yeV9lbnRyaWVzLmpz CmluZGV4IGZjYzIwODEyZS4uOGU1OGRjNWFhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvc3FsZWRpdG9yL2hpc3RvcnkvcXVlcnlfaGlzdG9yeV9lbnRyaWVzLmpzCisrKyBiL3dl Yi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvaGlzdG9yeS9xdWVyeV9oaXN0b3J5X2VudHJp ZXMuanMKQEAgLTI1MiwxMSArMjUyLDExIEBAIGV4cG9ydCBjbGFzcyBRdWVyeUhpc3RvcnlFbnRy aWVzIHsKICAgICAgICAgPGRpdiBjbGFzcz0idG9nZ2xlLWFuZC1oaXN0b3J5LWNvbnRhaW5lciI+ CiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJxdWVyeS1oaXN0b3J5LXRvZ2dsZSI+CiAgICAgICAg ICAgICAgICAgPGxhYmVsIGNsYXNzPSJjb250cm9sLWxhYmVsIj4KLSAgICAgICAgICAgICAgICAg ICAgJHtnZXR0ZXh0KCdTaG93IHF1ZXJpZXMgZ2VuZXJhdGVkIGludGVybmFsbHkgYnkgcGdBZG1p bicpfT8KKyAgICAgICAgICAgICAgICAgICAgYCArIGdldHRleHQoJ1Nob3cgcXVlcmllcyBnZW5l cmF0ZWQgaW50ZXJuYWxseSBieSBwZ0FkbWluPycpICsgYAogICAgICAgICAgICAgICAgIDwvbGFi ZWw+CiAgICAgICAgICAgICAgICAgPGlucHV0IGlkPSJnZW5lcmF0ZWQtcXVlcmllcy10b2dnbGUi IHR5cGU9ImNoZWNrYm94IgogICAgICAgICAgICAgICAgICAgY2xhc3M9InBnYWRtaW4tY29udHJv bHMiIGRhdGEtc3R5bGU9InF1aWNrIgotICAgICAgICAgICAgICAgICAgZGF0YS1zaXplPSJtaW5p IiBkYXRhLW9uPSIke2dldHRleHQoJ1llcycpfSIgZGF0YS1vZmY9IiR7Z2V0dGV4dCgnTm8nKX0i CisgICAgICAgICAgICAgICAgICBkYXRhLXNpemU9Im1pbmkiIGRhdGEtb249ImAgKyBnZXR0ZXh0 KCdZZXMnKSArICciIGRhdGEtb2ZmPSInICsgZ2V0dGV4dCgnTm8nKSArIGAiCiAgICAgICAgICAg ICAgICAgICBkYXRhLW9uc3R5bGU9InN1Y2Nlc3MiIGRhdGEtb2Zmc3R5bGU9InRlcm5hcnkiIGNo ZWNrZWQ+CiAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgIDxkaXYgaWQ9J3F1ZXJ5X2xp c3QnIGNsYXNzPSdxdWVyeS1oaXN0b3J5JyB0YWJpbmRleD0nMCc+PC9kaXY+CmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfbm90aWZpY2F0aW9u cy5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvcXVlcnlfdG9vbF9ub3RpZmlj YXRpb25zLmpzCmluZGV4IGNjMDFhYTE3YS4uYWVjM2I2NjkwIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfbm90aWZpY2F0aW9ucy5qcworKysg Yi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfbm90aWZpY2F0aW9u cy5qcwpAQCAtOTcsNyArOTcsNyBAQCBsZXQgcXVlcnlUb29sTm90aWZpY2F0aW9ucyA9IHsKIAog ICAgIC8vIFNldCB1cCB0aGUgZ3JpZAogICAgIGxldCBub3RpZmljYXRpb25zX2dyaWQgPSBuZXcg QmFja2dyaWQuR3JpZCh7Ci0gICAgICBlbXB0eVRleHQ6ICdObyBkYXRhIGZvdW5kJywKKyAgICAg IGVtcHR5VGV4dDogZ2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAgICAgY29sdW1uczogZ3Jp ZENvbHMsCiAgICAgICBjb2xsZWN0aW9uOiBxdWVyeVRvb2xOb3RpZmljYXRpb25zLmNvbGxlY3Rp b24sCiAgICAgICBjbGFzc05hbWU6ICdiYWNrZ3JpZCBwcmVzZW50YXRpb24gdGFibGUgdGFibGUt Ym9yZGVyZWQgdGFibGUtaG92ZXIgdGFibGUtbm9vdXRlci1ib3JkZXIgdGFibGUtYm90dG9tLWJv cmRlcicsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvc3RhdGljL2pzL2Jh Y2t1cF9kaWFsb2dfd3JhcHBlci5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMv anMvYmFja3VwX2RpYWxvZ193cmFwcGVyLmpzCmluZGV4IGJhODdhMzEzMC4uNjI3YWUzY2RmIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvc3RhdGljL2pzL2JhY2t1cF9kaWFs b2dfd3JhcHBlci5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvc3RhdGljL2pzL2Jh Y2t1cF9kaWFsb2dfd3JhcHBlci5qcwpAQCAtOTgsNyArOTgsNyBAQCBleHBvcnQgY2xhc3MgQmFj a3VwRGlhbG9nV3JhcHBlciBleHRlbmRzIERpYWxvZ1dyYXBwZXIgewogCiAgICAgY29uc3Qgbm9k ZSA9IHRoaXMucGdCcm93c2VyLk5vZGVzW3NlbGVjdGVkVHJlZU5vZGVEYXRhLl90eXBlXTsKICAg ICBpZiAodGhpcy5kaWFsb2dUaXRsZSA9PT0gbnVsbCkgewotICAgICAgY29uc3QgdGl0bGUgPSBg QmFja3VwICgke25vZGUubGFiZWx9OiAke3NlbGVjdGVkVHJlZU5vZGVEYXRhLmxhYmVsfSlgOwor ICAgICAgbGV0IHRpdGxlID0gZ2V0dGV4dCgnQmFja3VwICglczogJXMpJywgbm9kZS5sYWJlbCwg c2VsZWN0ZWRUcmVlTm9kZURhdGEubGFiZWwpOwogICAgICAgdGhpcy5tYWluKHRpdGxlKTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL3N0YXRpYy9qcy9k aXJlY3QuanMgYi93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9zdGF0aWMvanMvZGlyZWN0Lmpz CmluZGV4IDkwNDkzZjM1Ny4uMTc5ZGVkNmM5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29s cy9kZWJ1Z2dlci9zdGF0aWMvanMvZGlyZWN0LmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2Rl YnVnZ2VyL3N0YXRpYy9qcy9kaXJlY3QuanMKQEAgLTEwNDcsNyArMTA0Nyw3IEBAIGRlZmluZShb CiAKICAgICAgICAgLy8gSW5pdGlhbGl6ZSBhIG5ldyBHcmlkIGluc3RhbmNlCiAgICAgICAgIHZh ciBzdGFja19ncmlkID0gdGhpcy5zdGFja19ncmlkID0gbmV3IEJhY2tncmlkLkdyaWQoewotICAg ICAgICAgIGVtcHR5VGV4dDogJ05vIGRhdGEgZm91bmQnLAorICAgICAgICAgIGVtcHR5VGV4dDog Z2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAgICAgICAgIGNvbHVtbnM6IHN0YWNrR3JpZENv bHMsCiAgICAgICAgICAgcm93OiBCYWNrZ3JpZC5Sb3cuZXh0ZW5kKHsKICAgICAgICAgICAgIGV2 ZW50czogewpAQCAtMTExMiw3ICsxMTEyLDcgQEAgZGVmaW5lKFsKIAogICAgICAgICAvLyBJbml0 aWFsaXplIGEgbmV3IEdyaWQgaW5zdGFuY2UKICAgICAgICAgdmFyIHJlc3VsdF9ncmlkID0gdGhp cy5yZXN1bHRfZ3JpZCA9IG5ldyBCYWNrZ3JpZC5HcmlkKHsKLSAgICAgICAgICBlbXB0eVRleHQ6 ICdObyBkYXRhIGZvdW5kJywKKyAgICAgICAgICBlbXB0eVRleHQ6IGdldHRleHQoJ05vIGRhdGEg Zm91bmQnKSwKICAgICAgICAgICBjb2x1bW5zOiByZXN1bHRHcmlkQ29scywKICAgICAgICAgICBj b2xsZWN0aW9uOiBuZXcgUmVzdWx0c0NvbGxlY3Rpb24ocmVzdWx0KSwKICAgICAgICAgICBjbGFz c05hbWU6ICdiYWNrZ3JpZCB0YWJsZSB0YWJsZS1ib3JkZXJlZCB0YWJsZS1ub291dGVyLWJvcmRl ciB0YWJsZS1ib3R0b20tYm9yZGVyJywKQEAgLTExOTAsNyArMTE5MCw3IEBAIGRlZmluZShbCiAK ICAgICAgICAgLy8gSW5pdGlhbGl6ZSBhIG5ldyBHcmlkIGluc3RhbmNlCiAgICAgICAgIHZhciB2 YXJpYWJsZV9ncmlkID0gdGhpcy52YXJpYWJsZV9ncmlkID0gbmV3IEJhY2tncmlkLkdyaWQoewot ICAgICAgICAgIGVtcHR5VGV4dDogJ05vIGRhdGEgZm91bmQnLAorICAgICAgICAgIGVtcHR5VGV4 dDogZ2V0dGV4dCgnTm8gZGF0YSBmb3VuZCcpLAogICAgICAgICAgIGNvbHVtbnM6IGdyaWRDb2xz LAogICAgICAgICAgIGNvbGxlY3Rpb246IG5ldyBWYXJpYWJsZXNDb2xsZWN0aW9uKG15X29iaiks CiAgICAgICAgICAgY2xhc3NOYW1lOiAnYmFja2dyaWQgdGFibGUgdGFibGUtYm9yZGVyZWQgdGFi bGUtbm9vdXRlci1ib3JkZXIgdGFibGUtYm90dG9tLWJvcmRlcicsCkBAIC0xMjc2LDcgKzEyNzYs NyBAQCBkZWZpbmUoWwogCiAgICAgICAgIC8vIEluaXRpYWxpemUgYSBuZXcgR3JpZCBpbnN0YW5j ZQogICAgICAgICB2YXIgcGFyYW1fZ3JpZCA9IHRoaXMucGFyYW1fZ3JpZCA9IG5ldyBCYWNrZ3Jp ZC5HcmlkKHsKLSAgICAgICAgICBlbXB0eVRleHQ6ICdObyBkYXRhIGZvdW5kJywKKyAgICAgICAg ICBlbXB0eVRleHQ6IGdldHRleHQoJ05vIGRhdGEgZm91bmQnKSwKICAgICAgICAgICBjb2x1bW5z OiBwYXJhbUdyaWRDb2xzLAogICAgICAgICAgIGNvbGxlY3Rpb246IG5ldyBQYXJhbWV0ZXJzQ29s bGVjdGlvbihwYXJhbV9vYmopLAogICAgICAgICAgIGNsYXNzTmFtZTogJ2JhY2tncmlkIHRhYmxl IHRhYmxlLWJvcmRlcmVkIHRhYmxlLW5vb3V0ZXItYm9yZGVyIHRhYmxlLWJvdHRvbS1ib3JkZXIn LApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJkL3N0YXRpYy9qcy9n cmFudF93aXphcmQuanMgYi93ZWIvcGdhZG1pbi90b29scy9ncmFudF93aXphcmQvc3RhdGljL2pz L2dyYW50X3dpemFyZC5qcwppbmRleCBlNWY1MGZjN2QuLjc2M2VkZWY1NyAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJkL3N0YXRpYy9qcy9ncmFudF93aXphcmQuanMK KysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJkL3N0YXRpYy9qcy9ncmFudF93aXph cmQuanMKQEAgLTI1MSw3ICsyNTEsNyBAQCBkZWZpbmUoWwogICAgICAgICAgICAgRGJPYmplY3RG aWx0ZXI6IGZ1bmN0aW9uKGNvbGwpIHsKICAgICAgICAgICAgICAgdmFyIGNsaWVudFNpZGVGaWx0 ZXIgPSB0aGlzLmNsaWVudFNpZGVGaWx0ZXIgPSBuZXcgQmFja2dyaWQuRXh0ZW5zaW9uLkNsaWVu dFNpZGVGaWx0ZXIoewogICAgICAgICAgICAgICAgIGNvbGxlY3Rpb246IGNvbGwsCi0gICAgICAg ICAgICAgICAgcGxhY2Vob2xkZXI6IF8oJ1NlYXJjaCBieSBvYmplY3QgdHlwZSBvciBuYW1lJyks CisgICAgICAgICAgICAgICAgcGxhY2Vob2xkZXI6IGdldHRleHQoJ1NlYXJjaCBieSBvYmplY3Qg dHlwZSBvciBuYW1lJyksCiAKICAgICAgICAgICAgICAgICAvLyBUaGUgbW9kZWwgZmllbGRzIHRv IHNlYXJjaCBmb3IgbWF0Y2hlcwogICAgICAgICAgICAgICAgIGZpZWxkczogWydvYmplY3RfdHlw ZScsICduYW1lJ10sCkBAIC02OTcsMTEgKzY5NywxMSBAQCBkZWZpbmUoWwogICAgICAgICAgICAg ICAqLwogICAgICAgICAgICAgICB2YXIgZGJPYmplY3RUeXBlUGFnZSA9IHNlbGYuZGJPYmplY3RU eXBlUGFnZSA9IG5ldyBwZ0Jyb3dzZXIuV2l6YXJkUGFnZSh7CiAgICAgICAgICAgICAgICAgaWQ6 IDEsCi0gICAgICAgICAgICAgICAgcGFnZV90aXRsZTogXygnT2JqZWN0IFNlbGVjdGlvbiAoc3Rl cCAxIG9mIDMpJyksCisgICAgICAgICAgICAgICAgcGFnZV90aXRsZTogZ2V0dGV4dCgnT2JqZWN0 IFNlbGVjdGlvbiAoc3RlcCAxIG9mIDMpJyksCiAgICAgICAgICAgICAgICAgZGlzYWJsZV9wcmV2 OiB0cnVlLAogICAgICAgICAgICAgICAgIGRpc2FibGVfbmV4dDogdHJ1ZSwKICAgICAgICAgICAg ICAgICBzaG93X2Rlc2NyaXB0aW9uOiAnJywKLSAgICAgICAgICAgICAgICBzaG93X3Byb2dyZXNz X2JhcjogXygnUGxlYXNlIHdhaXQgd2hpbGUgZmV0Y2hpbmcgcmVjb3Jkcy4uLicpLAorICAgICAg ICAgICAgICAgIHNob3dfcHJvZ3Jlc3NfYmFyOiBnZXR0ZXh0KCdQbGVhc2Ugd2FpdCB3aGlsZSBm ZXRjaGluZyByZWNvcmRzLi4uJyksCiAgICAgICAgICAgICAgICAgbW9kZWw6IG5ld01vZGVsLAog ICAgICAgICAgICAgICAgIHZpZXc6IG5ldyhmdW5jdGlvbigpIHsKIApAQCAtNzM1LDEzICs3MzUs MTMgQEAgZGVmaW5lKFsKICAgICAgICAgICAgICAgICAgICAgICAgICQoYAogICAgICAgICAgICAg ICAgICAgICAgICAgPGRpdiBjbGFzcz0iZGJfb2JqZWN0c19jb250YWluZXIgcGctZWwteHMtMTIi PgogICAgICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJkYl9vYmplY3RzX2hlYWRl ciBkLWZsZXggcHktMSI+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgPGRpdj4ke18oJ1Bs ZWFzZSBzZWxlY3QgdGhlIG9iamVjdHMgdG8gZ3JhbnQgcHJpdmlsZWdlcyB0byBmcm9tIHRoZSBs aXN0IGJlbG93LicpfTwvZGl2PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxkaXY+YCAr IGdldHRleHQoJ1BsZWFzZSBzZWxlY3QgdGhlIG9iamVjdHMgdG8gZ3JhbnQgcHJpdmlsZWdlcyB0 byBmcm9tIHRoZSBsaXN0IGJlbG93LicpICsgYDwvZGl2PgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxkaXYgY2xhc3M9ImRiX29iamVjdHNfZmlsdGVyIG1sLWF1dG8iPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iaW5wdXQtZ3JvdXAiPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJpbnB1dC1ncm91cC1wcmVwZW5kIj4K ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iaW5wdXQtZ3Jv dXAtdGV4dCBmYSBmYS1zZWFyY2giIGlkPSJsYWJlbFNlYXJjaCI+PC9zcGFuPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGlucHV0IHR5cGU9InNlYXJjaCIgY2xhc3M9ImZvcm0tY29udHJvbCIgaWQ9InR4dEdy aWRTZWFyY2giIHBsYWNlaG9sZGVyPSJTZWFyY2giIGFyaWEtbGFiZWw9IlNlYXJjaCIgYXJpYS1k ZXNjcmliZWRieT0ibGFiZWxTZWFyY2giPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8aW5wdXQgdHlwZT0ic2VhcmNoIiBjbGFzcz0iZm9ybS1jb250cm9sIiBpZD0idHh0R3JpZFNl YXJjaCIgcGxhY2Vob2xkZXI9ImAgKyBnZXR0ZXh0KCdTZWFyY2gnKSArIGAiIGFyaWEtbGFiZWw9 IlNlYXJjaCIgYXJpYS1kZXNjcmliZWRieT0ibGFiZWxTZWFyY2giPgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvZGl2PgpAQCAtODIyLDggKzgyMiw4IEBAIGRl ZmluZShbCiAgICAgICAgICAgICAgIC8vIFdpemFyZCBmb3IgUHJpdmVsZWdlIGNvbnRyb2wKICAg ICAgICAgICAgICAgdmFyIHByaXZpbGVnZVBhZ2UgPSBzZWxmLnByaXZpbGVnZVBhZ2UgPSBuZXcg cGdCcm93c2VyLldpemFyZFBhZ2UoewogICAgICAgICAgICAgICAgIGlkOiAyLAotICAgICAgICAg ICAgICAgIHBhZ2VfdGl0bGU6IF8oJ1ByaXZpbGVnZSBTZWxlY3Rpb24gKHN0ZXAgMiBvZiAzKScp LAotICAgICAgICAgICAgICAgIHNob3dfZGVzY3JpcHRpb246IF8oJ1BsZWFzZSBhZGQgdGhlIHJl cXVpcmVkIHByaXZpbGVnZXMgZm9yIHRoZSBzZWxlY3RlZCBvYmplY3RzLicpLAorICAgICAgICAg ICAgICAgIHBhZ2VfdGl0bGU6IGdldHRleHQoJ1ByaXZpbGVnZSBTZWxlY3Rpb24gKHN0ZXAgMiBv ZiAzKScpLAorICAgICAgICAgICAgICAgIHNob3dfZGVzY3JpcHRpb246IGdldHRleHQoJ1BsZWFz ZSBhZGQgdGhlIHJlcXVpcmVkIHByaXZpbGVnZXMgZm9yIHRoZSBzZWxlY3RlZCBvYmplY3RzLicp LAogICAgICAgICAgICAgICAgIGRpc2FibGVfbmV4dDogdHJ1ZSwKICAgICAgICAgICAgICAgICBt b2RlbDogbmV3TW9kZWwsCiAKQEAgLTEwMjEsNyArMTAyMSw3IEBAIGRlZmluZShbCiAgICAgICAg ICAgICAgIC8vQ3JlYXRlIFNxbEZpZWxkIE9iamVjdAogICAgICAgICAgICAgICB2YXIgc3FsRmll bGQgPSBuZXcgQmFja2Zvcm0uRmllbGQoewogICAgICAgICAgICAgICAgICAgaWQ6ICdzcWx0YWIn LAotICAgICAgICAgICAgICAgICAgbGFiZWw6IF8oJ1NxbCBUYWInKSwKKyAgICAgICAgICAgICAg ICAgIGxhYmVsOiBnZXR0ZXh0KCdTcWwgVGFiJyksCiAKICAgICAgICAgICAgICAgICAgIC8qKgog ICAgICAgICAgICAgICAgICAgICBFeHRlbmQgJ1NxbFRhYkNvbnRyb2wnIHRvIGRlZmluZSBuZXcK QEAgLTEwOTEsOCArMTA5MSw4IEBAIGRlZmluZShbCiAgICAgICAgICAgICAgIC8vIFdpemFyZCBm b3IgU1FMIHRhYiBjb250cm9sCiAgICAgICAgICAgICAgIHZhciByZXZpZXdTUUxQYWdlID0gc2Vs Zi5yZXZpZXdTUUxQYWdlID0gbmV3IHBnQnJvd3Nlci5XaXphcmRQYWdlKHsKICAgICAgICAgICAg ICAgICBpZDogMywKLSAgICAgICAgICAgICAgICBwYWdlX3RpdGxlOiBfKCdGaW5hbCAoUmV2aWV3 IFNlbGVjdGlvbikgKHN0ZXAgMyBvZiAzKScpLAotICAgICAgICAgICAgICAgIHNob3dfZGVzY3Jp cHRpb246IF8oJ1RoZSBTUUwgYmVsb3cgd2lsbCBiZSBleGVjdXRlZCBvbiB0aGUgJyArCisgICAg ICAgICAgICAgICAgcGFnZV90aXRsZTogZ2V0dGV4dCgnRmluYWwgKFJldmlldyBTZWxlY3Rpb24p IChzdGVwIDMgb2YgMyknKSwKKyAgICAgICAgICAgICAgICBzaG93X2Rlc2NyaXB0aW9uOiBnZXR0 ZXh0KCdUaGUgU1FMIGJlbG93IHdpbGwgYmUgZXhlY3V0ZWQgb24gdGhlICcgKwogICAgICAgICAg ICAgICAgICAgJ2RhdGFiYXNlIHNlcnZlciB0byBncmFudCB0aGUgc2VsZWN0ZWQgcHJpdmlsZWdl cy4gJyArCiAgICAgICAgICAgICAgICAgICAnUGxlYXNlIGNsaWNrIG9uIDxiPkZpbmlzaDwvYj4g dG8gY29tcGxldGUgdGhlIHByb2Nlc3MuJyksCiAgICAgICAgICAgICAgICAgbW9kZWw6IG5ld01v ZGVsLApAQCAtMTE1MSw3ICsxMTUxLDcgQEAgZGVmaW5lKFsKICAgICAgICAgICAgICAgICAqLwog ICAgICAgICAgICAgICBzZWxmLndpemFyZCA9IG5ldyhwZ0Jyb3dzZXIuV2l6YXJkLmV4dGVuZCh7 CiAgICAgICAgICAgICAgICAgb3B0aW9uczogewotICAgICAgICAgICAgICAgICAgdGl0bGU6IF8o J0dyYW50IFdpemFyZCcpLAorICAgICAgICAgICAgICAgICAgdGl0bGU6IGdldHRleHQoJ0dyYW50 IFdpemFyZCcpLAogICAgICAgICAgICAgICAgICAgLyogTWFpbiBXaXphcmQgVGl0bGUgKi8KICAg ICAgICAgICAgICAgICAgIHdpZHRoOiAnJywKICAgICAgICAgICAgICAgICAgIGhlaWdodDogJycs CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9fX2luaXRfXy5weSBi L3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL19faW5pdF9fLnB5CmluZGV4IDNiMzY1MWU5 ZS4uZDE5ZTMyZDMwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9f X2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS9fX2luaXRfXy5w eQpAQCAtMjY2LDcgKzI2Niw3IEBAIGRlZiBjcmVhdGVfbWFpbnRlbmFuY2Vfam9iKHNpZCwgZGlk KToKICAgICAjIFJldHVybiByZXNwb25zZQogICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uo CiAgICAgICAgIGRhdGE9eydqb2JfaWQnOiBqaWQsICdzdGF0dXMnOiBUcnVlLAotICAgICAgICAg ICAgICAnaW5mbyc6ICdNYWludGVuYW5jZSBqb2IgY3JlYXRlZC4nfQorICAgICAgICAgICAgICAn aW5mbyc6IF8oJ01haW50ZW5hbmNlIGpvYiBjcmVhdGVkLicpfQogICAgICkKIAogCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL3Rvb2xzL3NjaGVtYV9kaWZmL19faW5pdF9fLnB5CmluZGV4IDIzZTE5MGNlMC4uMWQxZmYz NjlhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9fX2luaXRfXy5w eQorKysgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9fX2luaXRfXy5weQpAQCAtMzYs NyArMzYsNyBAQCBjbGFzcyBTY2hlbWFEaWZmTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgogICAgICAg ICBBIG1vZHVsZSBjbGFzcyBmb3IgU2NoZW1hIERpZmYgZGVyaXZlZCBmcm9tIFBnQWRtaW5Nb2R1 bGUuCiAgICAgIiIiCiAKLSAgICBMQUJFTCA9ICJTY2hlbWEgRGlmZiIKKyAgICBMQUJFTCA9IGdl dHRleHQoIlNjaGVtYSBEaWZmIikKIAogICAgIGRlZiBnZXRfb3duX21lbnVpdGVtcyhzZWxmKToK ICAgICAgICAgcmV0dXJuIHt9CkBAIC00MzksNyArNDM5LDcgQEAgZGVmIGNvbXBhcmUodHJhbnNf aWQsIHNvdXJjZV9zaWQsIHNvdXJjZV9kaWQsIHNvdXJjZV9zY2lkLAogCiAgICAgY29tcGFyaXNv bl9yZXN1bHQgPSBbXQogCi0gICAgZGlmZl9tb2RlbF9vYmouc2V0X2NvbXBhcmlzb25faW5mbygi Q29tcGFyaW5nIG9iamVjdHMuLi4iLCAwKQorICAgIGRpZmZfbW9kZWxfb2JqLnNldF9jb21wYXJp c29uX2luZm8oZ2V0dGV4dCgiQ29tcGFyaW5nIG9iamVjdHMuLi4iKSwgMCkKICAgICB1cGRhdGVf c2Vzc2lvbl9kaWZmX3RyYW5zYWN0aW9uKHRyYW5zX2lkLCBzZXNzaW9uX29iaiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZmZfbW9kZWxfb2JqKQogCkBAIC00NTEsNyAr NDUxLDggQEAgZGVmIGNvbXBhcmUodHJhbnNfaWQsIHNvdXJjZV9zaWQsIHNvdXJjZV9kaWQsIHNv dXJjZV9zY2lkLAogICAgICAgICBmb3Igbm9kZV9uYW1lLCBub2RlX3ZpZXcgaW4gYWxsX3JlZ2lz dGVyZWRfbm9kZXMuaXRlbXMoKToKICAgICAgICAgICAgIHZpZXcgPSBTY2hlbWFEaWZmUmVnaXN0 cnkuZ2V0X25vZGVfdmlldyhub2RlX25hbWUpCiAgICAgICAgICAgICBpZiBoYXNhdHRyKHZpZXcs ICdjb21wYXJlJyk6Ci0gICAgICAgICAgICAgICAgbXNnID0gIkNvbXBhcmluZyAiICsgdmlldy5i bHVlcHJpbnQuQ09MTEVDVElPTl9MQUJFTAorICAgICAgICAgICAgICAgIG1zZyA9IGdldHRleHQo J0NvbXBhcmluZyB7MH0nKS5cCisgICAgICAgICAgICAgICAgICAgIGZvcm1hdChnZXR0ZXh0KHZp ZXcuYmx1ZXByaW50LkNPTExFQ1RJT05fTEFCRUwpKQogICAgICAgICAgICAgICAgIGRpZmZfbW9k ZWxfb2JqLnNldF9jb21wYXJpc29uX2luZm8obXNnLCB0b3RhbF9wZXJjZW50KQogICAgICAgICAg ICAgICAgICMgVXBkYXRlIHRoZSBtZXNzYWdlIGFuZCB0b3RhbCBwZXJjZW50YWdlIGluIHNlc3Np b24gb2JqZWN0CiAgICAgICAgICAgICAgICAgdXBkYXRlX3Nlc3Npb25fZGlmZl90cmFuc2FjdGlv bih0cmFuc19pZCwgc2Vzc2lvbl9vYmosCkBAIC00NjgsNyArNDY5LDcgQEAgZGVmIGNvbXBhcmUo dHJhbnNfaWQsIHNvdXJjZV9zaWQsIHNvdXJjZV9kaWQsIHNvdXJjZV9zY2lkLAogICAgICAgICAg ICAgICAgICAgICBjb21wYXJpc29uX3Jlc3VsdCA9IGNvbXBhcmlzb25fcmVzdWx0ICsgcmVzCiAg ICAgICAgICAgICB0b3RhbF9wZXJjZW50ID0gdG90YWxfcGVyY2VudCArIG5vZGVfcGVyY2VudAog Ci0gICAgICAgIG1zZyA9ICJTdWNjZXNzZnVsbHkgY29tcGFyZSB0aGUgc3BlY2lmaWVkIHNjaGVt YXMuIgorICAgICAgICBtc2cgPSBnZXR0ZXh0KCJTdWNjZXNzZnVsbHkgY29tcGFyZSB0aGUgc3Bl Y2lmaWVkIHNjaGVtYXMuIikKICAgICAgICAgdG90YWxfcGVyY2VudCA9IDEwMAogICAgICAgICBk aWZmX21vZGVsX29iai5zZXRfY29tcGFyaXNvbl9pbmZvKG1zZywgdG90YWxfcGVyY2VudCkKICAg ICAgICAgIyBVcGRhdGUgdGhlIG1lc3NhZ2UgYW5kIHRvdGFsIHBlcmNlbnRhZ2UgZG9uZSBpbiBz ZXNzaW9uIG9iamVjdApAQCAtNTAxLDcgKzUwMiw3IEBAIGRlZiBwb2xsKHRyYW5zX2lkKToKICAg ICBtc2csIGRpZmZfcGVyY2VudGFnZSA9IGRpZmZfbW9kZWxfb2JqLmdldF9jb21wYXJpc29uX2lu Zm8oKQogCiAgICAgaWYgZGlmZl9wZXJjZW50YWdlID09IDEwMDoKLSAgICAgICAgZGlmZl9tb2Rl bF9vYmouc2V0X2NvbXBhcmlzb25faW5mbygiQ29tcGFyaW5nIG9iamVjdHMuLi4iLCAwKQorICAg ICAgICBkaWZmX21vZGVsX29iai5zZXRfY29tcGFyaXNvbl9pbmZvKGdldHRleHQoIkNvbXBhcmlu ZyBvYmplY3RzLi4uIiksIDApCiAgICAgICAgIHVwZGF0ZV9zZXNzaW9uX2RpZmZfdHJhbnNhY3Rp b24odHJhbnNfaWQsIHNlc3Npb25fb2JqLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpZmZfbW9kZWxfb2JqKQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29s cy9zY2hlbWFfZGlmZi9jb21wYXJlLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYv Y29tcGFyZS5weQppbmRleCA0MGQ0MzgyYmIuLjc0NTliODQ5YiAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvY29tcGFyZS5weQorKysgYi93ZWIvcGdhZG1pbi90b29s cy9zY2hlbWFfZGlmZi9jb21wYXJlLnB5CkBAIC0xMiw2ICsxMiw3IEBACiBpbXBvcnQgY29weQog CiBmcm9tIGZsYXNrIGltcG9ydCByZW5kZXJfdGVtcGxhdGUKK2Zyb20gZmxhc2tfYmFiZWxleCBp bXBvcnQgZ2V0dGV4dAogZnJvbSBwZ2FkbWluLnV0aWxzLmRyaXZlciBpbXBvcnQgZ2V0X2RyaXZl cgogZnJvbSBjb25maWcgaW1wb3J0IFBHX0RFRkFVTFRfRFJJVkVSCiBmcm9tIHBnYWRtaW4udXRp bHMuYWpheCBpbXBvcnQgaW50ZXJuYWxfc2VydmVyX2Vycm9yCkBAIC04Niw3ICs4Nyw3IEBAIGNs YXNzIFNjaGVtYURpZmZPYmplY3RDb21wYXJlOgogICAgICAgICByZXR1cm4gY29tcGFyZV9kaWN0 aW9uYXJpZXMoc2VsZiwgc291cmNlX3BhcmFtcywgdGFyZ2V0X3BhcmFtcywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRhcmdldF9zY2hlbWEsIHNvdXJjZSwgdGFyZ2V0LAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5ub2RlX3R5cGUsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmJsdWVwcmludC5DT0xMRUNUSU9O X0xBQkVMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0dGV4dChzZWxm LmJsdWVwcmludC5DT0xMRUNUSU9OX0xBQkVMKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYua2V5c190b19pZ25vcmUpCiAKICAgICBkZWYgZGRsX2NvbXBhcmUoc2Vs ZiwgKiprd2FyZ3MpOgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYv bW9kZWwucHkgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9tb2RlbC5weQppbmRleCA0 OTllY2NhMTUuLmUxNjUyYTIxOCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1h X2RpZmYvbW9kZWwucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvbW9kZWwu cHkKQEAgLTcsNiArNyw4IEBACiAjCiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCitmcm9tIGZsYXNrX2Jh YmVsZXggaW1wb3J0IGdldHRleHQKKwogCiBjbGFzcyBTY2hlbWFEaWZmTW9kZWwob2JqZWN0KToK ICAgICAiIiIKQEAgLTMwLDcgKzMyLDcgQEAgY2xhc3MgU2NoZW1hRGlmZk1vZGVsKG9iamVjdCk6 CiAgICAgICAgICAgICAqKmt3YXJncyA6IE4gbnVtYmVyIG9mIHBhcmFtZXRlcnMKICAgICAgICAg IiIiCiAgICAgICAgIHNlbGYuX2NvbXBhcmlzb25fcmVzdWx0ID0gZGljdCgpCi0gICAgICAgIHNl bGYuX2NvbXBhcmlzb25fbXNnID0gJ0NvbXBhcmlzaW9uIHN0YXJ0ZWQuLi4nCisgICAgICAgIHNl bGYuX2NvbXBhcmlzb25fbXNnID0gZ2V0dGV4dCgnQ29tcGFyaXNpb24gc3RhcnRlZC4uLicpCiAg ICAgICAgIHNlbGYuX2NvbXBhcmlzb25fcGVyY2VudGFnZSA9IDAKIAogICAgIGRlZiBjbGVhcl9k YXRhKHNlbGYpOgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvc3Rh dGljL2pzL3NjaGVtYV9kaWZmLmJhY2tmb3JtLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1h X2RpZmYvc3RhdGljL2pzL3NjaGVtYV9kaWZmLmJhY2tmb3JtLmpzCmluZGV4IGFlM2E3ZWViYi4u NGFmODg1N2IyIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0 aWMvanMvc2NoZW1hX2RpZmYuYmFja2Zvcm0uanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2No ZW1hX2RpZmYvc3RhdGljL2pzL3NjaGVtYV9kaWZmLmJhY2tmb3JtLmpzCkBAIC0yODksMTEgKzI4 OSwxMSBAQCBsZXQgU2NoZW1hRGlmZkhlYWRlclZpZXcgPSBCYWNrZm9ybS5Gb3JtLmV4dGVuZCh7 CiAgIH0sCiAgIHRlbXBsYXRlOiBfLnRlbXBsYXRlKGAKICAgICA8ZGl2IGNsYXNzPSJyb3cgcGdh ZG1pbi1jb250cm9sLWdyb3VwIj4KLSAgICAgIDxkaXYgY2xhc3M9ImNvbC0xIGNvbnRyb2wtbGFi ZWwiPlNlbGVjdCBTb3VyY2U8L2Rpdj4KKyAgICAgIDxkaXYgY2xhc3M9ImNvbC0xIGNvbnRyb2wt bGFiZWwiPmAgKyBnZXR0ZXh0KCdTZWxlY3QgU291cmNlJykgKyBgPC9kaXY+CiAgICAgICA8ZGl2 IGNsYXNzPSJjb2wtNiBzb3VyY2Ugcm93Ij48L2Rpdj4KICAgICA8L2Rpdj4KICAgICA8ZGl2IGNs YXNzPSJyb3cgcGdhZG1pbi1jb250cm9sLWdyb3VwIj4KLSAgICAgIDxkaXYgY2xhc3M9ImNvbC0x IGNvbnRyb2wtbGFiZWwiPlNlbGVjdCBUYXJnZXQ8L2Rpdj4KKyAgICAgIDxkaXYgY2xhc3M9ImNv bC0xIGNvbnRyb2wtbGFiZWwiPmAgKyBnZXR0ZXh0KCdTZWxlY3QgVGFyZ2V0JykgKyBgPC9kaXY+ CiAgICAgICA8ZGl2IGNsYXNzPSJjb2wtNiB0YXJnZXQgcm93Ij48L2Rpdj4KICAgICAgIDxkaXYg Y2xhc3M9ImNvbC01IHRhcmdldC1idXR0b25zIj4KICAgICAgICAgICA8ZGl2IGNsYXNzPSJhY3Rp b24tYnRucyBkLWZsZXgiPgpAQCAtNDIxLDkgKzQyMSw5IEBAIGxldCBTY2hlbWFEaWZmRm9vdGVy VmlldyA9IEJhY2tmb3JtLkZvcm0uZXh0ZW5kKHsKICAgdGVtcGxhdGU6IHsKICAgICAnY29udGVu dCc6IF8udGVtcGxhdGUoYAogICAgICAgIDxkaXYgY2xhc3M9InBnLWVsLXNtLTEyIHJvdyA8JT1j b250ZW50Q2xhc3MlPiI+Ci0gICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJwZy1lbC1zbS00 IGRkbC1zb3VyY2UiPlNvdXJjZTwvZGl2PgotICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0i cGctZWwtc20tNCBkZGwtdGFyZ2V0Ij5UYXJnZXQ8L2Rpdj4KLSAgICAgICAgICAgICAgICAgIDxk aXYgY2xhc3M9InBnLWVsLXNtLTQgZGRsLWRpZmYiPkRpZmZlcmVuY2UKKyAgICAgICAgICAgICAg ICAgIDxkaXYgY2xhc3M9InBnLWVsLXNtLTQgZGRsLXNvdXJjZSI+YCArIGdldHRleHQoJ1NvdXJj ZScpICsgYDwvZGl2PgorICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0icGctZWwtc20tNCBk ZGwtdGFyZ2V0Ij5gICsgZ2V0dGV4dCgnVGFyZ2V0JykgKyBgPC9kaXY+CisgICAgICAgICAgICAg ICAgICA8ZGl2IGNsYXNzPSJwZy1lbC1zbS00IGRkbC1kaWZmIj5gICsgZ2V0dGV4dCgnRGlmZmVy ZW5jZScpICsgYAogICAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgIDwvZGl2 PgogICAgICAgPC9kaXY+CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlm Zi9zdGF0aWMvanMvc2NoZW1hX2RpZmYuanMgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlm Zi9zdGF0aWMvanMvc2NoZW1hX2RpZmYuanMKaW5kZXggZWI3NzE5ODU5Li5mMGM3NWYyMjQgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NjaGVtYV9kaWZmL3N0YXRpYy9qcy9zY2hlbWFf ZGlmZi5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0aWMvanMvc2No ZW1hX2RpZmYuanMKQEAgLTg1LDcgKzg1LDcgQEAgZGVmaW5lKCdwZ2FkbWluLnNjaGVtYWRpZmYn LCBbCiAgICAgICB9KQogICAgICAgICAuZG9uZShmdW5jdGlvbihyZXMpIHsKICAgICAgICAgICBz ZWxmLnRyYW5zX2lkID0gcmVzLmRhdGEuc2NoZW1hRGlmZlRyYW5zSWQ7Ci0gICAgICAgICAgcmVz LmRhdGEucGFuZWxfdGl0bGUgPSAnU2NoZW1hIERpZmYgKEJldGEpJzsgLy9UT0RPOiBTZXQgdGhl IHBhbmVsIHRpdGxlCisgICAgICAgICAgcmVzLmRhdGEucGFuZWxfdGl0bGUgPSBnZXR0ZXh0KCdT Y2hlbWEgRGlmZiAoQmV0YSknKTsgLy9UT0RPOiBTZXQgdGhlIHBhbmVsIHRpdGxlCiAgICAgICAg ICAgLy8gVE9ETzogRm9sbG93aW5nIGZ1bmN0aW9uIGlzIHVzZWQgdG8gdGVzdCB0aGUgZmV0Y2hp bmcgb2YgdGhlCiAgICAgICAgICAgLy8gZGF0YWJhc2VzIHRoaXMgc2hvdWxkIGJlIG1vdmVkIHRv IHNlcnZlciBzZWxlY3Rpb24gZXZlbnQgbGF0ZXIuCiAgICAgICAgICAgc2VsZi5sYXVuY2hfc2No ZW1hX2RpZmYocmVzLmRhdGEpOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1h X2RpZmYvc3RhdGljL2pzL3NjaGVtYV9kaWZmX3VpLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2No ZW1hX2RpZmYvc3RhdGljL2pzL3NjaGVtYV9kaWZmX3VpLmpzCmluZGV4IGE1MDA4ZGIwOC4uNmJk ZTRhODQ2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlmZi9zdGF0aWMv anMvc2NoZW1hX2RpZmZfdWkuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYv c3RhdGljL2pzL3NjaGVtYV9kaWZmX3VpLmpzCkBAIC0zMDIsMTEgKzMwMiwxMSBAQCBleHBvcnQg ZGVmYXVsdCBjbGFzcyBTY2hlbWFEaWZmVUkgewogICAgIHZhciBncmlkX3dpZHRoID0gIChzZWxm LmdyaWRfd2lkdGggLSA0NykgLyAyIDsKICAgICB2YXIgY29sdW1ucyA9IFsKICAgICAgIGNoZWNr Ym94U2VsZWN0b3IuZ2V0Q29sdW1uRGVmaW5pdGlvbigpLAotICAgICAge2lkOiAndGl0bGUnLCBu YW1lOiAnU2NoZW1hIE9iamVjdHMnLCBmaWVsZDogJ3RpdGxlJywgbWluV2lkdGg6IGdyaWRfd2lk dGgsIGZvcm1hdHRlcjogZm9ybWF0Q29sdW1uVGl0bGV9LAotICAgICAge2lkOiAnc3RhdHVzJywg bmFtZTogJ0NvbXBhcmlzb24gUmVzdWx0JywgZmllbGQ6ICdzdGF0dXMnLCBtaW5XaWR0aDogZ3Jp ZF93aWR0aH0sCi0gICAgICB7aWQ6ICdsYWJlbCcsIG5hbWU6ICdTY2hlbWEgT2JqZWN0cycsIGZp ZWxkOiAnbGFiZWwnLCAgd2lkdGg6IDAsIG1pbldpZHRoOiAwLCBtYXhXaWR0aDogMCwKKyAgICAg IHtpZDogJ3RpdGxlJywgbmFtZTogZ2V0dGV4dCgnU2NoZW1hIE9iamVjdHMnKSwgZmllbGQ6ICd0 aXRsZScsIG1pbldpZHRoOiBncmlkX3dpZHRoLCBmb3JtYXR0ZXI6IGZvcm1hdENvbHVtblRpdGxl fSwKKyAgICAgIHtpZDogJ3N0YXR1cycsIG5hbWU6IGdldHRleHQoJ0NvbXBhcmlzb24gUmVzdWx0 JyksIGZpZWxkOiAnc3RhdHVzJywgbWluV2lkdGg6IGdyaWRfd2lkdGh9LAorICAgICAge2lkOiAn bGFiZWwnLCBuYW1lOiBnZXR0ZXh0KCdTY2hlbWEgT2JqZWN0cycpLCBmaWVsZDogJ2xhYmVsJywg IHdpZHRoOiAwLCBtaW5XaWR0aDogMCwgbWF4V2lkdGg6IDAsCiAgICAgICAgIGNzc0NsYXNzOiAn cmVhbGx5LWhpZGRlbicsIGhlYWRlckNzc0NsYXNzOiAncmVhbGx5LWhpZGRlbid9LAotICAgICAg e2lkOiAndHlwZScsIG5hbWU6ICdTY2hlbWEgT2JqZWN0cycsIGZpZWxkOiAndHlwZScsICB3aWR0 aDogMCwgbWluV2lkdGg6IDAsIG1heFdpZHRoOiAwLAorICAgICAge2lkOiAndHlwZScsIG5hbWU6 IGdldHRleHQoJ1NjaGVtYSBPYmplY3RzJyksIGZpZWxkOiAndHlwZScsICB3aWR0aDogMCwgbWlu V2lkdGg6IDAsIG1heFdpZHRoOiAwLAogICAgICAgICBjc3NDbGFzczogJ3JlYWxseS1oaWRkZW4n LCBoZWFkZXJDc3NDbGFzczogJ3JlYWxseS1oaWRkZW4nfSwKICAgICAgIHtpZDogJ2lkJywgbmFt ZTogJ2lkJywgZmllbGQ6ICdpZCcsIHdpZHRoOiAwLCBtaW5XaWR0aDogMCwgbWF4V2lkdGg6IDAs CiAgICAgICAgIGNzc0NsYXNzOiAncmVhbGx5LWhpZGRlbicsIGhlYWRlckNzc0NsYXNzOiAncmVh bGx5LWhpZGRlbicgfSwKQEAgLTQ2MiwxMCArNDYyLDEwIEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNz IFNjaGVtYURpZmZVSSB7CiAgICAgICAuZG9uZShmdW5jdGlvbiAocmVzKSB7CiAgICAgICAgIGxl dCBtc2cgPSByZXMuZGF0YS5jb21wYXJlX21zZzsKICAgICAgICAgaWYgKHJlcy5kYXRhLmRpZmZf cGVyY2VudGFnZSAhPSAxMDApIHsKLSAgICAgICAgICBtc2cgPSBtc2cgKyAnICh0aGlzIG1heSB0 YWtlIGEgZmV3IG1pbnV0ZXMpLi4uJzsKKyAgICAgICAgICBtc2cgPSBtc2cgKyBnZXR0ZXh0KCcg KHRoaXMgbWF5IHRha2UgYSBmZXcgbWludXRlcykuLi4nKTsKICAgICAgICAgfQogCi0gICAgICAg IG1zZyA9IG1zZyArICc8YnI+JysgcmVzLmRhdGEuZGlmZl9wZXJjZW50YWdlICsgJyUgY29tcGxl dGVkLic7CisgICAgICAgIG1zZyA9IG1zZyArICc8YnI+JyArIGdldHRleHQoJyVzIGNvbXBsZXRl ZC4nLCByZXMuZGF0YS5kaWZmX3BlcmNlbnRhZ2UgKyAnJScpOwogICAgICAgICAkKCcjZGlmZl9m ZXRjaGluZ19kYXRhJykuZmluZCgnLnNjaGVtYS1kaWZmLWJ1c3ktdGV4dCcpLmh0bWwobXNnKTsK ICAgICAgIH0pCiAgICAgICAuZmFpbChmdW5jdGlvbiAoeGhyKSB7CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRvci5qcyBiL3dlYi9wZ2Fk bWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzCmluZGV4IDI3NGZjYjg3 ZC4uNGZjNGYzMjliIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3Rh dGljL2pzL3NxbGVkaXRvci5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3Rh dGljL2pzL3NxbGVkaXRvci5qcwpAQCAtMjIzNyw3ICsyMjM3LDcgQEAgZGVmaW5lKCd0b29scy5x dWVyeXRvb2wnLCBbCiAKICAgICAgICAgc2VsZi50cmlnZ2VyKCdwZ2FkbWluLXNxbGVkaXRvcjps b2FkaW5nLWljb246aGlkZScpOwogCi0gICAgICAgIHNlbGYuZ3JpZFZpZXcuc2V0X2VkaXRvcl90 aXRsZShgKCR7Z2V0dGV4dCgnT2J0YWluaW5nIGNvbm5lY3Rpb24uLi4nKX0gJHtfLnVuZXNjYXBl KHVybF9wYXJhbXMudGl0bGUpfWApOworICAgICAgICBzZWxmLmdyaWRWaWV3LnNldF9lZGl0b3Jf dGl0bGUoJygnICsgZ2V0dGV4dCgnT2J0YWluaW5nIGNvbm5lY3Rpb24uLi4nKSArIGAgJHtfLnVu ZXNjYXBlKHVybF9wYXJhbXMudGl0bGUpfWApOwogCiAgICAgICAgIGxldCBhZnRlckNvbm4gPSBm dW5jdGlvbigpIHsKICAgICAgICAgICBsZXQgZW5hYmxlQnRucyA9IFtdOwpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3V0aWxzL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMu cHkgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvdXRpbHMvcXVlcnlfdG9vbF9wcmVmZXJl bmNlcy5weQppbmRleCAxMTQwNDZmNmMuLmE0ZDc0ZTg2MCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vdG9vbHMvc3FsZWRpdG9yL3V0aWxzL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMucHkKKysrIGIv d2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3V0aWxzL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMu cHkKQEAgLTIxMiw5ICsyMTIsOSBAQCBkZWYgUmVnaXN0ZXJRdWVyeVRvb2xQcmVmZXJlbmNlcyhz ZWxmKToKICAgICAgICAgJ0NTVl9vdXRwdXQnLCAnY3N2X3F1b3RpbmcnLAogICAgICAgICBnZXR0 ZXh0KCJDU1YgcXVvdGluZyIpLCAnb3B0aW9ucycsICdzdHJpbmdzJywKICAgICAgICAgY2F0ZWdv cnlfbGFiZWw9Z2V0dGV4dCgnQ1NWIE91dHB1dCcpLAotICAgICAgICBvcHRpb25zPVt7J2xhYmVs JzogJ05vbmUnLCAndmFsdWUnOiAnbm9uZSd9LAotICAgICAgICAgICAgICAgICB7J2xhYmVsJzog J0FsbCcsICd2YWx1ZSc6ICdhbGwnfSwKLSAgICAgICAgICAgICAgICAgeydsYWJlbCc6ICdTdHJp bmdzJywgJ3ZhbHVlJzogJ3N0cmluZ3MnfV0sCisgICAgICAgIG9wdGlvbnM9W3snbGFiZWwnOiBn ZXR0ZXh0KCdOb25lJyksICd2YWx1ZSc6ICdub25lJ30sCisgICAgICAgICAgICAgICAgIHsnbGFi ZWwnOiBnZXR0ZXh0KCdBbGwnKSwgJ3ZhbHVlJzogJ2FsbCd9LAorICAgICAgICAgICAgICAgICB7 J2xhYmVsJzogZ2V0dGV4dCgnU3RyaW5ncycpLCAndmFsdWUnOiAnc3RyaW5ncyd9XSwKICAgICAg ICAgc2VsZWN0Mj17CiAgICAgICAgICAgICAnYWxsb3dDbGVhcic6IEZhbHNlLAogICAgICAgICAg ICAgJ3RhZ3MnOiBGYWxzZQpAQCAtMjQwLDcgKzI0MCw3IEBAIGRlZiBSZWdpc3RlclF1ZXJ5VG9v bFByZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICBvcHRpb25zPVt7J2xhYmVsJzogJzsnLCAndmFs dWUnOiAnOyd9LAogICAgICAgICAgICAgICAgICB7J2xhYmVsJzogJywnLCAndmFsdWUnOiAnLCd9 LAogICAgICAgICAgICAgICAgICB7J2xhYmVsJzogJ3wnLCAndmFsdWUnOiAnfCd9LAotICAgICAg ICAgICAgICAgICB7J2xhYmVsJzogJ1RhYicsICd2YWx1ZSc6ICdcdCd9XSwKKyAgICAgICAgICAg ICAgICAgeydsYWJlbCc6IGdldHRleHQoJ1RhYicpLCAndmFsdWUnOiAnXHQnfV0sCiAgICAgICAg IHNlbGVjdDI9ewogICAgICAgICAgICAgJ2FsbG93Q2xlYXInOiBGYWxzZSwKICAgICAgICAgICAg ICd0YWdzJzogVHJ1ZQpAQCAtMjYyLDkgKzI2Miw5IEBAIGRlZiBSZWdpc3RlclF1ZXJ5VG9vbFBy ZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICAnUmVzdWx0c19ncmlkJywgJ3Jlc3VsdHNfZ3JpZF9x dW90aW5nJywKICAgICAgICAgZ2V0dGV4dCgiUmVzdWx0IGNvcHkgcXVvdGluZyIpLCAnb3B0aW9u cycsICdzdHJpbmdzJywKICAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnUmVzdWx0cyBn cmlkJyksCi0gICAgICAgIG9wdGlvbnM9W3snbGFiZWwnOiAnTm9uZScsICd2YWx1ZSc6ICdub25l J30sCi0gICAgICAgICAgICAgICAgIHsnbGFiZWwnOiAnQWxsJywgJ3ZhbHVlJzogJ2FsbCd9LAot ICAgICAgICAgICAgICAgICB7J2xhYmVsJzogJ1N0cmluZ3MnLCAndmFsdWUnOiAnc3RyaW5ncyd9 XSwKKyAgICAgICAgb3B0aW9ucz1beydsYWJlbCc6IGdldHRleHQoJ05vbmUnKSwgJ3ZhbHVlJzog J25vbmUnfSwKKyAgICAgICAgICAgICAgICAgeydsYWJlbCc6IGdldHRleHQoJ0FsbCcpLCAndmFs dWUnOiAnYWxsJ30sCisgICAgICAgICAgICAgICAgIHsnbGFiZWwnOiBnZXR0ZXh0KCdTdHJpbmdz JyksICd2YWx1ZSc6ICdzdHJpbmdzJ31dLAogICAgICAgICBzZWxlY3QyPXsKICAgICAgICAgICAg ICdhbGxvd0NsZWFyJzogRmFsc2UsCiAgICAgICAgICAgICAndGFncyc6IEZhbHNlCkBAIC0yOTAs NyArMjkwLDcgQEAgZGVmIFJlZ2lzdGVyUXVlcnlUb29sUHJlZmVyZW5jZXMoc2VsZik6CiAgICAg ICAgIG9wdGlvbnM9W3snbGFiZWwnOiAnOycsICd2YWx1ZSc6ICc7J30sCiAgICAgICAgICAgICAg ICAgIHsnbGFiZWwnOiAnLCcsICd2YWx1ZSc6ICcsJ30sCiAgICAgICAgICAgICAgICAgIHsnbGFi ZWwnOiAnfCcsICd2YWx1ZSc6ICd8J30sCi0gICAgICAgICAgICAgICAgIHsnbGFiZWwnOiAnVGFi JywgJ3ZhbHVlJzogJ1x0J31dLAorICAgICAgICAgICAgICAgICB7J2xhYmVsJzogZ2V0dGV4dCgn VGFiJyksICd2YWx1ZSc6ICdcdCd9XSwKICAgICAgICAgc2VsZWN0Mj17CiAgICAgICAgICAgICAn YWxsb3dDbGVhcic6IEZhbHNlLAogICAgICAgICAgICAgJ3RhZ3MnOiBUcnVlCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvc3RhdGljL2pzL3VzZXJfbWFuYWdl bWVudC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3VzZXJfbWFuYWdlbWVudC9zdGF0aWMvanMvdXNl cl9tYW5hZ2VtZW50LmpzCmluZGV4IDY0MDE0ODYzZi4uMmIxZWQxNzI3IDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvc3RhdGljL2pzL3VzZXJfbWFuYWdlbWVu dC5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvc3RhdGljL2pzL3Vz ZXJfbWFuYWdlbWVudC5qcwpAQCAtMjcsNyArMjcsNyBAQCBkZWZpbmUoWwogICAgIHVzZXJGaWx0 ZXIgPSBmdW5jdGlvbihjb2xsZWN0aW9uKSB7CiAgICAgICByZXR1cm4gKG5ldyBCYWNrZ3JpZC5F eHRlbnNpb24uQ2xpZW50U2lkZUZpbHRlcih7CiAgICAgICAgIGNvbGxlY3Rpb246IGNvbGxlY3Rp b24sCi0gICAgICAgIHBsYWNlaG9sZGVyOiBfKCdGaWx0ZXIgYnkgZW1haWwnKSwKKyAgICAgICAg cGxhY2Vob2xkZXI6IGdldHRleHQoJ0ZpbHRlciBieSBlbWFpbCcpLAogICAgICAgICAvLyBIb3cg bG9uZyB0byB3YWl0IGFmdGVyIHR5cGluZyBoYXMgc3RvcHBlZCBiZWZvcmUgc2VhcmNoaW5nIGNh biBzdGFydAogICAgICAgICB3YWl0OiAxNTAsCiAgICAgICB9KSk7CkBAIC03NjMsNyArNzYzLDcg QEAgZGVmaW5lKFsKICAgICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJpbnB1dC1ncm91 cC1wcmVwZW5kIj4KICAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJpbnB1dC1n cm91cC10ZXh0IGZhIGZhLXNlYXJjaCIgaWQ9ImxhYmVsU2VhcmNoIj48L3NwYW4+CiAgICAgICAg ICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgPGlucHV0 IHR5cGU9InNlYXJjaCIgY2xhc3M9ImZvcm0tY29udHJvbCIgaWQ9InR4dEdyaWRTZWFyY2giIHBs YWNlaG9sZGVyPSJTZWFyY2giIGFyaWEtbGFiZWw9IlNlYXJjaCIgYXJpYS1kZXNjcmliZWRieT0i bGFiZWxTZWFyY2giIC8+CisgICAgICAgICAgICAgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJz ZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlkU2VhcmNoIiBwbGFjZWhvbGRl cj0iYCArIGdldHRleHQoJ1NlYXJjaCcpICsgYCIgYXJpYS1sYWJlbD0iU2VhcmNoIiBhcmlhLWRl c2NyaWJlZGJ5PSJsYWJlbFNlYXJjaCIgLz4KICAgICAgICAgICAgICAgICAgICAgICAgIDwvZGl2 PgogICAgICAgICAgICAgICAgICAgICAgICAgPGJ1dHRvbiBpZD0iYnRuX3JlZnJlc2giIHR5cGU9 ImJ1dHRvbiIgY2xhc3M9ImJ0biBidG4tc2Vjb25kYXJ5IGJ0bi1uYXZ0YWItaW5saW5lIGFkZCIg dGl0bGU9IkFkZCI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJmYSBm YS1wbHVzICI+PC9zcGFuPgo= --00000000000078cc8005a193226c--