Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1eqz5c-0008La-Q7 for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 10:36:00 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1eqz5b-0000ww-K8 for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 10:35:59 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1eqz5b-0000wm-DT for pgadmin-hackers@lists.postgresql.org; Wed, 28 Feb 2018 10:35:59 +0000 Received: from mail-ot0-x243.google.com ([2607:f8b0:4003:c0f::243]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1eqz5V-0004yZ-Bl for pgadmin-hackers@postgresql.org; Wed, 28 Feb 2018 10:35:58 +0000 Received: by mail-ot0-x243.google.com with SMTP id g97so1753345otg.13 for ; Wed, 28 Feb 2018 02:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=udmg104iGRYDWAEpA97iW5rp/Gt/pkGkr2WV69bz4kU=; b=GvzRlAwFu7kUxUfWvP5qXPeJMBMc1e4JJ3F59Q6ri5na8T4Vf+gaPSacYWHZmunKSZ IxxUC9e/MTDxlrQiNZ2nNhKQvSK6W/iQTt8wJfKVtpOzeJVuwNeSb4l43Z9lAitQkCb9 CxgA7ZuR/CfJagBol44IbNElyyP7pOw0iDrLx2wwL8IyvIXFPkGKTQtIYfHSm4OIcLcD SBHdYhF0o3GZBwz7q4UNokopXSrVCAb2yPWMJ82sdX0D+kC4qC2bN8EWDjL0JK+XjG3X 2JTDQo3w8LsSFjlxiuDrE59EfAcImnIzpMtrqfCFQ9QPZWhMeYcNv8IyxAPYCXeVnrV4 iRFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=udmg104iGRYDWAEpA97iW5rp/Gt/pkGkr2WV69bz4kU=; b=c7HpnsI8tr2mDtgS3KW/Nnhv8RFpxiNefGYdhqWNpGgoTbvH7HD+HP0R1WWnusHo2a 5FOxvtGh3Z8V6icjYyoJ9lHdkLLog5wDRoDswmqBVlG1qsPdmIlXj2FU0kZAaEzGgVwn y6B7s6Jcg6/HCuACnnNXTh8g1Bd/1yCssmDt1evmDP4I3vCv02/5J5/rrSvjK7kmRVju 7UdVaHILELUMPmNMfsaOwdrXkQRatRNHp/U/oHRVckvx3zC0QbQrKKjVlF22BQFjadFN tBZjSyJ7ji9BXzRZeN9gEsf3tcxJAZHwkrQDw33jcysXJsLUm4PGrap0WfPTsCNENjXU Cp/w== X-Gm-Message-State: APf1xPDsQAI3+QfqmJUH3ViDUstRRNIjYxXVDkwKSwtJf5Kvhl67GeQO l2kv2r5wuAyEcELXEW7C3Cnl8TLeWi93SSyhHdlkng== X-Google-Smtp-Source: AG47ELsjtm29RM8JTLAVYYFboMm6f859mYRB8q7+l46UOaQNIPH6Zf+onemnTE6j18Fj84hmsR7FcI5Ctos/D0uBHXQ= X-Received: by 10.157.31.82 with SMTP id x18mr202310otx.291.1519814149926; Wed, 28 Feb 2018 02:35:49 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.8.150 with HTTP; Wed, 28 Feb 2018 02:35:29 -0800 (PST) In-Reply-To: References: From: Murtuza Zabuawala Date: Wed, 28 Feb 2018 16:05:29 +0530 Message-ID: Subject: Re: [pgAdmin4][RM#3073] Allow user to schedule without End date from UI To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a113dd2de8867140566434e90" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a113dd2de8867140566434e90 Content-Type: multipart/alternative; boundary="001a113dd2de8867100566434e8e" --001a113dd2de8867100566434e8e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Dave, I have found the issue, it was in Backform control itself :) Issue: We were passing today's date value as minDate option in pgAgent schedule schema while rendering the control, So when server was sending previous datetime value it was not displaying it causing sync problem. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Tue, Feb 27, 2018 at 8:39 PM, Murtuza Zabuawala < murtuza.zabuawala@enterprisedb.com> wrote: > =E2=80=8BThanks Dave, I'll look into it. > =E2=80=8B > > > On Tue, Feb 27, 2018 at 8:37 PM, Dave Page wrote: > >> Hi >> >> On Tue, Feb 27, 2018 at 12:03 PM, Murtuza Zabuawala < >> murtuza.zabuawala@enterprisedb.com> wrote: >> >>> I'm not able to re-produce the issue, Could you hard refresh and try >>> again? >>> >> >> I still see it. >> >> >>> >>> If possible could you please provide exact steps? >>> >> >> Attached is a dump of my test pgagent schema. >> >> 1) Load the schema dump into the maintenance database >> 2) Connect pgAdmin >> 3) Browse to pgAgent Jobs >> 4) Right-click Properties, and select the Schedules tab >> 5) Open the subnode for sched1 >> >> >>> >>> -- >>> Regards, >>> Murtuza Zabuawala >>> EnterpriseDB: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >>> >>> On Tue, Feb 27, 2018 at 5:30 PM, Dave Page wrote: >>> >>>> Sorry - here it is. >>>> >>>> On Tue, Feb 27, 2018 at 11:59 AM, Murtuza Zabuawala < >>>> murtuza.zabuawala@enterprisedb.com> wrote: >>>> >>>>> Hi Dave, >>>>> >>>>> Could you please send screenshot? >>>>> >>>>> -- >>>>> Regards, >>>>> Murtuza Zabuawala >>>>> EnterpriseDB: http://www.enterprisedb.com >>>>> The Enterprise PostgreSQL Company >>>>> >>>>> >>>>> On Tue, Feb 27, 2018 at 5:24 PM, Dave Page wrote: >>>>> >>>>>> Hi >>>>>> >>>>>> Still not quite right - see the attached screenshot which is the >>>>>> result of simply viewing the properties of an existing job. Note tha= t the >>>>>> start time is shown in the grid but not the subnode control. >>>>>> >>>>>> Thanks. >>>>>> >>>>>> On Tue, Feb 27, 2018 at 8:26 AM, Murtuza Zabuawala < >>>>>> murtuza.zabuawala@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Dave, >>>>>>> >>>>>>> As validation related patch was committed with RM#3148 [ Sorry abou= t >>>>>>> that I forgot to checkout :) ] >>>>>>> PFA patch to fix the issues you mentioned, I have also removed extr= a >>>>>>> error message from sub node collection control and made it optional= via >>>>>>> flag. >>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Regards, >>>>>>> Murtuza Zabuawala >>>>>>> EnterpriseDB: http://www.enterprisedb.com >>>>>>> The Enterprise PostgreSQL Company >>>>>>> >>>>>>> >>>>>>> On Mon, Feb 26, 2018 at 10:14 PM, Dave Page >>>>>>> wrote: >>>>>>> >>>>>>>> Hi >>>>>>>> >>>>>>>> On Mon, Feb 26, 2018 at 2:46 PM, Murtuza Zabuawala < >>>>>>>> murtuza.zabuawala@enterprisedb.com> wrote: >>>>>>>> >>>>>>>>> Hi, >>>>>>>>> >>>>>>>>> PFA patch to fix the issue where user was not able to create >>>>>>>>> pgAgent job from UI without entering End date in schedule section= . >>>>>>>>> >>>>>>>> >>>>>>>> Whilst this does resolve the validation issue, there are still a >>>>>>>> couple of other related problems, as can be seen in the attached >>>>>>>> screenshots: >>>>>>>> >>>>>>>> - The Start date/time in the subnode control doesn't seem to be >>>>>>>> properly synchronised with the value in the grid. >>>>>>>> >>>>>>>> - If you leave the End date/time blank (but maybe click into it >>>>>>>> first), the grid will show "Invalid date". >>>>>>>> >>>>>>>> It's possible there are other oddities as well - please check >>>>>>>> carefully for anything else. >>>>>>>> >>>>>>>> Thanks. >>>>>>>> >>>>>>>> -- >>>>>>>> Dave Page >>>>>>>> Blog: http://pgsnake.blogspot.com >>>>>>>> Twitter: @pgsnake >>>>>>>> >>>>>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>>>>> The Enterprise PostgreSQL Company >>>>>>>> >>>>>>> >>>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Dave Page >>>>>> Blog: http://pgsnake.blogspot.com >>>>>> Twitter: @pgsnake >>>>>> >>>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>>> The Enterprise PostgreSQL Company >>>>>> >>>>> >>>>> >>>> >>>> >>>> -- >>>> Dave Page >>>> Blog: http://pgsnake.blogspot.com >>>> Twitter: @pgsnake >>>> >>>> EnterpriseDB UK: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>>> >>> >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > --001a113dd2de8867100566434e8e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

I have= found the issue, it was in Backform control itself :)
Issue:= We were passing today's date value as minDate option in pgAgent schedu= le schema while rendering the control, So when server was sending previous = datetime value it was not displaying it causing sync problem.

<= div dir=3D"ltr">--
Regards,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://ww= w.enterprisedb.com
The Enterprise PostgreSQL Company


On Tue, Feb 27, 2018 at 8:39 PM, Murtuza Zab= uawala <murtuza.zabuawala@enterprisedb.com>= wrote:
=E2=80= =8BThanks Dave, I'll look into it.
=
= =E2=80=8B

=

On Tue, Feb 27, 2018 at 8:37 PM, Dave Page <= span dir=3D"ltr"><dpage@pgadmin.org> wrote:
=
Hi

On Tue, Feb 27, 2018 at 12:03 PM, Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com> wrote:
I'm not able to re-produce the issue, Could yo= u hard refresh and try again?

I still see it.
=C2=A0
<= br>
If pos= sible could you please provide exact steps?
Attached is a dump of my test pgagent schema.

1) Load the schema dump into the maintenance database
2)= Connect pgAdmin
3) Browse to pgAgent Jobs
4) Right-cli= ck Properties, and select the Schedules tab
5) Open the subnode f= or sched1
=C2=A0

