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 1kDn7J-0004x0-HD for pgadmin-hackers@arkaria.postgresql.org; Thu, 03 Sep 2020 11:09:22 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kDn7I-0000Yr-Ae for pgadmin-hackers@arkaria.postgresql.org; Thu, 03 Sep 2020 11:09:20 +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 1kDn7I-0000Yk-2B for pgadmin-hackers@lists.postgresql.org; Thu, 03 Sep 2020 11:09:20 +0000 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kDn7A-0005uf-25 for pgadmin-hackers@postgresql.org; Thu, 03 Sep 2020 11:09:19 +0000 Received: by mail-lj1-x231.google.com with SMTP id k25so3117867ljg.9 for ; Thu, 03 Sep 2020 04:09:11 -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=S05U9HOPJ8HDvKnevEKQbC3aoONs1OCZqDMqjNR+wJA=; b=sccjb1SWrWueQChOYewR/rYPHz5rSxyfvdzkhZhAzEUc8AfeDOBBxQF9veSHKdglxz x3GYqD7mLiY13DH2p1csxP9W8r8NZ35U+KXKgq284PE6VMKHc8s3o3iQasbnJclPv0ke 8SE6D0JgSFmf8Hfvh/Zstd8mgTu8e6l056+SOPoNJEQkOhAR3P2D2rZutc/CGi8Himmx jL4ieysdR2F5k80Iqw0NIjCKBJxyQMbf2gkb+ZI9PZalJEFsD37nhnH5rFulwa1iHsJg rkxE2bd8h9xShNkI+7NAOYk5Y89Bgg0Uk1gUSWkWOQHIrfhB3RffYt9T6zylz9zFejUb SD0A== 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=S05U9HOPJ8HDvKnevEKQbC3aoONs1OCZqDMqjNR+wJA=; b=locXQH1MhC6ogIF7Nbn1AwYrhn/PMFFyIvGYyANczas3/QQhQlpNaM5gy7rZ22GUf8 59QAsJMkPaR6r2VtiEVFfs/8vGHgxD4swyd6bhOFadfmLW5Qfeymon1Z45SgR9kYx0ML oAAb4T4z8oEYOl1iHuAUDcny4Xjl9B4ZYQvwa9EdqD+3rTak0kIwzox9E+NUNMED3QO9 JnHks55eLFjHNnQknVqqAlcaGa+N0qjXLIs/1txkXM1oh9Ic7G5MEBrY2jQdqFIHbRFQ eajUQ5qdDlcruWT+VYNugJD16ag21LgwyCoOH/Be4ggE0naIa06FZ/aFy2BkKbaOzHIw W7ng== X-Gm-Message-State: AOAM530Jhk2a5tiSt3ayylSU733xF5hiljNxSIUyU/7Vc0Dr49QQtxV/ efwBupQ1ovDyM07FH1e9VZ8MF0t8kZhVese8vfTFCIjAxpMPduaRkEtbVQZrrUJAqqWpLtvAiho 3yxOPAwKUsRkDr957dLWVAWQnbknL157urTqPoqmEKpLz3pYu+ZBhAyXcvkih7TF2+5HAzgiDYy N4RO+sw/qRa3/VVRp66EYyCQELFz3AGYr6XdqUTF2g5EBwK0qkPE15OSxG6MhcrRNfUA== X-Google-Smtp-Source: ABdhPJy+4vEYXqYlbop8EtcLaD38GkTjEjdkrB0da9G7LW/PwiIT+zMQ+yA82lQrUxftiDs/Z/Ta/Xpdziilcv0f8Ac= X-Received: by 2002:a2e:968c:: with SMTP id q12mr961704lji.51.1599131350840; Thu, 03 Sep 2020 04:09:10 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Khushboo Vashi Date: Thu, 3 Sep 2020 16:39:05 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch] - SonarQube Fixes To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000001de9b505ae66c88a" 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 --0000000000001de9b505ae66c88a Content-Type: multipart/alternative; boundary="0000000000001de9b205ae66c888" --0000000000001de9b205ae66c888 Content-Type: text/plain; charset="UTF-8" Hi, Please find more fixes for the sonarqube code smells having the rule "String literals should not be duplicated". Thanks, Khushboo On Wed, Aug 19, 2020 at 2:27 PM Akshay Joshi wrote: > Thanks, patch applied. > > On Wed, Aug 19, 2020 at 2:01 PM Khushboo Vashi < > khushboo.vashi@enterprisedb.com> wrote: > >> Hi, >> >> Please find the attached updated patch. >> >> >> On Tue, Aug 4, 2020 at 12:10 PM Akshay Joshi < >> akshay.joshi@enterprisedb.com> wrote: >> >>> Hi Khushboo >>> >>> As per offline discussion, multiple developers declaring the constant >>> for the same string and error messages. To avoid that only one developer >>> should work on this task. >>> Suggestions: >>> >>> - We should have a common class for Constants (which are not module >>> specific). >>> >>> Made a constant.py file which contains the common Constants. >> >>> >>> - For module specific constants we should not declare them as Global >>> variables if possible declare them as the Class variable. >>> >>> >>> - For common error messages(if any) we can define functions in >>> PGChildNodeView. >>> >>> Already implemented. >> >>> Please incorporate the changes send by Yogesh. >>> >> I will send another patch for Yogesh's changes as needed more changes. >> >> Thanks, >> Khushboo >> >>> >>> On Mon, Aug 3, 2020 at 1:36 PM Khushboo Vashi < >>> khushboo.vashi@enterprisedb.com> wrote: >>> >>>> Hi, >>>> >>>> Please find the attached patch to fix the sonarqube code smells having >>>> the rule "String literals should not be duplicated". >>>> >>>> Thanks, >>>> Khushboo >>>> >>> >>> >>> -- >>> *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* > --0000000000001de9b205ae66c888 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find more fixes for=C2=A0the=C2=A0sonarqube=C2=A0code smells having the rule "Strin= g literals should not be duplicated".

Thanks,
Khushboo

On Wed, Aug 19, 2020 at 2:27 PM Akshay J= oshi <akshay.joshi@ente= rprisedb.com> wrote:
Thanks, patch applied.

On Wed, Aug 19, 2020= at 2:01 PM Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrote:
=
Hi,

Please find the attached updated patc= h.


On Tue, Aug 4, 2020 at 12:10 PM Akshay Joshi <akshay.josh= i@enterprisedb.com> wrote:
Hi=C2=A0Khushboo

As p= er offline discussion, multiple developers declaring the constant for the s= ame string and error messages. To avoid that only one developer should work= on this task.
Suggestions:
  • We should have a=C2= =A0common=C2=A0class for Constants (which are not module specific).
Made a constant.py file which contains the = common Constants.=C2=A0
  • For module specific constants we should n= ot declare them as Global variables if possible declare them as the Class v= ariable.
  • For common error= messages(if any) we can define functions in PGChildNodeView.
