Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kQ39C-0008BS-ON for pgadmin-hackers@arkaria.postgresql.org; Wed, 07 Oct 2020 06:41:59 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kQ39B-0004iX-Nc for pgadmin-hackers@arkaria.postgresql.org; Wed, 07 Oct 2020 06:41:57 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kQ39B-0004iQ-2Y for pgadmin-hackers@lists.postgresql.org; Wed, 07 Oct 2020 06:41:57 +0000 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kQ397-00076V-Sp for pgadmin-hackers@postgresql.org; Wed, 07 Oct 2020 06:41:55 +0000 Received: by mail-yb1-xb41.google.com with SMTP id k18so1053171ybh.1 for ; Tue, 06 Oct 2020 23:41:53 -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=8fec3u8cv8WDeViw2WH6pfs9r5ZEK6TVmLCfVJ5sBmI=; b=JHVjzC52hAiHdOt1i0o40FWEp334ea0BubuTrl5pg5eICzP0xkwX4/xY9R5jXIx8tG h3XInQnf9km9E8wQVpC8dFk1kjcKWr5n8BBA40fYPwFw2ZB8f1jewh8vhku/CFBq8QUX FqabUMhiVzf6GuC1dpXmb1FMJQ7tGjXLR3+62BPjOBVeRaJzDZbHPPyf/rnfsXy0ZBfu EmcUTYlXvGh/Q9fOGpY3kf2z3ZxV3+bhC3wVIVizNiBGQLBd0IImnOF9WL9/tH4XBEn1 OC4j9/zd+uAc8KdqGtXlu4z26BZgGcCPF59xix5qObyPziQ0FBvKPXqWB4D8Y2/4OFWR 6Ycg== 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=8fec3u8cv8WDeViw2WH6pfs9r5ZEK6TVmLCfVJ5sBmI=; b=DejbwhPAdHCD+vO77vAIKhd0Ig8OWn9oZ1WFRj2w5XhkYcXeocitxQpLcd5da3R2zl hkhTt7AwIP3QsMAzE7EpQVeMbDbx8qhzJTdfhaziQZhiZWQ4b9GFWMHPy5kp/8UwXje7 UWrXqis9bH4kIMiGcLy2kGIzvUuEiydfQZyvET1c5CqoPXmN/0wWbRXgWahxts4IcZw6 AAvbZkf+6LN3E2OCd5a5d3cEXDdoQYEfY0e6xPJVNhgegtHsJ++7PgZ9QV4eWyt7/vpx kBJy5ae98TWTK/imLO9pVv4luXQhv8O2pebDaiAqY8X3/KGvvwRFJb1DPlZP99mNrHqD CqHQ== X-Gm-Message-State: AOAM531DMNATiNUwMVeFgUHfoaEqwFcoIUp2hKQbiZRmv3YO/n/ohVbZ J7I1tR5UJyCJn+5DgaTrYknbQn6OqeOtnjFNmxOIpEsBKedRv2C+p7lL4dcd2RDzQeSPQxNu36a bmLkJppoy1Kw42k5DmaNcVM1LR1+sGWClJyDVVDtIsScAGhjLrJ6kvJuixj7Bl6TVZ8gwPwhWX3 1N2IDKysLXJK6VpSunNg0OwIiPqiGuGWYmpq8v4r6Ns9SkIMtxGJTMN+ws1g== X-Google-Smtp-Source: ABdhPJxEOTCTJbR7rG1AeAW3vaVlF5I+GoR0iOm9ChKbkQwnSK0/ZR5cxABuBmaD68k/ZLAwXZ1P/HooJKY4OUSyav8= X-Received: by 2002:a25:2f85:: with SMTP id v127mr2446552ybv.372.1602052912721; Tue, 06 Oct 2020 23:41:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Nikhil Mohite Date: Wed, 7 Oct 2020 12:11:41 +0530 Message-ID: Subject: Re: [pgAdmin][RM3794]:Allow User to Change Database Connection from an Open Query Tool Tab To: Akshay Joshi Cc: pgadmin-hackers , Murtuza Zabuawala Content-Type: multipart/mixed; boundary="000000000000c6686705b10f023d" X-CLOUD-SEC-AV-Info: enterprisedb,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 --000000000000c6686705b10f023d Content-Type: multipart/alternative; boundary="000000000000c6686505b10f023b" --000000000000c6686505b10f023b Content-Type: text/plain; charset="UTF-8" Hi Akshay, I checked the implementation and found 2 locations which I missed in the last patch to remove async: False. I have removed all occurrences of async: False now also added missing loader in required places. PFA updated the patch for the same. Regards, Nikhil Mohite. On Tue, Oct 6, 2020 at 6:19 PM Akshay Joshi wrote: > Hi Nikhil > > Please verify and remove async = false wherever possible. > > On Tue, Oct 6, 2020 at 5:24 PM Dave Page > wrote: > >> >> >> On Tue, Oct 6, 2020 at 12:51 PM Murtuza Zabuawala < >> murtuza.zabuawala@enterprisedb.com> wrote: >> >>> Hi Akshay, >>> >>> We have used aysnc=False in most ajax calls with this feature, It is >>> causing UI hang in case of slow server response. >>> You can try adding a time.sleep() call at the python side response and >>> check the UI hang, I think we should avoid sync calls as much as possible. >>> >> >> I consider a sync ajax call to be a bug. >> >> >>> >>> >>> -- >>> Regards, >>> Murtuza Zabuawala >>> *EDB* >>> *POWER TO POSTGRES* >>> https://www.edbpostgres.com >>> >>> >>> On Thu, Oct 1, 2020 at 1:31 PM Akshay Joshi < >>> akshay.joshi@enterprisedb.com> wrote: >>> >>>> Thanks, patch applied. >>>> >>>> On Thu, Oct 1, 2020 at 10:42 AM Nikhil Mohite < >>>> nikhil.mohite@enterprisedb.com> wrote: >>>> >>>>> Hi Akshay, >>>>> >>>>> I have resolved the sonarQube issues, PFA updated patch for the same. >>>>> >>>>> >>>>> Regards, >>>>> Nikhil Mohite. >>>>> >>>>> >>>>> On Tue, Sep 29, 2020 at 11:31 AM Akshay Joshi < >>>>> akshay.joshi@enterprisedb.com> wrote: >>>>> >>>>>> Hi Nikhil >>>>>> >>>>>> Your patch introduces 1 new Bug and 13 new code smells, please fix >>>>>> those and resend the patch. >>>>>> >>>>>> On Mon, Sep 28, 2020 at 7:31 PM Nikhil Mohite < >>>>>> nikhil.mohite@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Akshay, >>>>>>> >>>>>>> I have resolved code conflict issues and sonarqube issues. >>>>>>> PFA updated patch. >>>>>>> >>>>>>> Regards, >>>>>>> Nikhil Mohite. >>>>>>> >>>>>>> On Mon, Sep 28, 2020 at 5:58 PM Akshay Joshi < >>>>>>> akshay.joshi@enterprisedb.com> wrote: >>>>>>> >>>>>>>> Hi Nikhil >>>>>>>> >>>>>>>> The patch is not applying, rebase, and send it again. Please check >>>>>>>> your code should not create any new SonarQube issues. >>>>>>>> >>>>>>>> On Mon, Sep 28, 2020 at 11:20 AM Nikhil Mohite < >>>>>>>> nikhil.mohite@enterprisedb.com> wrote: >>>>>>>> >>>>>>>>> Hi Akshay, >>>>>>>>> >>>>>>>>> I have resolved all the review comments and also updated the test >>>>>>>>> cases as per the new implementation. >>>>>>>>> >>>>>>>>> PFA updated patch. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> On Mon, Sep 21, 2020 at 5:24 PM Akshay Joshi < >>>>>>>>> akshay.joshi@enterprisedb.com> wrote: >>>>>>>>> >>>>>>>>>> Hi Nikhil >>>>>>>>>> >>>>>>>>>> Following are the initial review comments: >>>>>>>>>> >>>>>>>>>> - Open View/Edit data on any table and click on the same >>>>>>>>>> database connection and then click on the Execute button. Got >>>>>>>>>> "get_primary_keys() takes 1 positional argument but 2 were given" error. >>>>>>>>>> - In my opinion, we should hide the option to change the >>>>>>>>>> database connection for View/Edit Data. >>>>>>>>>> - If the user clicks on the same database connection multiple >>>>>>>>>> times then no need to change the backend connection and transaction id. Add >>>>>>>>>> validation at the backend, no action required in this case. >>>>>>>>>> - The role option is missing from the "connect to server" >>>>>>>>>> dialog. >>>>>>>>>> - The Password field should not be there on the "connect to >>>>>>>>>> server" dialog. Sometimes we saved the password so asking a password every >>>>>>>>>> time is not correct. Check the pgAdmin 3 behavior. >>>>>>>>>> >>>>>>>>>> Code review still remains. >>>>>>>>>> >>>>>>>>>> On Thu, Sep 17, 2020 at 4:15 PM Nikhil Mohite < >>>>>>>>>> nikhil.mohite@enterprisedb.com> wrote: >>>>>>>>>> >>>>>>>>>>> Hi Team, >>>>>>>>>>> >>>>>>>>>>> Regarding RM-3794 >>>>>>>>>>> allow the user to change the database connection from an open query tool: >>>>>>>>>>> I have implemented the feature and also added documentation for >>>>>>>>>>> it. >>>>>>>>>>> >>>>>>>>>>> PFA patch. >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> *Thanks & Regards,* >>>>>>>>>>> *Nikhil Mohite* >>>>>>>>>>> *Software Engineer.* >>>>>>>>>>> *EDB Postgres* >>>>>>>>>>> *Mob.No: +91-7798364578.* >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> *Thanks & Regards* >>>>>>>>>> *Akshay Joshi* >>>>>>>>>> *pgAdmin Hacker | Sr. Software Architect* >>>>>>>>>> *EDB Postgres * >>>>>>>>>> >>>>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> *Thanks & Regards* >>>>>>>> *Akshay Joshi* >>>>>>>> *pgAdmin Hacker | Sr. Software Architect* >>>>>>>> *EDB Postgres * >>>>>>>> >>>>>>>> *Mobile: +91 976-788-8246* >>>>>>>> >>>>>>> >>>>>> >>>>>> -- >>>>>> *Thanks & Regards* >>>>>> *Akshay Joshi* >>>>>> *pgAdmin Hacker | Sr. Software Architect* >>>>>> *EDB Postgres * >>>>>> >>>>>> *Mobile: +91 976-788-8246* >>>>>> >>>>> >>>> >>>> -- >>>> *Thanks & Regards* >>>> *Akshay Joshi* >>>> *pgAdmin Hacker | Sr. Software Architect* >>>> *EDB Postgres * >>>> >>>> *Mobile: +91 976-788-8246* >>>> >>> >> >> -- >> Dave Page >> VP & Chief Architect, Database Infrastructure >> EDB: http://www.enterprisedb.com >> >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Sr. Software Architect* > *EDB Postgres * > > *Mobile: +91 976-788-8246* > --000000000000c6686505b10f023b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Akshay,