--=
Regard= s,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterpr= isedb.com
The Enterprise PostgreSQL Company

<= /font>

On Tue, Feb 27, 2018 at 5:30 PM, Dave Page <dp= age@pgadmin.org> wrote:
Sorry - here it is.

On Tue, Feb 27, 2018 at 11:59 AM, Murtuza Zabuawala <= span dir=3D"ltr"><murtuza.zabuawala@enterprisedb.com> wr= ote:
Hi Dave,

Could you please send screenshot?
<= /div>

<= div dir=3D"ltr">
--
Regards,
<= font size=3D"2">Murtuz= a Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.comThe Enterprise PostgreSQL Company


On T= ue, Feb 27, 2018 at 5:24 PM, Dave Page <dpage@pgadmin.org> w= rote:
Hi

<= div>Still not quite right - see the attached screenshot which is the result= of simply viewing the properties of an existing job. Note that the start t= ime is shown in the grid but not the subnode control.

<= div>Thanks.

On Tue, Feb 27, 2018 at 8:26 AM, Murtuza Zabuawala = <murtuza.zabuawala@enterprisedb.com> wrote:
Hi Dave,

As validation related patch was committ= ed with RM#3148 [ Sorry about that I forgot to checkout :)=C2=A0]
PFA patch to = fix the issues you mentioned, I have also removed extra error message from = sub node collection control and made it optional via flag.



