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 1jMn9C-0008RU-Re for pgadmin-hackers@arkaria.postgresql.org; Fri, 10 Apr 2020 06:28:15 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jMn9A-00089u-N9 for pgadmin-hackers@arkaria.postgresql.org; Fri, 10 Apr 2020 06:28:12 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jMn9A-000876-7Y for pgadmin-hackers@lists.postgresql.org; Fri, 10 Apr 2020 06:28:12 +0000 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jMn97-00020x-Jg for pgadmin-hackers@postgresql.org; Fri, 10 Apr 2020 06:28:10 +0000 Received: by mail-lj1-x22c.google.com with SMTP id r7so921198ljg.13 for ; Thu, 09 Apr 2020 23:28:09 -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=e2bMMwOGf9JV6o8KAABQipcqlPfSVAN/louQZp152CM=; b=fDR3CGN9nNSISBTB82YyZr5/hP3kiCg8Foy3GwG7rstCpsVWTiRvf3ojsKlXfKnHOY XNc1ThDxRb2ETk5Ov142Gr7M7ml3f/oWFeP1nw1abQTZ2bnGF0v9tYxMajdExU0pTkla 97DcgQEEmLMSIP9VX21W7r/M4Iky+n0b0dKUQPphrMIBvE1q42cF04BcLYwXCIxrnGLA ap2k522gtd5bRSHKiQJ0TsIIPl6pSEDp6E+8XI6lWJQQeCIyL9J28cD8L4nyFRlWBvm9 UGP1i5hipPYsXCeCI1Yd9hDY0EAlyISV9hZTEIx2IC2VQg1x3ZUGEnj849OqdLEdQdEY HNIg== 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=e2bMMwOGf9JV6o8KAABQipcqlPfSVAN/louQZp152CM=; b=D9EnBcX3UEq2pRfiitEwxMLy89EquNX0y3yMbasiUuGtXD0HmiAKereKJkBIl6JlZa iSz221nwREjQjx6dHbNZftfvtA8oohJEqJw+Qq2m4Ha70tpRD9N45b48ia4W4Mz79dWC xseXt/662NaB1jAJ5PFp9hr1U2fWhFnfZzOfJDss0nSSIHtcV/Zc2vrgeHJfjqA22MhO sC1oVmnYTkbcHwIOUAgXXgSCn6vLs2i7TtMVBCTriT6DetKVzAP+xvGUS6qymu1dKNZz AXBt1GMeVGeTq6e1SPc8X1zdxi0Nn/ZEaGRC1MDYfaaQiGSbh3bWXNDPO9dupT4P+9im X4lA== X-Gm-Message-State: AGi0PubsnUyhqAK0TNpIWrgCDuRRhPvplNcBfD33Tmti388ElFVypc9Z vKhhF8f9J23r+V4gOpUnMI9cFu/uzzsSQkO6YZGAb4+/0EH2UvqNuExwLx9YTTZIsCx61lw2XTx Dh6zX/RkZfG4glk8RE3xvg5G7JcGQ48SstZPsvD6/eK02VROftXYVQU6GShmrrX3HC+a5gEw4eO z6bymxGaUhIMOH768B8smCT1rPRsRjbdbvsFctY/2xpCFu8XxSNhE= X-Google-Smtp-Source: APiQypJ/MoadG6rEbhUoHJ6YmNdw0Q2+ZOL42UvfVQoTPxXMXe9yvaHqjeaeGrz+OUOe+R87SihxqskUJWZMs9kMGvQ= X-Received: by 2002:a2e:988c:: with SMTP id b12mr2134991ljj.138.1586500087430; Thu, 09 Apr 2020 23:28:07 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Khushboo Vashi Date: Fri, 10 Apr 2020 11:58:00 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch] - RM 5270 - [EPAS] Synonym properties does not show OID. To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000026c9b705a2e9d600" X-CLOUD-SEC-AV-Info: edb,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 --00000000000026c9b705a2e9d600 Content-Type: multipart/alternative; boundary="00000000000026c9b405a2e9d6fe" --00000000000026c9b405a2e9d6fe Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached updated patch. Thanks, Khushboo On Fri, Apr 10, 2020 at 10:41 AM Khushboo Vashi < khushboo.vashi@enterprisedb.com> wrote: > Hi Akshay, > > On Wed, Apr 8, 2020 at 12:33 PM Akshay Joshi < > akshay.joshi@enterprisedb.com> wrote: > >> Hi Khushboo >> >> Schema Diff test cases are failing with this patch. Please fix and resend >> the patch. >> >> Fixed. Thanks, Khushboo > Can you please re-verify as I don't think schema diff test cases are > failing due to this patch. > > Thanks, > Khushboo > >> On Tue, Apr 7, 2020 at 6:37 PM Khushboo Vashi < >> khushboo.vashi@enterprisedb.com> wrote: >> >>> Hi, >>> >>> Please find the attached patch to fix the RM # 5270 - [EPAS] Synonym >>> properties does not show OID. >>> >>> As per the current implementation, we completely ignored OID and instead >>> considered the name as the unique field, now with this patch OID will be >>> used as an unique id and also will display OID in the properties tab. >>> >>> Thanks, >>> Khushboo >>> >>> >> >> -- >> *Thanks & Regards* >> *Akshay Joshi* >> >> *Sr. Software Architect* >> *EnterpriseDB Software India Private Limited* >> *Mobile: +91 976-788-8246* >> > --00000000000026c9b405a2e9d6fe Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the at= tached updated patch.

Thanks,
Khushboo

On Fri, Apr 10, 2020 at 10:41 AM Khushboo Vashi <khushboo.vashi@enterprisedb.com> wro= te:
Hi Akshay,

On Wed, Apr 8, 2020 at 12:33 PM Akshay Joshi <akshay.joshi@e= nterprisedb.com> wrote:
Hi=C2=A0Khushboo

Schema = Diff test cases are failing=C2=A0with this patch. Please fix and resend the= patch.

Fixed.

Thanks,
Khushboo=C2=A0
Ca= n you please re-verify as I don't think schema diff test cases are fail= ing due to this patch.

Thanks,
Khushboo= =C2=A0
On Tue, Apr 7, 2020 at = 6:37 PM Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrote:
Hi,