I checked the implementa= tion and found 2 locations which I missed in the last patch to remove async= : False.
I have removed all occurrences of async: False now also= =C2=A0added missing loader in required places.

PFA= updated the patch for the same.

Regards,
Nikhil Mohite.

On Tue, Oct 6, 2020 at 6:19 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi Nikhil=C2=A0

Please verify and remove = async =3D false wherever possible.

On Tue, Oct 6, 2020 at 5:24 PM Dave= Page <d= ave.page@enterprisedb.com> wrote:

=C2=A0

On Thu, Oct 1, 2020 at 1:31 PM Akshay J= oshi <akshay.joshi@enterprisedb.com> wrote:
Thanks, patch applied.

On= Thu, Oct 1, 2020 at 10:42 AM Nikhil Mohite <nikhil.mohite@enterprisedb.com= > wrote:
Hi Akshay,

I have=C2=A0resolved the son= arQube issues, PFA updated patch for the same.

Regards,
Nikhil Mohite.

On Tue, S= ep 29, 2020 at 11:31 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrot= e:
Hi=C2=A0Nikhil

Your patch introduces 1 new Bug and 1= 3 new code smells, please fix those and resend the patch.

On Mon, Sep = 28, 2020 at 7:31 PM Nikhil Mohite <nikhil.mohite@enterprisedb.com> wrote= :
Hi Akshay,

