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 1kPiha-0001py-D4 for pgadmin-hackers@arkaria.postgresql.org; Tue, 06 Oct 2020 08:52:06 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kPihY-0006gc-7N for pgadmin-hackers@arkaria.postgresql.org; Tue, 06 Oct 2020 08:52:04 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kPihX-0006eg-VB for pgadmin-hackers@lists.postgresql.org; Tue, 06 Oct 2020 08:52:04 +0000 Received: from mail-yb1-xb44.google.com ([2607:f8b0:4864:20::b44]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kPihU-0005xQ-3D for pgadmin-hackers@postgresql.org; Tue, 06 Oct 2020 08:52:03 +0000 Received: by mail-yb1-xb44.google.com with SMTP id x8so8428278ybe.12 for ; Tue, 06 Oct 2020 01:51:59 -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=Fafgk8TUY1xjV3mgvuqEhyiw+bnkczs3C+c/ZLTgS/g=; b=S4SII5cNrU6L6r0yRHRcL0R/mM9vcIRxG3M/K1IYtrAZJGlc3Ev5Bk4H+FBQPqKQWo IHDpvoduHk83L0//NUsXh/ZkELqdqKXjOdfK0AgaRP7R0NB7CIyuj9Ot/m9SJpWEFCMZ 6GRpRcPrvcyMFthnpYqI7daKp9xP1doJD7ECBbKf8C9ul0m7zWiIE0dGoGScKrGw/IVM MUomw56HAtG7q9EHhZ4AuV83dzffu6XgAIELHK/mnndcOZk/YCPaprpfjpIBdreO1J3P VxpWFVUFIQj6Xu82GSJIpsHkMlQZXBOmIkNmIdWmv07GTljKRqhfKYdx12VyWpGjkNuc h0lA== 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=Fafgk8TUY1xjV3mgvuqEhyiw+bnkczs3C+c/ZLTgS/g=; b=BIRT+/MgG/DoqPJjyDDDCK9MftmbKzjl/UJ8qRR+C/IaONvZTGIXj8EIE7W4T5Z7qB xeg6jEP6emC4HBeNWkJ2qw86APDqW7G8QMEbDRCqcLQBL5lHvO4yCmoIxDKGwJInnrEA AuhyJ4PW676HA/jOXxyqBoYYafM3pErWJAsL4Ttverr3MpaFKGRVhEhRqgraoFLc8tM3 PTJX3g1UWVBtq5eG3wmoFkdz1beuA87THAy4Cjen45TdkmpsWi/iLOJl+zKKchtw4xkD G4USdbreZgsOaZu0uLKz3uYVPIzF6fr8TgfL9vwFQtcl+FGbptiggn0M7cTvO7HeUikq p7rA== X-Gm-Message-State: AOAM533vLUWf77jyUNnf1YtSAQHhdUS5O4PlJtOsjldvXBo0nARZPc0I vNH7ob+rnGXBRVmTD3tfgV65RPNsE1KHWrF/LX4eXXOfYQLt2KtHjuHi1jT38xoYHhX45MJQB+Y bIxnZFFqVInpZ6+fMY24qg/hDXediFb6CHjQA5cttXYYsZVZyo6OlXrnhpUgYWnBbglW11ERpSz R1HA1AVimwTN4owaxXpDlMQl7CXNnaiTxBLKKvAw8YlrBnz2qtdX1fLpA2AA== X-Google-Smtp-Source: ABdhPJzQYVzMdP6wfptsDMH8uLU6Pu914CON52EyNQzlh1RtArAZyCHnwVLeAQu2BhMLdE29wuY7kfp6zGu1D2oJOg0= X-Received: by 2002:a25:6909:: with SMTP id e9mr4736115ybc.479.1601974318408; Tue, 06 Oct 2020 01:51:58 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Nikhil Mohite Date: Tue, 6 Oct 2020 14:21:47 +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 Content-Type: multipart/mixed; boundary="00000000000030636005b0fcb693" 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 --00000000000030636005b0fcb693 Content-Type: multipart/alternative; boundary="00000000000030635e05b0fcb691" --00000000000030635e05b0fcb691 Content-Type: text/plain; charset="UTF-8" Hi Akshay, I have updated the following points as per suggestions: 1. Updated connection success message. (Added database name in the success message.) 2. Resolve issue of the mouse pointer and dropdown will show below the connection string only. 3. Added loader for both new connections and load existing connections. 4. Removed async: false for update connection. Regards, Nikhil Mohite. On Thu, Oct 1, 2020 at 1:31 PM Akshay Joshi 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* > --00000000000030635e05b0fcb691 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Akshay,

I have updated the follo= wing points as per suggestions:
1. Updated connection success mes= sage. (Added database name in the success message.)
2. Resolve is= sue of the mouse pointer and dropdown will show below the connection string= only.
3. Added=C2=A0loader=C2=A0for both new connections and loa= d existing connections.
4. Removed async: false for update connec= tion.


Regards,
Nikhil Moh= ite.


On Thu, Oct 1, 2020 at 1:31 PM Akshay Joshi <akshay.joshi@enterprisedb.co= m> 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 sonarQube issues, PFA updated pa= tch for the same.


Regards,
Nikhil Mohite.


<= div dir=3D"ltr" class=3D"gmail_attr">On Tue, Sep 29, 2020 at 11:31 AM Aksha= y Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi=C2=A0Nikhil

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 Mo= hite <nikhil.mohite@enterprisedb.com> wrote:
Hi Akshay,

I have resolved code conflict issues and sonarqube issues.
PFA updated patch.

Regards,
Nikhil Mo= hite.

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

The patch is not a= pplying, rebase, and send it again. Please check your code should not creat= e any new SonarQube issues.

On Mon, Sep 28, 2020 at 11:20 AM Nikhil Mo= hite <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 p= atch.



On Mon, Sep 21, 2020 at 5:24 PM Ak= shay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi=C2=A0Nikhil
Following are the initial review comments:
  • Open Vie= w/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 position= al argument but 2 were given" error.
  • In my opinion, we should = hide the option to change the database connection for View/Edit Data.
    • <= li>If the user clicks on the same database connection multiple times then n= o 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 Passwor= d field should not be there on the "connect to server" dialog. So= metimes we saved the password so asking a password every time is not correc= t. Check the pgAdmin 3 behavior.
Code review still remains.
<= /div>

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

Regarding RM-3794 allow t= he=C2=A0user to change the database connection from an open query tool:
I have implemented the feature and also added documentation for it.<= /div>

PFA patch.

--
Thanks &= ; Regards,
Nikhil Mohi= te
Software Engi= neer.


--


--
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

--00000000000030635e05b0fcb691-- --00000000000030636005b0fcb693 Content-Type: application/octet-stream; name="RM_3794_V6.patch" Content-Disposition: attachment; filename="RM_3794_V6.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kfxq4jxk0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3IvbmV3X2Nvbm5lY3Rp b25fZGlhbG9nLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVj dGlvbl9kaWFsb2cuanMKaW5kZXggM2ZjZDM3NC4uYTY3NGYyYyAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVjdGlvbl9kaWFsb2cuanMKKysrIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9uZXdfY29ubmVjdGlvbl9kaWFsb2cuanMK QEAgLTIzMCw2ICsyMzAsOCBAQCBsZXQgTmV3Q29ubmVjdGlvbkRpYWxvZyA9IHsKICAgICAgICAg ICAgICAgICAgICd1c2VyJzogbmV3Q29ubkNvbGxlY3Rpb25Nb2RlbFsndXNlciddLAogICAgICAg ICAgICAgICAgICAgJ3JvbGUnOiBuZXdDb25uQ29sbGVjdGlvbk1vZGVsWydyb2xlJ10sCiAgICAg ICAgICAgICAgICAgICAncGFzc3dvcmQnOiByZXNwb25zZS5wYXNzd29yZCwKKyAgICAgICAgICAg ICAgICAgICdzZXJ2ZXJfbmFtZSc6IHJlc3BvbnNlLnNlcnZlcl9uYW1lLAorICAgICAgICAgICAg ICAgICAgJ2RhdGFiYXNlX25hbWUnOiBzZWxlY3RlZF9kYXRhYmFzZV9uYW1lLAogICAgICAgICAg ICAgICAgIH07CiAgICAgICAgICAgICAgICAgaGFuZGxlci5ncmlkVmlldy5vbl9jaGFuZ2VfY29u bmVjdGlvbihjb25uZWN0aW9uX2RldGFpbHMsIHNlbGYpOwogICAgICAgICAgICAgICB9CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9kYXRhZ3JpZC90ZW1wbGF0ZXMvZGF0YWdyaWQvaW5k ZXguaHRtbCBiL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3RlbXBsYXRlcy9kYXRhZ3JpZC9p bmRleC5odG1sCmluZGV4IDQ5NzAwMjcuLmZlZWRjNjMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L3Rvb2xzL2RhdGFncmlkL3RlbXBsYXRlcy9kYXRhZ3JpZC9pbmRleC5odG1sCisrKyBiL3dlYi9w Z2FkbWluL3Rvb2xzL2RhdGFncmlkL3RlbXBsYXRlcy9kYXRhZ3JpZC9pbmRleC5odG1sCkBAIC00 MTgsMTEgKzQxOCwxMyBAQAogICAgICAgICAgICAgICAgIDwvaT4KICAgICAgICAgICAgIDwvZGl2 PgogICAgICAgICAgICAgPGRpdiBjbGFzcz0iY29ubmVjdGlvbi1pbmZvIGJ0bi1ncm91cCBtci0x IiByb2xlPSJncm91cCIgYXJpYS1sYWJlbD0iIj4KLSAgICAgICAgICAgICAgICA8ZGl2IGNsYXNz PSJlZGl0b3ItdGl0bGUiIGRhdGEtdG9nZ2xlPSJkcm9wZG93biIgYXJpYS1oYXNwb3B1cD0idHJ1 ZSIgYXJpYS1leHBhbmRlZD0iZmFsc2UiCi0gICAgICAgICAgICAgICAgICAgICBzdHlsZT0iYmFj a2dyb3VuZC1jb2xvcjogeyUgaWYgZmdjb2xvciAlfXt7IGJnY29sb3Igb3IgJyNGRkZGRkYnIH19 eyUgZW5kaWYgJX07IGNvbG9yOiB7JSBpZiBmZ2NvbG9yICV9e3sgZmdjb2xvciB9fXslIGVuZGlm ICV9OyI+Jm5ic3A7CisgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iY29ubmVjdGlvbi1kYXRh IiBkYXRhLXRvZ2dsZT0iZHJvcGRvd24iPgorICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNz PSJlZGl0b3ItdGl0bGUiIGFyaWEtaGFzcG9wdXA9InRydWUiIGFyaWEtZXhwYW5kZWQ9ImZhbHNl IgorICAgICAgICAgICAgICAgICAgICAgICAgIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiB7JSBp ZiBmZ2NvbG9yICV9e3sgYmdjb2xvciBvciAnI0ZGRkZGRicgfX17JSBlbmRpZiAlfTsgY29sb3I6 IHslIGlmIGZnY29sb3IgJX17eyBmZ2NvbG9yIH19eyUgZW5kaWYgJX07Ij4mbmJzcDsKKyAgICAg ICAgICAgICAgICAgICAgPC9kaXY+CisgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJj b25uLWluZm8tZGQgZHJvcGRvd24tdG9nZ2xlIGRyb3Bkb3duLXRvZ2dsZS1zcGxpdCIKKyAgICAg ICAgICAgICAgICAgICAgYXJpYS1oYXNwb3B1cD0idHJ1ZSIgYXJpYS1leHBhbmRlZD0iZmFsc2Ui Pjwvc3Bhbj4KICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAgICA8c3BhbiBj bGFzcz0iY29ubi1pbmZvLWRkIGRyb3Bkb3duLXRvZ2dsZSBkcm9wZG93bi10b2dnbGUtc3BsaXQi Ci0gICAgICAgICAgICAgICAgZGF0YS10b2dnbGU9ImRyb3Bkb3duIiBhcmlhLWhhc3BvcHVwPSJ0 cnVlIiBhcmlhLWV4cGFuZGVkPSJmYWxzZSI+PC9zcGFuPgogICAgICAgICAgICAgICAgIDx1bCBj bGFzcz0iZHJvcGRvd24tbWVudSIgaWQ9ImNvbm5lY3Rpb25zLWxpc3QiPgogICAgICAgICAgICAg ICAgIDwvdWw+CiAgICAgICAgICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rv b2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMv c3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0b3IuanMKaW5kZXggNGVmNGI4Zi4uNjAwYTY0NCAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0 b3IuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9qcy9zcWxlZGl0 b3IuanMKQEAgLTE4Miw3ICsxODIsNyBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5dG9vbCcsIFsKICAg ICAgICAgfSk7CiAgICAgICB9IGVsc2UgewogICAgICAgICAkKCcuY29ubi1pbmZvLWRkJykuaGlk ZSgpOwotICAgICAgICAkKCcuZWRpdG9yLXRpdGxlJykuY3NzKHtwb2ludGVyRXZlbnRzOiAnbm9u ZSd9KTsKKyAgICAgICAgJCgnLmNvbm5lY3Rpb24tZGF0YScpLmNzcyh7cG9pbnRlckV2ZW50czog J25vbmUnLCBjdXJzb3I6ICdhcnJvdyd9KTsKICAgICAgIH0KICAgICB9LAogCkBAIC0yMTIyLDgg KzIxMjIsMjAgQEAgZGVmaW5lKCd0b29scy5xdWVyeXRvb2wnLCBbCiAgICAgICBsZXQgdGl0bGUg PSB0aGlzLiRlbC5maW5kKCcuZWRpdG9yLXRpdGxlJykuaHRtbCgpOwogICAgICAgaWYoY29ubmVj dGlvbl9kZXRhaWxzWyd0aXRsZSddICE9IHRpdGxlKSB7CiAgICAgICAgIHZhciBzZWxmID0gdGhp czsKKyAgICAgICAgdmFyIGxvYWRpbmdEaXYgPSBudWxsOworICAgICAgICB2YXIgbXNnRGl2ID0g bnVsbDsKKyAgICAgICAgaWYocmVmKXsKKyAgICAgICAgICBsb2FkaW5nRGl2ID0gJCgnI3Nob3df ZmlsdGVyX3Byb2dyZXNzJyk7CisgICAgICAgICAgbG9hZGluZ0Rpdi5yZW1vdmVDbGFzcygnZC1u b25lJyk7CisgICAgICAgICAgbXNnRGl2ID0gbG9hZGluZ0Rpdi5maW5kKCcuc3FsLWVkaXRvci1i dXN5LXRleHQnKTsKKyAgICAgICAgICBtc2dEaXYudGV4dCgnQ29ubmVjdGluZyB0byBkYXRhYmFz ZS4uLicpOworICAgICAgICB9IGVsc2V7CisgICAgICAgICAgbG9hZGluZ0RpdiA9ICQoJyNmZXRj aGluZ19kYXRhJyk7CisgICAgICAgICAgbG9hZGluZ0Rpdi5yZW1vdmVDbGFzcygnZC1ub25lJyk7 CisgICAgICAgICAgbXNnRGl2ID0gbG9hZGluZ0Rpdi5maW5kKCcuc3FsLWVkaXRvci1idXN5LXRl eHQnKTsKKyAgICAgICAgfQorCiAgICAgICAgICQuYWpheCh7Ci0gICAgICAgICAgYXN5bmM6IGZh bHNlLAogICAgICAgICAgIHVybDogdXJsX2ZvcignZGF0YWdyaWQudXBkYXRlX3F1ZXJ5X3Rvb2xf Y29ubmVjdGlvbicsIHsKICAgICAgICAgICAgICd0cmFuc19pZCc6IHNlbGYudHJhbnNJZCwKICAg ICAgICAgICAgICdzZ2lkJzogY29ubmVjdGlvbl9kZXRhaWxzWydzZXJ2ZXJfZ3JvdXAnXSwKQEAg LTIxNDgsNyArMjE2MCw4IEBAIGRlZmluZSgndG9vbHMucXVlcnl0b29sJywgWwogICAgICAgICAg ICAgICB9OwogICAgICAgICAgICAgICBzZWxmLnNldF9lZGl0b3JfdGl0bGUoc2VsZi5oYW5kbGVy LnVybF9wYXJhbXMudGl0bGUpOwogICAgICAgICAgICAgICBzZWxmLmhhbmRsZXIuc2V0VGl0bGUo c2VsZi5oYW5kbGVyLnVybF9wYXJhbXMudGl0bGUpOwotICAgICAgICAgICAgICBhbGVydGlmeS5z dWNjZXNzKCdjb25uZWN0ZWQgc3VjY2Vzc2Z1bGx5Jyk7CisgICAgICAgICAgICAgIGxldCBzdWNj ZXNzX21zZyA9IGNvbm5lY3Rpb25fZGV0YWlsc1snc2VydmVyX25hbWUnXSArICcvJyArIGNvbm5l Y3Rpb25fZGV0YWlsc1snZGF0YWJhc2VfbmFtZSddKyAnLSBEYXRhYmFzZSBjb25uZWN0ZWQnOwor ICAgICAgICAgICAgICBhbGVydGlmeS5zdWNjZXNzKHN1Y2Nlc3NfbXNnKTsKICAgICAgICAgICAg ICAgaWYocmVmKXsKICAgICAgICAgICAgICAgICBsZXQgY29ubmVjdGlvbl9kYXRhID0gewogICAg ICAgICAgICAgICAgICAgJ3NlcnZlcl9ncm91cCc6IHNlbGYuaGFuZGxlci51cmxfcGFyYW1zLnNn aWQsCkBAIC0yMTU5LDE1ICsyMTcyLDIxIEBAIGRlZmluZSgndG9vbHMucXVlcnl0b29sJywgWwog ICAgICAgICAgICAgICAgICAgJ3JvbGUnOiBjb25uZWN0aW9uX2RldGFpbHNbJ3JvbGUnXSwKICAg ICAgICAgICAgICAgICAgICdwYXNzd29yZCc6IGNvbm5lY3Rpb25fZGV0YWlsc1sncGFzc3dvcmQn XSwKICAgICAgICAgICAgICAgICAgICdpc19hbGxvd19uZXdfY29ubmVjdGlvbic6IHRydWUsCisg ICAgICAgICAgICAgICAgICAnZGF0YWJhc2VfbmFtZSc6IGNvbm5lY3Rpb25fZGV0YWlsc1snZGF0 YWJhc2VfbmFtZSddLAorICAgICAgICAgICAgICAgICAgJ3NlcnZlcl9uYW1lJzogY29ubmVjdGlv bl9kZXRhaWxzWydzZXJ2ZXJfbmFtZSddLAogICAgICAgICAgICAgICAgIH07CiAgICAgICAgICAg ICAgICAgc2VsZi5jb25uZWN0aW9uX2xpc3QudW5zaGlmdChjb25uZWN0aW9uX2RhdGEpOwogICAg ICAgICAgICAgICAgIHNlbGYucmVuZGVyX2Nvbm5lY3Rpb24oc2VsZi5jb25uZWN0aW9uX2xpc3Qp OworICAgICAgICAgICAgICAgIGxvYWRpbmdEaXYuYWRkQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAg ICAgICAgICAgIHJlZi5jbG9zZSgpOworICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAgIGxvYWRpbmdEaXYuYWRkQ2xhc3MoJ2Qtbm9uZScpOwogICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICB9KQogICAg ICAgICAgIC5mYWlsKGZ1bmN0aW9uKHhocikgeworICAgICAgICAgICAgbG9hZGluZ0Rpdi5hZGRD bGFzcygnZC1ub25lJyk7CiAgICAgICAgICAgICBpZih4aHIuc3RhdHVzID09IDQyOCkgewogICAg ICAgICAgICAgICBhbGVydGlmeS5jb25uZWN0U2VydmVyKCdDb25uZWN0IHRvIHNlcnZlcicsIHho ci5yZXNwb25zZUpTT04ucmVzdWx0LCBjb25uZWN0aW9uX2RldGFpbHNbJ3NlcnZlciddLCBmYWxz ZSk7CiAgICAgICAgICAgICB9IGVsc2UgewpAQCAtMjUyNiw2ICsyNTQ1LDggQEAgZGVmaW5lKCd0 b29scy5xdWVyeXRvb2wnLCBbCiAgICAgICAgICAgICAncm9sZSc6IG51bGwsCiAgICAgICAgICAg ICAndGl0bGUnOiBfLnVuZXNjYXBlKHVybF9wYXJhbXMudGl0bGUpLAogICAgICAgICAgICAgJ2lz X2FsbG93X25ld19jb25uZWN0aW9uJzogZmFsc2UsCisgICAgICAgICAgICAnZGF0YWJhc2VfbmFt ZSc6IHVybF9wYXJhbXMudGl0bGUuc3BsaXQoJy8nKVswXSwKKyAgICAgICAgICAgICdzZXJ2ZXJf bmFtZSc6IHVybF9wYXJhbXMudGl0bGUuc3BsaXQoJ0AnKVsxXSwKICAgICAgICAgICB9OwogICAg ICAgICAgIHNlbGYuZ3JpZFZpZXcuY29ubmVjdGlvbl9saXN0LnVuc2hpZnQoY29ubmVjdGlvbl9k YXRhKTsKICAgICAgICAgICBzZWxmLmdyaWRWaWV3LnJlbmRlcl9jb25uZWN0aW9uKHNlbGYuZ3Jp ZFZpZXcuY29ubmVjdGlvbl9saXN0KTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3Nx bGVkaXRvci9zdGF0aWMvc2Nzcy9fc3FsZWRpdG9yLnNjc3MgYi93ZWIvcGdhZG1pbi90b29scy9z cWxlZGl0b3Ivc3RhdGljL3Njc3MvX3NxbGVkaXRvci5zY3NzCmluZGV4IDUzZjI0NDkuLjdmYzU3 NmEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvc2Nzcy9f c3FsZWRpdG9yLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3N0YXRpYy9z Y3NzL19zcWxlZGl0b3Iuc2NzcwpAQCAtNDMsNiArNDMsMTIgQEAKICAgY3Vyc29yOiBwb2ludGVy OwogfQogCisuY29ubmVjdGlvbi1kYXRhIHsKKyAgZGlzcGxheTogaW5oZXJpdDsKKyAgY3Vyc29y OiBwb2ludGVyOworICB3aWR0aDogYXV0bzsKK30KKwogCiAjZWRpdG9yLXBhbmVsIHsKICAgei1p bmRleDogMDsK --00000000000030636005b0fcb693--