--
Regards,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.= enterprisedb.com
The Enterprise PostgreSQL Company

<= /div>

On Mon, Feb 26, 2018 at 10:14 PM, Dave Page = <dpage@pgadmin.org> wrote:
Hi

On Mon, Feb 26, 2018 at 2:46 PM, Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com> wrote:
Hi,

PFA patch to fix the issue where user was not able to create = pgAgent job from UI without entering End date in schedule section.

=C2=A0Whilst this does resolve the vali= dation issue, there are still a couple of other related problems, as can be= seen in the attached screenshots:

- The Start dat= e/time in the subnode control doesn't seem to be properly synchronised = with the value in the grid.

- If you leave the End= date/time blank (but maybe click into it first), the grid will show "= Invalid date".

It'= s possible there are other oddities as well - please check carefully for an= ything else.

Thanks.

--
Dave Page
Blog: http://pgsnake.blogspot.com
= Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise = PostgreSQL Company




--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

Enterp= riseDB UK: http:/= /www.enterprisedb.com
The Enterprise PostgreSQL Company

-- =
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

Enterpri= seDB UK: http://w= ww.enterprisedb.com
The Enterprise PostgreSQL Company



--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
<= /div>


--001a113dd2de8867100566434e8e-- --001a113dd2de8867140566434e90 Content-Type: text/plain; charset="US-ASCII"; name="RM_3073_v2.diff" Content-Disposition: attachment; filename="RM_3073_v2.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_je6xwcax0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Bn YWdlbnQvc2NoZWR1bGVzL3N0YXRpYy9qcy9wZ2Ffc2NoZWR1bGUuanMgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9wZ2FnZW50L3NjaGVkdWxlcy9zdGF0aWMvanMv cGdhX3NjaGVkdWxlLmpzCmluZGV4IGE4OGY5ZDAuLjFjZmEzOGMgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvc2NoZWR1bGVzL3N0 YXRpYy9qcy9wZ2Ffc2NoZWR1bGUuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zY2hlZHVsZXMvc3RhdGljL2pzL3BnYV9zY2hlZHVsZS5q cwpAQCAtMjc5LDcgKzI3OSw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnBnYV9zY2hlZHVsZScs IFsKICAgICAgICAgICBjb250cm9sOiAnZGF0ZXRpbWVwaWNrZXInLCBjZWxsOiBEYXRldGltZUNl bGwsCiAgICAgICAgICAgZGlzYWJsZWQ6IGZ1bmN0aW9uKCkgeyByZXR1cm4gZmFsc2U7IH0sIGRp c3BsYXlJblVUQzogZmFsc2UsCiAgICAgICAgICAgZGlzcGxheUZvcm1hdDogJ1lZWVktTU0tREQg SEg6bW06c3MgWicsIG9wdGlvbnM6IHsKLSAgICAgICAgICAgIGZvcm1hdDogJ1lZWVktTU0tREQg SEg6bW06c3MgWicsIHVzZUN1cnJlbnQ6IGZhbHNlLAorICAgICAgICAgICAgZm9ybWF0OiAnWVlZ WS1NTS1ERCBISDptbTpzcyBaJywKICAgICAgICAgICAgIG1pbkRhdGU6IG1vbWVudCgpLmFkZCgw LCAnbScpLAogICAgICAgICAgIH0sIGNlbGxIZWFkZXJDbGFzc2VzOiAnd2lkdGhfcGVyY2VudF8y NScsCiAgICAgICAgICAgbW9kZWxGb3JtYXQ6ICdZWVlZLU1NLUREIEhIOm1tOnNzIFonLApAQCAt NDU4LDYgKzQ1OCw5IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnBnYV9zY2hlZHVsZScsIFsKICAg ICAgICAgICBpZiAoXy5pc1VuZGVmaW5lZCh2YWwpIHx8IF8uaXNOdWxsKHZhbCkgfHwKICAgICAg ICAgICAgIFN0cmluZyh2YWwpLnJlcGxhY2UoL15ccyt8XHMrJC9nLCAnJykgPT0gJycpIHsKICAg ICAgICAgICAgIG1zZyA9IGdldHRleHQoJ1BsZWFzZSBlbnRlciB0aGUgc3RhcnQgdGltZS4nKTsK KyAgICAgICAgICAgIGlmICh2YWwgPT0gJycpIHsKKyAgICAgICAgICAgICAgdGhpcy5zZXQoJ2pz Y3N0YXJ0JywgdW5kZWZpbmVkKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuZXJy b3JNb2RlbC5zZXQoJ2pzY3N0YXJ0JywgbXNnKTsKICAgICAgICAgICAgIGVyck1zZyA9IGVyck1z ZyB8fCBtc2c7CiAgICAgICAgICAgfSBlbHNlIHsKQEAgLTQ3MSw2ICs0NzQsOSBAQCBkZWZpbmUo J3BnYWRtaW4ubm9kZS5wZ2Ffc2NoZWR1bGUnLCBbCiAgICAgICAgICAgICAvLyB0aGUgdXNlcgog ICAgICAgICAgICAgaWYgKF8uaXNVbmRlZmluZWQodmFsKSB8fCBfLmlzTnVsbCh2YWwpIHx8CiAg ICAgICAgICAgICAgIFN0cmluZyh2YWwpLnJlcGxhY2UoL15ccyt8XHMrJC9nLCAnJykgPT0gJycp IHsKKyAgICAgICAgICAgICAgaWYgKHZhbCA9PSAnJykgeworICAgICAgICAgICAgICAgIHRoaXMu c2V0KCdqc2NlbmQnLCB1bmRlZmluZWQpOworICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGF0aWMvanMvcGdhX2pvYi5qcyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvc3RhdGljL2pz L3BnYV9qb2IuanMKaW5kZXggMWExY2ZiMS4uNzJmZDFiZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGF0aWMvanMvcGdhX2pv Yi5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9wZ2Fn ZW50L3N0YXRpYy9qcy9wZ2Ffam9iLmpzCkBAIC0xMzMsNiArMTMzLDcgQEAgZGVmaW5lKCdwZ2Fk bWluLm5vZGUucGdhX2pvYicsIFsKICAgICAgICAgICB0eXBlOiAnY29sbGVjdGlvbicsIG1vZGU6 IFsnZWRpdCcsICdjcmVhdGUnXSwKICAgICAgICAgICBtb2RlbDogcGdCcm93c2VyLk5vZGVzWydw Z2Ffam9ic3RlcCddLm1vZGVsLCBjYW5FZGl0OiB0cnVlLAogICAgICAgICAgIGNvbnRyb2w6ICdz dWItbm9kZS1jb2xsZWN0aW9uJywgY2FuQWRkOiB0cnVlLCBjYW5EZWxldGU6IHRydWUsCisgICAg ICAgICAgc2hvd0Vycm9yOiBmYWxzZSwKICAgICAgICAgICBjb2x1bW5zOiBbCiAgICAgICAgICAg ICAnanN0bmFtZScsICdqc3RlbmFibGVkJywgJ2pzdGtpbmQnLCAnanN0Y29ubnR5cGUnLCAnanN0 b25lcnJvcicsCiAgICAgICAgICAgXSwKQEAgLTE0MSw2ICsxNDIsNyBAQCBkZWZpbmUoJ3BnYWRt aW4ubm9kZS5wZ2Ffam9iJywgWwogICAgICAgICAgIHR5cGU6ICdjb2xsZWN0aW9uJywgbW9kZTog WydlZGl0JywgJ2NyZWF0ZSddLAogICAgICAgICAgIGNvbnRyb2w6ICdzdWItbm9kZS1jb2xsZWN0 aW9uJywgY2FuQWRkOiB0cnVlLCBjYW5EZWxldGU6IHRydWUsCiAgICAgICAgICAgY2FuRWRpdDog dHJ1ZSwgbW9kZWw6IHBnQnJvd3Nlci5Ob2Rlc1sncGdhX3NjaGVkdWxlJ10ubW9kZWwsCisgICAg ICAgICAgc2hvd0Vycm9yOiBmYWxzZSwKICAgICAgICAgICBjb2x1bW5zOiBbJ2pzY25hbWUnLCAn anNjZW5hYmxlZCcsICdqc2NzdGFydCcsICdqc2NlbmQnXSwKICAgICAgICAgfV0sCiAgICAgICAg IHZhbGlkYXRlOiBmdW5jdGlvbigpIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvc3RlcHMvc3RhdGljL2pzL3BnYV9qb2JzdGVw LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9z dGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMKaW5kZXggMGRkM2Y2MC4uOTcxYzJkNiAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2Vu dC9zdGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0 ZXAuanMKQEAgLTMwMCw2ICszMDAsMTcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUucGdhX2pvYnN0 ZXAnLCBbCiAgICAgICAgICAgICB0aGlzLmVycm9yTW9kZWwudW5zZXQoJ2pzdGNvZGUnKTsKICAg ICAgICAgICB9CiAKKyAgICAgICAgICB2YWwgPSB0aGlzLmdldCgnanN0b25lcnJvcicpOworICAg ICAgICAgIGlmICgKKyAgICAgICAgICAgICFfLmlzVW5kZWZpbmVkKHZhbCkgJiYgIV8uaXNOdWxs KHZhbCkgJiYKKyAgICAgICAgICAgICAgU3RyaW5nKHZhbCkucmVwbGFjZSgvXlxzK3xccyskL2cs ICcnKSA9PSAnJworICAgICAgICAgICkgeworICAgICAgICAgICAgbXNnID0gZ2V0dGV4dCgnUGxl YXNlIHNlbGVjdCB2YWxpZCBvbiBlcnJvciBvcHRpb24gLicpOworICAgICAgICAgICAgdGhpcy5l cnJvck1vZGVsLnNldCgnanN0b25lcnJvcicsIG1zZyk7CisgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgIHRoaXMuZXJyb3JNb2RlbC51bnNldCgnanN0b25lcnJvcicpOworICAgICAgICAg IH0KKwogICAgICAgICAgIHJldHVybiBlcnJNc2c7CiAgICAgICAgIH0sCiAgICAgICB9KSwKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzIGIvd2Vi L3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKaW5kZXggNWJiYmY5Zi4uYWM2 ZDVhYSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4u anMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKQEAgLTEx OTYsNiArMTE5Niw3IEBAIGRlZmluZShbCiAgICAgICAgIGNhbkFkZFJvdzogZGF0YS5jYW5BZGRS b3csCiAgICAgICAgIGNhbkVkaXQ6IGV2YWxGKGRhdGEuY2FuRWRpdCwgZGF0YSwgdGhpcy5tb2Rl bCksCiAgICAgICAgIGNhbkRlbGV0ZTogZXZhbEYoZGF0YS5jYW5EZWxldGUsIGRhdGEsIHRoaXMu bW9kZWwpLAorICAgICAgICBzaG93RXJyb3I6IGRhdGEuc2hvd0Vycm9yIHx8IHRydWUsCiAgICAg ICB9KTsKICAgICAgIC8vIFNob3cgQmFja2dyaWQgQ29udHJvbAogICAgICAgdmFyIGdyaWQgPSAo ZGF0YS5zdWJub2RlID09IHVuZGVmaW5lZCkgPyAnJyA6IHRoaXMuc2hvd0dyaWRDb250cm9sKGRh dGEpOwpAQCAtMTIyNCw5ICsxMjI1LDExIEBAIGRlZmluZShbCiAKICAgICAgIGlmIChfLmlzRW1w dHkoZXJyb3IpKSByZXR1cm47CiAKLSAgICAgIHNlbGYuJGVsLmFkZENsYXNzKCdzdWJub2RlLWVy cm9yJykuYXBwZW5kKAotICAgICAgICAkKCc8ZGl2PjwvZGl2PicpLmFkZENsYXNzKCdwZ2FkbWlu LWNvbnRyb2wtZXJyb3ItbWVzc2FnZSBwZy1lbC14cy1vZmZzZXQtNCBwZy1lbC14cy04IGhlbHAt YmxvY2snKS50ZXh0KGVycm9yKQotICAgICAgKTsKKyAgICAgIGlmIChzZWxmLmZpZWxkLmdldCgn c2hvd0Vycm9yJykpIHsKKyAgICAgICAgc2VsZi4kZWwuYWRkQ2xhc3MoJ3N1Ym5vZGUtZXJyb3In KS5hcHBlbmQoCisgICAgICAgICAgJCgnPGRpdj48L2Rpdj4nKS5hZGRDbGFzcygncGdhZG1pbi1j b250cm9sLWVycm9yLW1lc3NhZ2UgcGctZWwteHMtb2Zmc2V0LTQgcGctZWwteHMtOCBoZWxwLWJs b2NrJykudGV4dChlcnJvcikKKyAgICAgICAgKTsKKyAgICAgIH0KICAgICB9LAogICAgIGNsZWFu dXA6IGZ1bmN0aW9uKCkgewogICAgICAgLy8gQ2xlYW4gdXAgZXhpc3RpbmcgZ3JpZCBpZiBhbnkg KGluIGNhc2Ugb2YgcmUtcmVuZGVyKQpAQCAtMTIzOCw4ICsxMjQxLDEwIEBAIGRlZmluZShbCiAg ICAgICB9CiAgICAgfSwKICAgICBjbGVhckludmFsaWQ6IGZ1bmN0aW9uKCkgewotICAgICAgdGhp cy4kZWwucmVtb3ZlQ2xhc3MoJ3N1Ym5vZGUtZXJyb3InKTsKLSAgICAgIHRoaXMuJGVsLmZpbmQo Jy5wZ2FkbWluLWNvbnRyb2wtZXJyb3ItbWVzc2FnZScpLnJlbW92ZSgpOworICAgICAgaWYgKHRo aXMuZmllbGQuZ2V0KCdzaG93RXJyb3InKSkgeworICAgICAgICB0aGlzLiRlbC5yZW1vdmVDbGFz cygnc3Vibm9kZS1lcnJvcicpOworICAgICAgICB0aGlzLiRlbC5maW5kKCcucGdhZG1pbi1jb250 cm9sLWVycm9yLW1lc3NhZ2UnKS5yZW1vdmUoKTsKKyAgICAgIH0KICAgICAgIHJldHVybiB0aGlz OwogICAgIH0sCiAgICAgc2hvd0dyaWRDb250cm9sOiBmdW5jdGlvbihkYXRhKSB7CkBAIC0yMzkx LDYgKzIzOTYsNyBAQCBkZWZpbmUoWwogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgfSwg dGhpcy5kZWZhdWx0cy5vcHRpb25zLCB0aGlzLmZpZWxkLmdldCgnb3B0aW9ucycpLCB7CiAgICAg ICAgICAgICAgICdkYXRlJzogZGF0YS52YWx1ZSwKKyAgICAgICAgICAgICAgJ21pbkRhdGUnOiBk YXRhLnZhbHVlLAogICAgICAgICAgICAgfSkKICAgICAgICAgICApOwogICAgICAgICB9Cg== --001a113dd2de8867140566434e90--