I have resolved code conflict issues a= nd sonarqube issues.
PFA updated patch.

= Regards,
Nikhil Mohite.

On Mon, Sep 28, 2020 at 5:58 PM Aksh= ay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi=C2=A0Nikhil

<= /div>
The patch is not applying, rebase, and send it again. Please chec= k your code should not create any new SonarQube issues.

On Mon, Sep 28= , 2020 at 11:20 AM Nikhil Mohite <nikhil.mohite@enterprisedb.com> wrote:=
Hi Akshay,

I have resolved all the review comments= and also updated the test cases as per the new implementation.
<= br>
PFA updated patch.


<= br>
On Mon,= Sep 21, 2020 at 5:24 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wro= te:
Hi=C2=A0Nikhil

Following are the initial review com= ments:
  • Open View/Edit data on any table and click on the same d= atabase connection and then click on the Execute button. Got "get_prim= ary_keys() takes 1 positional argument but 2 were given" error.
    • In my opinion, we should hide the option to change the database connectio= n for View/Edit Data.
  • If the user clicks on the same database conne= ction multiple times then no need to change the backend connection and tran= saction id. Add validation at the backend, no action required in this case.=
  • The role option is missing from the "connect to server" = dialog.
  • The Password field should not be there on the "connect= to server" dialog. Sometimes we saved the password so asking a passwo= rd every time is not correct. Check the pgAdmin 3 behavior.
Code r= eview still remains.

On Thu, Sep 17, 2020 at 4:15 PM Nikhil Mohi= te <= nikhil.mohite@enterprisedb.com> wrote:
Hi Team,

= Regarding RM-3794 allow the=C2=A0user to change the database connection f= rom an open query tool:
I have implemented the feature and also a= dded documentation for it.

PFA patch.

=
--
Thanks & Regards,
Nikhil Mohite
Software Engineer.

--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Sr. Software Ar= chitect
EDB Postgres=
Mobile: +91 976-788-8246



--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Sr. Software Ar= chitect
EDB Postgres=
Mobile: +91 976-788-8246



--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Sr. Software Ar= chitect
EDB Postgres=
Mobile: +91 976-788-8246



--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Sr. Software Ar= chitect
EDB Postgres=
Mobile: +91 976-788-8246



--
Dave Page
VP & Chief Architect, Database Infr= astructure
EDB: http://www.enterprisedb.com

Blog: http://pgsnake.blogspot.com
Twitter: @= pgsnake


--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Sr. Software Ar= chitect
EDB Postgres=
Mobile: +91 976-788-8246

