Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gltBK-0005hk-Cq for pgadmin-hackers@arkaria.postgresql.org; Tue, 22 Jan 2019 10:21:22 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gltBJ-00056l-3X for pgadmin-hackers@arkaria.postgresql.org; Tue, 22 Jan 2019 10:21:21 +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_SHA1:256) (Exim 4.89) (envelope-from ) id 1gltBI-00056e-P2 for pgadmin-hackers@lists.postgresql.org; Tue, 22 Jan 2019 10:21:20 +0000 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gltBF-0001M8-O5 for pgadmin-hackers@postgresql.org; Tue, 22 Jan 2019 10:21:20 +0000 Received: by mail-oi1-x232.google.com with SMTP id i6so16949542oia.6 for ; Tue, 22 Jan 2019 02:21:17 -0800 (PST) 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=MtKpmLEf6+I46QUo2FWbY+TIzLF0I/MK9r5WghQZhLU=; b=UFG5VwdmyVzn3kE/50aovju8l+HOH8bcIwKbCA6yn9RDgJnsf1HdCAboWSEQPkKN6x /9bMSXXmNNbZ/AXH+R2aHyjz/waHhLRpLrtKf+ivzk5SRnFnxiMOYk3yX/dWeGptc3qn 2D+PvZMn77OgPojX02+Fpc01AUTo6hvFn1vIlmQrGwPNm1KaUxwtfletWQoYGu8QsHeC DUldMIG4kxinzeuX88dq4jazLGd6oRK3Z5L3fHkF0SjPhiLgWxFU7nV5+X+pJ9S04Km2 bG+8JukjxJZI38SwNomIwyszWsHKGxYXa/8F693TcNpNkXkDIyUc3KofrwPdxH1WdgbT 7FtQ== 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=MtKpmLEf6+I46QUo2FWbY+TIzLF0I/MK9r5WghQZhLU=; b=nYTkhCeEbB0C1NRTztI9RyNhBIUv8VeS+ba3Tk/QMezqqFlo20/okV7CRaATXxhZz5 ziSAbxsYIBY71UYafUdUwE/wBYzDl7Hn6fDXkRUHvbRGX4rZoHhu4NvnEyM39oCWg14+ dXE5nN9y5TeNY672IhSWzctaQ+y/CE78g6So6ZnVDLmbsJhN86Dnx28etr+nkJBHigDj skloEMRXjXgPIDG9pGpsLE5ioyxRaVANVqwArQeFjAzSvYPob2+aPNOIIsclmbYQm5Hd KupnEI8d3+5qE4uPGkvd7iPvwkZu7ljqqanC263NziBYBW/PIetAG+cxusoFND9q4TUO Os/w== X-Gm-Message-State: AJcUukf1P3GOz8zZdADcELJsB/mhaMi8B1E/rd4PiEXHecl9IdB/VqIJ AZOf4s55Eduf/XC7elsE6Dk8U1l6nl4xVP/A3xFZrQ== X-Google-Smtp-Source: ALg8bN4ZIbSvKKw/RZbqRMtvL4EJBS9PA0II5HjJPyCOUadnBaLV8hwnA7AttDyPNtN37TPrIz4HshCtNYWxKfNJjDA= X-Received: by 2002:a54:450f:: with SMTP id l15mr8190137oil.351.1548152474703; Tue, 22 Jan 2019 02:21:14 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Khushboo Vashi Date: Tue, 22 Jan 2019 15:51:03 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch] - RM 3853 - Incorrect SQL generated for create script of domain type interval with precision. ERROR: syntax error at or near "[" To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000050654b0580095637" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --00000000000050654b0580095637 Content-Type: multipart/alternative; boundary="0000000000005065490580095635" --0000000000005065490580095635 Content-Type: text/plain; charset="UTF-8" Hi Akshay, Please find the attached updated patch. On Mon, Jan 21, 2019 at 2:57 PM Akshay Joshi wrote: > Hi Khushboo > > Can you please fix the following and send the patch again > > - PEP8 issue > > Fixed > > - Test cases is failing with Python 3.5. > > I have tested with Python 3.7 and it is working fine. Please give me the log to reproduce the issue. > > On Mon, Jan 21, 2019 at 2:06 PM Khushboo Vashi < > khushboo.vashi@enterprisedb.com> wrote: > >> Hi, >> >> Please find the attached patch to fix the RM #3853 - Incorrect SQL >> generated for create script of domain type interval with precision. ERROR: >> syntax error at or near "[" >> >> The patch includes the fix as well as the API test case to verify the >> reverse Engineered SQL. >> >> Thanks, >> Khushboo >> > > > Thanks, Khushboo > -- > *Akshay Joshi* > > *Sr. Software Architect * > > > > *Phone: +91 20-3058-9517Mobile: +91 976-788-8246* > --0000000000005065490580095635 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Akshay,

Please find the a= ttached updated patch.

On Mon, Jan 21, 2019 at 2:57 PM Akshay Joshi <akshay.joshi@enterprisedb.com<= /a>> wrote:
<= div dir=3D"ltr">Hi=C2=A0Khu= shboo

Can you please fix the following and send t= he patch again
  • PEP8 issue
=
  • Test cases is failing with Python 3.5.

On Mon, Jan 21= , 2019 at 2:06 PM Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrot= e:
Hi,

Please find the attached patch to fix the RM #38= 53 -=C2=A0Incorrect SQL generated for create script of domain type interval= with precision. ERROR: syntax error at or near "["
The patch includes the fix as well as the API test case to verify th= e reverse Engineered SQL.

Thanks,
<= div>Khushboo


Thank= s,
Khushboo=C2=A0
--
Akshay Joshi=
Sr. Softwa= re Architect

<= br>
Phone: +91 20-3058-9517
Mobile: +91 976-788-8246
--0000000000005065490580095635-- --00000000000050654b0580095637 Content-Type: application/octet-stream; name="RM_3853_v1.patch" Content-Disposition: attachment; filename="RM_3853_v1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jr7lzomv0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL19faW5pdF9f LnB5CmluZGV4IDkwYzNjZjRkLi5iZWRlZGE5MCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZG9tYWlucy9fX2lu aXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL19faW5pdF9fLnB5CkBAIC00NDYsNyArNDQ2LDcgQEAg SXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkIGJ5IGFub3RoZXIgdXNlciBvciBtb3ZlZCB0byBhbm90 aGVyIHNjaGVtYS4KICAgICAgICAgICAgICAgICB0eXBfbGVuID0gdHlwbGVuWzBdCiAgICAgICAg ICAgICAgICAgdHlwX3ByZWNpc2lvbiA9IHR5cGxlblsxXQogICAgICAgICAgICAgZWxzZToKLSAg ICAgICAgICAgICAgICB0eXBfbGVuID0gdHlwbGVuCisgICAgICAgICAgICAgICAgdHlwX2xlbiA9 IHR5cGxlblswXQogICAgICAgICAgICAgICAgIHR5cF9wcmVjaXNpb24gPSAnJwogCiAgICAgICAg IHJldHVybiB7J3R5cGxlbic6IHR5cF9sZW4sICdwcmVjaXNpb24nOiB0eXBfcHJlY2lzaW9ufQpk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZG9tYWlucy90ZXN0cy90ZXN0X2RvbWFpbl9zcWwucHkgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21h aW5zL3Rlc3RzL3Rlc3RfZG9tYWluX3NxbC5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMC4uMGYwMjJmMWMKLS0tIC9kZXYvbnVsbAorKysgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL3Rlc3RzL3Rl c3RfZG9tYWluX3NxbC5weQpAQCAtMCwwICsxLDExNyBAQAorIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMK KyMgcGdBZG1pbiA0IC0gUG9zdGdyZVNRTCBUb29scworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMg LSAyMDE5LCBUaGUgcGdBZG1pbiBEZXZlbG9wbWVudCBUZWFtCisjIFRoaXMgc29mdHdhcmUgaXMg cmVsZWFzZWQgdW5kZXIgdGhlIFBvc3RncmVTUUwgTGljZW5jZQorIworIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMKKworaW1wb3J0IHV1aWQKK2ltcG9ydCBqc29uCitpbXBvcnQgcmUKKworZnJvbSBwZ2FkbWlu LmJyb3dzZXIuc2VydmVyX2dyb3Vwcy5zZXJ2ZXJzLmRhdGFiYXNlcy5zY2hlbWFzLnRlc3RzIGlt cG9ydCBcCisgICAgdXRpbHMgYXMgc2NoZW1hX3V0aWxzCitmcm9tIHBnYWRtaW4uYnJvd3Nlci5z ZXJ2ZXJfZ3JvdXBzLnNlcnZlcnMuZGF0YWJhc2VzLnRlc3RzIGltcG9ydCB1dGlscyBhcyBcCisg ICAgZGF0YWJhc2VfdXRpbHMKK2Zyb20gcGdhZG1pbi51dGlscy5yb3V0ZSBpbXBvcnQgQmFzZVRl c3RHZW5lcmF0b3IKK2Zyb20gcmVncmVzc2lvbiBpbXBvcnQgcGFyZW50X25vZGVfZGljdAorZnJv bSByZWdyZXNzaW9uLnB5dGhvbl90ZXN0X3V0aWxzIGltcG9ydCB0ZXN0X3V0aWxzIGFzIHV0aWxz Citmcm9tIC4gaW1wb3J0IHV0aWxzIGFzIGRvbWFpbl91dGlscworCisKK2NsYXNzIERvbWFpblJl dmVyc2VFbmdpbmVlcmVkU1FMVGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0b3IpOgorICAgICIiIiBU aGlzIGNsYXNzIHdpbGwgdmVyaWZ5IHJldmVyc2UgZW5naW5lZXJlZCBzcWwgZm9yIGRvbWFpbgor ICAgICB1bmRlciBzY2hlbWEgbm9kZS4gIiIiCisgICAgc2NlbmFyaW9zID0gWworICAgICAgICAj IEZldGNoaW5nIGRlZmF1bHQgVVJMIGZvciBkb21haW4gbm9kZS4KKyAgICAgICAgKCdEb21haW4g UmV2ZXJzZSBFbmdpbmVlcmVkIFNRTCB3aXRoIGNoYXInLAorICAgICAgICAgZGljdCh1cmw9Jy9i cm93c2VyL2RvbWFpbi9zcWwvJywKKyAgICAgICAgICAgICAgZG9tYWluX25hbWU9J2RvbWFpbl9n ZXRfJXMnICUgKHN0cih1dWlkLnV1aWQ0KCkpWzE6OF0pLAorICAgICAgICAgICAgICBkb21haW5f c3FsPSdBUyAiY2hhciI7JworICAgICAgICAgICAgICApCisgICAgICAgICApLAorICAgICAgICAo J0RvbWFpbiBSZXZlcnNlIEVuZ2luZWVyZWQgU1FMIHdpdGggTGVuZ3RoLCBQcmVjaXNpb24gYW5k IERlZmF1bHQnLAorICAgICAgICAgZGljdCh1cmw9Jy9icm93c2VyL2RvbWFpbi9zcWwvJywKKyAg ICAgICAgICAgICAgZG9tYWluX25hbWU9J2RvbWFpbl9nZXRfJXMnICUgKHN0cih1dWlkLnV1aWQ0 KCkpWzE6OF0pLAorICAgICAgICAgICAgICBkb21haW5fc3FsPSdBUyBudW1lcmljKDEyLDIpIERF RkFVTFQgMTIgTk9UIE5VTEw7JworICAgICAgICAgICAgICApCisgICAgICAgICApLAorICAgICAg ICAoJ0RvbWFpbiBSZXZlcnNlIEVuZ2luZWVyZWQgU1FMIHdpdGggTGVuZ3RoJywKKyAgICAgICAg IGRpY3QodXJsPScvYnJvd3Nlci9kb21haW4vc3FsLycsCisgICAgICAgICAgICAgIGRvbWFpbl9u YW1lPSdkb21haW5fZ2V0XyVzJyAlIChzdHIodXVpZC51dWlkNCgpKVsxOjhdKSwKKyAgICAgICAg ICAgICAgZG9tYWluX3NxbD0nQVMgaW50ZXJ2YWwoNik7JworICAgICAgICAgICAgICApCisgICAg ICAgICApLAorICAgIF0KKworICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAgICAgc2VsZi5kYXRh YmFzZV9pbmZvID0gcGFyZW50X25vZGVfZGljdFsiZGF0YWJhc2UiXVstMV0KKyAgICAgICAgc2Vs Zi5kYl9uYW1lID0gc2VsZi5kYXRhYmFzZV9pbmZvWyJkYl9uYW1lIl0KKyAgICAgICAgc2VsZi5z Y2hlbWFfaW5mbyA9IHBhcmVudF9ub2RlX2RpY3RbInNjaGVtYSJdWy0xXQorICAgICAgICBzZWxm LnNjaGVtYV9uYW1lID0gc2VsZi5zY2hlbWFfaW5mb1sic2NoZW1hX25hbWUiXQorICAgICAgICBz ZWxmLnNjaGVtYV9pZCA9IHNlbGYuc2NoZW1hX2luZm9bInNjaGVtYV9pZCJdCisgICAgICAgIHNl bGYuZG9tYWluX2luZm8gPSBkb21haW5fdXRpbHMuY3JlYXRlX2RvbWFpbihzZWxmLnNlcnZlciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNl bGYuZGJfbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuc2NoZW1hX25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVtYV9pZCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZG9tYWluX25hbWUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz ZWxmLmRvbWFpbl9zcWwpCisKKyAgICBkZWYgcnVuVGVzdChzZWxmKToKKyAgICAgICAgIiIiIFRo aXMgZnVuY3Rpb24gd2lsbCBhZGQgZG9tYWluIGFuZCB2ZXJpZnkgdGhlCisgICAgICAgICByZXZl cnNlIGVuZ2luZWVyZWQgc3FsLiAiIiIKKyAgICAgICAgZGJfaWQgPSBzZWxmLmRhdGFiYXNlX2lu Zm9bImRiX2lkIl0KKyAgICAgICAgc2VydmVyX2lkID0gc2VsZi5kYXRhYmFzZV9pbmZvWyJzZXJ2 ZXJfaWQiXQorICAgICAgICBkYl9jb24gPSBkYXRhYmFzZV91dGlscy5jb25uZWN0X2RhdGFiYXNl KHNlbGYsIHV0aWxzLlNFUlZFUl9HUk9VUCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJfaWQsIGRiX2lkKQorICAgICAgICBpZiBub3QgZGJf Y29uWydkYXRhJ11bImNvbm5lY3RlZCJdOgorICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJD b3VsZCBub3QgY29ubmVjdCB0byBkYXRhYmFzZSB0byBnZXQgdGhlIGRvbWFpbi4iKQorCisgICAg ICAgIGRiX25hbWUgPSBzZWxmLmRhdGFiYXNlX2luZm9bImRiX25hbWUiXQorICAgICAgICBzY2hl bWFfcmVzcG9uc2UgPSBzY2hlbWFfdXRpbHMudmVyaWZ5X3NjaGVtYXMoc2VsZi5zZXJ2ZXIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYl9u YW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2VsZi5zY2hlbWFfbmFtZSkKKyAgICAgICAgaWYgbm90IHNjaGVtYV9yZXNwb25zZToKKyAg ICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiQ291bGQgbm90IGZpbmQgdGhlIHNjaGVtYSB0byBn ZXQgdGhlIGRvbWFpbi4iKQorICAgICAgICBkb21haW5faWQgPSBzZWxmLmRvbWFpbl9pbmZvWzBd CisKKyAgICAgICAgIyBDYWxsIEdFVCBBUEkgdG8gZmV0Y2ggdGhlIGRvbWFpbiBzcWwKKyAgICAg ICAgZ2V0X3Jlc3BvbnNlID0gc2VsZi50ZXN0ZXIuZ2V0KAorICAgICAgICAgICAgc2VsZi51cmwg KyBzdHIodXRpbHMuU0VSVkVSX0dST1VQKSArICcvJyArCisgICAgICAgICAgICBzdHIoc2VydmVy X2lkKSArICcvJyArCisgICAgICAgICAgICBzdHIoZGJfaWQpICsgJy8nICsKKyAgICAgICAgICAg IHN0cihzZWxmLnNjaGVtYV9pZCkgKyAnLycgKworICAgICAgICAgICAgc3RyKGRvbWFpbl9pZCks CisgICAgICAgICAgICBjb250ZW50X3R5cGU9J2h0bWwvanNvbicpCisKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbHMoZ2V0X3Jlc3BvbnNlLnN0YXR1c19jb2RlLCAyMDApCisgICAgICAgIG9yaWdf c3FsID0ganNvbi5sb2FkcyhnZXRfcmVzcG9uc2UuZGF0YSkKKworICAgICAgICAjIFJlcGxhY2Ug bXVsdGlwbGUgc3BhY2VzIHdpdGggb25lIHNwYWNlIGFuZCBjaGVjayB0aGUgZXhwZWN0ZWQgc3Fs CisgICAgICAgIHNxbCA9IHJlLnN1YignXHMrJywgJyAnLCBvcmlnX3NxbCkuc3RyaXAoKQorICAg ICAgICBleHBlY3RlZF9zcWwgPSAnLS0gRE9NQUlOOiB7MH0uezF9IC0tIERST1AgRE9NQUlOIHsw fS57MX07ICcgXAorICAgICAgICAgICAgICAgICAgICAgICAnQ1JFQVRFIERPTUFJTiB7MH0uezF9 IHsyfSAnIFwKKyAgICAgICAgICAgICAgICAgICAgICAgJ0FMVEVSIERPTUFJTiB7MH0uezF9IE9X TkVSJyBcCisgICAgICAgICAgICAgICAgICAgICAgICcgVE8gcG9zdGdyZXM7Jy5mb3JtYXQoc2Vs Zi5zY2hlbWFfbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLmRvbWFpbl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuZG9tYWluX3NxbCkKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhzcWwsIGV4cGVjdGVkX3NxbCkKKworICAgICAgICBkb21haW5fdXRpbHMuZGVsZXRlX2RvbWFp bihzZWxmLnNlcnZlciwgZGJfbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2VsZi5zY2hlbWFfbmFtZSwgc2VsZi5kb21haW5fbmFtZSkKKworICAgICAgICAjIFZlcmlm eSB0aGUgcmV2ZXJzZSBlbmdpbmVlcmVkIHNxbCB3aXRoIGNyZWF0aW5nIGRvbWFpbiB3aXRoCisg ICAgICAgICMgdGhlIHNxbCB3ZSBnZXQgZnJvbSB0aGUgc2VydmVyCisgICAgICAgIGRvbWFpbl91 dGlscy5jcmVhdGVfZG9tYWluX2Zyb21fc3FsKHNlbGYuc2VydmVyLCBkYl9uYW1lLCBvcmlnX3Nx bCkKKworICAgICAgICBkb21haW5fdXRpbHMuZGVsZXRlX2RvbWFpbihzZWxmLnNlcnZlciwgZGJf bmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5zY2hlbWFfbmFt ZSwgc2VsZi5kb21haW5fbmFtZSkKKworICAgICAgICAjIERpc2Nvbm5lY3QgdGhlIGRhdGFiYXNl CisgICAgICAgIGRhdGFiYXNlX3V0aWxzLmRpc2Nvbm5lY3RfZGF0YWJhc2Uoc2VsZiwgc2VydmVy X2lkLCBkYl9pZCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcGFzcwpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvZG9tYWlucy90ZXN0cy91dGlscy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvdGVzdHMvdXRp bHMucHkKaW5kZXggNDM1NGViMjkuLjNiZDlhMjdmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21haW5zL3Rl c3RzL3V0aWxzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvdGVzdHMvdXRpbHMucHkKQEAgLTE1LDcgKzE1 LDggQEAgaW1wb3J0IHRyYWNlYmFjawogZnJvbSByZWdyZXNzaW9uLnB5dGhvbl90ZXN0X3V0aWxz IGltcG9ydCB0ZXN0X3V0aWxzIGFzIHV0aWxzCiAKIAotZGVmIGNyZWF0ZV9kb21haW4oc2VydmVy LCBkYl9uYW1lLCBzY2hlbWFfbmFtZSwgc2NoZW1hX2lkLCBkb21haW5fbmFtZSk6CitkZWYgY3Jl YXRlX2RvbWFpbihzZXJ2ZXIsIGRiX25hbWUsIHNjaGVtYV9uYW1lLCBzY2hlbWFfaWQsIGRvbWFp bl9uYW1lLAorICAgICAgICAgICAgICAgICAgZG9tYWluX3NxbD1Ob25lKToKICAgICAiIiIKICAg ICBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gYWRkIHRoZSBkb21haW4gdG8gZXhpc3Rpbmcgc2No ZW1hCiAgICAgOnBhcmFtIHNlcnZlcjogc2VydmVyIGRldGFpbHMKQEAgLTM3LDggKzM4LDE0IEBA IGRlZiBjcmVhdGVfZG9tYWluKHNlcnZlciwgZGJfbmFtZSwgc2NoZW1hX25hbWUsIHNjaGVtYV9p ZCwgZG9tYWluX25hbWUpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VydmVyWydob3N0J10sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzZXJ2ZXJbJ3BvcnQnXSkKICAgICAgICAgcGdfY3Vyc29yID0gY29ubmVjdGlv bi5jdXJzb3IoKQotICAgICAgICBxdWVyeSA9ICdDUkVBVEUgRE9NQUlOICcgKyBzY2hlbWFfbmFt ZSArICcuJyArIGRvbWFpbl9uYW1lICsgXAotICAgICAgICAgICAgICAgICcgQVMgY2hhcmFjdGVy KDEwKSBERUZBVUxUIDEnCisKKyAgICAgICAgaWYgZG9tYWluX3NxbCBpcyBOb25lOgorICAgICAg ICAgICAgcXVlcnkgPSAnQ1JFQVRFIERPTUFJTiAnICsgc2NoZW1hX25hbWUgKyAnLicgKyBkb21h aW5fbmFtZSArIFwKKyAgICAgICAgICAgICAgICAgICAgJyBBUyBjaGFyYWN0ZXIoMTApIERFRkFV TFQgMScKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHF1ZXJ5ID0gJ0NSRUFURSBET01BSU4g JyArIHNjaGVtYV9uYW1lICsgJy4nICtcCisgICAgICAgICAgICAgICAgICAgIGRvbWFpbl9uYW1l ICsgJyAnICsgZG9tYWluX3NxbAorCiAgICAgICAgIHBnX2N1cnNvci5leGVjdXRlKHF1ZXJ5KQog ICAgICAgICBjb25uZWN0aW9uLmNvbW1pdCgpCiAgICAgICAgICMgR2V0ICdvaWQnIGZyb20gbmV3 bHkgY3JlYXRlZCBkb21haW4KQEAgLTc3LDMgKzg0LDUxIEBAIGRlZiB2ZXJpZnlfZG9tYWluKHNl cnZlciwgZGJfbmFtZSwgc2NoZW1hX2lkLCBkb21haW5fbmFtZSk6CiAgICAgZG9tYWlucyA9IHBn X2N1cnNvci5mZXRjaG9uZSgpCiAgICAgY29ubmVjdGlvbi5jbG9zZSgpCiAgICAgcmV0dXJuIGRv bWFpbnMKKworCitkZWYgZGVsZXRlX2RvbWFpbihzZXJ2ZXIsIGRiX25hbWUsIHNjaGVtYV9uYW1l LCBkb21haW5fbmFtZSk6CisgICAgIiIiCisgICAgVGhpcyBmdW5jdGlvbiBkZWxldGVzIHRoZSBk b21haW4uCisgICAgOnBhcmFtIHNlcnZlcjoKKyAgICA6cGFyYW0gZGJfbmFtZToKKyAgICA6cGFy YW0gc2NoZW1hX25hbWU6CisgICAgOnBhcmFtIGRvbWFpbl9uYW1lOgorICAgIDpyZXR1cm46Cisg ICAgIiIiCisKKyAgICB0cnk6CisgICAgICAgIGNvbm5lY3Rpb24gPSB1dGlscy5nZXRfZGJfY29u bmVjdGlvbihkYl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VydmVyWyd1c2VybmFtZSddLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VydmVyWydkYl9wYXNzd29yZCddLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VydmVyWydob3N0J10sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJbJ3BvcnQnXSkKKyAgICAgICAg cGdfY3Vyc29yID0gY29ubmVjdGlvbi5jdXJzb3IoKQorICAgICAgICBwZ19jdXJzb3IuZXhlY3V0 ZSgiRFJPUCBET01BSU4gJXMuJXMiICUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKHNjaGVt YV9uYW1lLCBkb21haW5fbmFtZSkpCisgICAgICAgIGNvbm5lY3Rpb24uY29tbWl0KCkKKyAgICAg ICAgY29ubmVjdGlvbi5jbG9zZSgpCisgICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAgdHJh Y2ViYWNrLnByaW50X2V4YyhmaWxlPXN5cy5zdGRlcnIpCisKKworZGVmIGNyZWF0ZV9kb21haW5f ZnJvbV9zcWwoc2VydmVyLCBkYl9uYW1lLCBzcWwpOgorICAgICIiIgorICAgIFRoaXMgZnVuY3Rp b24gY3JlYXRlIGRvbWFpbiBmcm9tIHRoZSByZXZlcnNlIGVuZ2luZWVyZWQgc3FsCisgICAgOnBh cmFtIHNlcnZlcjoKKyAgICA6cGFyYW0gZGJfbmFtZToKKyAgICA6cGFyYW0gc3FsOgorICAgIDpy ZXR1cm46CisgICAgIiIiCisKKyAgICB0cnk6CisgICAgICAgIGNvbm5lY3Rpb24gPSB1dGlscy5n ZXRfZGJfY29ubmVjdGlvbihkYl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VydmVyWyd1c2VybmFtZSddLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VydmVyWydkYl9wYXNzd29yZCddLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VydmVyWydob3N0J10sCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJbJ3BvcnQnXSkK KyAgICAgICAgcGdfY3Vyc29yID0gY29ubmVjdGlvbi5jdXJzb3IoKQorICAgICAgICBwZ19jdXJz b3IuZXhlY3V0ZShzcWwpCisgICAgICAgIGNvbm5lY3Rpb24uY29tbWl0KCkKKyAgICAgICAgY29u bmVjdGlvbi5jbG9zZSgpCisgICAgZXhjZXB0IEV4Y2VwdGlvbjoKKyAgICAgICAgdHJhY2ViYWNr LnByaW50X2V4YyhmaWxlPXN5cy5zdGRlcnIpCg== --00000000000050654b0580095637--