Already implemented.=C2=A0
Please incorporate t= he changes send by Yogesh.=C2=A0 =C2=A0
I will= send another patch for Yogesh's changes as needed more changes.
<= div>
Thanks,
Khushboo

On Mon, Aug 3, 2020 at 1:36 PM Khushboo Vashi <khushboo.va= shi@enterprisedb.com> wrote:
Hi,

Please find the = attached patch to fix the sonarqube code smells having the rule "String literals should not be duplicated".

T= hanks,
Khushboo


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



--
Thanks & R= egards
Akshay Joshi
pgAdmin Hacker | Sr. Software Architect=
= EDB Postgres
Mobile: +91 976-788-8246

--0000000000001de9b205ae66c888-- --0000000000001de9b505ae66c88a Content-Type: application/octet-stream; name="Sonar_Qube_Fixes.patch" Content-Disposition: attachment; filename="Sonar_Qube_Fixes.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kempi1go0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3V0aWxzLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdXRpbHMucHkKaW5kZXggMzYyMjA5YTExLi4x MGZjZTMwNGYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3V0aWxzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3V0aWxzLnB5CkBAIC0x OSw2ICsxOSwxMCBAQCBmcm9tIHBnYWRtaW4uYnJvd3Nlci5jb2xsZWN0aW9uIGltcG9ydCBDb2xs ZWN0aW9uTm9kZU1vZHVsZQogZnJvbSBwZ2FkbWluLnV0aWxzLmFqYXggaW1wb3J0IGludGVybmFs X3NlcnZlcl9lcnJvcgogZnJvbSBwZ2FkbWluLnV0aWxzLmRyaXZlciBpbXBvcnQgZ2V0X2RyaXZl cgogZnJvbSBjb25maWcgaW1wb3J0IFBHX0RFRkFVTFRfRFJJVkVSCitmcm9tIHBnYWRtaW4udXRp bHMuY29uc3RhbnRzIGltcG9ydCBEQVRBVFlQRV9USU1FX1dJVEhfVElNRVpPTkUsXAorICAgIERB VEFUWVBFX1RJTUVfV0lUSE9VVF9USU1FWk9ORSxcCisgICAgREFUQVRZUEVfVElNRVNUQU1QX1dJ VEhfVElNRVpPTkUsXAorICAgIERBVEFUWVBFX1RJTUVTVEFNUF9XSVRIT1VUX1RJTUVaT05FCiAK IAogY2xhc3MgU2NoZW1hQ2hpbGRNb2R1bGUoQ29sbGVjdGlvbk5vZGVNb2R1bGUpOgpAQCAtMjA1 LDIwICsyMDksMjIgQEAgY2xhc3MgRGF0YVR5cGVSZWFkZXI6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDEwMTQsICdicGNoYXJbXScsICdjaGFyYWN0ZXJbXScsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEwMTUsICd2YXJjaGFyW10nLCAnY2hhcmFjdGVy IHZhcnlpbmdbXScpOgogICAgICAgICAgICAgICAgIHR5cGV2YWwgPSAnTCcKLSAgICAgICAgICAg IGVsaWYgZWxlbW9pZF9vcl9uYW1lIGluICgxMDgzLCAndGltZScsICd0aW1lIHdpdGhvdXQgdGlt ZSB6b25lJywKKyAgICAgICAgICAgIGVsaWYgZWxlbW9pZF9vcl9uYW1lIGluICgxMDgzLCAndGlt ZScsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgREFUQVRZUEVfVElNRV9X SVRIT1VUX1RJTUVaT05FLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEx MTQsICd0aW1lc3RhbXAnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0 aW1lc3RhbXAgd2l0aG91dCB0aW1lIHpvbmUnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIERBVEFUWVBFX1RJTUVTVEFNUF9XSVRIT1VUX1RJTUVaT05FLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDExMTUsICd0aW1lc3RhbXBbXScsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3RpbWVzdGFtcCB3aXRob3V0IHRpbWUgem9u ZVtdJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxMTgzLCAndGltZVtd JywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAndGltZSB3aXRob3V0IHRp bWUgem9uZVtdJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAxMTg0LCAn dGltZXN0YW1wdHonLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0aW1l c3RhbXAgd2l0aCB0aW1lIHpvbmUnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIERBVEFUWVBFX1RJTUVTVEFNUF9XSVRIX1RJTUVaT05FLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDExODUsICd0aW1lc3RhbXB0eltdJywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAndGltZXN0YW1wIHdpdGggdGltZSB6b25lW10nLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDExODYsICdpbnRlcnZhbCcsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTE4NywgJ2ludGVydmFsW10nLCAnaW50 ZXJ2YWxbXScsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTI2NiwgJ3Rp bWV0eicsICd0aW1lIHdpdGggdGltZSB6b25lJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAxMjY2LCAndGltZXR6JywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBEQVRBVFlQRV9USU1FX1dJVEhfVElNRVpPTkUsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgMTI3MCwgJ3RpbWV0eicsICd0aW1lIHdpdGggdGltZSB6b25lW10n KToKICAgICAgICAgICAgICAgICB0eXBldmFsID0gJ0QnCiAgICAgICAgICAgICBlbGlmIGVsZW1v aWRfb3JfbmFtZSBpbiAoMTIzMSwgJ251bWVyaWNbXScsCkBAIC0yNTQsMTIgKzI2MCwxMiBAQCBj bGFzcyBEYXRhVHlwZVJlYWRlcjoKICAgICAgICAgZWxpZiAoCiAgICAgICAgICAgICBuYW1lID09 ICd0aW1lJyBvcgogICAgICAgICAgICAgbmFtZSA9PSAndGltZXR6JyBvcgotICAgICAgICAgICAg bmFtZSA9PSAndGltZSB3aXRob3V0IHRpbWUgem9uZScgb3IKLSAgICAgICAgICAgIG5hbWUgPT0g J3RpbWUgd2l0aCB0aW1lIHpvbmUnIG9yCisgICAgICAgICAgICBuYW1lID09IERBVEFUWVBFX1RJ TUVfV0lUSE9VVF9USU1FWk9ORSBvcgorICAgICAgICAgICAgbmFtZSA9PSBEQVRBVFlQRV9USU1F X1dJVEhfVElNRVpPTkUgb3IKICAgICAgICAgICAgIG5hbWUgPT0gJ3RpbWVzdGFtcCcgb3IKICAg ICAgICAgICAgIG5hbWUgPT0gJ3RpbWVzdGFtcHR6JyBvcgotICAgICAgICAgICAgbmFtZSA9PSAn dGltZXN0YW1wIHdpdGhvdXQgdGltZSB6b25lJyBvcgotICAgICAgICAgICAgbmFtZSA9PSAndGlt ZXN0YW1wIHdpdGggdGltZSB6b25lJyBvcgorICAgICAgICAgICAgbmFtZSA9PSBEQVRBVFlQRV9U SU1FU1RBTVBfV0lUSE9VVF9USU1FWk9ORSBvcgorICAgICAgICAgICAgbmFtZSA9PSBEQVRBVFlQ RV9USU1FU1RBTVBfV0lUSF9USU1FWk9ORSBvcgogICAgICAgICAgICAgbmFtZSA9PSAnYml0JyBv cgogICAgICAgICAgICAgbmFtZSA9PSAnYml0IHZhcnlpbmcnIG9yCiAgICAgICAgICAgICBuYW1l ID09ICd2YXJiaXQnCkBAIC0zMDAsMTMgKzMwNiwxMyBAQCBjbGFzcyBEYXRhVHlwZVJlYWRlcjoK ICAgICAgICAgIiIiCiAgICAgICAgIGlmIG5hbWUgPT0gJ2NoYXInIGFuZCBzY2hlbWEgPT0gJ3Bn X2NhdGFsb2cnOgogICAgICAgICAgICAgcmV0dXJuICciY2hhciInICsgYXJyYXkKLSAgICAgICAg ZWxpZiBuYW1lID09ICd0aW1lIHdpdGggdGltZSB6b25lJzoKKyAgICAgICAgZWxpZiBuYW1lID09 IERBVEFUWVBFX1RJTUVfV0lUSF9USU1FWk9ORToKICAgICAgICAgICAgIHJldHVybiAndGltZScg KyBsZW5ndGggKyAnIHdpdGggdGltZSB6b25lJyArIGFycmF5Ci0gICAgICAgIGVsaWYgbmFtZSA9 PSAndGltZSB3aXRob3V0IHRpbWUgem9uZSc6CisgICAgICAgIGVsaWYgbmFtZSA9PSBEQVRBVFlQ RV9USU1FX1dJVEhPVVRfVElNRVpPTkU6CiAgICAgICAgICAgICByZXR1cm4gJ3RpbWUnICsgbGVu Z3RoICsgJyB3aXRob3V0IHRpbWUgem9uZScgKyBhcnJheQotICAgICAgICBlbGlmIG5hbWUgPT0g J3RpbWVzdGFtcCB3aXRoIHRpbWUgem9uZSc6CisgICAgICAgIGVsaWYgbmFtZSA9PSBEQVRBVFlQ RV9USU1FU1RBTVBfV0lUSF9USU1FWk9ORToKICAgICAgICAgICAgIHJldHVybiAndGltZXN0YW1w JyArIGxlbmd0aCArICcgd2l0aCB0aW1lIHpvbmUnICsgYXJyYXkKLSAgICAgICAgZWxpZiBuYW1l ID09ICd0aW1lc3RhbXAgd2l0aG91dCB0aW1lIHpvbmUnOgorICAgICAgICBlbGlmIG5hbWUgPT0g REFUQVRZUEVfVElNRVNUQU1QX1dJVEhPVVRfVElNRVpPTkU6CiAgICAgICAgICAgICByZXR1cm4g J3RpbWVzdGFtcCcgKyBsZW5ndGggKyAnIHdpdGhvdXQgdGltZSB6b25lJyArIGFycmF5CiAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICByZXR1cm4gbmFtZSArIGxlbmd0aCArIGFycmF5CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9fX2luaXRfXy5weSBiL3dlYi9w Z2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5CmluZGV4IDk1NWY5ODA3My4uYTk2 ZDdiOWVjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9fX2luaXRf Xy5weQorKysgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9fX2luaXRfXy5weQpAQCAt NTU3LDEwICs1NTcsOSBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAg RmlsZW1hbmFnZXIuY2hlY2tfYWNjZXNzX3Blcm1pc3Npb24oaW5fZGlyLCBwYXRoKQogICAgICAg ICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICBGaWxlbWFuYWdlci5yZXN1bWVf d2luZG93c193YXJuaW5nKCkKLSAgICAgICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KCJFcnJvcjog ezB9IikuZm9ybWF0KGUpCiAgICAgICAgICAgICBmaWxlcyA9IHsKICAgICAgICAgICAgICAgICAn Q29kZSc6IDAsCi0gICAgICAgICAgICAgICAgJ0Vycm9yJzogZXJyX21zZworICAgICAgICAgICAg ICAgICdFcnJvcic6IHN0cihlKQogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIGZp bGVzCiAKQEAgLTY2MCw5ICs2NTksOSBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAg ICAgICAgICAgRmlsZW1hbmFnZXIucmVzdW1lX3dpbmRvd3Nfd2FybmluZygpCiAgICAgICAgICAg ICBpZiAoaGFzYXR0cihlLCAnc3RyZXJyb3InKSBhbmQKICAgICAgICAgICAgICAgICAgICAgZS5z dHJlcnJvciA9PSBnZXR0ZXh0KCdQZXJtaXNzaW9uIGRlbmllZCcpKToKLSAgICAgICAgICAgICAg ICBlcnJfbXNnID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChlLnN0cmVycm9yKQorICAg ICAgICAgICAgICAgIGVycl9tc2cgPSBzdHIoZS5zdHJlcnJvcikKICAgICAgICAgICAgIGVsc2U6 Ci0gICAgICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQo ZSkKKyAgICAgICAgICAgICAgICBlcnJfbXNnID0gc3RyKGUpCiAgICAgICAgICAgICBmaWxlcyA9 IHsKICAgICAgICAgICAgICAgICAnQ29kZSc6IDAsCiAgICAgICAgICAgICAgICAgJ0Vycm9yJzog ZXJyX21zZwpAQCAtNzUyLDcgKzc1MSw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAg ICAgICAgICAgICAgICAgJ0ZpbGVuYW1lJzogc3BsaXRfcGF0aChwYXRoKVstMV0sCiAgICAgICAg ICAgICAgICAgJ0ZpbGVUeXBlJzogJycsCiAgICAgICAgICAgICAgICAgJ1BhdGgnOiBwYXRoLAot ICAgICAgICAgICAgICAgICdFcnJvcic6IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQoZSks CisgICAgICAgICAgICAgICAgJ0Vycm9yJzogc3RyKGUpLAogICAgICAgICAgICAgICAgICdDb2Rl JzogMCwKICAgICAgICAgICAgICAgICAnSW5mbyc6ICcnLAogICAgICAgICAgICAgICAgICdQcm9w ZXJ0aWVzJzogewpAQCAtODM2LDcgKzgzNSw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6 CiAgICAgICAgICAgICBGaWxlbWFuYWdlci5jaGVja19hY2Nlc3NfcGVybWlzc2lvbih0aGVfZGly LCBuZXcpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIHJlcyA9 IHsKLSAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KCJFcnJvcjogezB9IikuZm9ybWF0 KGUpLAorICAgICAgICAgICAgICAgICdFcnJvcic6IHN0cihlKSwKICAgICAgICAgICAgICAgICAn Q29kZSc6IDAKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiByZXMKQEAgLTg5Nyw3 ICs4OTYsNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgRmlsZW1h bmFnZXIuY2hlY2tfYWNjZXNzX3Blcm1pc3Npb24odGhlX2RpciwgcGF0aCkKICAgICAgICAgZXhj ZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgcmVzID0gewotICAgICAgICAgICAgICAg ICdFcnJvcic6IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQoZSksCisgICAgICAgICAgICAg ICAgJ0Vycm9yJzogc3RyKGUpLAogICAgICAgICAgICAgICAgICdDb2RlJzogMAogICAgICAgICAg ICAgfQogICAgICAgICAgICAgcmV0dXJuIHJlcwpAQCAtOTExLDcgKzkxMCw3IEBAIGNsYXNzIEZp bGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgb3MucmVtb3ZlKG9yaWdfcGF0aCkK ICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgY29kZSA9IDAKLSAg ICAgICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KCJFcnJvcjogezB9IikuZm9ybWF0KGUuc3RyZXJy b3IpCisgICAgICAgICAgICBlcnJfbXNnID0gc3RyKGUuc3RyZXJyb3IpCiAKICAgICAgICAgcmVz dWx0ID0gewogICAgICAgICAgICAgJ1BhdGgnOiBwYXRoLApAQCAtOTUxLDE0ICs5NTAsMTMgQEAg Y2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgZi53cml0ZShk YXRhKQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICBjb2RlID0g MAotICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQoCi0g ICAgICAgICAgICAgICAgZS5zdHJlcnJvciBpZiBoYXNhdHRyKGUsICdzdHJlcnJvcicpIGVsc2Ug Z2V0dGV4dCgnVW5rbm93bicpKQorICAgICAgICAgICAgZXJyX21zZyA9IHN0cihlLnN0cmVycm9y KSBpZiBoYXNhdHRyKGUsICdzdHJlcnJvcicpIGVsc2Ugc3RyKGUpCiAKICAgICAgICAgdHJ5Ogog ICAgICAgICAgICAgRmlsZW1hbmFnZXIuY2hlY2tfYWNjZXNzX3Blcm1pc3Npb24odGhlX2Rpciwg cGF0aCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgcmVzID0g ewotICAgICAgICAgICAgICAgICdFcnJvcic6IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQo ZSksCisgICAgICAgICAgICAgICAgJ0Vycm9yJzogc3RyKGUpLAogICAgICAgICAgICAgICAgICdD b2RlJzogMAogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIHJlcwpAQCAtOTkyLDkg Kzk5MCw5IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGV4Y2VwdCBFeGNl cHRpb24gYXMgZToKICAgICAgICAgICAgIGNvZGUgPSAwCiAgICAgICAgICAgICBpZiBoYXNhdHRy KGUsICdzdHJlcnJvcicpOgotICAgICAgICAgICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KCJFcnJv cjogezB9IikuZm9ybWF0KGUuc3RyZXJyb3IpCisgICAgICAgICAgICAgICAgZXJyX21zZyA9IHN0 cihlLnN0cmVycm9yKQogICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBlcnJfbXNn ID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChlKQorICAgICAgICAgICAgICAgIGVycl9t c2cgPSBzdHIoZSkKIAogICAgICAgICByZXN1bHQgPSB7CiAgICAgICAgICAgICAnUGF0aCc6IHBh dGgsCkBAIC0xMDg0LDEzICsxMDgyLDEzIEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAg ICAgICAgICAgICAjIHdlIGRvbid0IHdhbnQgdG8gZXhwb3NlIHJlYWwgcGF0aCBvZiBmaWxlCiAg ICAgICAgICAgICAjIHNvIG9ubHkgc2hvdyBlcnJvciBtZXNzYWdlLgogICAgICAgICAgICAgaWYg ZXguc3RyZXJyb3IgPT0gJ1Blcm1pc3Npb24gZGVuaWVkJzoKLSAgICAgICAgICAgICAgICBlcnJf bXNnID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChleC5zdHJlcnJvcikKKyAgICAgICAg ICAgICAgICBlcnJfbXNnID0gc3RyKGV4LnN0cmVycm9yKQogICAgICAgICAgICAgZWxzZToKLSAg ICAgICAgICAgICAgICBlcnJfbXNnID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChzdHIo ZXgpKQorICAgICAgICAgICAgICAgIGVycl9tc2cgPSBzdHIoZXgpCiAKICAgICAgICAgZXhjZXB0 IEV4Y2VwdGlvbiBhcyBleDoKICAgICAgICAgICAgIHN0YXR1cyA9IEZhbHNlCi0gICAgICAgICAg ICBlcnJfbXNnID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChzdHIoZXgpKQorICAgICAg ICAgICAgZXJyX21zZyA9IHN0cihleCkKIAogICAgICAgICAjIFJlbW92ZSByb290IHN0b3JhZ2Ug cGF0aCBmcm9tIGVycm9yIG1lc3NhZ2UKICAgICAgICAgIyB3aGVuIHJ1bm5pbmcgaW4gU2VydmVy IG1vZGUKQEAgLTExMTgsNyArMTExNiw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAg ICAgICAgICAgICAgICAgcGF0aCwgbmFtZSkpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMg ZToKICAgICAgICAgICAgIHJlcyA9IHsKLSAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0 KCJFcnJvcjogezB9IikuZm9ybWF0KGUpLAorICAgICAgICAgICAgICAgICdFcnJvcic6IHN0cihl KSwKICAgICAgICAgICAgICAgICAnQ29kZSc6IDAKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IHJldHVybiByZXMKQEAgLTExMzYsMTQgKzExMzQsMTQgQEAgY2xhc3MgRmlsZW1hbmFnZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICBvcy5ta2RpcihuZXdfcGF0aCkKICAgICAgICAgICAgIGV4 Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgICAgICBjb2RlID0gMAotICAgICAgICAg ICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KCJFcnJvcjogezB9IikuZm9ybWF0KGUuc3RyZXJyb3Ip CisgICAgICAgICAgICAgICAgZXJyX21zZyA9IHN0cihlLnN0cmVycm9yKQogICAgICAgICBlbHNl OgogICAgICAgICAgICAgbmV3X3BhdGgsIG5ld19uYW1lID0gc2VsZi5nZXRfbmV3X25hbWUodGhl X2RpciwgcGF0aCwgbmFtZSkKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBvcy5t a2RpcihuZXdfcGF0aCkKICAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAg ICAgICAgICAgICBjb2RlID0gMAotICAgICAgICAgICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KCJF cnJvcjogezB9IikuZm9ybWF0KGUuc3RyZXJyb3IpCisgICAgICAgICAgICAgICAgZXJyX21zZyA9 IHN0cihlLnN0cmVycm9yKQogCiAgICAgICAgIHJlc3VsdCA9IHsKICAgICAgICAgICAgICdQYXJl bnQnOiBwYXRoLApAQCAtMTE3Miw3ICsxMTcwLDcgQEAgY2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0 KToKICAgICAgICAgICAgICAgICB0aGVfZGlyLCAie317fSIuZm9ybWF0KHBhdGgsIHBhdGgpCiAg ICAgICAgICAgICApCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKLSAgICAgICAgICAg IHJlc3AgPSBSZXNwb25zZShnZXR0ZXh0KCJFcnJvcjogezB9IikuZm9ybWF0KGUpKQorICAgICAg ICAgICAgcmVzcCA9IFJlc3BvbnNlKHN0cihlKSkKICAgICAgICAgICAgIHJlc3AuaGVhZGVyc1sn Q29udGVudC1EaXNwb3NpdGlvbiddID0gXAogICAgICAgICAgICAgICAgICdhdHRhY2htZW50OyBm aWxlbmFtZT0nICsgbmFtZQogICAgICAgICAgICAgcmV0dXJuIHJlc3AKQEAgLTExODksNyArMTE4 Nyw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIEZpbGVtYW5hZ2VyLmNoZWNrX2FjY2Vzc19wZXJtaXNzaW9uKHRoZV9kaXIsIHBhdGgpCiAg ICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKLSAgICAgICAgICAgIGVycl9tc2cgPSBnZXR0 ZXh0KCJFcnJvcjogezB9IikuZm9ybWF0KGUpCisgICAgICAgICAgICBlcnJfbXNnID0gc3RyKGUp CiAgICAgICAgICAgICByZXNbJ0NvZGUnXSA9IDAKICAgICAgICAgICAgIHJlc1snRXJyb3InXSA9 IGVycl9tc2cKICAgICAgICAgcmV0dXJuIHJlcwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9v bHMvc2NoZW1hX2RpZmYvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlm Zi9fX2luaXRfXy5weQppbmRleCBiYWJiMDU4ODguLmVhNTMzZWI2ZCAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4v dG9vbHMvc2NoZW1hX2RpZmYvX19pbml0X18ucHkKQEAgLTI2LDcgKzI2LDggQEAgZnJvbSBwZ2Fk bWluLnRvb2xzLnNjaGVtYV9kaWZmLm1vZGVsIGltcG9ydCBTY2hlbWFEaWZmTW9kZWwKIGZyb20g Y29uZmlnIGltcG9ydCBQR19ERUZBVUxUX0RSSVZFUgogZnJvbSBwZ2FkbWluLnV0aWxzLmRyaXZl ciBpbXBvcnQgZ2V0X2RyaXZlcgogZnJvbSBwZ2FkbWluLnV0aWxzLnByZWZlcmVuY2VzIGltcG9y dCBQcmVmZXJlbmNlcwotZnJvbSBwZ2FkbWluLnV0aWxzLmNvbnN0YW50cyBpbXBvcnQgUFJFRl9M QUJFTF9ESVNQTEFZLCBNSU1FVFlQRV9BUFBfSlMKK2Zyb20gcGdhZG1pbi51dGlscy5jb25zdGFu dHMgaW1wb3J0IFBSRUZfTEFCRUxfRElTUExBWSwgTUlNRVRZUEVfQVBQX0pTLFwKKyAgICBFUlJP Ul9NU0dfVFJBTlNfSURfTk9UX0ZPVU5ECiBmcm9tIHNxbGFsY2hlbXkgaW1wb3J0IG9yXwogCiBN T0RVTEVfTkFNRSA9ICdzY2hlbWFfZGlmZicKQEAgLTQzOSw3ICs0NDAsNyBAQCBkZWYgY29tcGFy ZSh0cmFuc19pZCwgc291cmNlX3NpZCwgc291cmNlX2RpZCwgdGFyZ2V0X3NpZCwgdGFyZ2V0X2Rp ZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGRpZmZfbW9kZWxfb2JqLCBzZXNzaW9uX29iaiA9 IFwKICAgICAgICAgY2hlY2tfdHJhbnNhY3Rpb25fc3RhdHVzKHRyYW5zX2lkKQogCi0gICAgaWYg ZXJyb3JfbXNnID09IGdldHRleHQoJ1RyYW5zYWN0aW9uIElEIG5vdCBmb3VuZCBpbiB0aGUgc2Vz c2lvbi4nKToKKyAgICBpZiBlcnJvcl9tc2cgPT0gRVJST1JfTVNHX1RSQU5TX0lEX05PVF9GT1VO RDoKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShzdWNjZXNzPTAsIGVycm9ybXNn PWVycm9yX21zZywgc3RhdHVzPTQwNCkKIAogICAgICMgU2VydmVyIHZlcnNpb24gY29tcGF0aWJp bGl0eSBjaGVjawpAQCAtNTY2LDcgKzU2Nyw3IEBAIGRlZiBwb2xsKHRyYW5zX2lkKToKICAgICBz dGF0dXMsIGVycm9yX21zZywgZGlmZl9tb2RlbF9vYmosIHNlc3Npb25fb2JqID0gXAogICAgICAg ICBjaGVja190cmFuc2FjdGlvbl9zdGF0dXModHJhbnNfaWQpCiAKLSAgICBpZiBlcnJvcl9tc2cg PT0gZ2V0dGV4dCgnVHJhbnNhY3Rpb24gSUQgbm90IGZvdW5kIGluIHRoZSBzZXNzaW9uLicpOgor ICAgIGlmIGVycm9yX21zZyA9PSBFUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5EOgogICAgICAg ICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKHN1Y2Nlc3M9MCwgZXJyb3Jtc2c9ZXJyb3JfbXNn LCBzdGF0dXM9NDA0KQogCiAgICAgbXNnLCBkaWZmX3BlcmNlbnRhZ2UgPSBkaWZmX21vZGVsX29i ai5nZXRfY29tcGFyaXNvbl9pbmZvKCkKQEAgLTU5OSw3ICs2MDAsNyBAQCBkZWYgZGRsX2NvbXBh cmUodHJhbnNfaWQsIHNvdXJjZV9zaWQsIHNvdXJjZV9kaWQsIHNvdXJjZV9zY2lkLAogICAgIHN0 YXR1cywgZXJyb3JfbXNnLCBkaWZmX21vZGVsX29iaiwgc2Vzc2lvbl9vYmogPSBcCiAgICAgICAg IGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKIAotICAgIGlmIGVycm9yX21zZyA9 PSBnZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6Cisg ICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6CiAgICAgICAg IHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vzcz0wLCBlcnJvcm1zZz1lcnJvcl9tc2cs IHN0YXR1cz00MDQpCiAKICAgICB2aWV3ID0gU2NoZW1hRGlmZlJlZ2lzdHJ5LmdldF9ub2RlX3Zp ZXcobm9kZV90eXBlKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5pdF9fLnB5CmluZGV4 IDAxNDE5Mjc2My4uNTI0ZDAyOTRiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxl ZGl0b3IvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5p dF9fLnB5CkBAIC00NCw3ICs0NCw4IEBAIGZyb20gcGdhZG1pbi50b29scy5zcWxlZGl0b3IudXRp bHMucXVlcnlfdG9vbF9mc191dGlscyBpbXBvcnQgXAogICAgIHJlYWRfZmlsZV9nZW5lcmF0b3IK IGZyb20gcGdhZG1pbi50b29scy5zcWxlZGl0b3IudXRpbHMuZmlsdGVyX2RpYWxvZyBpbXBvcnQg RmlsdGVyRGlhbG9nCiBmcm9tIHBnYWRtaW4udG9vbHMuc3FsZWRpdG9yLnV0aWxzLnF1ZXJ5X2hp c3RvcnkgaW1wb3J0IFF1ZXJ5SGlzdG9yeQotZnJvbSBwZ2FkbWluLnV0aWxzLmNvbnN0YW50cyBp bXBvcnQgTUlNRVRZUEVfQVBQX0pTLCBTRVJWRVJfQ09OTkVDVElPTl9DTE9TRUQKK2Zyb20gcGdh ZG1pbi51dGlscy5jb25zdGFudHMgaW1wb3J0IE1JTUVUWVBFX0FQUF9KUywgU0VSVkVSX0NPTk5F Q1RJT05fQ0xPU0VELFwKKyAgICBFUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5ECiAKIE1PRFVM RV9OQU1FID0gJ3NxbGVkaXRvcicKIApAQCAtMTM5LDE3ICsxNDAsMTMgQEAgZGVmIGNoZWNrX3Ry YW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCk6CiAgICAgIiIiCiAKICAgICBpZiAnZ3JpZERhdGEn IG5vdCBpbiBzZXNzaW9uOgotICAgICAgICByZXR1cm4gRmFsc2UsIGdldHRleHQoCi0gICAgICAg ICAgICAnVHJhbnNhY3Rpb24gSUQgbm90IGZvdW5kIGluIHRoZSBzZXNzaW9uLicKLSAgICAgICAg KSwgTm9uZSwgTm9uZSwgTm9uZQorICAgICAgICByZXR1cm4gRmFsc2UsIEVSUk9SX01TR19UUkFO U19JRF9OT1RfRk9VTkQsIE5vbmUsIE5vbmUsIE5vbmUKIAogICAgIGdyaWRfZGF0YSA9IHNlc3Np b25bJ2dyaWREYXRhJ10KIAogICAgICMgUmV0dXJuIGZyb20gdGhlIGZ1bmN0aW9uIGlmIHRyYW5z YWN0aW9uIGlkIG5vdCBmb3VuZAogICAgIGlmIHN0cih0cmFuc19pZCkgbm90IGluIGdyaWRfZGF0 YToKLSAgICAgICAgcmV0dXJuIEZhbHNlLCBnZXR0ZXh0KAotICAgICAgICAgICAgJ1RyYW5zYWN0 aW9uIElEIG5vdCBmb3VuZCBpbiB0aGUgc2Vzc2lvbi4nCi0gICAgICAgICksIE5vbmUsIE5vbmUs IE5vbmUKKyAgICAgICAgcmV0dXJuIEZhbHNlLCBFUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5E LCBOb25lLCBOb25lLCBOb25lCiAKICAgICAjIEZldGNoIHRoZSBvYmplY3QgZm9yIHRoZSBzcGVj aWZpZWQgdHJhbnNhY3Rpb24gaWQuCiAgICAgIyBVc2UgcGlja2xlLmxvYWRzIGZ1bmN0aW9uIHRv IGdldCB0aGUgY29tbWFuZCBvYmplY3QKQEAgLTE5OSw3ICsxOTYsNyBAQCBkZWYgc3RhcnRfdmll d19kYXRhKHRyYW5zX2lkKToKICAgICBzdGF0dXMsIGVycm9yX21zZywgY29ubiwgdHJhbnNfb2Jq LCBzZXNzaW9uX29iaiA9IFwKICAgICAgICAgY2hlY2tfdHJhbnNhY3Rpb25fc3RhdHVzKHRyYW5z X2lkKQogCi0gICAgaWYgZXJyb3JfbXNnID09IGdldHRleHQoJ1RyYW5zYWN0aW9uIElEIG5vdCBm b3VuZCBpbiB0aGUgc2Vzc2lvbi4nKToKKyAgICBpZiBlcnJvcl9tc2cgPT0gRVJST1JfTVNHX1RS QU5TX0lEX05PVF9GT1VORDoKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShzdWNj ZXNzPTAsIGVycm9ybXNnPWVycm9yX21zZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbmZvPSdEQVRBR1JJRF9UUkFOU0FDVElPTl9SRVFVSVJFRCcsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQwNCkKQEAgLTM0NSw3ICszNDIsNyBAQCBkZWYg cG9sbCh0cmFuc19pZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwg c2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19p ZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91 bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFO U19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vz cz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC01MzEsNyArNTI4LDcgQEAgZGVmIGZl dGNoKHRyYW5zX2lkLCBmZXRjaF9hbGw9Tm9uZSk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNv bm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0aW9u X3N0YXR1cyh0cmFuc19pZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFuc2Fj dGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNnID09 IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25f cmVzcG9uc2Uoc3VjY2Vzcz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC02NzcsNyAr Njc0LDcgQEAgZGVmIHNhdmUodHJhbnNfaWQpOgogICAgIHN0YXR1cywgZXJyb3JfbXNnLCBjb25u LCB0cmFuc19vYmosIHNlc3Npb25fb2JqID0gXAogICAgICAgICBjaGVja190cmFuc2FjdGlvbl9z dGF0dXModHJhbnNfaWQpCiAKLSAgICBpZiBlcnJvcl9tc2cgPT0gZ2V0dGV4dCgnVHJhbnNhY3Rp b24gSUQgbm90IGZvdW5kIGluIHRoZSBzZXNzaW9uLicpOgorICAgIGlmIGVycm9yX21zZyA9PSBF UlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5EOgogICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jl c3BvbnNlKHN1Y2Nlc3M9MCwgZXJyb3Jtc2c9ZXJyb3JfbXNnLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGluZm89J0RBVEFHUklEX1RSQU5TQUNUSU9OX1JFUVVJUkVEJywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDA0KQpAQCAtNzUwLDcgKzc0 Nyw3IEBAIGRlZiBhcHBlbmRfZmlsdGVyX2luY2x1c2l2ZSh0cmFuc19pZCk6CiAgICAgc3RhdHVz LCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNo ZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBn ZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAg aWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJl dHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vzcz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJ T05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00 MDQpCkBAIC04MDUsNyArODAyLDcgQEAgZGVmIGFwcGVuZF9maWx0ZXJfZXhjbHVzaXZlKHRyYW5z X2lkKToKICAgICBzdGF0dXMsIGVycm9yX21zZywgY29ubiwgdHJhbnNfb2JqLCBzZXNzaW9uX29i aiA9IFwKICAgICAgICAgY2hlY2tfdHJhbnNhY3Rpb25fc3RhdHVzKHRyYW5zX2lkKQogCi0gICAg aWYgZXJyb3JfbXNnID09IGdldHRleHQoJ1RyYW5zYWN0aW9uIElEIG5vdCBmb3VuZCBpbiB0aGUg c2Vzc2lvbi4nKToKKyAgICBpZiBlcnJvcl9tc2cgPT0gRVJST1JfTVNHX1RSQU5TX0lEX05PVF9G T1VORDoKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShzdWNjZXNzPTAsIGVycm9y bXNnPWVycm9yX21zZywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvPSdE QVRBR1JJRF9UUkFOU0FDVElPTl9SRVFVSVJFRCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3RhdHVzPTQwNCkKQEAgLTg1Nyw3ICs4NTQsNyBAQCBkZWYgcmVtb3ZlX2ZpbHRl cih0cmFuc19pZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vz c2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkK IAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQg aW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19J RF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vzcz0w LCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC05MDEsNyArODk4LDcgQEAgZGVmIHNldF9s aW1pdCh0cmFuc19pZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwg c2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19p ZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91 bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFO U19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vz cz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC05ODQsNyArOTgxLDcgQEAgZGVmIGNh bmNlbF90cmFuc2FjdGlvbih0cmFuc19pZCk6CiAgICAgaWYgaXNfZXJyb3I6CiAgICAgICAgIHJl dHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICBzdWNjZXNzPTAsCi0gICAgICAg ICAgICBlcnJvcm1zZz1nZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNl c3Npb24uJyksCisgICAgICAgICAgICBlcnJvcm1zZz1FUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZP VU5ELAogICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLCBz dGF0dXM9NDA0KQogCiAgICAgIyBGZXRjaCB0aGUgb2JqZWN0IGZvciB0aGUgc3BlY2lmaWVkIHRy YW5zYWN0aW9uIGlkLgpAQCAtMTA0Myw3ICsxMDQwLDcgQEAgZGVmIGdldF9vYmplY3RfbmFtZSh0 cmFuc19pZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lv bl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKIAot ICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4g dGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19JRF9O T1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vzcz0wLCBl cnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5m bz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC0xMDc5LDcgKzEwNzYsNyBAQCBkZWYgc2V0X2F1 dG9fY29tbWl0KHRyYW5zX2lkKToKICAgICBzdGF0dXMsIGVycm9yX21zZywgY29ubiwgdHJhbnNf b2JqLCBzZXNzaW9uX29iaiA9IFwKICAgICAgICAgY2hlY2tfdHJhbnNhY3Rpb25fc3RhdHVzKHRy YW5zX2lkKQogCi0gICAgaWYgZXJyb3JfbXNnID09IGdldHRleHQoJ1RyYW5zYWN0aW9uIElEIG5v dCBmb3VuZCBpbiB0aGUgc2Vzc2lvbi4nKToKKyAgICBpZiBlcnJvcl9tc2cgPT0gRVJST1JfTVNH X1RSQU5TX0lEX05PVF9GT1VORDoKICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShz dWNjZXNzPTAsIGVycm9ybXNnPWVycm9yX21zZywKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbmZvPSdEQVRBR1JJRF9UUkFOU0FDVElPTl9SRVFVSVJFRCcsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQwNCkKQEAgLTExMjQsNyArMTEyMSw3IEBA IGRlZiBzZXRfYXV0b19yb2xsYmFjayh0cmFuc19pZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2cs IGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNrX3RyYW5zYWN0 aW9uX3N0YXR1cyh0cmFuc19pZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0ZXh0KCdUcmFu c2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYgZXJyb3JfbXNn ID09IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVybiBtYWtlX2pz b25fcmVzcG9uc2Uoc3VjY2Vzcz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05fUkVRVUlSRUQn LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDQpCkBAIC0xMTc2 LDcgKzExNzMsNyBAQCBkZWYgYXV0b19jb21wbGV0ZSh0cmFuc19pZCk6CiAgICAgc3RhdHVzLCBl cnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9vYmogPSBcCiAgICAgICAgIGNoZWNr X3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKIAotICAgIGlmIGVycm9yX21zZyA9PSBnZXR0 ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAgaWYg ZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6CiAgICAgICAgIHJldHVy biBtYWtlX2pzb25fcmVzcG9uc2Uoc3VjY2Vzcz0wLCBlcnJvcm1zZz1lcnJvcl9tc2csCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNBQ1RJT05f UkVRVUlSRUQnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDQp CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvdXRpbHMvZmlsdGVyX2Rp YWxvZy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci91dGlscy9maWx0ZXJfZGlhbG9n LnB5CmluZGV4IDYyYmFhYjNkZS4uNzdlZmQ4MGE4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3IvdXRpbHMvZmlsdGVyX2RpYWxvZy5weQorKysgYi93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3IvdXRpbHMvZmlsdGVyX2RpYWxvZy5weQpAQCAtMTYsNiArMTYsNyBAQCBm cm9tIHBnYWRtaW4udXRpbHMuYWpheCBpbXBvcnQgbWFrZV9qc29uX3Jlc3BvbnNlLCBpbnRlcm5h bF9zZXJ2ZXJfZXJyb3IKIGZyb20gcGdhZG1pbi50b29scy5zcWxlZGl0b3IudXRpbHMudXBkYXRl X3Nlc3Npb25fZ3JpZF90cmFuc2FjdGlvbiBpbXBvcnQgXAogICAgIHVwZGF0ZV9zZXNzaW9uX2dy aWRfdHJhbnNhY3Rpb24KIGZyb20gcGdhZG1pbi51dGlscy5leGNlcHRpb24gaW1wb3J0IENvbm5l Y3Rpb25Mb3N0LCBTU0hUdW5uZWxDb25uZWN0aW9uTG9zdAorZnJvbSBwZ2FkbWluLnV0aWxzLmNv bnN0YW50cyBpbXBvcnQgRVJST1JfTVNHX1RSQU5TX0lEX05PVF9GT1VORAogCiAKIGNsYXNzIEZp bHRlckRpYWxvZyhvYmplY3QpOgpAQCAtMjMsNyArMjQsNyBAQCBjbGFzcyBGaWx0ZXJEaWFsb2co b2JqZWN0KToKICAgICBkZWYgZ2V0KCphcmdzKToKICAgICAgICAgIiIiVG8gZmV0Y2ggdGhlIGN1 cnJlbnQgc29ydGVkIGNvbHVtbnMiIiIKICAgICAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4s IHRyYW5zX29iaiwgc2Vzc2lvbl9vYmogPSBhcmdzCi0gICAgICAgIGlmIGVycm9yX21zZyA9PSBn ZXR0ZXh0KCdUcmFuc2FjdGlvbiBJRCBub3QgZm91bmQgaW4gdGhlIHNlc3Npb24uJyk6CisgICAg ICAgIGlmIGVycm9yX21zZyA9PSBFUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5EOgogICAgICAg ICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAgICAgICAgICAgICAgICBzdWNjZXNz PTAsCiAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9ZXJyb3JfbXNnLApAQCAtNzYsNyArNzcsNyBA QCBjbGFzcyBGaWx0ZXJEaWFsb2cob2JqZWN0KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAg IGRhdGEgPSByZXF1ZXN0LmFyZ3Mgb3IgcmVxdWVzdC5mb3JtCiAKLSAgICAgICAgaWYgZXJyb3Jf bXNnID09IGdldHRleHQoJ1RyYW5zYWN0aW9uIElEIG5vdCBmb3VuZCBpbiB0aGUgc2Vzc2lvbi4n KToKKyAgICAgICAgaWYgZXJyb3JfbXNnID09IEVSUk9SX01TR19UUkFOU19JRF9OT1RfRk9VTkQ6 CiAgICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKAogICAgICAgICAgICAgICAg IHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICBlcnJvcm1zZz1lcnJvcl9tc2csCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvdXRpbHMvc3RhcnRfcnVubmluZ19xdWVy eS5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci91dGlscy9zdGFydF9ydW5uaW5nX3F1 ZXJ5LnB5CmluZGV4IGFiODQ1Y2M1MS4uN2JhYzc4YmE1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi90b29scy9zcWxlZGl0b3IvdXRpbHMvc3RhcnRfcnVubmluZ19xdWVyeS5weQorKysgYi93ZWIv cGdhZG1pbi90b29scy9zcWxlZGl0b3IvdXRpbHMvc3RhcnRfcnVubmluZ19xdWVyeS5weQpAQCAt MjcsNiArMjcsNyBAQCBmcm9tIHBnYWRtaW4udXRpbHMuYWpheCBpbXBvcnQgbWFrZV9qc29uX3Jl c3BvbnNlLCBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IKIGZyb20gcGdhZG1pbi51dGlscy5kcml2ZXIg aW1wb3J0IGdldF9kcml2ZXIKIGZyb20gcGdhZG1pbi51dGlscy5leGNlcHRpb24gaW1wb3J0IENv bm5lY3Rpb25Mb3N0LCBTU0hUdW5uZWxDb25uZWN0aW9uTG9zdCxcCiAgICAgQ3J5cHRLZXlNaXNz aW5nCitmcm9tIHBnYWRtaW4udXRpbHMuY29uc3RhbnRzIGltcG9ydCBFUlJPUl9NU0dfVFJBTlNf SURfTk9UX0ZPVU5ECiAKIAogY2xhc3MgU3RhcnRSdW5uaW5nUXVlcnk6CkBAIC0xNzMsNyArMTc0 LDcgQEAgY2xhc3MgU3RhcnRSdW5uaW5nUXVlcnk6CiAgICAgICAgIGlmICdncmlkRGF0YScgbm90 IGluIGh0dHBfc2Vzc2lvbjoKICAgICAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2Uo CiAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAotICAgICAgICAgICAgICAgIGVycm9ybXNnPWdl dHRleHQoJ1RyYW5zYWN0aW9uIElEIG5vdCBmb3VuZCBpbiB0aGUgc2Vzc2lvbi4nKSwKKyAgICAg ICAgICAgICAgICBlcnJvcm1zZz1FUlJPUl9NU0dfVFJBTlNfSURfTk9UX0ZPVU5ELAogICAgICAg ICAgICAgICAgIGluZm89J0RBVEFHUklEX1RSQU5TQUNUSU9OX1JFUVVJUkVEJywgc3RhdHVzPTQw NAogICAgICAgICAgICAgKQogICAgICAgICBncmlkX2RhdGEgPSBodHRwX3Nlc3Npb25bJ2dyaWRE YXRhJ10KQEAgLTE4MSw3ICsxODIsNyBAQCBjbGFzcyBTdGFydFJ1bm5pbmdRdWVyeToKICAgICAg ICAgaWYgc3RyKHRyYW5zYWN0aW9uX2lkKSBub3QgaW4gZ3JpZF9kYXRhOgogICAgICAgICAgICAg cmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCi0g ICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgnVHJhbnNhY3Rpb24gSUQgbm90IGZvdW5k IGluIHRoZSBzZXNzaW9uLicpLAorICAgICAgICAgICAgICAgIGVycm9ybXNnPUVSUk9SX01TR19U UkFOU19JRF9OT1RfRk9VTkQsCiAgICAgICAgICAgICAgICAgaW5mbz0nREFUQUdSSURfVFJBTlNB Q1RJT05fUkVRVUlSRUQnLAogICAgICAgICAgICAgICAgIHN0YXR1cz00MDQKICAgICAgICAgICAg ICkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL2NvbnN0YW50cy5weSBiL3dlYi9wZ2Fk bWluL3V0aWxzL2NvbnN0YW50cy5weQppbmRleCA4OGFlNTBkZTIuLjRlZjAzMjg5MiAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vdXRpbHMvY29uc3RhbnRzLnB5CisrKyBiL3dlYi9wZ2FkbWluL3V0 aWxzL2NvbnN0YW50cy5weQpAQCAtMjksMyArMjksMTQgQEAgUEdBRE1JTl9OT0RFID0gJ3BnYWRt aW4ubm9kZS4lcycKIFVOQVVUSF9SRVEgPSAiVW5hdXRob3JpemVkIHJlcXVlc3QuIgogU0VSVkVS X0NPTk5FQ1RJT05fQ0xPU0VEID0gZ2V0dGV4dCgKICAgICAnTm90IGNvbm5lY3RlZCB0byBzZXJ2 ZXIgb3IgY29ubmVjdGlvbiB3aXRoIHRoZSBzZXJ2ZXIgaGFzIGJlZW4gY2xvc2VkLicpCisKKyMg RGF0YSBUeXBlcworREFUQVRZUEVfVElNRV9XSVRIX1RJTUVaT05FID0gJ3RpbWUgd2l0aCB0aW1l IHpvbmUnCitEQVRBVFlQRV9USU1FX1dJVEhPVVRfVElNRVpPTkUgPSAndGltZSB3aXRob3V0IHRp bWUgem9uZScKKworREFUQVRZUEVfVElNRVNUQU1QX1dJVEhfVElNRVpPTkUgPSAndGltZXN0YW1w IHdpdGggdGltZSB6b25lJworREFUQVRZUEVfVElNRVNUQU1QX1dJVEhPVVRfVElNRVpPTkUgPSAn dGltZXN0YW1wIHdpdGhvdXQgdGltZSB6b25lJworCisjIEVycm9yIE1lc3NhZ2VzCitFUlJPUl9N U0dfVFJBTlNfSURfTk9UX0ZPVU5EID0gZ2V0dGV4dCgKKyAgICAnVHJhbnNhY3Rpb24gSUQgbm90 IGZvdW5kIGluIHRoZSBzZXNzaW9uLicpCg== --0000000000001de9b505ae66c88a--