Please find the attached patch to fix the= RM # 5270 -=C2=A0[EPAS] Synonym properties does not show OID.
<= span style=3D"color:rgb(0,0,0);font-family:arial,sans-serif">
As per the curre= nt implementation, we completely ignored OID and instead considered the nam= e as the unique field, now with this patch OID will be used as an unique id= and also will display OID in the properties tab.

Thanks,
= Khushboo



--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=
--00000000000026c9b405a2e9d6fe-- --00000000000026c9b705a2e9d600 Content-Type: application/octet-stream; name="RM_5270_v1.patch" Content-Disposition: attachment; filename="RM_5270_v1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k8tt6gyz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvX19pbml0 X18ucHkKaW5kZXggYjlmNWQ1N2RmLi42NDhmZTQwMWUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1z L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL19faW5pdF9fLnB5CkBAIC0yNzAsNyArMjcw LDcgQEAgY2xhc3MgU3lub255bVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0 Q29tcGFyZSk6CiAgICAgICAgIGZvciByb3cgaW4gcnNldFsncm93cyddOgogICAgICAgICAgICAg cmVzLmFwcGVuZCgKICAgICAgICAgICAgICAgICBzZWxmLmJsdWVwcmludC5nZW5lcmF0ZV9icm93 c2VyX25vZGUoCi0gICAgICAgICAgICAgICAgICAgIHJvd1snbmFtZSddLAorICAgICAgICAgICAg ICAgICAgICByb3dbJ29pZCddLAogICAgICAgICAgICAgICAgICAgICBzY2lkLAogICAgICAgICAg ICAgICAgICAgICByb3dbJ25hbWUnXSwKICAgICAgICAgICAgICAgICAgICAgaWNvbj0iaWNvbi1z eW5vbnltIgpAQCAtNDY3LDEzICs0NjcsMTYgQEAgY2xhc3MgU3lub255bVZpZXcoUEdDaGlsZE5v ZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICBTUUwgPSByZW5k ZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2dldF9wYXJlbnRfb2lkLnNxbCddKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhPWRhdGEsIGNvbm49c2VsZi5jb25u KQotICAgICAgICAgICAgc3RhdHVzLCBwYXJlbnRfaWQgPSBzZWxmLmNvbm4uZXhlY3V0ZV9zY2Fs YXIoU1FMKQorICAgICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0 KFNRTCkKICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAgICAgICAgcmV0dXJu IGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAKKyAgICAgICAgICAgIHBhcmVu dF9pZCA9IHJlc1sncm93cyddWzBdWydzY2lkJ10KKyAgICAgICAgICAgIHN5aWQgPSByZXNbJ3Jv d3MnXVswXVsnc3lpZCddCisKICAgICAgICAgICAgIHJldHVybiBqc29uaWZ5KAogICAgICAgICAg ICAgICAgIG5vZGU9c2VsZi5ibHVlcHJpbnQuZ2VuZXJhdGVfYnJvd3Nlcl9ub2RlKAotICAgICAg ICAgICAgICAgICAgICBkYXRhWyduYW1lJ10sCisgICAgICAgICAgICAgICAgICAgIHN5aWQsCiAg ICAgICAgICAgICAgICAgICAgIGludChwYXJlbnRfaWQpLAogICAgICAgICAgICAgICAgICAgICBk YXRhWyduYW1lJ10sCiAgICAgICAgICAgICAgICAgICAgIGljb249Imljb24tc3lub255bSIKQEAg LTU1Niw3ICs1NTksNyBAQCBjbGFzcyBTeW5vbnltVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVt YURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgZGF0YSA9IHJlcXVlc3QuZm9ybSBpZiByZXF1 ZXN0LmZvcm0gZWxzZSBqc29uLmxvYWRzKAogICAgICAgICAgICAgcmVxdWVzdC5kYXRhLCBlbmNv ZGluZz0ndXRmLTgnCiAgICAgICAgICkKLSAgICAgICAgU1FMID0gc2VsZi5nZXRfc3FsKGdpZCwg c2lkLCBkYXRhLCBzY2lkLCBzeWlkKQorICAgICAgICBTUUwsIG5hbWUgPSBzZWxmLmdldF9zcWwo Z2lkLCBzaWQsIGRhdGEsIHNjaWQsIHN5aWQpCiAgICAgICAgICMgTW9zdCBwcm9iYWJseSB0aGlz IGlzIGR1ZSB0byBlcnJvcgogICAgICAgICBpZiBub3QgaXNpbnN0YW5jZShTUUwsIChzdHIsIHVu aWNvZGUpKToKICAgICAgICAgICAgIHJldHVybiBTUUwKQEAgLTU3MCw3ICs1NzMsNyBAQCBjbGFz cyBTeW5vbnltVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToK ICAgICAgICAgICAgICAgICBub2RlPXNlbGYuYmx1ZXByaW50LmdlbmVyYXRlX2Jyb3dzZXJfbm9k ZSgKICAgICAgICAgICAgICAgICAgICAgc3lpZCwKICAgICAgICAgICAgICAgICAgICAgc2NpZCwK LSAgICAgICAgICAgICAgICAgICAgc3lpZCwKKyAgICAgICAgICAgICAgICAgICAgbmFtZSwKICAg ICAgICAgICAgICAgICAgICAgaWNvbj0iaWNvbi1zeW5vbnltIgogICAgICAgICAgICAgICAgICkK ICAgICAgICAgICAgICkKQEAgLTU5OCw3ICs2MDEsNyBAQCBjbGFzcyBTeW5vbnltVmlldyhQR0No aWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICBk YXRhW2tdID0gdgogCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIFNRTCA9IHNlbGYuZ2V0X3Nx bChnaWQsIHNpZCwgZGF0YSwgc2NpZCwgc3lpZCkKKyAgICAgICAgICAgIFNRTCwgbmFtZSA9IHNl bGYuZ2V0X3NxbChnaWQsIHNpZCwgZGF0YSwgc2NpZCwgc3lpZCkKICAgICAgICAgICAgICMgTW9z dCBwcm9iYWJseSB0aGlzIGlzIGR1ZSB0byBlcnJvcgogICAgICAgICAgICAgaWYgbm90IGlzaW5z dGFuY2UoU1FMLCAoc3RyLCB1bmljb2RlKSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIFNRTApA QCAtNjE0LDYgKzYxNyw3IEBAIGNsYXNzIFN5bm9ueW1WaWV3KFBHQ2hpbGROb2RlVmlldywgU2No ZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAiIiIKICAgICAgICAgVGhpcyBmdW5jdGlv biB3aWxsIGdlbnJhdGUgc3FsIGZyb20gbW9kZWwgZGF0YQogICAgICAgICAiIiIKKyAgICAgICAg bmFtZSA9IE5vbmUKICAgICAgICAgaWYgc3lpZCBpcyBub3QgTm9uZToKICAgICAgICAgICAgIFNR TCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncHJvcGVydGllcy5zcWwnXSks CkBAIC02MjYsNiArNjMwLDcgQEAgY2xhc3MgU3lub255bVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBT Y2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIGdldHRleHQoIkNv dWxkIG5vdCBmaW5kIHRoZSBzeW5vbnltIG9uIHRoZSBzZXJ2ZXIuIikKICAgICAgICAgICAgICAg ICApCiAgICAgICAgICAgICBvbGRfZGF0YSA9IHJlc1sncm93cyddWzBdCisgICAgICAgICAgICBu YW1lID0gb2xkX2RhdGFbJ25hbWUnXQogICAgICAgICAgICAgIyBJZiB0YXJnZXQgc2NoZW1hL29i amVjdCBpcyBub3QgcHJlc2VudCB0aGVuIHRha2UgaXQgZnJvbQogICAgICAgICAgICAgIyBvbGQg ZGF0YSwgaXQgbWVhbnMgaXQgZG9lcyBub3QgY2hhbmdlZAogICAgICAgICAgICAgaWYgJ3N5bm9i anNjaGVtYScgbm90IGluIGRhdGE6CkBAIC02NDYsMTAgKzY1MSwxMSBAQCBjbGFzcyBTeW5vbnlt VmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAg ICAgICAgICBpZiBhcmcgbm90IGluIGRhdGE6CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiAi LS0gbWlzc2luZyBkZWZpbml0aW9uIgogCisgICAgICAgICAgICBuYW1lID0gZGF0YVsnbmFtZSdd CiAgICAgICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh dGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Ny ZWF0ZS5zcWwnXSksIGNvbW1lbnQ9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGF0YT1kYXRhLCBjb25uPXNlbGYuY29ubikKLSAgICAgICAgcmV0dXJuIFNRTC5zdHJp cCgnXG4nKQorICAgICAgICByZXR1cm4gU1FMLnN0cmlwKCdcbicpLCBuYW1lCiAKICAgICBAY2hl Y2tfcHJlY29uZGl0aW9uCiAgICAgZGVmIHNxbChzZWxmLCBnaWQsIHNpZCwgZGlkLCBzY2lkLCBz eWlkLCBkaWZmX3NjaGVtYT1Ob25lLApAQCAtNzU3LDcgKzc2Myw3IEBAIGNsYXNzIFN5bm9ueW1W aWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBhcmUpOgogICAgICAgICAg ICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAKICAgICAgICAg Zm9yIHJvdyBpbiByc2V0Wydyb3dzJ106Ci0gICAgICAgICAgICBzdGF0dXMsIGRhdGEgPSBzZWxm Ll9mZXRjaF9wcm9wZXJ0aWVzKHNjaWQsIHJvd1snbmFtZSddKQorICAgICAgICAgICAgc3RhdHVz LCBkYXRhID0gc2VsZi5fZmV0Y2hfcHJvcGVydGllcyhzY2lkLCByb3dbJ29pZCddKQogICAgICAg ICAgICAgaWYgc3RhdHVzOgogICAgICAgICAgICAgICAgIHJlc1tyb3dbJ25hbWUnXV0gPSBkYXRh CiAKQEAgLTc4MSw3ICs3ODcsNyBAQCBjbGFzcyBTeW5vbnltVmlldyhQR0NoaWxkTm9kZVZpZXcs IFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgaWYgZGF0YToKICAgICAgICAgICAg IGlmIGRpZmZfc2NoZW1hOgogICAgICAgICAgICAgICAgIGRhdGFbJ3NjaGVtYSddID0gZGlmZl9z Y2hlbWEKLSAgICAgICAgICAgIHNxbCA9IHNlbGYuZ2V0X3NxbChnaWQsIHNpZCwgZGF0YSwgc2Np ZCwgb2lkKQorICAgICAgICAgICAgc3FsLCBuYW1lID0gc2VsZi5nZXRfc3FsKGdpZCwgc2lkLCBk YXRhLCBzY2lkLCBvaWQpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBpZiBkcm9wX3NxbDoK ICAgICAgICAgICAgICAgICBzcWwgPSBzZWxmLmRlbGV0ZShnaWQ9Z2lkLCBzaWQ9c2lkLCBkaWQ9 ZGlkLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvc3RhdGljL2pzL3N5bm9ueW0uanMgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9z eW5vbnltcy9zdGF0aWMvanMvc3lub255bS5qcwppbmRleCA0MmMzNjE2MzMuLjA1N2NiMmQ5NyAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvc3lub255bXMvc3RhdGljL2pzL3N5bm9ueW0uanMKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lu b255bXMvc3RhdGljL2pzL3N5bm9ueW0uanMKQEAgLTY5LDcgKzY5LDcgQEAgZGVmaW5lKCdwZ2Fk bWluLm5vZGUuc3lub255bScsIFsKICAgICAgICAgaXNOZXc6IGZ1bmN0aW9uKCkgewogICAgICAg ICAgIHJldHVybiAhdGhpcy5mZXRjaEZyb21TZXJ2ZXI7CiAgICAgICAgIH0sCi0gICAgICAgIGlk QXR0cmlidXRlOiAnbmFtZScsCisgICAgICAgIGlkQXR0cmlidXRlOiAnb2lkJywKICAgICAgICAg Ly8gRGVmYXVsdCB2YWx1ZXMhCiAgICAgICAgIGluaXRpYWxpemU6IGZ1bmN0aW9uKGF0dHJzLCBh cmdzKSB7CiAgICAgICAgICAgdmFyIGlzTmV3ID0gKF8uc2l6ZShhdHRycykgPT09IDApOwpAQCAt OTMsNiArOTMsOSBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5zeW5vbnltJywgWwogICAgICAgICAg IGlkOiAnbmFtZScsIGxhYmVsOiBnZXR0ZXh0KCdOYW1lJyksIGNlbGw6ICdzdHJpbmcnLAogICAg ICAgICAgIHR5cGU6ICd0ZXh0JywgbW9kZTogWydwcm9wZXJ0aWVzJywgJ2NyZWF0ZScsICdlZGl0 J10sCiAgICAgICAgICAgZGlzYWJsZWQ6ICdpblNjaGVtYScsIHJlYWRvbmx5OiBmdW5jdGlvbiht KSB7IHJldHVybiAhbS5pc05ldygpOyB9LAorICAgICAgICB9LHsKKyAgICAgICAgICBpZDogJ29p ZCcsIGxhYmVsOiBnZXR0ZXh0KCdPSUQnKSwgY2VsbDogJ3N0cmluZycsCisgICAgICAgICAgdHlw ZTogJ3RleHQnLCBtb2RlOiBbJ3Byb3BlcnRpZXMnXSwKICAgICAgICAgfSx7CiAgICAgICAgICAg aWQ6ICdvd25lcicsIGxhYmVsOiBnZXR0ZXh0KCdPd25lcicpLCBjZWxsOiAnc3RyaW5nJywKICAg ICAgICAgICB0eXBlOiAndGV4dCcsIG1vZGU6IFsncHJvcGVydGllcycsICdjcmVhdGUnLCAnZWRp dCddLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvdGVtcGxhdGVzL3N5bm9ueW1zL3NxbC85LjJf cGx1cy9wcm9wZXJ0aWVzLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9zeW5vbnltcy9zcWwv OS4yX3BsdXMvcHJvcGVydGllcy5zcWwKaW5kZXggZWMyNzI0YTBhLi5jYjRjNjZjMjggMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvOS4yX3BsdXMvcHJvcGVy dGllcy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvdGVtcGxhdGVzL3N5bm9ueW1zL3NxbC85LjJfcGx1 cy9wcm9wZXJ0aWVzLnNxbApAQCAtMjYsNiArMjYsNiBAQCBTRUxFQ1Qgc3lubmFtZSBBUyBuYW1l LCBwZ19nZXRfdXNlcmJ5aWQoc3lub3duZXIpIEFTIG93bmVyLAogRlJPTSBwZ19zeW5vbnltIHMg IEpPSU4gcGdfbmFtZXNwYWNlIG5zIE9OIHMuc3lubmFtZXNwYWNlID0gbnMub2lkCiAgV0hFUkUg cy5zeW5uYW1lc3BhY2U9e3tzY2lkfX06Om9pZAogIHslIGlmIHN5aWQgJX0KLSAgIEFORCBzLnN5 bm5hbWU9e3sgc3lpZHxxdExpdGVyYWwgfX0KKyAgIEFORCBzLm9pZD17e3N5aWR9fTo6b2lkCiAg eyUgZW5kaWYgJX0KLU9SREVSIEJZIHN5bm5hbWU7ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmls ZQorT1JERVIgQlkgc3lubmFtZTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9z eW5vbnltcy9zcWwvOS41X3BsdXMvcHJvcGVydGllcy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZW1wbGF0 ZXMvc3lub255bXMvc3FsLzkuNV9wbHVzL3Byb3BlcnRpZXMuc3FsCmluZGV4IGVjMjcyNGEwYS4u MGIzYjgyZDk3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZW1wbGF0ZXMvc3lub255bXMvc3Fs LzkuNV9wbHVzL3Byb3BlcnRpZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9zeW5v bnltcy9zcWwvOS41X3BsdXMvcHJvcGVydGllcy5zcWwKQEAgLTEsNCArMSw0IEBACi1TRUxFQ1Qg c3lubmFtZSBBUyBuYW1lLCBwZ19nZXRfdXNlcmJ5aWQoc3lub3duZXIpIEFTIG93bmVyLAorU0VM RUNUIHMub2lkLCBzeW5uYW1lIEFTIG5hbWUsIHBnX2dldF91c2VyYnlpZChzeW5vd25lcikgQVMg b3duZXIsCiAgIHN5bm9ianNjaGVtYSwgc3lub2JqbmFtZSwgIG5zLm5zcG5hbWUgYXMgc2NoZW1h LAogICBDT0FMRVNDRSgKICAgKFNFTEVDVCByZWxraW5kCkBAIC0yNiw2ICsyNiw2IEBAIFNFTEVD VCBzeW5uYW1lIEFTIG5hbWUsIHBnX2dldF91c2VyYnlpZChzeW5vd25lcikgQVMgb3duZXIsCiBG Uk9NIHBnX3N5bm9ueW0gcyAgSk9JTiBwZ19uYW1lc3BhY2UgbnMgT04gcy5zeW5uYW1lc3BhY2Ug PSBucy5vaWQKICBXSEVSRSBzLnN5bm5hbWVzcGFjZT17e3NjaWR9fTo6b2lkCiAgeyUgaWYgc3lp ZCAlfQotICAgQU5EIHMuc3lubmFtZT17eyBzeWlkfHF0TGl0ZXJhbCB9fQorICAgQU5EIHMub2lk PXt7c3lpZH19OjpvaWQKICB7JSBlbmRpZiAlfQotT1JERVIgQlkgc3lubmFtZTsKXCBObyBuZXds aW5lIGF0IGVuZCBvZiBmaWxlCitPUkRFUiBCWSBzeW5uYW1lOwpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lu b255bXMvdGVtcGxhdGVzL3N5bm9ueW1zL3NxbC9kZWZhdWx0L2dldF9wYXJlbnRfb2lkLnNxbCBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9nZXRfcGFyZW50X29p ZC5zcWwKaW5kZXggMDhmMDdlMDMxLi5lMjFmOTY4M2UgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1z L3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9nZXRfcGFyZW50X29pZC5zcWwKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvc3lub255bXMvdGVtcGxhdGVzL3N5bm9ueW1zL3NxbC9kZWZhdWx0L2dldF9wYXJlbnRfb2lk LnNxbApAQCAtMSw1ICsxLDUgQEAKLVNFTEVDVCBzeW5uYW1lc3BhY2UgYXMgc2NpZAorU0VMRUNU IHMub2lkIGFzIHN5aWQsIHN5bm5hbWVzcGFjZSBhcyBzY2lkCiAgICAgRlJPTSBwZ19zeW5vbnlt IHMKIFdIRVJFIHN5bm5hbWUgPSB7eyBkYXRhLm5hbWV8cXRMaXRlcmFsIH19CiBBTkQgc3lubmFt ZXNwYWNlIElOCi0gICAgKCBTRUxFQ1Qgb2lkIEZST00gcGdfbmFtZXNwYWNlIFdIRVJFIG5zcG5h bWUgPSB7eyBkYXRhLnNjaGVtYXxxdExpdGVyYWwgfX0gKTsKXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBmaWxlCisgICAgKCBTRUxFQ1Qgb2lkIEZST00gcGdfbmFtZXNwYWNlIFdIRVJFIG5zcG5hbWUg PSB7eyBkYXRhLnNjaGVtYXxxdExpdGVyYWwgfX0gKTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1z L3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9ub2Rlcy5zcWwgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90 ZW1wbGF0ZXMvc3lub255bXMvc3FsL2RlZmF1bHQvbm9kZXMuc3FsCmluZGV4IDFmODI1OWI0YS4u YzFkZjA3ZjA4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZW1wbGF0ZXMvc3lub255bXMvc3Fs L2RlZmF1bHQvbm9kZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBsYXRlcy9zeW5vbnltcy9z cWwvZGVmYXVsdC9ub2Rlcy5zcWwKQEAgLTEsNCArMSw0IEBACi1TRUxFQ1Qgc3lubmFtZSBhcyBu YW1lCitTRUxFQ1Qgcy5vaWQsIHN5bm5hbWUgYXMgbmFtZQogRlJPTSBwZ19zeW5vbnltIHMKICAg ICBKT0lOIHBnX25hbWVzcGFjZSBucyBPTiBzLnN5bm5hbWVzcGFjZSA9IG5zLm9pZAogICAgIEFO RCBzLnN5bm5hbWVzcGFjZSA9IHt7c2NpZH19OjpvaWQKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1z L3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbCBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9u eW1zL3RlbXBsYXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbAppbmRleCBj ZTZkNTliMTQuLmVhYjU3YzhlMyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvdGVtcGxhdGVzL3N5 bm9ueW1zL3NxbC9kZWZhdWx0L3Byb3BlcnRpZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3RlbXBs YXRlcy9zeW5vbnltcy9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbApAQCAtMTQsNiArMTQsNiBA QCBTRUxFQ1Qgc3lubmFtZSBBUyBuYW1lLCBwZ19nZXRfdXNlcmJ5aWQoc3lub3duZXIpIEFTIG93 bmVyLAogRlJPTSBwZ19zeW5vbnltIHMgIEpPSU4gcGdfbmFtZXNwYWNlIG5zIE9OIHMuc3lubmFt ZXNwYWNlID0gbnMub2lkCiAgV0hFUkUgcy5zeW5uYW1lc3BhY2U9e3tzY2lkfX06Om9pZAogIHsl IGlmIHN5aWQgJX0KLSAgIEFORCBzLnN5bm5hbWU9e3sgc3lpZHxxdExpdGVyYWwgfX0KKyAgIEFO RCBzLm9pZD17e3N5aWR9fTo6b2lkCiAgeyUgZW5kaWYgJX0KLU9SREVSIEJZIHN5bm5hbWU7Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorT1JERVIgQlkgc3lubmFtZTsKZGlmZiAtLWdpdCBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9kZWxldGUucHkgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90 ZXN0cy90ZXN0X3N5bm9ueW1fZGVsZXRlLnB5CmluZGV4IDg4ZDc0OWFlYy4uYmFkOTViZjUwIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZXN0cy90ZXN0X3N5bm9ueW1fZGVsZXRlLnB5CisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9kZWxldGUucHkKQEAgLTU5LDExICs1OSwx MSBAQCBjbGFzcyBTeW5vbnltRGVsZXRlVGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0b3IpOgogICAg ICAgICBzZWxmLnNlcXVlbmNlX2lkID0gc2VxdWVuY2VfdXRpbHMuY3JlYXRlX3NlcXVlbmNlcygK ICAgICAgICAgICAgIHNlbGYuc2VydmVyLCBzZWxmLmRiX25hbWUsIHNlbGYuc2NoZW1hX25hbWUs IHNlbGYuc2VxdWVuY2VfbmFtZSkKICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUgPSAidGVzdF9z eW5vbnltX2RlbGV0ZV8lcyIgJSBzdHIodXVpZC51dWlkNCgpKVsxOjhdCi0gICAgICAgIHN5bm9u eW1fdXRpbHMuY3JlYXRlX3N5bm9ueW0oc2VsZi5zZXJ2ZXIsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5kYl9uYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2NoZW1hX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5zZXF1ZW5jZV9uYW1lKQorICAgICAgICBzZWxmLnN5bl9vaWQgPSBz eW5vbnltX3V0aWxzLmNyZWF0ZV9zeW5vbnltKHNlbGYuc2VydmVyLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfbmFtZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVt YV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGYuc3lub255bV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuc2VxdWVuY2VfbmFtZSkKIAogICAgIGRlZiBydW5UZXN0 KHNlbGYpOgogICAgICAgICAiIiJUaGlzIGZ1bmN0aW9uIHdpbGwgZGVsZXRlIHN5bm9ueW0gdW5k ZXIgc2NoZW1hIG5vZGUuIiIiCkBAIC03Nyw3ICs3Nyw3IEBAIGNsYXNzIFN5bm9ueW1EZWxldGVU ZXN0Q2FzZShCYXNlVGVzdEdlbmVyYXRvcik6CiAgICAgICAgIHJlc3BvbnNlID0gc2VsZi50ZXN0 ZXIuZGVsZXRlKAogICAgICAgICAgICAgc2VsZi51cmwgKyBzdHIodXRpbHMuU0VSVkVSX0dST1VQ KSArICcvJyArCiAgICAgICAgICAgICBzdHIoc2VsZi5zZXJ2ZXJfaWQpICsgJy8nICsgc3RyKHNl bGYuZGJfaWQpICsgJy8nICsKLSAgICAgICAgICAgIHN0cihzZWxmLnNjaGVtYV9pZCkgKyAnLycg KyBzdHIoc2VsZi5zeW5vbnltX25hbWUpLAorICAgICAgICAgICAgc3RyKHNlbGYuc2NoZW1hX2lk KSArICcvJyArIHN0cihzZWxmLnN5bl9vaWQpLAogICAgICAgICAgICAgZm9sbG93X3JlZGlyZWN0 cz1UcnVlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhyZXNwb25zZS5zdGF0dXNfY29kZSwg MjAwKQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZXN0cy90ZXN0X3N5bm9ueW1fZGVsZXRl X211bHRpcGxlLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvdGVzdHMvdGVzdF9zeW5vbnltX2RlbGV0ZV9tdWx0 aXBsZS5weQppbmRleCBlNWIxNzQ2OWYuLjM2MWY1NDcxMyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255 bXMvdGVzdHMvdGVzdF9zeW5vbnltX2RlbGV0ZV9tdWx0aXBsZS5weQorKysgYi93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnlt cy90ZXN0cy90ZXN0X3N5bm9ueW1fZGVsZXRlX211bHRpcGxlLnB5CkBAIC02MCwxNyArNjAsMTgg QEAgY2xhc3MgU3lub255bURlbGV0ZU11bHRpcGxlVGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0b3Ip OgogICAgICAgICBzZWxmLnNlcXVlbmNlX2lkID0gc2VxdWVuY2VfdXRpbHMuY3JlYXRlX3NlcXVl bmNlcygKICAgICAgICAgICAgIHNlbGYuc2VydmVyLCBzZWxmLmRiX25hbWUsIHNlbGYuc2NoZW1h X25hbWUsIHNlbGYuc2VxdWVuY2VfbmFtZSkKICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUgPSAi dGVzdF9zeW5vbnltX2RlbGV0ZV8lcyIgJSBzdHIodXVpZC51dWlkNCgpKVsxOjhdCi0gICAgICAg IHN5bm9ueW1fdXRpbHMuY3JlYXRlX3N5bm9ueW0oc2VsZi5zZXJ2ZXIsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5kYl9uYW1lLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuc2NoZW1hX25hbWUsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5zZXF1ZW5jZV9uYW1lKQorICAgICAgICBzZWxmLnN5bl9v aWQgPSBzeW5vbnltX3V0aWxzLmNyZWF0ZV9zeW5vbnltKHNlbGYuc2VydmVyLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfbmFtZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxm LnNjaGVtYV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNlbGYuc3lub255bV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuc2VxdWVuY2VfbmFtZSkKKwogICAgICAgICBz ZWxmLnN5bm9ueW1fbmFtZV8xID0gInRlc3Rfc3lub255bV9kZWxldGVfJXMiICUgc3RyKHV1aWQu dXVpZDQoKSlbMTo4XQotICAgICAgICBzeW5vbnltX3V0aWxzLmNyZWF0ZV9zeW5vbnltKHNlbGYu c2VydmVyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfbmFt ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVtYV9uYW1l LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuc3lub255bV9uYW1l XzEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5zZXF1ZW5jZV9u YW1lKQorICAgICAgICBzZWxmLnN5bl9vaWRfMSA9IHN5bm9ueW1fdXRpbHMuY3JlYXRlX3N5bm9u eW0oc2VsZi5zZXJ2ZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzZWxmLmRiX25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVtYV9uYW1lLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5zeW5vbnltX25h bWVfMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNlbGYuc2VxdWVuY2VfbmFtZSkKIAogICAgIGRlZiBydW5UZXN0KHNlbGYpOgogICAgICAg ICAiIiJUaGlzIGZ1bmN0aW9uIHdpbGwgZGVsZXRlIHN5bm9ueW0gdW5kZXIgc2NoZW1hIG5vZGUu IiIiCkBAIC04Nyw3ICs4OCw3IEBAIGNsYXNzIFN5bm9ueW1EZWxldGVNdWx0aXBsZVRlc3RDYXNl KEJhc2VUZXN0R2VuZXJhdG9yKToKICAgICAgICAgaWYgbm90IHN5bm9ueW1fcmVzcG9uc2U6CiAg ICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oIk5vIHN5bm9ueW0gbm9kZSB0byBkZWxldGUuIikK IAotICAgICAgICBkYXRhID0geydpZHMnOiBbc2VsZi5zeW5vbnltX25hbWUsIHNlbGYuc3lub255 bV9uYW1lXzFdfQorICAgICAgICBkYXRhID0geydpZHMnOiBbc2VsZi5zeW5fb2lkLCBzZWxmLnN5 bl9vaWRfMV19CiAgICAgICAgIHJlc3BvbnNlID0gc2VsZi50ZXN0ZXIuZGVsZXRlKAogICAgICAg ICAgICAgc2VsZi51cmwgKyBzdHIodXRpbHMuU0VSVkVSX0dST1VQKSArICcvJyArCiAgICAgICAg ICAgICBzdHIoc2VsZi5zZXJ2ZXJfaWQpICsgJy8nICsgc3RyKHNlbGYuZGJfaWQpICsgJy8nICsK ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9nZXQucHkgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9z eW5vbnltcy90ZXN0cy90ZXN0X3N5bm9ueW1fZ2V0LnB5CmluZGV4IDYwZjU2NWIzNS4uNjY4MWYx ZTZkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZXN0cy90ZXN0X3N5bm9ueW1fZ2V0LnB5Cisr KyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9nZXQucHkKQEAgLTU5LDExICs1OSwx MSBAQCBjbGFzcyBTeW5vbnltR2V0VGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0b3IpOgogICAgICAg ICBzZWxmLnNlcXVlbmNlX2lkID0gc2VxdWVuY2VfdXRpbHMuY3JlYXRlX3NlcXVlbmNlcygKICAg ICAgICAgICAgIHNlbGYuc2VydmVyLCBzZWxmLmRiX25hbWUsIHNlbGYuc2NoZW1hX25hbWUsIHNl bGYuc2VxdWVuY2VfbmFtZSkKICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUgPSAidGVzdF9zeW5v bnltX2dldF8lcyIgJSBzdHIodXVpZC51dWlkNCgpKVsxOjhdCi0gICAgICAgIHN5bm9ueW1fdXRp bHMuY3JlYXRlX3N5bm9ueW0oc2VsZi5zZXJ2ZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5kYl9uYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuc2NoZW1hX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VsZi5zeW5vbnltX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VsZi5zZXF1ZW5jZV9uYW1lKQorICAgICAgICBzZWxmLnN5bl9vaWQgPSBzeW5vbnlt X3V0aWxzLmNyZWF0ZV9zeW5vbnltKHNlbGYuc2VydmVyLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfbmFtZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVtYV9uYW1l LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNl bGYuc3lub255bV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuc2VxdWVuY2VfbmFtZSkKIAogICAgIGRlZiBydW5UZXN0KHNlbGYp OgogICAgICAgICAiIiJUaGlzIGZ1bmN0aW9uIHdpbGwgZmV0Y2ggc3lub255bSB1bmRlciBzY2hl bWEgbm9kZS4iIiIKQEAgLTcxLDcgKzcxLDcgQEAgY2xhc3MgU3lub255bUdldFRlc3RDYXNlKEJh c2VUZXN0R2VuZXJhdG9yKToKICAgICAgICAgcmVzcG9uc2UgPSBzZWxmLnRlc3Rlci5nZXQoCiAg ICAgICAgICAgICBzZWxmLnVybCArIHN0cih1dGlscy5TRVJWRVJfR1JPVVApICsgJy8nICsKICAg ICAgICAgICAgIHN0cihzZWxmLnNlcnZlcl9pZCkgKyAnLycgKyBzdHIoc2VsZi5kYl9pZCkgKyAn LycgKwotICAgICAgICAgICAgc3RyKHNlbGYuc2NoZW1hX2lkKSArICcvJyArIHN0cihzZWxmLnN5 bm9ueW1fbmFtZSksCisgICAgICAgICAgICBzdHIoc2VsZi5zY2hlbWFfaWQpICsgJy8nICsgc3Ry KHNlbGYuc3luX29pZCksCiAgICAgICAgICAgICBmb2xsb3dfcmVkaXJlY3RzPVRydWUpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHJlc3BvbnNlLnN0YXR1c19jb2RlLCAyMDApCiAKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9wdXQucHkgYi93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnlt cy90ZXN0cy90ZXN0X3N5bm9ueW1fcHV0LnB5CmluZGV4IGRmMGFiMDAwMC4uYjlmYWE3MDg3IDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy9zeW5vbnltcy90ZXN0cy90ZXN0X3N5bm9ueW1fcHV0LnB5CisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3N5bm9ueW1zL3Rlc3RzL3Rlc3Rfc3lub255bV9wdXQucHkKQEAgLTY2LDExICs2NiwxMSBAQCBj bGFzcyBTeW5vbnltUHV0VGVzdENhc2UoQmFzZVRlc3RHZW5lcmF0b3IpOgogICAgICAgICBzZWxm LnNlcXVlbmNlX2lkID0gc2VxdWVuY2VfdXRpbHMuY3JlYXRlX3NlcXVlbmNlcygKICAgICAgICAg ICAgIHNlbGYuc2VydmVyLCBzZWxmLmRiX25hbWUsIHNlbGYuc2NoZW1hX25hbWUsIHNlbGYuc2Vx dWVuY2VfbmFtZSkKICAgICAgICAgc2VsZi5zeW5vbnltX25hbWUgPSAidGVzdF9zeW5vbnltX3B1 dF8lcyIgJSBzdHIodXVpZC51dWlkNCgpKVsxOjhdCi0gICAgICAgIHN5bm9ueW1fdXRpbHMuY3Jl YXRlX3N5bm9ueW0oc2VsZi5zZXJ2ZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VsZi5kYl9uYW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuc2NoZW1hX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZi5zeW5vbnltX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZi5zZXF1ZW5jZV9uYW1lKQorICAgICAgICBzZWxmLnN5bl9vaWQgPSBzeW5vbnltX3V0aWxz LmNyZWF0ZV9zeW5vbnltKHNlbGYuc2VydmVyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGJfbmFtZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLnNjaGVtYV9uYW1lLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuc3lu b255bV9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuc2VxdWVuY2VfbmFtZSkKIAogICAgIGRlZiBydW5UZXN0KHNlbGYpOgogICAg ICAgICAiIiJUaGlzIGZ1bmN0aW9uIHdpbGwgdXBkYXRlIHN5bm9ueW0gdW5kZXIgc2NoZW1hIG5v ZGUuIiIiCkBAIC05Niw3ICs5Niw3IEBAIGNsYXNzIFN5bm9ueW1QdXRUZXN0Q2FzZShCYXNlVGVz dEdlbmVyYXRvcik6CiAgICAgICAgICAgICBzdHIoc2VsZi5zZXJ2ZXJfaWQpICsgJy8nICsKICAg ICAgICAgICAgIHN0cihzZWxmLmRiX2lkKSArICcvJyArCiAgICAgICAgICAgICBzdHIoc2VsZi5z Y2hlbWFfaWQpICsgJy8nICsKLSAgICAgICAgICAgIHN0cihzZWxmLnN5bm9ueW1fbmFtZSksCisg ICAgICAgICAgICBzdHIoc2VsZi5zeW5fb2lkKSwKICAgICAgICAgICAgIGRhdGE9anNvbi5kdW1w cyhkYXRhKSwKICAgICAgICAgICAgIGZvbGxvd19yZWRpcmVjdHM9VHJ1ZSkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMocmVzcG9uc2Uuc3RhdHVzX2NvZGUsIDIwMCkKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3N5bm9ueW1zL3Rlc3RzL3V0aWxzLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvdGVzdHMvdXRpbHMucHkKaW5k ZXggYTYyY2Q3MDZlLi5mNWY0Y2JkNDIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3Rlc3RzL3V0 aWxzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3N5bm9ueW1zL3Rlc3RzL3V0aWxzLnB5CkBAIC00MCw2ICs0MCwxNCBA QCBkZWYgY3JlYXRlX3N5bm9ueW0oc2VydmVyLCBkYl9uYW1lLCBzY2hlbWFfbmFtZSwgc3lub255 bV9uYW1lLCBzZXF1ZW5jZV9uYW1lKToKICAgICAgICAgICAgIHNjaGVtYV9uYW1lLCBzeW5vbnlt X25hbWUsIHNjaGVtYV9uYW1lLCBzZXF1ZW5jZV9uYW1lKQogICAgICAgICBwZ19jdXJzb3IuZXhl Y3V0ZShxdWVyeSkKICAgICAgICAgY29ubmVjdGlvbi5jb21taXQoKQorCisgICAgICAgICMgR2V0 ICdvaWQnIGZyb20gbmV3bHkgY3JlYXRlZCBzeW5vbnltCisgICAgICAgIHBnX2N1cnNvci5leGVj dXRlKCJTRUxFQ1Qgcy5vaWQgYXMgbmFtZSBGUk9NIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAiIHBnX3N5bm9ueW0gcyBXSEVSRSBzLnN5bm5hbWU9JyVzJyIgJQorICAgICAgICAgICAgICAg ICAgICAgICAgICBzeW5vbnltX25hbWUpCisgICAgICAgIHN5bm9ueW0gPSBwZ19jdXJzb3IuZmV0 Y2hvbmUoKQorICAgICAgICBjb25uZWN0aW9uLmNsb3NlKCkKKyAgICAgICAgcmV0dXJuIHN5bm9u eW1bMF0KICAgICBleGNlcHQgRXhjZXB0aW9uOgogICAgICAgICB0cmFjZWJhY2sucHJpbnRfZXhj KGZpbGU9c3lzLnN0ZGVycikKIApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1h X2RpZmYvZGlyZWN0b3J5X2NvbXBhcmUucHkgYi93ZWIvcGdhZG1pbi90b29scy9zY2hlbWFfZGlm Zi9kaXJlY3RvcnlfY29tcGFyZS5weQppbmRleCA0ZmFiY2ExZTcuLjIzZDE5NTMyOSAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvZGlyZWN0b3J5X2NvbXBhcmUucHkK KysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc2NoZW1hX2RpZmYvZGlyZWN0b3J5X2NvbXBhcmUucHkK QEAgLTUzLDkgKzUzLDYgQEAgZGVmIGNvbXBhcmVfZGljdGlvbmFyaWVzKHZpZXdfb2JqZWN0LCBz b3VyY2VfcGFyYW1zLCB0YXJnZXRfcGFyYW1zLAogICAgICAgICBzb3VyY2Vfb2JqZWN0X2lkID0g Tm9uZQogICAgICAgICBpZiAnb2lkJyBpbiBzb3VyY2VfZGljdFtpdGVtXToKICAgICAgICAgICAg IHNvdXJjZV9vYmplY3RfaWQgPSBzb3VyY2VfZGljdFtpdGVtXVsnb2lkJ10KLSAgICAgICAgZWxp ZiAnbmFtZScgaW4gc291cmNlX2RpY3RbaXRlbV06Ci0gICAgICAgICAgICAjIEZvciBzeW5vbnlt cyB1c2UgbmFtZSBhcyBPSUQKLSAgICAgICAgICAgIHNvdXJjZV9vYmplY3RfaWQgPSBzb3VyY2Vf ZGljdFtpdGVtXVsnbmFtZSddCiAKICAgICAgICAgaWYgbm9kZSA9PSAndGFibGUnOgogICAgICAg ICAgICAgdGVtcF9zcmNfcGFyYW1zID0gY29weS5kZWVwY29weShzb3VyY2VfcGFyYW1zKQpAQCAt OTYsOSArOTMsNiBAQCBkZWYgY29tcGFyZV9kaWN0aW9uYXJpZXModmlld19vYmplY3QsIHNvdXJj ZV9wYXJhbXMsIHRhcmdldF9wYXJhbXMsCiAgICAgICAgIHRhcmdldF9vYmplY3RfaWQgPSBOb25l CiAgICAgICAgIGlmICdvaWQnIGluIHRhcmdldF9kaWN0W2l0ZW1dOgogICAgICAgICAgICAgdGFy Z2V0X29iamVjdF9pZCA9IHRhcmdldF9kaWN0W2l0ZW1dWydvaWQnXQotICAgICAgICBlbGlmICdu YW1lJyBpbiB0YXJnZXRfZGljdFtpdGVtXToKLSAgICAgICAgICAgICMgRm9yIHN5bm9ueW1zIHVz ZSBuYW1lIGFzIE9JRAotICAgICAgICAgICAgdGFyZ2V0X29iamVjdF9pZCA9IHRhcmdldF9kaWN0 W2l0ZW1dWyduYW1lJ10KIAogICAgICAgICBpZiBub2RlID09ICd0YWJsZSc6CiAgICAgICAgICAg ICB0ZW1wX3RndF9wYXJhbXMgPSBjb3B5LmRlZXBjb3B5KHRhcmdldF9wYXJhbXMpCkBAIC0xNDAs MTAgKzEzNCw2IEBAIGRlZiBjb21wYXJlX2RpY3Rpb25hcmllcyh2aWV3X29iamVjdCwgc291cmNl X3BhcmFtcywgdGFyZ2V0X3BhcmFtcywKICAgICAgICAgaWYgJ29pZCcgaW4gc291cmNlX2RpY3Rb a2V5XToKICAgICAgICAgICAgIHNvdXJjZV9vYmplY3RfaWQgPSBzb3VyY2VfZGljdFtrZXldWydv aWQnXQogICAgICAgICAgICAgdGFyZ2V0X29iamVjdF9pZCA9IHRhcmdldF9kaWN0W2tleV1bJ29p ZCddCi0gICAgICAgIGVsaWYgJ25hbWUnIGluIHRhcmdldF9kaWN0W2tleV06Ci0gICAgICAgICAg ICAjIEZvciBzeW5vbnltcyB1c2UgbmFtZSBhcyBPSUQKLSAgICAgICAgICAgIHNvdXJjZV9vYmpl Y3RfaWQgPSBzb3VyY2VfZGljdFtrZXldWyduYW1lJ10KLSAgICAgICAgICAgIHRhcmdldF9vYmpl Y3RfaWQgPSB0YXJnZXRfZGljdFtrZXldWyduYW1lJ10KIAogICAgICAgICAjIFJlY3Vyc2l2ZWx5 IENvbXBhcmUgdGhlIHR3byBkaWN0aW9uYXJ5CiAgICAgICAgIGlmIGFyZV9kaWN0aW9uYXJpZXNf aWRlbnRpY2FsKGRpY3QxW2tleV0sIGRpY3QyW2tleV0sIGlnbm9yZV9rZXlzKToK --00000000000026c9b705a2e9d600--