--000000000000c6686505b10f023b-- --000000000000c6686705b10f023d Content-Type: application/octet-stream; name="RM_3794_V7.patch" Content-Disposition: attachment; filename="RM_3794_V7.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kfz0ss630 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbmV3X2Nvbm5lY3Rp b25fZGlhbG9nLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVj dGlvbl9kaWFsb2cuanMKaW5kZXggM2ZjZDM3NC4uMTMyNjdhYiAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVjdGlvbl9kaWFsb2cuanMKKysrIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVjdGlvbl9kaWFsb2cuanMK QEAgLTk1LDcgKzk1LDcgQEAgbGV0IE5ld0Nvbm5lY3Rpb25EaWFsb2cgPSB7CiAgICAgICAgICAg ICAgICAgY2xvc2FibGVCeURpbW1lcjogZmFsc2UsCiAgICAgICAgICAgICAgICAgbW9kYWw6IGZh bHNlLAogICAgICAgICAgICAgICAgIGF1dG9SZXNldDogZmFsc2UsCi0gICAgICAgICAgICAgICAg Y2xvc2FibGU6IHRydWUsCisgICAgICAgICAgICAgICAgY2xvc2FibGU6IGZhbHNlLAogICAgICAg ICAgICAgICB9LAogICAgICAgICAgICAgfTsKICAgICAgICAgICB9LApAQCAtMTUyLDE0ICsxNTIs MTggQEAgbGV0IE5ld0Nvbm5lY3Rpb25EaWFsb2cgPSB7CiAgICAgICAgICAgICAgICAgc2VsZi5z dGF0dXNCYXIucmVtb3ZlQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgICAgICAgICQoc2VsZi5z dGF0dXNCYXIuZmluZCgnLmFsZXJ0LXRleHQnKSkuaHRtbChtc2cpOwogICAgICAgICAgICAgICAg IC8vIERpc2FibGUgT2theSBidXR0b24KLSAgICAgICAgICAgICAgICBzZWxmLl9faW50ZXJuYWwu YnV0dG9uc1syXS5lbGVtZW50LmRpc2FibGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBpZihz ZWxmLl9faW50ZXJuYWwpeworICAgICAgICAgICAgICAgICAgc2VsZi5fX2ludGVybmFsLmJ1dHRv bnNbMl0uZWxlbWVudC5kaXNhYmxlZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICB9KTsKIAogICAgICAgICAgICAgICB2aWV3Lmxpc3RlblRvKHZpZXcubW9kZWwsICdw Z2FkbWluLXNlc3Npb246dmFsaWQnLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICBzZWxm LnN0YXR1c0Jhci5hZGRDbGFzcygnZC1ub25lJyk7CiAgICAgICAgICAgICAgICAgJChzZWxmLnN0 YXR1c0Jhci5maW5kKCcuYWxlcnQtdGV4dCcpKS5odG1sKCcnKTsKICAgICAgICAgICAgICAgICAv LyBFbmFibGUgT2theSBidXR0b24KLSAgICAgICAgICAgICAgICBzZWxmLl9faW50ZXJuYWwuYnV0 dG9uc1syXS5lbGVtZW50LmRpc2FibGVkID0gZmFsc2U7CisgICAgICAgICAgICAgICAgaWYoc2Vs Zi5fX2ludGVybmFsKSB7CisgICAgICAgICAgICAgICAgICBzZWxmLl9faW50ZXJuYWwuYnV0dG9u c1syXS5lbGVtZW50LmRpc2FibGVkID0gZmFsc2U7CisgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICB9KTsKICAgICAgICAgICAgIH0pOwogCkBAIC0yMzAsMTUgKzIzNCwxOCBAQCBsZXQg TmV3Q29ubmVjdGlvbkRpYWxvZyA9IHsKICAgICAgICAgICAgICAgICAgICd1c2VyJzogbmV3Q29u bkNvbGxlY3Rpb25Nb2RlbFsndXNlciddLAogICAgICAgICAgICAgICAgICAgJ3JvbGUnOiBuZXdD b25uQ29sbGVjdGlvbk1vZGVsWydyb2xlJ10sCiAgICAgICAgICAgICAgICAgICAncGFzc3dvcmQn OiByZXNwb25zZS5wYXNzd29yZCwKKyAgICAgICAgICAgICAgICAgICdzZXJ2ZXJfbmFtZSc6IHJl c3BvbnNlLnNlcnZlcl9uYW1lLAorICAgICAgICAgICAgICAgICAgJ2RhdGFiYXNlX25hbWUnOiBz ZWxlY3RlZF9kYXRhYmFzZV9uYW1lLAogICAgICAgICAgICAgICAgIH07CiAgICAgICAgICAgICAg ICAgaGFuZGxlci5ncmlkVmlldy5vbl9jaGFuZ2VfY29ubmVjdGlvbihjb25uZWN0aW9uX2RldGFp bHMsIHNlbGYpOwogICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgICBzZWxmLmNsb3NlKCk7CisgICAgICAgICAgICAgIEFsZXJ0aWZ5Lm5ld0Nvbm5lY3Rp b25EaWFsb2coKS5kZXN0cm95KCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgfSwKICAgICAg ICAgfTsKICAgICAgIH0pOworCiAgICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCl7CiAgICAgICAg IEFsZXJ0aWZ5Lm5ld0Nvbm5lY3Rpb25EaWFsb2coJ0Nvbm5lY3QgdG8gc2VydmVyLicpLnJlc2l6 ZVRvKHBnQWRtaW4uQnJvd3Nlci5zdGRXLm1kLHBnQWRtaW4uQnJvd3Nlci5zdGRILm1kKTsKICAg ICAgIH0sIDUwMCk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9y L25ld19jb25uZWN0aW9uX2RpYWxvZ19tb2RlbC5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9z cWxlZGl0b3IvbmV3X2Nvbm5lY3Rpb25fZGlhbG9nX21vZGVsLmpzCmluZGV4IGUyNjJkMGUuLjll MDMwNTEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbmV3X2Nv bm5lY3Rpb25fZGlhbG9nX21vZGVsLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxl ZGl0b3IvbmV3X2Nvbm5lY3Rpb25fZGlhbG9nX21vZGVsLmpzCkBAIC0zMSw3ICszMSw2IEBAIGV4 cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG5ld0Nvbm5lY3Rpb25EaWFsb2dNb2RlbChyZXNwb25zZSwg c2dpZCwgc2lkKSB7CiAgICAgICB9KTsKIAogICAgICAgJC5hamF4KHsKLSAgICAgICAgYXN5bmM6 IGZhbHNlLAogICAgICAgICB1cmw6IHVybCwKICAgICAgICAgaGVhZGVyczogewogICAgICAgICAg ICdDYWNoZS1Db250cm9sJyA6ICduby1jYWNoZScsCkBAIC01Miw4ICs1MSw4IEBAIGV4cG9ydCBk ZWZhdWx0IGZ1bmN0aW9uIG5ld0Nvbm5lY3Rpb25EaWFsb2dNb2RlbChyZXNwb25zZSwgc2dpZCwg c2lkKSB7CiAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIHNlbGYuZmllbGQuc2V0KCdv cHRpb25zJywgW10pOwogICAgICAgICAgIH0KLSAgICAgICAgICAvL2FsZXJ0aWZ5LmVycm9yKHJl cy5kYXRhLm1zZyk7CiAgICAgICAgIH0KKyAgICAgICAgQmFja2Zvcm0uU2VsZWN0MkNvbnRyb2wu cHJvdG90eXBlLnJlbmRlci5hcHBseShzZWxmLCBhcmd1bWVudHMpOwogICAgICAgfSkuZmFpbChm dW5jdGlvbihlKXsKICAgICAgICAgbGV0IG1zZyA9ICcnOwogICAgICAgICBpZihlLnN0YXR1cyA9 PSA0MDQpIHsKQEAgLTEzMSw3ICsxMzAsOCBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBuZXdD b25uZWN0aW9uRGlhbG9nTW9kZWwocmVzcG9uc2UsIHNnaWQsIHNpZCkgewogICAgICAgICAgICAg ICAgICAgaWYgKGNsb3NlRXZlbnQuYnV0dG9uLnRleHQgPT0gZ2V0dGV4dCgnT0snKSkgewogICAg ICAgICAgICAgICAgICAgICBpZih0aGlzLnN1Ym1pdF9wYXNzd29yZCkgewogICAgICAgICAgICAg ICAgICAgICAgIHZhciBfdXJsID0gdXJsX2Zvcignc3FsZWRpdG9yLmNvbm5lY3Rfc2VydmVyJywg eydzaWQnOiB0aGlzLnNlcnZlcl9pZH0pOwotCisgICAgICAgICAgICAgICAgICAgICAgdmFyIGxv YWRpbmdEaXYgPSAkKCcjc2hvd19maWx0ZXJfcHJvZ3Jlc3MnKTsKKyAgICAgICAgICAgICAgICAg ICAgICBsb2FkaW5nRGl2LnJlbW92ZUNsYXNzKCdkLW5vbmUnKTsKICAgICAgICAgICAgICAgICAg ICAgICAkLmFqYXgoewogICAgICAgICAgICAgICAgICAgICAgICAgdHlwZTogJ1BPU1QnLAogICAg ICAgICAgICAgICAgICAgICAgICAgdGltZW91dDogMzAwMDAsCkBAIC0xNDgsOCArMTQ4LDEwIEBA IGV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG5ld0Nvbm5lY3Rpb25EaWFsb2dNb2RlbChyZXNwb25z ZSwgc2dpZCwgc2lkKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNwb25zZS5z ZXJ2ZXJfbmFtZSA9IG9iai5uYW1lOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgIGxv YWRpbmdEaXYuYWRkQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgICAgICAgICAgICAgICAgfSkK ICAgICAgICAgICAgICAgICAgICAgICAgIC5mYWlsKGZ1bmN0aW9uKHhocikgeworICAgICAgICAg ICAgICAgICAgICAgICAgICBsb2FkaW5nRGl2LmFkZENsYXNzKCdkLW5vbmUnKTsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgYWxlcnRpZnkuY29ubmVjdFNlcnZlcignQ29ubmVjdCB0byBzZXJ2 ZXInLCB4aHIucmVzcG9uc2VKU09OLnJlc3VsdCwgbG9jYWxfc2VsZi5nZXRWYWx1ZUZyb21ET00o KSk7CiAgICAgICAgICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICAgICAgfSBl bHNlIHsKQEAgLTE4Miw4ICsxODQsOSBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBuZXdDb25u ZWN0aW9uRGlhbG9nTW9kZWwocmVzcG9uc2UsIHNnaWQsIHNpZCkgewogICAgICAgICAgICAgJ3Np ZCc6IHNlbGYuZ2V0VmFsdWVGcm9tRE9NKCksCiAgICAgICAgICAgICAndXNyJzogc2VsZi5tb2Rl bC5hdHRyaWJ1dGVzLnVzZXIsCiAgICAgICAgICAgfSk7CisgICAgICAgICAgdmFyIGxvYWRpbmdE aXYgPSAkKCcjc2hvd19maWx0ZXJfcHJvZ3Jlc3MnKTsKKyAgICAgICAgICBsb2FkaW5nRGl2LnJl bW92ZUNsYXNzKCdkLW5vbmUnKTsKICAgICAgICAgICAkLmFqYXgoewotICAgICAgICAgICAgYXN5 bmM6IGZhbHNlLAogICAgICAgICAgICAgdXJsOiB1cmwsCiAgICAgICAgICAgICB0eXBlOiAnUE9T VCcsCiAgICAgICAgICAgICBoZWFkZXJzOiB7CkBAIC0xOTYsNyArMTk5LDkgQEAgZXhwb3J0IGRl ZmF1bHQgZnVuY3Rpb24gbmV3Q29ubmVjdGlvbkRpYWxvZ01vZGVsKHJlc3BvbnNlLCBzZ2lkLCBz aWQpIHsKICAgICAgICAgICAgICAgICByZXNwb25zZS5zZXJ2ZXJfbmFtZSA9IG9iai5uYW1lOwog ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIGxvYWRpbmdEaXYu YWRkQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgIH0pLmZhaWwoZnVuY3Rpb24oeGhyKXsKKyAg ICAgICAgICAgIGxvYWRpbmdEaXYuYWRkQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgICAgYWxl cnRpZnkuY29ubmVjdFNlcnZlcignQ29ubmVjdCB0byBzZXJ2ZXInLCB4aHIucmVzcG9uc2VKU09O LnJlc3VsdCwgc2VsZi5nZXRWYWx1ZUZyb21ET00oKSk7CiAgICAgICAgICAgfSk7CiAKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3RlbXBsYXRlcy9kYXRhZ3JpZC9pbmRl eC5odG1sIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvdGVtcGxhdGVzL2RhdGFncmlkL2lu ZGV4Lmh0bWwKaW5kZXggNDk3MDAyNy4uZmVlZGM2MyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v dG9vbHMvZGF0YWdyaWQvdGVtcGxhdGVzL2RhdGFncmlkL2luZGV4Lmh0bWwKKysrIGIvd2ViL3Bn YWRtaW4vdG9vbHMvZGF0YWdyaWQvdGVtcGxhdGVzL2RhdGFncmlkL2luZGV4Lmh0bWwKQEAgLTQx OCwxMSArNDE4LDEzIEBACiAgICAgICAgICAgICAgICAgPC9pPgogICAgICAgICAgICAgPC9kaXY+ CiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjb25uZWN0aW9uLWluZm8gYnRuLWdyb3VwIG1yLTEi IHJvbGU9Imdyb3VwIiBhcmlhLWxhYmVsPSIiPgotICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9 ImVkaXRvci10aXRsZSIgZGF0YS10b2dnbGU9ImRyb3Bkb3duIiBhcmlhLWhhc3BvcHVwPSJ0cnVl IiBhcmlhLWV4cGFuZGVkPSJmYWxzZSIKLSAgICAgICAgICAgICAgICAgICAgIHN0eWxlPSJiYWNr Z3JvdW5kLWNvbG9yOiB7JSBpZiBmZ2NvbG9yICV9e3sgYmdjb2xvciBvciAnI0ZGRkZGRicgfX17 JSBlbmRpZiAlfTsgY29sb3I6IHslIGlmIGZnY29sb3IgJX17eyBmZ2NvbG9yIH19eyUgZW5kaWYg JX07Ij4mbmJzcDsKKyAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjb25uZWN0aW9uLWRhdGEi IGRhdGEtdG9nZ2xlPSJkcm9wZG93biI+CisgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9 ImVkaXRvci10aXRsZSIgYXJpYS1oYXNwb3B1cD0idHJ1ZSIgYXJpYS1leHBhbmRlZD0iZmFsc2Ui CisgICAgICAgICAgICAgICAgICAgICAgICAgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHslIGlm IGZnY29sb3IgJX17eyBiZ2NvbG9yIG9yICcjRkZGRkZGJyB9fXslIGVuZGlmICV9OyBjb2xvcjog eyUgaWYgZmdjb2xvciAlfXt7IGZnY29sb3IgfX17JSBlbmRpZiAlfTsiPiZuYnNwOworICAgICAg ICAgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImNv bm4taW5mby1kZCBkcm9wZG93bi10b2dnbGUgZHJvcGRvd24tdG9nZ2xlLXNwbGl0IgorICAgICAg ICAgICAgICAgICAgICBhcmlhLWhhc3BvcHVwPSJ0cnVlIiBhcmlhLWV4cGFuZGVkPSJmYWxzZSI+ PC9zcGFuPgogICAgICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgICAgIDxzcGFuIGNs YXNzPSJjb25uLWluZm8tZGQgZHJvcGRvd24tdG9nZ2xlIGRyb3Bkb3duLXRvZ2dsZS1zcGxpdCIK LSAgICAgICAgICAgICAgICBkYXRhLXRvZ2dsZT0iZHJvcGRvd24iIGFyaWEtaGFzcG9wdXA9InRy dWUiIGFyaWEtZXhwYW5kZWQ9ImZhbHNlIj48L3NwYW4+CiAgICAgICAgICAgICAgICAgPHVsIGNs YXNzPSJkcm9wZG93bi1tZW51IiBpZD0iY29ubmVjdGlvbnMtbGlzdCI+CiAgICAgICAgICAgICAg ICAgPC91bD4KICAgICAgICAgICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9v bHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMgYi93ZWIvcGdhZG1pbi90b29scy9z cWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRvci5qcwppbmRleCA0ZWY0YjhmLi5jYjFmOGEyIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRv ci5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRv ci5qcwpAQCAtMTgyLDcgKzE4Miw3IEBAIGRlZmluZSgndG9vbHMucXVlcnl0b29sJywgWwogICAg ICAgICB9KTsKICAgICAgIH0gZWxzZSB7CiAgICAgICAgICQoJy5jb25uLWluZm8tZGQnKS5oaWRl KCk7Ci0gICAgICAgICQoJy5lZGl0b3ItdGl0bGUnKS5jc3Moe3BvaW50ZXJFdmVudHM6ICdub25l J30pOworICAgICAgICAkKCcuY29ubmVjdGlvbi1kYXRhJykuY3NzKHtwb2ludGVyRXZlbnRzOiAn bm9uZScsIGN1cnNvcjogJ2Fycm93J30pOwogICAgICAgfQogICAgIH0sCiAKQEAgLTIxMjIsOCAr MjEyMiwyMCBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5dG9vbCcsIFsKICAgICAgIGxldCB0aXRsZSA9 IHRoaXMuJGVsLmZpbmQoJy5lZGl0b3ItdGl0bGUnKS5odG1sKCk7CiAgICAgICBpZihjb25uZWN0 aW9uX2RldGFpbHNbJ3RpdGxlJ10gIT0gdGl0bGUpIHsKICAgICAgICAgdmFyIHNlbGYgPSB0aGlz OworICAgICAgICB2YXIgbG9hZGluZ0RpdiA9IG51bGw7CisgICAgICAgIHZhciBtc2dEaXYgPSBu dWxsOworICAgICAgICBpZihyZWYpeworICAgICAgICAgIGxvYWRpbmdEaXYgPSAkKCcjc2hvd19m aWx0ZXJfcHJvZ3Jlc3MnKTsKKyAgICAgICAgICBsb2FkaW5nRGl2LnJlbW92ZUNsYXNzKCdkLW5v bmUnKTsKKyAgICAgICAgICBtc2dEaXYgPSBsb2FkaW5nRGl2LmZpbmQoJy5zcWwtZWRpdG9yLWJ1 c3ktdGV4dCcpOworICAgICAgICAgIG1zZ0Rpdi50ZXh0KCdDb25uZWN0aW5nIHRvIGRhdGFiYXNl Li4uJyk7CisgICAgICAgIH0gZWxzZXsKKyAgICAgICAgICBsb2FkaW5nRGl2ID0gJCgnI2ZldGNo aW5nX2RhdGEnKTsKKyAgICAgICAgICBsb2FkaW5nRGl2LnJlbW92ZUNsYXNzKCdkLW5vbmUnKTsK KyAgICAgICAgICBtc2dEaXYgPSBsb2FkaW5nRGl2LmZpbmQoJy5zcWwtZWRpdG9yLWJ1c3ktdGV4 dCcpOworICAgICAgICB9CisKICAgICAgICAgJC5hamF4KHsKLSAgICAgICAgICBhc3luYzogZmFs c2UsCiAgICAgICAgICAgdXJsOiB1cmxfZm9yKCdkYXRhZ3JpZC51cGRhdGVfcXVlcnlfdG9vbF9j b25uZWN0aW9uJywgewogICAgICAgICAgICAgJ3RyYW5zX2lkJzogc2VsZi50cmFuc0lkLAogICAg ICAgICAgICAgJ3NnaWQnOiBjb25uZWN0aW9uX2RldGFpbHNbJ3NlcnZlcl9ncm91cCddLApAQCAt MjE0OCw3ICsyMTYwLDggQEAgZGVmaW5lKCd0b29scy5xdWVyeXRvb2wnLCBbCiAgICAgICAgICAg ICAgIH07CiAgICAgICAgICAgICAgIHNlbGYuc2V0X2VkaXRvcl90aXRsZShzZWxmLmhhbmRsZXIu dXJsX3BhcmFtcy50aXRsZSk7CiAgICAgICAgICAgICAgIHNlbGYuaGFuZGxlci5zZXRUaXRsZShz ZWxmLmhhbmRsZXIudXJsX3BhcmFtcy50aXRsZSk7Ci0gICAgICAgICAgICAgIGFsZXJ0aWZ5LnN1 Y2Nlc3MoJ2Nvbm5lY3RlZCBzdWNjZXNzZnVsbHknKTsKKyAgICAgICAgICAgICAgbGV0IHN1Y2Nl c3NfbXNnID0gY29ubmVjdGlvbl9kZXRhaWxzWydzZXJ2ZXJfbmFtZSddICsgJy8nICsgY29ubmVj dGlvbl9kZXRhaWxzWydkYXRhYmFzZV9uYW1lJ10rICctIERhdGFiYXNlIGNvbm5lY3RlZCc7Cisg ICAgICAgICAgICAgIGFsZXJ0aWZ5LnN1Y2Nlc3Moc3VjY2Vzc19tc2cpOwogICAgICAgICAgICAg ICBpZihyZWYpewogICAgICAgICAgICAgICAgIGxldCBjb25uZWN0aW9uX2RhdGEgPSB7CiAgICAg ICAgICAgICAgICAgICAnc2VydmVyX2dyb3VwJzogc2VsZi5oYW5kbGVyLnVybF9wYXJhbXMuc2dp ZCwKQEAgLTIxNTksMzkgKzIxNzIsMjcgQEAgZGVmaW5lKCd0b29scy5xdWVyeXRvb2wnLCBbCiAg ICAgICAgICAgICAgICAgICAncm9sZSc6IGNvbm5lY3Rpb25fZGV0YWlsc1sncm9sZSddLAogICAg ICAgICAgICAgICAgICAgJ3Bhc3N3b3JkJzogY29ubmVjdGlvbl9kZXRhaWxzWydwYXNzd29yZCdd LAogICAgICAgICAgICAgICAgICAgJ2lzX2FsbG93X25ld19jb25uZWN0aW9uJzogdHJ1ZSwKKyAg ICAgICAgICAgICAgICAgICdkYXRhYmFzZV9uYW1lJzogY29ubmVjdGlvbl9kZXRhaWxzWydkYXRh YmFzZV9uYW1lJ10sCisgICAgICAgICAgICAgICAgICAnc2VydmVyX25hbWUnOiBjb25uZWN0aW9u X2RldGFpbHNbJ3NlcnZlcl9uYW1lJ10sCiAgICAgICAgICAgICAgICAgfTsKICAgICAgICAgICAg ICAgICBzZWxmLmNvbm5lY3Rpb25fbGlzdC51bnNoaWZ0KGNvbm5lY3Rpb25fZGF0YSk7CiAgICAg ICAgICAgICAgICAgc2VsZi5yZW5kZXJfY29ubmVjdGlvbihzZWxmLmNvbm5lY3Rpb25fbGlzdCk7 CisgICAgICAgICAgICAgICAgbG9hZGluZ0Rpdi5hZGRDbGFzcygnZC1ub25lJyk7CisgICAgICAg ICAgICAgICAgYWxlcnRpZnkubmV3Q29ubmVjdGlvbkRpYWxvZygpLmRlc3Ryb3koKTsKICAgICAg ICAgICAgICAgICByZWYuY2xvc2UoKTsKKyAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgICAgICBsb2FkaW5nRGl2LmFkZENsYXNzKCdkLW5vbmUnKTsKICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgfSkKICAg ICAgICAgICAuZmFpbChmdW5jdGlvbih4aHIpIHsKKyAgICAgICAgICAgIGxvYWRpbmdEaXYuYWRk Q2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgICAgaWYoeGhyLnN0YXR1cyA9PSA0MjgpIHsKICAg ICAgICAgICAgICAgYWxlcnRpZnkuY29ubmVjdFNlcnZlcignQ29ubmVjdCB0byBzZXJ2ZXInLCB4 aHIucmVzcG9uc2VKU09OLnJlc3VsdCwgY29ubmVjdGlvbl9kZXRhaWxzWydzZXJ2ZXInXSwgZmFs c2UpOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgYWxlcnRpZnkuZXJyb3Io eGhyLnJlc3BvbnNlSlNPTlsnZXJyb3Jtc2cnXSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAvKmxldCB1cmwgPSB1cmxfZm9yKCdzcWxlZGl0b3IuY29ubmVjdF9zZXJ2ZXJfd2l0aF91c2Vy JywgewotICAgICAgICAgICAgICAnc2lkJzogbmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsnc2VydmVy J10sCi0gICAgICAgICAgICAgICd1c3InOiBuZXdDb25uQ29sbGVjdGlvbk1vZGVsWyd1c2VyJ10K LSAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgJC5hamF4KHsKLSAgICAgICAgICAgICAgYXN5 bmM6IGZhbHNlLAotICAgICAgICAgICAgICB1cmw6IHVybCwKLSAgICAgICAgICAgICAgaGVhZGVy czogewotICAgICAgICAgICAgICAgICdDYWNoZS1Db250cm9sJyA6ICduby1jYWNoZScsCi0gICAg ICAgICAgICAgIH0sCi0gICAgICAgICAgICB9KS5kb25lKGZ1bmN0aW9uICgpIHsKLSAgICAgICAg ICAgICAgQmFja2Zvcm0uU2VsZWN0MkNvbnRyb2wucHJvdG90eXBlLm9uQ2hhbmdlLmFwcGx5KHNl bGYsIGFyZ3VtZW50cyk7Ci0gICAgICAgICAgICAgIHJlc3BvbnNlLnNlcnZlcl9saXN0LmZvckVh Y2goZnVuY3Rpb24ob2JqKXsKLSAgICAgICAgICAgICAgICBpZihvYmouaWQ9PXNlbGYubW9kZWwu Y2hhbmdlZC5zZXJ2ZXIpIHsKLSAgICAgICAgICAgICAgICAgIHJlc3BvbnNlLnNlcnZlcl9uYW1l ID0gb2JqLm5hbWU7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICB9KTsKLSAgICAg ICAgICAgIH0pLmZhaWwoZnVuY3Rpb24oeGhyKXt9KTsqLwotCiAgICAgICAgICAgfSk7CiAgICAg ICB9CiAgICAgfSwKQEAgLTI1MjYsNiArMjUyNyw4IEBAIGRlZmluZSgndG9vbHMucXVlcnl0b29s JywgWwogICAgICAgICAgICAgJ3JvbGUnOiBudWxsLAogICAgICAgICAgICAgJ3RpdGxlJzogXy51 bmVzY2FwZSh1cmxfcGFyYW1zLnRpdGxlKSwKICAgICAgICAgICAgICdpc19hbGxvd19uZXdfY29u bmVjdGlvbic6IGZhbHNlLAorICAgICAgICAgICAgJ2RhdGFiYXNlX25hbWUnOiB1cmxfcGFyYW1z LnRpdGxlLnNwbGl0KCcvJylbMF0sCisgICAgICAgICAgICAnc2VydmVyX25hbWUnOiB1cmxfcGFy YW1zLnRpdGxlLnNwbGl0KCdAJylbMV0sCiAgICAgICAgICAgfTsKICAgICAgICAgICBzZWxmLmdy aWRWaWV3LmNvbm5lY3Rpb25fbGlzdC51bnNoaWZ0KGNvbm5lY3Rpb25fZGF0YSk7CiAgICAgICAg ICAgc2VsZi5ncmlkVmlldy5yZW5kZXJfY29ubmVjdGlvbihzZWxmLmdyaWRWaWV3LmNvbm5lY3Rp b25fbGlzdCk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGlj L3Njc3MvX3NxbGVkaXRvci5zY3NzIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRp Yy9zY3NzL19zcWxlZGl0b3Iuc2NzcwppbmRleCA1M2YyNDQ5Li43ZmM1NzZhIDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL3Njc3MvX3NxbGVkaXRvci5zY3Nz CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvc2Nzcy9fc3FsZWRpdG9y LnNjc3MKQEAgLTQzLDYgKzQzLDEyIEBACiAgIGN1cnNvcjogcG9pbnRlcjsKIH0KIAorLmNvbm5l Y3Rpb24tZGF0YSB7CisgIGRpc3BsYXk6IGluaGVyaXQ7CisgIGN1cnNvcjogcG9pbnRlcjsKKyAg d2lkdGg6IGF1dG87Cit9CisKIAogI2VkaXRvci1wYW5lbCB7CiAgIHotaW5kZXg6IDA7Cg== --000000000000c6686705b10f023d--