Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cZXHC-00043c-Q8 for pgadmin-hackers@arkaria.postgresql.org; Fri, 03 Feb 2017 06:23:19 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1cZXHB-0006B7-PZ for pgadmin-hackers@arkaria.postgresql.org; Fri, 03 Feb 2017 06:23:17 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1cZXH9-0006B0-Gm for pgadmin-hackers@postgresql.org; Fri, 03 Feb 2017 06:23:16 +0000 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1cZXH4-00055S-KN for pgadmin-hackers@postgresql.org; Fri, 03 Feb 2017 06:23:14 +0000 Received: by mail-lf0-x235.google.com with SMTP id x1so4972798lff.0 for ; Thu, 02 Feb 2017 22:23:10 -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=enbyl6KNCtBlFLDe5gQtxhA7OxjYkf73JvclvECmMU0=; b=TuUCIafFql1uU6rA8LXYOom1hZPJYFYIFUbZexiQul6eFvnKeYLapDCw5/jbecCTSK vFvv+9IEWmBxPckVvb9prob5ONDeuo9BODqxcCZofrOcGogz3HgY6tFlH/MdkG9nzeuk rxv5InsYMTEkydSw9Dz5G2VF9cEDa2xRhAAkJsXdCLM1KrY0sNP+P4jcT91URT2qMJGV zUOJKdY8Io6Vrnp8/K9n8Szhmwqn8iXzKppMF5ep6FcRhD1d1MF1WqFY8izQAoofElh2 2Ac+eaCQ7mNg5nWFQVQOWotjvMUcogPiFUaF6krY251w2eGMKTDVY/XHvCO24c1lLLmy sNnA== 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=enbyl6KNCtBlFLDe5gQtxhA7OxjYkf73JvclvECmMU0=; b=ZfgfAMOLM358NoZs2NeED4FqnPlYQN46wCxFQ5tSBakhiz4ZuYReb2RLiT68NChEfM kb8icBwcqEKsHjr/zl0Y6R/4KW+vwaz0HYHYSqSmLNJX/UAaTGDGvO/DqtC7Ze58NdLT 30kaPYefgELQZ78gHu3HHkZHnZdb74a/VI6kZ4l91hqU0MX/Wd3F2rdMDGF48WvriyPg JiUQhtb9a/d34YBV93ZVUZYWl6CfqhzrLDRzkHeRrhDOStY/TTd5afZtyfl2yJ+3ChtO 6WbTpnDkbRQZtuHVIrwHplG8ruN5kzyFaWdYzqE/h8lGvB5M5pmV1XDf9HitMmMiesDZ mh7A== X-Gm-Message-State: AIkVDXI4VPW+u66EpJvSNsxz1LHe6xm3VC9lCouSGDDn+E2HKe4MVf3JUHUJnxz+TtH8YxIEy0fYxw8+u7F6L4Y5 X-Received: by 10.25.67.83 with SMTP id m19mr3630404lfj.24.1486102988760; Thu, 02 Feb 2017 22:23:08 -0800 (PST) MIME-Version: 1.0 Received: by 10.25.41.201 with HTTP; Thu, 2 Feb 2017 22:23:07 -0800 (PST) In-Reply-To: References: From: Khushboo Vashi Date: Fri, 3 Feb 2017 11:53:07 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch]: RM 2069 - Wrong tablespace displayed in table properties To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary=f403045ea3c4bedbef05479a509d X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --f403045ea3c4bedbef05479a509d Content-Type: multipart/alternative; boundary=f403045ea3c4bedbea05479a509b --f403045ea3c4bedbea05479a509b Content-Type: text/plain; charset=UTF-8 Hi, Please find the attached rebased patch. Thanks, Khushboo On Mon, Jan 30, 2017 at 6:20 PM, Dave Page wrote: > Hi > > Can you rebase this please? > > Thanks. > > On Fri, Jan 27, 2017 at 11:53 AM, Khushboo Vashi > wrote: > > Hi, > > > > Please find the attached updated patch. > > > > Thanks, > > Khushboo > > > > On Fri, Jan 20, 2017 at 5:31 PM, Dave Page wrote: > >> > >> On Fri, Jan 13, 2017 at 6:41 AM, Khushboo Vashi > >> wrote: > >> > Hi, > >> > > >> > Please find the attached patch to fix the RM 2069 - Wrong tablespace > >> > displayed in table properties. > >> > > >> > When the table is created without a tablespace, the "pg_default" > >> > tablespace > >> > gets selected rather than the default tablespace (the current database > >> > tablespace). > >> > So, this issue has been fixed. > >> > >> Unfortunately more work is required. I started hacking on it (see > >> attached), but there is more effort needed and I'm out of time. > >> Specifically: > >> > >> - We need to remove 'pg_default' as the default tablespace when > >> creating objects. Let's have no default, and let PG automatically pick > >> the right tablespace, unless the user specifically overrides it. My > >> updated patch removes that default, and fixes some of the SQL to > >> handle it. > >> > > Done > >> > >> - Matviews don't list the correct tablespace in their properties list. > >> > > Done > >> > >> - Unique constraints ignore the tablespace option if the user selects > >> pg_default, even if the database's default is something different. > >> > > Done > >> > >> So I think to complete this we need to review all objects that use > >> tablespaces (databases, tables, matviews, indexes, index-backed > >> constraints) and ensure: > >> > > Done > >> > >> - No default tablespace is selected when creating an object. > >> > > Done > >> > >> - If the user selects a tablespace, the CREATE SQL must handle it > >> properly. Similarly, if they leave it to the default. > >> > > Done > >> > >> - The Properties views must display the actual tablespace in use, > >> whether it is specific to the object, or the database default. > >> > > Done > >> > >> 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 > --f403045ea3c4bedbea05479a509b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

Please find the attached rebased pa= tch.

Thanks,
Khushboo

On Mon, Jan 30, 2017 at = 6:20 PM, Dave Page <dpage@pgadmin.org> wrote:
Hi

Can you rebase this please?

Thanks.

On Fri, Jan 27, 2017 at 11:53 AM, Khushboo Vashi
<khushboo.vashi@enterprisedb.com> wrote:
> Hi,
>
> Please find the attached updated patch.
>
> Thanks,
> Khushboo
>
> On Fri, Jan 20, 2017 at 5:31 PM, Dave Page <dpage@pgadmin.org> wrote:
>>
>> On Fri, Jan 13, 2017 at 6:41 AM, Khushboo Vashi
>> <khushboo.va= shi@enterprisedb.com> wrote:
>> > Hi,
>> >
>> > Please find the attached patch to fix the RM 2069 - Wrong tab= lespace
>> > displayed in table properties.
>> >
>> > When the table is created without a tablespace, the "pg_= default"
>> > tablespace
>> > gets selected rather than the default tablespace (the current= database
>> > tablespace).
>> > So, this issue has been fixed.
>>
>> Unfortunately more work is required. I started hacking on it (see<= br> >> attached), but there is more effort needed and I'm out of time= .
>> Specifically:
>>
>> - We need to remove 'pg_default' as the default tablespace= when
>> creating objects. Let's have no default, and let PG automatica= lly pick
>> the right tablespace, unless the user specifically overrides it. M= y
>> updated patch removes that default, and fixes some of the SQL to >> handle it.
>>
> Done
>>
>> - Matviews don't list the correct tablespace in their properti= es list.
>>
> Done
>>
>> - Unique constraints ignore the tablespace option if the user sele= cts
>> pg_default, even if the database's default is something differ= ent.
>>
> Done
>>
>> So I think to complete this we need to review all objects that use=
>> tablespaces (databases, tables, matviews, indexes, index-backed
>> constraints) and ensure:
>>
> Done
>>
>> - No default tablespace is selected when creating an object.
>>
> Done
>>
>> - If the user selects a tablespace, the CREATE SQL must handle it<= br> >> properly. Similarly, if they leave it to the default.
>>
> Done
>>
>> - The Properties views must display the actual tablespace in use,<= br> >> whether it is specific to the object, or the database default.
>>
> Done
>>
>> 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

--f403045ea3c4bedbea05479a509b-- --f403045ea3c4bedbef05479a509d Content-Type: text/x-patch; charset=US-ASCII; name="RM_2069_ver2.patch" Content-Disposition: attachment; filename="RM_2069_ver2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iypfcbnd0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9fX2luaXRfXy5weQppbmRleCA5 MjkyOTg5Li43OTIxZjhlIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L19faW5pdF9fLnB5CkBAIC0xMzQsNyArMTM0LDcgQEAgY2xhc3MgVGFibGVW aWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNl dHRpbmdzKToKICAgICAgIC0gVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIHJl dHVybiBtb2RpZmllZCBTUUwgZm9yIHRoZSBzZWxlY3RlZAogICAgICAgICBU YWJsZSBub2RlCiAKLSAgICAqIGdldF9zcWwoZGF0YSwgc2NpZCwgdGlkKQor ICAgICogZ2V0X3NxbChkaWQsIHNjaWQsIHRpZCwgZGF0YSkKICAgICAgIC0g VGhpcyBmdW5jdGlvbiB3aWxsIGdlbmVyYXRlIHNxbCBmcm9tIG1vZGVsIGRh dGEKIAogICAgICogc3FsKGdpZCwgc2lkLCBkaWQsIHNjaWQsIHRpZCk6CkBA IC0xODIsNyArMTgyLDcgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGROb2Rl VmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKICAgICAg IC0gSXQgd2lsbCByZXR1cm4gZm9ybWF0dGVkIG91dHB1dCBvZiBxdWVyeSBy ZXN1bHQKICAgICAgICAgYXMgcGVyIGNsaWVudCBtb2RlbCBmb3JtYXQgZm9y IGNvbHVtbiBub2RlCiAKLSAgICAqIF9pbmRleF9jb25zdHJhaW50c19mb3Jt YXR0ZXIoc2VsZiwgdGlkLCBkYXRhKToKKyAgICAqIF9pbmRleF9jb25zdHJh aW50c19mb3JtYXR0ZXIoc2VsZiwgZGlkLCB0aWQsIGRhdGEpOgogICAgICAg LSBJdCB3aWxsIHJldHVybiBmb3JtYXR0ZWQgb3V0cHV0IG9mIHF1ZXJ5IHJl c3VsdAogICAgICAgICBhcyBwZXIgY2xpZW50IG1vZGVsIGZvcm1hdCBmb3Ig aW5kZXggY29uc3RyYWludCBub2RlCiAKQEAgLTE5NSw3ICsxOTUsNyBAQCBj bGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRl ciwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgIC0gVGhpcyBmdW5jdGlvbiB3 aWxsIHBhcnNlIGFuZCByZXR1cm4gZm9ybWF0dGVkIGxpc3Qgb2YgY29sdW1u cwogICAgICAgICAgYWRkZWQgYnkgdXNlcgogCi0gICAgKiBnZXRfaW5kZXhf Y29uc3RyYWludF9zcWwoc2VsZiwgdGlkLCBkYXRhKToKKyAgICAqIGdldF9p bmRleF9jb25zdHJhaW50X3NxbChzZWxmLCBkaWQsIHRpZCwgZGF0YSk6CiAg ICAgICAtIFRoaXMgZnVuY3Rpb24gd2lsbCBnZW5lcmF0ZSBtb2RpZmllZCBz cWwgZm9yIGluZGV4IGNvbnN0cmFpbnRzCiAgICAgICAgIChQcmltYXJ5IEtl eSAmIFVuaXF1ZSkKIApAQCAtMzMyLDcgKzMzMiw4IEBAIGNsYXNzIFRhYmxl VmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1T ZXR0aW5ncyk6CiAgICAgICAgICIiIgogICAgICAgICBTUUwgPSByZW5kZXJf dGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncHJvcGVydGll cy5zcWwnXSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY2lk PXNjaWQsIGRhdGxhc3RzeXNvaWQ9c2VsZi5kYXRsYXN0c3lzb2lkKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgc2NpZD1zY2lk LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0bGFzdHN5c29p ZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAgICAgICAgIHN0YXR1cywgcmVzID0g c2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCiAKICAgICAgICAgaWYgbm90 IHN0YXR1czoKQEAgLTcyNSw3ICs3MjYsNyBAQCBjbGFzcyBUYWJsZVZpZXco UEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgVmFjdXVtU2V0dGlu Z3MpOgogCiAgICAgICAgIHJldHVybiBkYXRhCiAKLSAgICBkZWYgX2luZGV4 X2NvbnN0cmFpbnRzX2Zvcm1hdHRlcihzZWxmLCB0aWQsIGRhdGEpOgorICAg IGRlZiBfaW5kZXhfY29uc3RyYWludHNfZm9ybWF0dGVyKHNlbGYsIGRpZCwg dGlkLCBkYXRhKToKICAgICAgICAgIiIiCiAgICAgICAgIEFyZ3M6CiAgICAg ICAgICAgICB0aWQ6IFRhYmxlIE9JRApAQCAtNzQ2LDcgKzc0Nyw3IEBAIGNs YXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVy LCBWYWN1dW1TZXR0aW5ncyk6CiAKICAgICAgICAgICAgIHNxbCA9IHJlbmRl cl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi5pbmRleF9jb25zdHJhaW50X3Rl bXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlkLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsIHRpZD10aWQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3RyYWludF90eXBl PWN0eXBlKQogICAgICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4u ZXhlY3V0ZV9kaWN0KHNxbCkKIApAQCAtODc0LDcgKzg3NSw3IEBAIGNsYXNz IFRhYmxlVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBW YWN1dW1TZXR0aW5ncyk6CiAKICAgICAgICAgcmV0dXJuIGRhdGEKIAotICAg IGRlZiBfZXhjbHVzaW9uX2NvbnN0cmFpbnRfZm9ybWF0dGVyKHNlbGYsIHRp ZCwgZGF0YSk6CisgICAgZGVmIF9leGNsdXNpb25fY29uc3RyYWludF9mb3Jt YXR0ZXIoc2VsZiwgZGlkLCB0aWQsIGRhdGEpOgogICAgICAgICAiIiIKICAg ICAgICAgQXJnczoKICAgICAgICAgICAgIHRpZDogVGFibGUgT0lECkBAIC04 ODgsNyArODg5LDcgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGROb2RlVmll dywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKICAgICAgICAg IyBXZSB3aWxsIGZldGNoIGFsbCB0aGUgaW5kZXggY29uc3RyYWludHMgZm9y IHRoZSB0YWJsZQogICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8i LmpvaW4oW3NlbGYuZXhjbHVzaW9uX2NvbnN0cmFpbnRfdGVtcGxhdGVfcGF0 aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn cHJvcGVydGllcy5zcWwnXSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0aWQ9dGlkKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlkPWRpZCwgdGlkPXRpZCkKIAogICAgICAgICBzdGF0dXMsIHJlc3VsdCA9 IHNlbGYuY29ubi5leGVjdXRlX2RpY3Qoc3FsKQogCkBAIC05NzEsNyArOTcy LDcgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5 cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKIAogICAgICAgICByZXR1cm4g Tm9uZQogCi0gICAgZGVmIF9mb3JtYXR0ZXIoc2VsZiwgc2NpZCwgdGlkLCBk YXRhKToKKyAgICBkZWYgX2Zvcm1hdHRlcihzZWxmLCBkaWQsIHNjaWQsIHRp ZCwgZGF0YSk6CiAgICAgICAgICIiIgogICAgICAgICBBcmdzOgogICAgICAg ICAgICAgZGF0YTogZGljdCBvZiBxdWVyeSByZXN1bHQKQEAgLTEwOTAsMTAg KzEwOTEsMTAgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGROb2RlVmlldywg RGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKICAgICAgICAgICAg IGRhdGEgPSBzZWxmLl9jb2x1bW5zX2Zvcm1hdHRlcih0aWQsIGRhdGEpCiAK ICAgICAgICAgIyBIZXJlIHdlIHdpbGwgYWRkIGNvbnN0cmFpbnQgaW4gb3Vy IG91dHB1dAotICAgICAgICBkYXRhID0gc2VsZi5faW5kZXhfY29uc3RyYWlu dHNfZm9ybWF0dGVyKHRpZCwgZGF0YSkKKyAgICAgICAgZGF0YSA9IHNlbGYu X2luZGV4X2NvbnN0cmFpbnRzX2Zvcm1hdHRlcihkaWQsIHRpZCwgZGF0YSkK ICAgICAgICAgZGF0YSA9IHNlbGYuX2ZvcmVpZ25fa2V5X2Zvcm1hdHRlcih0 aWQsIGRhdGEpCiAgICAgICAgIGRhdGEgPSBzZWxmLl9jaGVja19jb25zdHJh aW50X2Zvcm1hdHRlcih0aWQsIGRhdGEpCi0gICAgICAgIGRhdGEgPSBzZWxm Ll9leGNsdXNpb25fY29uc3RyYWludF9mb3JtYXR0ZXIodGlkLCBkYXRhKQor ICAgICAgICBkYXRhID0gc2VsZi5fZXhjbHVzaW9uX2NvbnN0cmFpbnRfZm9y bWF0dGVyKGRpZCwgdGlkLCBkYXRhKQogCiAgICAgICAgIHJldHVybiBkYXRh CiAKQEAgLTExMTYsNyArMTExNyw3IEBAIGNsYXNzIFRhYmxlVmlldyhQR0No aWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncyk6 CiAKICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtz ZWxmLnRlbXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc2NpZD1zY2lkLCB0aWQ9dGlkLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgc2NpZD1zY2lk LCB0aWQ9dGlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0 bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAgICAgICAgIHN0YXR1 cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCiAgICAgICAg IGlmIG5vdCBzdGF0dXM6CkBAIC0xMTM5LDcgKzExNDAsNyBAQCBjbGFzcyBU YWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgVmFj dXVtU2V0dGluZ3MpOgogICAgICAgICAgICAgJ3ZhY3V1bV9zZXR0aW5nc19z dHInCiAgICAgICAgIF0ucmVwbGFjZSgiPSIsICIgPSAiKQogCi0gICAgICAg IGRhdGEgPSBzZWxmLl9mb3JtYXR0ZXIoc2NpZCwgdGlkLCBkYXRhKQorICAg ICAgICBkYXRhID0gc2VsZi5fZm9ybWF0dGVyKGRpZCwgc2NpZCwgdGlkLCBk YXRhKQogCiAgICAgICAgIHJldHVybiBhamF4X3Jlc3BvbnNlKAogICAgICAg ICAgICAgcmVzcG9uc2U9ZGF0YSwKQEAgLTE0ODYsNyArMTQ4Nyw3IEBAIGNs YXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVy LCBWYWN1dW1TZXR0aW5ncyk6CiAgICAgICAgICAgICAgICAgZGF0YVtrXSA9 IHYKIAogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBTUUwsIG5hbWUgPSBz ZWxmLmdldF9zcWwoc2NpZCwgdGlkLCBkYXRhKQorICAgICAgICAgICAgU1FM LCBuYW1lID0gc2VsZi5nZXRfc3FsKGRpZCwgc2NpZCwgdGlkLCBkYXRhKQog CiAgICAgICAgICAgICBTUUwgPSBTUUwuc3RyaXAoJ1xuJykuc3RyaXAoJyAn KQogICAgICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0 ZV9zY2FsYXIoU1FMKQpAQCAtMTUzNSw3ICsxNTM2LDcgQEAgY2xhc3MgVGFi bGVWaWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1 bVNldHRpbmdzKToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgU1FMID0g cmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzY2lkPXNjaWQsIHRpZD10aWQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgc2NpZD1zY2lkLCB0aWQ9 dGlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGxh c3RzeXNvaWQ9c2VsZi5kYXRsYXN0c3lzb2lkKQogICAgICAgICAgICAgc3Rh dHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKICAgICAg ICAgICAgIGlmIG5vdCBzdGF0dXM6CkBAIC0xNTk2LDcgKzE1OTcsNyBAQCBj bGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRl ciwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgICB0cnk6CiAgICAgICAgICAg ICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh dGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNjaWQ9c2NpZCwgdGlkPXRpZCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBzY2lkPXNj aWQsIHRpZD10aWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAgICAgICAg ICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3QoU1FM KQogICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKQEAgLTE2NDQsNyArMTY0 NSw3IEBAIGNsYXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFU eXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncyk6CiAgICAgICAgIHRyeToKICAg ICAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2Vs Zi50ZW1wbGF0ZV9wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAncHJvcGVydGllcy5zcWwnXSksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NpZD1zY2lkLCB0aWQ9dGlk LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQs IHNjaWQ9c2NpZCwgdGlkPXRpZCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkYXRsYXN0c3lzb2lkPXNlbGYuZGF0bGFzdHN5c29pZCkK ICAgICAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVf ZGljdChTUUwpCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgpAQCAtMTcy NCw3ICsxNzI1LDcgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGROb2RlVmll dywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKICAgICAgICAg ICAgICAgICBkYXRhW2tdID0gdgogCiAgICAgICAgIHRyeToKLSAgICAgICAg ICAgIFNRTCwgbmFtZSA9IHNlbGYuZ2V0X3NxbChzY2lkLCB0aWQsIGRhdGEp CisgICAgICAgICAgICBTUUwsIG5hbWUgPSBzZWxmLmdldF9zcWwoZGlkLCBz Y2lkLCB0aWQsIGRhdGEpCiAgICAgICAgICAgICBTUUwgPSByZS5zdWIoJ1xu ezIsfScsICdcblxuJywgU1FMKQogICAgICAgICAgICAgU1FMID0gU1FMLnN0 cmlwKCdcbicpCiAgICAgICAgICAgICBpZiBTUUwgPT0gJyc6CkBAIC0xNzM2 LDcgKzE3MzcsNyBAQCBjbGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3 LCBEYXRhVHlwZVJlYWRlciwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgICBl eGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICByZXR1cm4gaW50 ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXN0cihlKSkKIAotICAgIGRl ZiBnZXRfaW5kZXhfY29uc3RyYWludF9zcWwoc2VsZiwgdGlkLCBkYXRhKToK KyAgICBkZWYgZ2V0X2luZGV4X2NvbnN0cmFpbnRfc3FsKHNlbGYsIGRpZCwg dGlkLCBkYXRhKToKICAgICAgICAgIiIiCiAgICAgICAgICBBcmdzOgogICAg ICAgICAgICB0aWQ6IFRhYmxlIElECkBAIC0xNzc4LDcgKzE3NzksNyBAQCBj bGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRl ciwgVmFjdXVtU2V0dGluZ3MpOgogCiAgICAgICAgICAgICAgICAgICAgICAg ICBwcm9wZXJ0aWVzX3NxbCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbigK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbc2VsZi5pbmRleF9jb25z dHJhaW50X3RlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlkLCBjaWQ9Y1snb2lk J10sIGNvbnN0cmFpbnRfdHlwZT1jdHlwZSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaWQ9ZGlkLCB0aWQ9dGlkLCBjaWQ9Y1snb2lkJ10sIGNv bnN0cmFpbnRfdHlwZT1jdHlwZSkKICAgICAgICAgICAgICAgICAgICAgICAg IHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChwcm9wZXJ0 aWVzX3NxbCkKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIG5vdCBzdGF0 dXM6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGludGVy bmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCkBAIC0yMDkyLDcgKzIw OTMsNyBAQCBjbGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRh VHlwZVJlYWRlciwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgICBlbHNlOgog ICAgICAgICAgICAgcmV0dXJuIE5vbmUKIAotICAgIGRlZiBnZXRfc3FsKHNl bGYsIHNjaWQsIHRpZCwgZGF0YSk6CisgICAgZGVmIGdldF9zcWwoc2VsZiwg ZGlkLCBzY2lkLCB0aWQsIGRhdGEpOgogICAgICAgICAiIiIKICAgICAgICAg VGhpcyBmdW5jdGlvbiB3aWxsIGdlbmVyYXRlIGNyZWF0ZS91cGRhdGUgc3Fs IGZyb20gbW9kZWwgZGF0YQogICAgICAgICBjb21pbmcgZnJvbSBjbGllbnQK QEAgLTIxMDAsMTQgKzIxMDEsMTQgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hp bGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToK ICAgICAgICAgaWYgdGlkIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgU1FM ID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3Bh dGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzY2lkPXNjaWQsIHRpZD10aWQsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgc2NpZD1zY2lkLCB0 aWQ9dGlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRh dGxhc3RzeXNvaWQ9c2VsZi5kYXRsYXN0c3lzb2lkKQogICAgICAgICAgICAg c3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKICAg ICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAgICAgICAgcmV0 dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAKICAg ICAgICAgICAgIG9sZF9kYXRhID0gcmVzWydyb3dzJ11bMF0KLSAgICAgICAg ICAgIG9sZF9kYXRhID0gc2VsZi5fZm9ybWF0dGVyKHNjaWQsIHRpZCwgb2xk X2RhdGEpCisgICAgICAgICAgICBvbGRfZGF0YSA9IHNlbGYuX2Zvcm1hdHRl cihkaWQsIHNjaWQsIHRpZCwgb2xkX2RhdGEpCiAKICAgICAgICAgICAgICMg V2Ugd2lsbCBjb252ZXJ0IHByaXZpbGVnZXMgY29taW5nIGZyb20gY2xpZW50 IHJlcXVpcmVkCiAgICAgICAgICAgICBpZiAncmVsYWNsJyBpbiBkYXRhOgpA QCAtMjI1OSw3ICsyMjYwLDcgQEAgY2xhc3MgVGFibGVWaWV3KFBHQ2hpbGRO b2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNldHRpbmdzKToKICAg ICAgICAgICAgICAgICBTUUwgKz0gY29sdW1uX3NxbC5zdHJpcCgnXG4nKQog CiAgICAgICAgICAgICAjIENoZWNrIGlmIGluZGV4IGNvbnN0cmFpbnRzIGFy ZSBhZGRlZC9jaGFuZ2VkL2RlbGV0ZWQKLSAgICAgICAgICAgIGluZGV4X2Nv bnN0cmFpbnRfc3FsID0gc2VsZi5nZXRfaW5kZXhfY29uc3RyYWludF9zcWwo dGlkLCBkYXRhKQorICAgICAgICAgICAgaW5kZXhfY29uc3RyYWludF9zcWwg PSBzZWxmLmdldF9pbmRleF9jb25zdHJhaW50X3NxbChkaWQsIHRpZCwgZGF0 YSkKICAgICAgICAgICAgICMgSWYgd2UgaGF2ZSBpbmRleCBjb25zdHJhaW50 IHNxbCB0aGVuIGFkIGl0IGluIG1haW4gc3FsCiAgICAgICAgICAgICBpZiBp bmRleF9jb25zdHJhaW50X3NxbCBpcyBub3QgTm9uZToKICAgICAgICAgICAg ICAgICBTUUwgKz0gJ1xuJyArIGluZGV4X2NvbnN0cmFpbnRfc3FsCkBAIC0y NDU2LDcgKzI0NTcsNyBAQCBjbGFzcyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVW aWV3LCBEYXRhVHlwZVJlYWRlciwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAg ICAiIiIKICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2lu KFtzZWxmLnRlbXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2NpZD1zY2lkLCB0aWQ9dGlkLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwgc2NpZD1z Y2lkLCB0aWQ9dGlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAgICAgICAgIHN0 YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCiAgICAg ICAgIGlmIG5vdCBzdGF0dXM6CkBAIC0yNDY4LDcgKzI0NjksNyBAQCBjbGFz cyBUYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwg VmFjdXVtU2V0dGluZ3MpOgogICAgICAgICBzY2hlbWEgPSBkYXRhWydzY2hl bWEnXQogICAgICAgICB0YWJsZSA9IGRhdGFbJ25hbWUnXQogCi0gICAgICAg IGRhdGEgPSBzZWxmLl9mb3JtYXR0ZXIoc2NpZCwgdGlkLCBkYXRhKQorICAg ICAgICBkYXRhID0gc2VsZi5fZm9ybWF0dGVyKGRpZCwgc2NpZCwgdGlkLCBk YXRhKQogCiAgICAgICAgICMgTm93IHdlIGhhdmUgYWxsIGxpcyBvZiBjb2x1 bW5zIHdoaWNoIHdlIG5lZWQKICAgICAgICAgIyB0byBpbmNsdWRlIGluIG91 ciBjcmVhdGUgZGVmaW5pdGlvbiwgTGV0J3MgZm9ybWF0IHRoZW0KQEAgLTI1 MjQsNyArMjUyNSw3IEBAIGNsYXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZp ZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncyk6CiAKICAgICAg ICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi5p bmRleF90ZW1wbGF0ZV9wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAncHJvcGVydGllcy5zcWwnXSksCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlkPXRpZCwgaWR4PXJv d1snb2lkJ10sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlkPWRpZCwgdGlkPXRpZCwgaWR4PXJvd1snb2lkJ10sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGF0bGFzdHN5c29pZD1zZWxmLmRh dGxhc3RzeXNvaWQpCiAKICAgICAgICAgICAgIHN0YXR1cywgcmVzID0gc2Vs Zi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCkBAIC0yNzI2LDE0ICsyNzI3LDE0 IEBAIGNsYXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZpZXcsIERhdGFUeXBl UmVhZGVyLCBWYWN1dW1TZXR0aW5ncyk6CiAgICAgICAgICIiIgogICAgICAg ICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh dGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAncHJvcGVydGllcy5zcWwnXSksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzY2lkPXNjaWQsIHRpZD10aWQsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBzY2lkPXNjaWQsIHRpZD10aWQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRsYXN0c3lzb2lk PXNlbGYuZGF0bGFzdHN5c29pZCkKICAgICAgICAgc3RhdHVzLCByZXMgPSBz ZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKICAgICAgICAgaWYgbm90IHN0 YXR1czoKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJy b3IoZXJyb3Jtc2c9cmVzKQogCiAgICAgICAgIGRhdGEgPSByZXNbJ3Jvd3Mn XVswXQotICAgICAgICBkYXRhID0gc2VsZi5fZm9ybWF0dGVyKHNjaWQsIHRp ZCwgZGF0YSkKKyAgICAgICAgZGF0YSA9IHNlbGYuX2Zvcm1hdHRlcihkaWQs IHNjaWQsIHRpZCwgZGF0YSkKIAogICAgICAgICBjb2x1bW5zID0gW10KIApA QCAtMjc3MCwxNCArMjc3MSwxNCBAQCBjbGFzcyBUYWJsZVZpZXcoUEdDaGls ZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgVmFjdXVtU2V0dGluZ3MpOgog ICAgICAgICAiIiIKICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIv Ii5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NpZD1zY2lkLCB0aWQ9 dGlkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwg c2NpZD1zY2lkLCB0aWQ9dGlkLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAgICAg ICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwp CiAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAgICByZXR1cm4g aW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKIAogICAgICAg ICBkYXRhID0gcmVzWydyb3dzJ11bMF0KLSAgICAgICAgZGF0YSA9IHNlbGYu X2Zvcm1hdHRlcihzY2lkLCB0aWQsIGRhdGEpCisgICAgICAgIGRhdGEgPSBz ZWxmLl9mb3JtYXR0ZXIoZGlkLCBzY2lkLCB0aWQsIGRhdGEpCiAKICAgICAg ICAgY29sdW1ucyA9IFtdCiAgICAgICAgIHZhbHVlcyA9IFtdCkBAIC0yODE3 LDE0ICsyODE4LDE0IEBAIGNsYXNzIFRhYmxlVmlldyhQR0NoaWxkTm9kZVZp ZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncyk6CiAgICAgICAg ICIiIgogICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4o W3NlbGYudGVtcGxhdGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAncHJvcGVydGllcy5zcWwnXSksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzY2lkPXNjaWQsIHRpZD10aWQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWQ9ZGlkLCBzY2lkPXNj aWQsIHRpZD10aWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk YXRsYXN0c3lzb2lkPXNlbGYuZGF0bGFzdHN5c29pZCkKICAgICAgICAgc3Rh dHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9kaWN0KFNRTCkKICAgICAg ICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgIHJldHVybiBpbnRlcm5h bF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQogCiAgICAgICAgIGRhdGEg PSByZXNbJ3Jvd3MnXVswXQotICAgICAgICBkYXRhID0gc2VsZi5fZm9ybWF0 dGVyKHNjaWQsIHRpZCwgZGF0YSkKKyAgICAgICAgZGF0YSA9IHNlbGYuX2Zv cm1hdHRlcihkaWQsIHNjaWQsIHRpZCwgZGF0YSkKIAogICAgICAgICBjb2x1 bW5zID0gW10KIApAQCAtMjg2Niw3ICsyODY3LDcgQEAgY2xhc3MgVGFibGVW aWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIsIFZhY3V1bVNl dHRpbmdzKToKICAgICAgICAgIiIiCiAgICAgICAgIFNRTCA9IHJlbmRlcl90 ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdwcm9wZXJ0aWVz LnNxbCddKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjaWQ9 c2NpZCwgdGlkPXRpZCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGRpZD1kaWQsIHNjaWQ9c2NpZCwgdGlkPXRpZCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRhdGxhc3RzeXNvaWQ9c2VsZi5kYXRsYXN0c3lz b2lkKQogICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRl X2RpY3QoU1FMKQogICAgICAgICBpZiBub3Qgc3RhdHVzOgpkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2V4Y2x1c2lv bl9jb25zdHJhaW50L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL2NvbnN0cmFpbnRzL2V4Y2x1c2lvbl9jb25zdHJhaW50L19faW5pdF9f LnB5CmluZGV4IDA2ZTkwMjIuLjAzNmRiYzQgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9leGNsdXNpb25fY29uc3Ry YWludC9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMv Y29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvX19pbml0X18ucHkK QEAgLTI2Niw3ICsyNjYsNyBAQCBjbGFzcyBFeGNsdXNpb25Db25zdHJhaW50 VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAgICIiIgogICAgICAg ICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh dGVfcGF0aCwgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGlkPXRpZCwgY2lkPWV4aWQpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkaWQ9ZGlkLCB0aWQ9dGlkLCBjaWQ9ZXhp ZCkKIAogICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRl X2RpY3Qoc3FsKQogCkBAIC0zNzQsNiArMzc0LDcgQEAgY2xhc3MgRXhjbHVz aW9uQ29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKIAogICAgICAg ICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh dGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAncHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaWQ9ZGlkLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgdGlkPXRpZCkKICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNv bm4uZXhlY3V0ZV9kaWN0KFNRTCkKIApAQCAtNjM1LDcgKzYzNiw3IEBAIGNs YXNzIEV4Y2x1c2lvbkNvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6 CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIGRhdGFbJ3NjaGVtYSddID0g c2VsZi5zY2hlbWEKICAgICAgICAgICAgIGRhdGFbJ3RhYmxlJ10gPSBzZWxm LnRhYmxlCi0gICAgICAgICAgICBzcWwsIG5hbWUgPSBzZWxmLmdldF9zcWwo ZGF0YSwgdGlkLCBleGlkKQorICAgICAgICAgICAgc3FsLCBuYW1lID0gc2Vs Zi5nZXRfc3FsKGRhdGEsIGRpZCwgdGlkLCBleGlkKQogICAgICAgICAgICAg c3FsID0gc3FsLnN0cmlwKCdcbicpLnN0cmlwKCcgJykKICAgICAgICAgICAg IHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfc2NhbGFyKHNxbCkK ICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CkBAIC03NTAsNyArNzUxLDcg QEAgY2xhc3MgRXhjbHVzaW9uQ29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVW aWV3KToKICAgICAgICAgZGF0YVsnc2NoZW1hJ10gPSBzZWxmLnNjaGVtYQog ICAgICAgICBkYXRhWyd0YWJsZSddID0gc2VsZi50YWJsZQogICAgICAgICB0 cnk6Ci0gICAgICAgICAgICBzcWwsIG5hbWUgPSBzZWxmLmdldF9zcWwoZGF0 YSwgdGlkLCBleGlkKQorICAgICAgICAgICAgc3FsLCBuYW1lID0gc2VsZi5n ZXRfc3FsKGRhdGEsIGRpZCwgdGlkLCBleGlkKQogICAgICAgICAgICAgc3Fs ID0gc3FsLnN0cmlwKCdcbicpLnN0cmlwKCcgJykKICAgICAgICAgICAgIGlm IHNxbCA9PSAnJzoKICAgICAgICAgICAgICAgICBzcWwgPSAiLS1tb2RpZmll ZCBTUUwiCkBAIC03NjIsNyArNzYzLDcgQEAgY2xhc3MgRXhjbHVzaW9uQ29u c3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgZXhjZXB0 IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgcmV0dXJuIGludGVybmFs X3NlcnZlcl9lcnJvcihlcnJvcm1zZz1zdHIoZSkpCiAKLSAgICBkZWYgZ2V0 X3NxbChzZWxmLCBkYXRhLCB0aWQsIGV4aWQ9Tm9uZSk6CisgICAgZGVmIGdl dF9zcWwoc2VsZiwgZGF0YSwgZGlkLCB0aWQsIGV4aWQ9Tm9uZSk6CiAgICAg ICAgICIiIgogICAgICAgICBUaGlzIGZ1bmN0aW9uIHdpbGwgZ2VuZXJhdGUg c3FsIGZyb20gbW9kZWwgZGF0YS4KIApAQCAtNzc2LDYgKzc3Nyw3IEBAIGNs YXNzIEV4Y2x1c2lvbkNvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6 CiAgICAgICAgICIiIgogICAgICAgICBpZiBleGlkIGlzIG5vdCBOb25lOgog ICAgICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtz ZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWQ9ZGlkLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpZD10aWQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY2lkPWV4aWQpCiAgICAgICAg ICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3Qoc3Fs KQpAQCAtODI0LDcgKzgyNiw3IEBAIGNsYXNzIEV4Y2x1c2lvbkNvbnN0cmFp bnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIHRyeToKICAgICAg ICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAgICAgICAg ICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAncHJvcGVydGllcy5z cWwnXSksCi0gICAgICAgICAgICAgICAgdGlkPXRpZCwgY29ubj1zZWxmLmNv bm4sIGNpZD1leGlkKQorICAgICAgICAgICAgICAgIGRpZD1kaWQsIHRpZD10 aWQsIGNvbm49c2VsZi5jb25uLCBjaWQ9ZXhpZCkKICAgICAgICAgICAgIHN0 YXR1cywgcmVzdWx0ID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCiAg ICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgICAgIHJl dHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzdWx0KQpA QCAtOTEyLDcgKzkxNCw3IEBAIGNsYXNzIEV4Y2x1c2lvbkNvbnN0cmFpbnRW aWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAjIEZldGNoIGlu ZGV4IGRldGFpbHMgb25seSBpZiBleHRlbmRlZCBzdGF0cyBhdmFpbGFibGUK ICAgICAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAg ICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAncHJvcGVy dGllcy5zcWwnXSksCi0gICAgICAgICAgICAgICAgdGlkPXRpZCwgY29ubj1z ZWxmLmNvbm4sIGNpZD1leGlkKQorICAgICAgICAgICAgICAgIGRpZD1kaWQs IHRpZD10aWQsIGNvbm49c2VsZi5jb25uLCBjaWQ9ZXhpZCkKICAgICAgICAg ICAgIHN0YXR1cywgcmVzdWx0ID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChT UUwpCiAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAg ICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVz dWx0KQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0 cmFpbnRzL2V4Y2x1c2lvbl9jb25zdHJhaW50L3RlbXBsYXRlcy9leGNsdXNp b25fY29uc3RyYWludC9qcy9leGNsdXNpb25fY29uc3RyYWludC5qcyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9leGNsdXNpb25fY29u c3RyYWludC90ZW1wbGF0ZXMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvanMvZXhj bHVzaW9uX2NvbnN0cmFpbnQuanMKaW5kZXggZTdiZDkwNS4uMDJiNzdlMSAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRz L2V4Y2x1c2lvbl9jb25zdHJhaW50L3RlbXBsYXRlcy9leGNsdXNpb25fY29u c3RyYWludC9qcy9leGNsdXNpb25fY29uc3RyYWludC5qcworKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0 cmFpbnQvdGVtcGxhdGVzL2V4Y2x1c2lvbl9jb25zdHJhaW50L2pzL2V4Y2x1 c2lvbl9jb25zdHJhaW50LmpzCkBAIC02NTMsNyArNjUzLDcgQEAgZnVuY3Rp b24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlmeSkgewog ICAgICAgICAgIG5hbWU6IHVuZGVmaW5lZCwKICAgICAgICAgICBvaWQ6IHVu ZGVmaW5lZCwKICAgICAgICAgICBjb21tZW50OiB1bmRlZmluZWQsCi0gICAg ICAgICAgc3BjbmFtZTogInBnX2RlZmF1bHQiLAorICAgICAgICAgIHNwY25h bWU6IHVuZGVmaW5lZCwKICAgICAgICAgICBhbW5hbWU6ICJnaXN0IiwKICAg ICAgICAgICBmaWxsZmFjdG9yOiB1bmRlZmluZWQsCiAgICAgICAgICAgY29u ZGVmZXJyYWJsZTogdW5kZWZpbmVkLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvX19p bml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMv aW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQppbmRleCBkYzVjNDYxLi5k MzM3MTE5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29u c3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQorKysgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3Ry YWludC9fX2luaXRfXy5weQpAQCAtMjg1LDYgKzI4NSw3IEBAIGNsYXNzIElu ZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKIAogICAgICAg ICAiIiIKICAgICAgICAgc3FsID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2lu KFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlkLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY2lkPWNpZCwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0cmFpbnRfdHlwZT1zZWxmLmNvbnN0cmFpbnRf dHlwZSkKQEAgLTM4MSw2ICszODIsNyBAQCBjbGFzcyBJbmRleENvbnN0cmFp bnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICBzZWxmLnRh YmxlID0gcm93Wyd0YWJsZSddCiAKICAgICAgICAgU1FMID0gcmVuZGVyX3Rl bXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgsICdwcm9wZXJ0 aWVzLnNxbCddKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRp ZD1kaWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlk LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3RyYWludF90 eXBlPXNlbGYuY29uc3RyYWludF90eXBlKQogICAgICAgICBzdGF0dXMsIHJl cyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3QoU1FMKQpAQCAtNjY0LDcgKzY2 Niw3IEBAIGNsYXNzIEluZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVW aWV3KToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgZGF0YVsnc2NoZW1h J10gPSBzZWxmLnNjaGVtYQogICAgICAgICAgICAgZGF0YVsndGFibGUnXSA9 IHNlbGYudGFibGUKLSAgICAgICAgICAgIHNxbCwgbmFtZSA9IHNlbGYuZ2V0 X3NxbChkYXRhLCB0aWQsIGNpZCkKKyAgICAgICAgICAgIHNxbCwgbmFtZSA9 IHNlbGYuZ2V0X3NxbChkYXRhLCBkaWQsIHRpZCwgY2lkKQogICAgICAgICAg ICAgc3FsID0gc3FsLnN0cmlwKCdcbicpLnN0cmlwKCcgJykKIAogICAgICAg ICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9zY2FsYXIo c3FsKQpAQCAtNzg0LDcgKzc4Niw3IEBAIGNsYXNzIEluZGV4Q29uc3RyYWlu dFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgZGF0YVsnc2NoZW1h J10gPSBzZWxmLnNjaGVtYQogICAgICAgICBkYXRhWyd0YWJsZSddID0gc2Vs Zi50YWJsZQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBzcWwsIG5hbWUg PSBzZWxmLmdldF9zcWwoZGF0YSwgdGlkLCBjaWQpCisgICAgICAgICAgICBz cWwsIG5hbWUgPSBzZWxmLmdldF9zcWwoZGF0YSwgZGlkLCB0aWQsIGNpZCkK ICAgICAgICAgICAgIHNxbCA9IHNxbC5zdHJpcCgnXG4nKS5zdHJpcCgnICcp CiAgICAgICAgICAgICBpZiBzcWwgPT0gJyc6CiAgICAgICAgICAgICAgICAg c3FsID0gIi0tbW9kaWZpZWQgU1FMIgpAQCAtNzk2LDcgKzc5OCw3IEBAIGNs YXNzIEluZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAg ICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgcmV0 dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1zdHIoZSkpCiAK LSAgICBkZWYgZ2V0X3NxbChzZWxmLCBkYXRhLCB0aWQsIGNpZD1Ob25lKToK KyAgICBkZWYgZ2V0X3NxbChzZWxmLCBkYXRhLCBkaWQsIHRpZCwgY2lkPU5v bmUpOgogICAgICAgICAiIiIKICAgICAgICAgVGhpcyBmdW5jdGlvbiB3aWxs IGdlbmVyYXRlIHNxbCBmcm9tIG1vZGVsIGRhdGEuCiAKQEAgLTgxMCw2ICs4 MTIsNyBAQCBjbGFzcyBJbmRleENvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2Rl Vmlldyk6CiAgICAgICAgICIiIgogICAgICAgICBpZiBjaWQgaXMgbm90IE5v bmU6CiAgICAgICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpv aW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ3Byb3BlcnRpZXMuc3FsJ10pLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGlkPXRpZCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaWQ9Y2lkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0cmFpbnRfdHlw ZT1zZWxmLmNvbnN0cmFpbnRfdHlwZSkKQEAgLTg3Myw2ICs4NzYsNyBAQCBj bGFzcyBJbmRleENvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAg ICAgICAgIHRyeToKICAgICAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0 ZSgKICAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9w YXRoLCAncHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICAgICAgZGlk PWRpZCwKICAgICAgICAgICAgICAgICB0aWQ9dGlkLAogICAgICAgICAgICAg ICAgIGNvbm49c2VsZi5jb25uLAogICAgICAgICAgICAgICAgIGNpZD1jaWQs CkBAIC05NTAsNiArOTU0LDcgQEAgY2xhc3MgSW5kZXhDb25zdHJhaW50Vmll dyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBpZiBpc19wZ3N0YXR0dXBs ZToKICAgICAgICAgICAgICMgRmV0Y2ggaW5kZXggZGV0YWlscyBvbmx5IGlm IGV4dGVuZGVkIHN0YXRzIGF2YWlsYWJsZQogICAgICAgICAgICAgc3FsID0g cmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3BhdGgs ICdwcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaWQ9ZGlkLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpZD10aWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY2lkPWNpZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdHJhaW50X3R5cGU9c2VsZi5jb25zdHJhaW50X3R5cGUp CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWlu dHMvaW5kZXhfY29uc3RyYWludC90ZW1wbGF0ZXMvaW5kZXhfY29uc3RyYWlu dC9qcy9pbmRleF9jb25zdHJhaW50LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvdGVtcGxhdGVzL2lu ZGV4X2NvbnN0cmFpbnQvanMvaW5kZXhfY29uc3RyYWludC5qcwppbmRleCBm NTUyOTcyLi42NDM5Y2FmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC90ZW1wbGF0ZXMv aW5kZXhfY29uc3RyYWludC9qcy9pbmRleF9jb25zdHJhaW50LmpzCisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25z dHJhaW50L3RlbXBsYXRlcy9pbmRleF9jb25zdHJhaW50L2pzL2luZGV4X2Nv bnN0cmFpbnQuanMKQEAgLTg1LDcgKzg1LDcgQEAgZnVuY3Rpb24oJCwgXywg UywgcGdBZG1pbiwgcGdCcm93c2VyLCBhbGVydGlmeSkgewogICAgICAgICAg IG5hbWU6IHVuZGVmaW5lZCwKICAgICAgICAgICBvaWQ6IHVuZGVmaW5lZCwK ICAgICAgICAgICBjb21tZW50OiB1bmRlZmluZWQsCi0gICAgICAgICAgc3Bj bmFtZTogInBnX2RlZmF1bHQiLAorICAgICAgICAgIHNwY25hbWU6IHVuZGVm aW5lZCwKICAgICAgICAgICBpbmRleDogdW5kZWZpbmVkLAogICAgICAgICAg IGZpbGxmYWN0b3I6IHVuZGVmaW5lZCwKICAgICAgICAgICBjb25kZWZlcnJh YmxlOiB1bmRlZmluZWQsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvaW5kZXhlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9pbmRleGVzL19faW5pdF9fLnB5CmluZGV4IGU1MDkzYTIuLjQ0MDNj ZDggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9pbmRleGVz L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9pbmRl eGVzL19faW5pdF9fLnB5CkBAIC01MjEsNyArNTIxLDcgQEAgY2xhc3MgSW5k ZXhlc1ZpZXcoUEdDaGlsZE5vZGVWaWV3KToKIAogICAgICAgICBTUUwgPSBy ZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncHJv cGVydGllcy5zcWwnXSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0aWQ9dGlkLCBpZHg9aWR4LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGlkPWRpZCwgdGlkPXRpZCwgaWR4PWlkeCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRhdGxhc3RzeXNvaWQ9c2VsZi5kYXRsYXN0 c3lzb2lkKQogCiAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4 ZWN1dGVfZGljdChTUUwpCkBAIC02NjUsNyArNjY1LDcgQEAgY2xhc3MgSW5k ZXhlc1ZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICMgc28g dGhhdCB3ZSBjcmVhdGUgdGVtcGxhdGUgZm9yIGRyb3BwaW5nIGluZGV4CiAg ICAgICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3Nl bGYudGVtcGxhdGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpZD10aWQsIGlkeD1pZHgs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlkPWRpZCwg dGlkPXRpZCwgaWR4PWlkeCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkYXRsYXN0c3lzb2lkPXNlbGYuZGF0bGFzdHN5c29pZCkKIAog ICAgICAgICAgICAgc3RhdHVzLCByZXMgPSBzZWxmLmNvbm4uZXhlY3V0ZV9k aWN0KFNRTCkKQEAgLTcyMyw3ICs3MjMsNyBAQCBjbGFzcyBJbmRleGVzVmll dyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBkYXRhWydzY2hlbWEnXSA9 IHNlbGYuc2NoZW1hCiAgICAgICAgIGRhdGFbJ3RhYmxlJ10gPSBzZWxmLnRh YmxlCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIFNRTCwgbmFtZSA9IHNl bGYuZ2V0X3NxbChzY2lkLCB0aWQsIGlkeCwgZGF0YSkKKyAgICAgICAgICAg IFNRTCwgbmFtZSA9IHNlbGYuZ2V0X3NxbChkaWQsIHNjaWQsIHRpZCwgaWR4 LCBkYXRhKQogICAgICAgICAgICAgU1FMID0gU1FMLnN0cmlwKCdcbicpLnN0 cmlwKCcgJykKICAgICAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25u LmV4ZWN1dGVfc2NhbGFyKFNRTCkKICAgICAgICAgICAgIGlmIG5vdCBzdGF0 dXM6CkBAIC03NjUsNyArNzY1LDcgQEAgY2xhc3MgSW5kZXhlc1ZpZXcoUEdD aGlsZE5vZGVWaWV3KToKICAgICAgICAgZGF0YVsndGFibGUnXSA9IHNlbGYu dGFibGUKIAogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBzcWwsIG5hbWUg PSBzZWxmLmdldF9zcWwoc2NpZCwgdGlkLCBpZHgsIGRhdGEsIG1vZGU9J2Ny ZWF0ZScpCisgICAgICAgICAgICBzcWwsIG5hbWUgPSBzZWxmLmdldF9zcWwo ZGlkLCBzY2lkLCB0aWQsIGlkeCwgZGF0YSwgbW9kZT0nY3JlYXRlJykKICAg ICAgICAgICAgIHNxbCA9IHNxbC5zdHJpcCgnXG4nKS5zdHJpcCgnICcpCiAg ICAgICAgICAgICBpZiBzcWwgPT0gJyc6CiAgICAgICAgICAgICAgICAgc3Fs ID0gIi0tbW9kaWZpZWQgU1FMIgpAQCAtNzc2LDE0ICs3NzYsMTQgQEAgY2xh c3MgSW5kZXhlc1ZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgZXhj ZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgcmV0dXJuIGludGVy bmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1zdHIoZSkpCiAKLSAgICBkZWYg Z2V0X3NxbChzZWxmLCBzY2lkLCB0aWQsIGlkeCwgZGF0YSwgbW9kZT1Ob25l KToKKyAgICBkZWYgZ2V0X3NxbChzZWxmLCBkaWQsIHNjaWQsIHRpZCwgaWR4 LCBkYXRhLCBtb2RlPU5vbmUpOgogICAgICAgICAiIiIKICAgICAgICAgVGhp cyBmdW5jdGlvbiB3aWxsIGdlbnJhdGUgc3FsIGZyb20gbW9kZWwgZGF0YQog ICAgICAgICAiIiIKICAgICAgICAgaWYgaWR4IGlzIG5vdCBOb25lOgogICAg ICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxm LnRlbXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlkLCBpZHg9aWR4LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsIHRp ZD10aWQsIGlkeD1pZHgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAKICAg ICAgICAgICAgIHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGlj dChTUUwpCkBAIC04NDIsNyArODQyLDcgQEAgY2xhc3MgSW5kZXhlc1ZpZXco UEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgdHJ5OgogICAgICAgICAgICAg U1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRl X3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICdwcm9wZXJ0aWVzLnNxbCddKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0aWQ9dGlkLCBpZHg9aWR4LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGRpZD1kaWQsIHRpZD10aWQsIGlk eD1pZHgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0 bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCiAKICAgICAgICAgICAg IHN0YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCkBA IC04NTcsNyArODU3LDcgQEAgY2xhc3MgSW5kZXhlc1ZpZXcoUEdDaGlsZE5v ZGVWaWV3KToKICAgICAgICAgICAgICMgQWRkIGNvbHVtbiBkZXRhaWxzIGZv ciBjdXJyZW50IGluZGV4CiAgICAgICAgICAgICBkYXRhID0gc2VsZi5fY29s dW1uX2RldGFpbHMoaWR4LCBkYXRhKQogCi0gICAgICAgICAgICBTUUwsIG5h bWUgPSBzZWxmLmdldF9zcWwoc2NpZCwgdGlkLCBOb25lLCBkYXRhKQorICAg ICAgICAgICAgU1FMLCBuYW1lID0gc2VsZi5nZXRfc3FsKGRpZCwgc2NpZCwg dGlkLCBOb25lLCBkYXRhKQogCiAgICAgICAgICAgICBzcWxfaGVhZGVyID0g Ii0tIEluZGV4OiB7MH1cblxuLS0gIi5mb3JtYXQoZGF0YVsnbmFtZSddKQog ICAgICAgICAgICAgaWYgaGFzYXR0cihzdHIsICdkZWNvZGUnKToKQEAgLTk1 NSw3ICs5NTUsNyBAQCBjbGFzcyBJbmRleGVzVmlldyhQR0NoaWxkTm9kZVZp ZXcpOgogICAgICAgICAgICAgICAgICMgRmV0Y2ggaW5kZXggZGV0YWlscyBv bmx5IGlmIGV4dGVuZGVkIHN0YXRzIGF2YWlsYWJsZQogICAgICAgICAgICAg ICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1w bGF0ZV9wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ3Byb3BlcnRpZXMuc3FsJ10pLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aWQ9dGlkLCBpZHg9aWR4 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWQ9 ZGlkLCB0aWQ9dGlkLCBpZHg9aWR4LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkYXRsYXN0c3lzb2lkPXNlbGYuZGF0bGFzdHN5 c29pZCkKICAgICAgICAgICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29u bi5leGVjdXRlX2RpY3QoU1FMKQogICAgICAgICAgICAgICAgIGlmIG5vdCBz dGF0dXM6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvaW5k ZXhlcy90ZW1wbGF0ZXMvaW5kZXgvanMvaW5kZXguanMgYi93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvaW5kZXhlcy90ZW1wbGF0ZXMvaW5kZXgvanMvaW5kZXgu anMKaW5kZXggNmY0NjI2NS4uN2NhMmRhNCAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL2luZGV4ZXMvdGVtcGxhdGVzL2luZGV4L2pzL2lu ZGV4LmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9pbmRleGVzL3Rl bXBsYXRlcy9pbmRleC9qcy9pbmRleC5qcwpAQCAtMjU5LDcgKzI1OSw3IEBA IGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIHBnQnJvd3NlciwgQmFja2Zv cm0sIGFsZXJ0aWZ5KSB7CiAgICAgICAgICAgb2lkOiB1bmRlZmluZWQsCiAg ICAgICAgICAgbnNwbmFtZTogdW5kZWZpbmVkLAogICAgICAgICAgIHRhYm5h bWU6IHVuZGVmaW5lZCwKLSAgICAgICAgICBzcGNuYW1lOiAncGdfZGVmYXVs dCcsCisgICAgICAgICAgc3BjbmFtZTogdW5kZWZpbmVkLAogICAgICAgICAg IGFtbmFtZTogJ2J0cmVlJwogICAgICAgICB9LAogICAgICAgICBzY2hlbWE6 IFt7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVtcGxh dGVzL2V4Y2x1c2lvbl9jb25zdHJhaW50L3NxbC9kZWZhdWx0L3Byb3BlcnRp ZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy9leGNs dXNpb25fY29uc3RyYWludC9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbApp bmRleCAzYTFjODk3Li5iYTNhOTgxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvdGVtcGxhdGVzL2V4Y2x1c2lvbl9jb25zdHJhaW50L3Nx bC9kZWZhdWx0L3Byb3BlcnRpZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy90ZW1wbGF0ZXMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvc3FsL2Rl ZmF1bHQvcHJvcGVydGllcy5zcWwKQEAgLTIsNyArMiwxMSBAQCBTRUxFQ1Qg Y2xzLm9pZCwKICAgICBjbHMucmVsbmFtZSBhcyBuYW1lLAogICAgIGluZG5h dHRzLAogICAgIGFtbmFtZSwKLSAgICBDT0FMRVNDRShzcGNuYW1lLCAncGdf ZGVmYXVsdCcpIGFzIHNwY25hbWUsCisgICAgQ0FTRSBXSEVOIGxlbmd0aChz cGNuYW1lKSA+IDAgVEhFTiBzcGNuYW1lIEVMU0UKKyAgICAgICAgKFNFTEVD VCBzcC5zcGNuYW1lIEZST00gcGdfZGF0YWJhc2UgZHRiCisgICAgICAgIEpP SU4gcGdfdGFibGVzcGFjZSBzcCBPTiBkdGIuZGF0dGFibGVzcGFjZT1zcC5v aWQKKyAgICAgICAgV0hFUkUgZHRiLm9pZCA9IHt7IGRpZCB9fTo6b2lkKQor ICAgIEVORCBhcyBzcGNuYW1lLAogICAgIENBU0UgY29udHlwZQogICAgICAg ICBXSEVOICdwJyBUSEVOIGRlc3AuZGVzY3JpcHRpb24KICAgICAgICAgV0hF TiAndScgVEhFTiBkZXNwLmRlc2NyaXB0aW9uCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvdGVtcGxhdGVzL2luZGV4L3NxbC9kZWZhdWx0 L3Byb3BlcnRpZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBs YXRlcy9pbmRleC9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbAppbmRleCAy NjQxZDRjLi4xMjA0MjM0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvdGVtcGxhdGVzL2luZGV4L3NxbC9kZWZhdWx0L3Byb3BlcnRpZXMu c3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvaW5k ZXgvc3FsL2RlZmF1bHQvcHJvcGVydGllcy5zcWwKQEAgLTEsNiArMSwxMSBA QAogU0VMRUNUIERJU1RJTkNUIE9OKGNscy5yZWxuYW1lKSBjbHMub2lkLCBj bHMucmVsbmFtZSBhcyBuYW1lLCBpbmRyZWxpZCwgaW5ka2V5LCBpbmRpc2Ns dXN0ZXJlZCwKICAgICBpbmRpc3ZhbGlkLCBpbmRpc3VuaXF1ZSwgaW5kaXNw cmltYXJ5LCBuLm5zcG5hbWUsaW5kbmF0dHMsY2xzLnJlbHRhYmxlc3BhY2Ug QVMgc3Bjb2lkLAotICAgIENPQUxFU0NFKHNwY25hbWUsICdwZ19kZWZhdWx0 JykgYXMgc3BjbmFtZSwgdGFiLnJlbG5hbWUgYXMgdGFibmFtZSwgaW5kY2xh c3MsIGNvbi5vaWQgQVMgY29ub2lkLAorICAgIENBU0UgV0hFTiBsZW5ndGgo c3BjbmFtZSkgPiAwIFRIRU4gc3BjbmFtZSBFTFNFCisgICAgICAgIChTRUxF Q1Qgc3Auc3BjbmFtZSBGUk9NIHBnX2RhdGFiYXNlIGR0YgorICAgICAgICBK T0lOIHBnX3RhYmxlc3BhY2Ugc3AgT04gZHRiLmRhdHRhYmxlc3BhY2U9c3Au b2lkCisgICAgICAgIFdIRVJFIGR0Yi5vaWQgPSB7eyBkaWQgfX06Om9pZCkK KyAgICBFTkQgYXMgc3BjbmFtZSwKKyAgICB0YWIucmVsbmFtZSBhcyB0YWJu YW1lLCBpbmRjbGFzcywgY29uLm9pZCBBUyBjb25vaWQsCiAgICAgQ0FTRSBX SEVOIGNvbnR5cGUgSU4gKCdwJywgJ3UnLCAneCcpIFRIRU4gZGVzcC5kZXNj cmlwdGlvbgogICAgICAgICAgRUxTRSBkZXMuZGVzY3JpcHRpb24gRU5EIEFT IGRlc2NyaXB0aW9uLAogICAgIHBnX2dldF9leHByKGluZHByZWQsIGluZHJl bGlkLCB0cnVlKSBhcyBpbmRjb25zdHJhaW50LCBjb250eXBlLCBjb25kZWZl cnJhYmxlLCBjb25kZWZlcnJlZCwgYW1uYW1lLApkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy9pbmRleF9jb25zdHJhaW50 L3NxbC9wcm9wZXJ0aWVzLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90 ZW1wbGF0ZXMvaW5kZXhfY29uc3RyYWludC9zcWwvcHJvcGVydGllcy5zcWwK aW5kZXggMGVhYmRkNy4uOWUzOTJlYiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdGFibGVzL3RlbXBsYXRlcy9pbmRleF9jb25zdHJhaW50L3NxbC9w cm9wZXJ0aWVzLnNxbAorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVt cGxhdGVzL2luZGV4X2NvbnN0cmFpbnQvc3FsL3Byb3BlcnRpZXMuc3FsCkBA IC0xLDcgKzEsMTEgQEAKIFNFTEVDVCBjbHMub2lkLAogICAgIGNscy5yZWxu YW1lIGFzIG5hbWUsCiAgICAgaW5kbmF0dHMsCi0gICAgQ09BTEVTQ0Uoc3Bj bmFtZSwgJ3BnX2RlZmF1bHQnKSBhcyBzcGNuYW1lLAorICAgIENBU0UgV0hF TiBsZW5ndGgoc3BjbmFtZSkgPiAwIFRIRU4gc3BjbmFtZSBFTFNFCisgICAg ICAgIChTRUxFQ1Qgc3Auc3BjbmFtZSBGUk9NIHBnX2RhdGFiYXNlIGR0Ygor ICAgICAgICBKT0lOIHBnX3RhYmxlc3BhY2Ugc3AgT04gZHRiLmRhdHRhYmxl c3BhY2U9c3Aub2lkCisgICAgICAgIFdIRVJFIGR0Yi5vaWQgPSB7eyBkaWQg fX06Om9pZCkKKyAgICBFTkQgYXMgc3BjbmFtZSwKICAgICBDQVNFIGNvbnR5 cGUKICAgICAgICAgV0hFTiAncCcgVEhFTiBkZXNwLmRlc2NyaXB0aW9uCiAg ICAgICAgIFdIRU4gJ3UnIFRIRU4gZGVzcC5kZXNjcmlwdGlvbgpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy90YWJsZS9q cy90YWJsZS5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMv dGFibGUvanMvdGFibGUuanMKaW5kZXggYzg3YTI5My4uMjU1MmNjNyAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy90YWJs ZS9qcy90YWJsZS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVt cGxhdGVzL3RhYmxlL2pzL3RhYmxlLmpzCkBAIC0yNTMsNyArMjUzLDcgQEAg ZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBhbGVydGlm eSkgewogICAgICAgICAgIG5hbWU6IHVuZGVmaW5lZCwKICAgICAgICAgICBv aWQ6IHVuZGVmaW5lZCwKICAgICAgICAgICBzcGNvaWQ6IHVuZGVmaW5lZCwK LSAgICAgICAgICBzcGNuYW1lOiAncGdfZGVmYXVsdCcsCisgICAgICAgICAg c3BjbmFtZTogdW5kZWZpbmVkLAogICAgICAgICAgIHJlbG93bmVyOiB1bmRl ZmluZWQsCiAgICAgICAgICAgcmVsYWNsOiB1bmRlZmluZWQsCiAgICAgICAg ICAgcmVsaGFzb2lkczogdW5kZWZpbmVkLApAQCAtMzE1LDcgKzMxNSw3IEBA IGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIHBnQnJvd3NlciwgYWxlcnRp ZnkpIHsKICAgICAgICAgfSx7CiAgICAgICAgICAgaWQ6ICdzcGNuYW1lJywg bGFiZWw6J3t7IF8oJ1RhYmxlc3BhY2UnKSB9fScsIG5vZGU6ICd0YWJsZXNw YWNlJywKICAgICAgICAgICB0eXBlOiAndGV4dCcsIGNvbnRyb2w6ICdub2Rl LWxpc3QtYnktbmFtZScsIGRpc2FibGVkOiAnaW5TY2hlbWEnLAotICAgICAg ICAgIG1vZGU6IFsncHJvcGVydGllcycsICdjcmVhdGUnLCAnZWRpdCddLCBz ZWxlY3QyOnthbGxvd0NsZWFyOmZhbHNlfSwKKyAgICAgICAgICBtb2RlOiBb J3Byb3BlcnRpZXMnLCAnY3JlYXRlJywgJ2VkaXQnXSwKICAgICAgICAgICBm aWx0ZXI6IGZ1bmN0aW9uKGQpIHsKICAgICAgICAgICAgIC8vIElmIHRhYmxl c3BhY2UgbmFtZSBpcyBub3QgInBnX2dsb2JhbCIgdGhlbiB3ZSBuZWVkIHRv IGV4Y2x1ZGUgdGhlbQogICAgICAgICAgICAgcmV0dXJuICghKGQgJiYgZC5s YWJlbC5tYXRjaCgvcGdfZ2xvYmFsLykpKQpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy90YWJsZS9zcWwvZGVmYXVsdC9j cmVhdGUuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy90 YWJsZS9zcWwvZGVmYXVsdC9jcmVhdGUuc3FsCmluZGV4IGJhOTFhYzUuLmQ3 MTM2ZjcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1w bGF0ZXMvdGFibGUvc3FsL2RlZmF1bHQvY3JlYXRlLnNxbAorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvdGVtcGxhdGVzL3RhYmxlL3NxbC9kZWZhdWx0 L2NyZWF0ZS5zcWwKQEAgLTc5LDEwICs3OSwxMiBAQCBXSVRIICgKICAgICB0 b2FzdC57e29wdC5uYW1lfX0gPSB7e29wdC52YWx1ZX19eyUgZW5kaWYgJX0K IHslIGVuZGZvciAlfXslIGVuZGlmICV9CiAKLSkKIHsjIyMgU1FMIGZvciBU YWJsZXNwYWNlICMjI30KIHslIGlmIGRhdGEuc3BjbmFtZSAlfQorKQogVEFC TEVTUEFDRSB7eyBjb25ufHF0SWRlbnQoZGF0YS5zcGNuYW1lKSB9fTsKK3sl IGVsc2UgJX0KKyk7CiB7JSBlbmRpZiAlfQogeyMjIyBBbHRlciBTUUwgZm9y IE93bmVyICMjI30KIHslIGlmIGRhdGEucmVsb3duZXIgJX0KZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvdGFibGUvc3Fs L2RlZmF1bHQvcHJvcGVydGllcy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJs ZXMvdGVtcGxhdGVzL3RhYmxlL3NxbC9kZWZhdWx0L3Byb3BlcnRpZXMuc3Fs CmluZGV4IGQ5OTVkMDAuLjliZmI4NGEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvdGFibGUvc3FsL2RlZmF1bHQvcHJv cGVydGllcy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBs YXRlcy90YWJsZS9zcWwvZGVmYXVsdC9wcm9wZXJ0aWVzLnNxbApAQCAtMSw1 ICsxLDkgQEAKIFNFTEVDVCByZWwub2lkLCByZWwucmVsbmFtZSBBUyBuYW1l LCByZWwucmVsdGFibGVzcGFjZSBBUyBzcGNvaWQscmVsLnJlbGFjbCBBUyBy ZWxhY2xfc3RyLAotICAoQ0FTRSBXSEVOIGxlbmd0aChzcGMuc3BjbmFtZSkg PiAwIFRIRU4gc3BjLnNwY25hbWUgRUxTRSAncGdfZGVmYXVsdCcgRU5EKSBh cyBzcGNuYW1lLAorICAoQ0FTRSBXSEVOIGxlbmd0aChzcGMuc3BjbmFtZSkg PiAwIFRIRU4gc3BjLnNwY25hbWUgRUxTRQorICAgIChTRUxFQ1Qgc3Auc3Bj bmFtZSBGUk9NIHBnX2RhdGFiYXNlIGR0YgorICAgIEpPSU4gcGdfdGFibGVz cGFjZSBzcCBPTiBkdGIuZGF0dGFibGVzcGFjZT1zcC5vaWQKKyAgICBXSEVS RSBkdGIub2lkID0ge3sgZGlkIH19OjpvaWQpCisgIEVORCkgYXMgc3BjbmFt ZSwKICAgKHNlbGVjdCBuc3BuYW1lIEZST00gcGdfbmFtZXNwYWNlIFdIRVJF IG9pZCA9IHt7c2NpZH19OjpvaWQgKSBhcyBzY2hlbWEsCiAgIHBnX2dldF91 c2VyYnlpZChyZWwucmVsb3duZXIpIEFTIHJlbG93bmVyLCByZWwucmVsaGFz b2lkcywKICAgcmVsLnJlbGhhc3N1YmNsYXNzLCByZWwucmVsdHVwbGVzLCBk ZXMuZGVzY3JpcHRpb24sIGNvbi5jb25uYW1lLCBjb24uY29ua2V5LApkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmlld3MvX19pbml0X18ucHkgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy92aWV3cy9fX2luaXRfXy5weQppbmRleCBmZjQzMzEy Li4wOGJkZDBjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3cy9f X2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3cy9fX2luaXRf Xy5weQpAQCAtNDYyLDcgKzQ2Miw3IEBAIGNsYXNzIFZpZXdOb2RlKFBHQ2hp bGROb2RlVmlldywgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgICAgICAgICAg ICAgICApCiAgICAgICAgICAgICAgICAgKQogICAgICAgICB0cnk6Ci0gICAg ICAgICAgICBTUUwsIG5hbWVPckVycm9yID0gc2VsZi5nZXRTUUwoZ2lkLCBz aWQsIGRhdGEpCisgICAgICAgICAgICBTUUwsIG5hbWVPckVycm9yID0gc2Vs Zi5nZXRTUUwoZ2lkLCBzaWQsIGRpZCwgZGF0YSkKICAgICAgICAgICAgIGlm IFNRTCBpcyBOb25lOgogICAgICAgICAgICAgICAgIHJldHVybiBuYW1lT3JF cnJvcgogICAgICAgICAgICAgU1FMID0gU1FMLnN0cmlwKCdcbicpLnN0cmlw KCcgJykKQEAgLTUwNiw3ICs1MDYsNyBAQCBjbGFzcyBWaWV3Tm9kZShQR0No aWxkTm9kZVZpZXcsIFZhY3V1bVNldHRpbmdzKToKICAgICAgICAgICAgIHJl cXVlc3QuZGF0YSwgZW5jb2Rpbmc9J3V0Zi04JwogICAgICAgICApCiAgICAg ICAgIHRyeToKLSAgICAgICAgICAgIFNRTCwgbmFtZU9yRXJyb3IgPSBzZWxm LmdldFNRTChnaWQsIHNpZCwgZGF0YSwgdmlkKQorICAgICAgICAgICAgU1FM LCBuYW1lT3JFcnJvciA9IHNlbGYuZ2V0U1FMKGdpZCwgc2lkLCBkaWQsIGRh dGEsIHZpZCkKICAgICAgICAgICAgIGlmIFNRTCBpcyBOb25lOgogICAgICAg ICAgICAgICAgIHJldHVybiBuYW1lT3JFcnJvcgogICAgICAgICAgICAgU1FM ID0gU1FMLnN0cmlwKCdcbicpLnN0cmlwKCcgJykKQEAgLTYzMSw3ICs2MzEs NyBAQCBjbGFzcyBWaWV3Tm9kZShQR0NoaWxkTm9kZVZpZXcsIFZhY3V1bVNl dHRpbmdzKToKICAgICAgICAgICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgogICAg ICAgICAgICAgICAgIGRhdGFba10gPSB2CiAKLSAgICAgICAgc3FsLCBuYW1l T3JFcnJvciA9IHNlbGYuZ2V0U1FMKGdpZCwgc2lkLCBkYXRhLCB2aWQpCisg ICAgICAgIHNxbCwgbmFtZU9yRXJyb3IgPSBzZWxmLmdldFNRTChnaWQsIHNp ZCwgZGlkLCBkYXRhLCB2aWQpCiAgICAgICAgIGlmIHNxbCBpcyBOb25lOgog ICAgICAgICAgICAgcmV0dXJuIG5hbWVPckVycm9yCiAKQEAgLTY0NSw3ICs2 NDUsNyBAQCBjbGFzcyBWaWV3Tm9kZShQR0NoaWxkTm9kZVZpZXcsIFZhY3V1 bVNldHRpbmdzKToKICAgICAgICAgICAgIHN0YXR1cz0yMDAKICAgICAgICAg KQogCi0gICAgZGVmIGdldFNRTChzZWxmLCBnaWQsIHNpZCwgZGF0YSwgdmlk PU5vbmUpOgorICAgIGRlZiBnZXRTUUwoc2VsZiwgZ2lkLCBzaWQsIGRpZCwg ZGF0YSwgdmlkPU5vbmUpOgogICAgICAgICAiIiIKICAgICAgICAgVGhpcyBm dW5jdGlvbiB3aWxsIGdlbmVyYXRlIHNxbCBmcm9tIG1vZGVsIGRhdGEKICAg ICAgICAgIiIiCkBAIC05MDEsNyArOTAxLDcgQEAgY2xhc3MgVmlld05vZGUo UEdDaGlsZE5vZGVWaWV3LCBWYWN1dW1TZXR0aW5ncyk6CiAKICAgICAgICAg cmV0dXJuIFNRTF9kYXRhCiAKLSAgICBkZWYgZ2V0X2luZGV4X3NxbChzZWxm LCB2aWQpOgorICAgIGRlZiBnZXRfaW5kZXhfc3FsKHNlbGYsIGRpZCwgdmlk KToKICAgICAgICAgIiIiCiAgICAgICAgIEdldCBhbGwgaW5kZXggYXNzb2Np YXRlZCB3aXRoIHZpZXcgbm9kZSwKICAgICAgICAgZ2VuZXJhdGUgdGhlaXIg c3FsIGFuZCByZW5kZXIKQEAgLTkxMCwxMCArOTEwLDEyIEBAIGNsYXNzIFZp ZXdOb2RlKFBHQ2hpbGROb2RlVmlldywgVmFjdXVtU2V0dGluZ3MpOgogCiAg ICAgICAgIHNlbGYuaW5kZXhfdGVtcF9wYXRoID0gJ2luZGV4JwogICAgICAg ICBTUUxfZGF0YSA9ICcnCisgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0 ZSgiLyIuam9pbigKKyAgICAgICAgICAgIFtzZWxmLmluZGV4X3RlbXBfcGF0 aCwgJ3NxbC8jezB9Iy9wcm9wZXJ0aWVzLnNxbCcuZm9ybWF0KHNlbGYubWFu YWdlci52ZXJzaW9uKV0pLAorICAgICAgICAgICAgZGlkPWRpZCwKKyAgICAg ICAgICAgIHRpZD12aWQpCiAgICAgICAgIHN0YXR1cywgZGF0YSA9IHNlbGYu Y29ubi5leGVjdXRlX2RpY3QoU1FMKQogICAgICAgICBpZiBub3Qgc3RhdHVz OgotICAgICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2lu KAotICAgICAgICAgICAgICAgIFtzZWxmLmluZGV4X3RlbXBfcGF0aCwgJ3Nx bC8jezB9Iy9wcm9wZXJ0aWVzLnNxbCcuZm9ybWF0KHNlbGYubWFuYWdlci52 ZXJzaW9uKV0pLCB0aWQ9dmlkKQogICAgICAgICAgICAgcmV0dXJuIGludGVy bmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1kYXRhKQogCiAgICAgICAgIGZv ciBpbmRleCBpbiBkYXRhWydyb3dzJ106CkBAIC05MjEsNiArOTIzLDcgQEAg Y2xhc3MgVmlld05vZGUoUEdDaGlsZE5vZGVWaWV3LCBWYWN1dW1TZXR0aW5n cyk6CiAgICAgICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpv aW4oCiAgICAgICAgICAgICAgICAgW3NlbGYuaW5kZXhfdGVtcF9wYXRoLCAn c3FsLyN7MH0jL3Byb3BlcnRpZXMuc3FsJy5mb3JtYXQoc2VsZi5tYW5hZ2Vy LnZlcnNpb24pXSksCiAgICAgICAgICAgICAgICAgaWR4PWluZGV4WydvaWQn XSwKKyAgICAgICAgICAgICAgICBkaWQ9ZGlkLAogICAgICAgICAgICAgICAg IHRpZD12aWQKICAgICAgICAgICAgICkKICAgICAgICAgICAgIHN0YXR1cywg cmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCkBAIC0xMDA3LDcg KzEwMTAsNyBAQCBjbGFzcyBWaWV3Tm9kZShQR0NoaWxkTm9kZVZpZXcsIFZh Y3V1bVNldHRpbmdzKToKICAgICAgICAgU1FMX2RhdGEgKz0gU1FMCiAgICAg ICAgIFNRTF9kYXRhICs9IHNlbGYuZ2V0X3J1bGVfc3FsKHZpZCkKICAgICAg ICAgU1FMX2RhdGEgKz0gc2VsZi5nZXRfdHJpZ2dlcl9zcWwodmlkKQotICAg ICAgICBTUUxfZGF0YSArPSBzZWxmLmdldF9pbmRleF9zcWwodmlkKQorICAg ICAgICBTUUxfZGF0YSArPSBzZWxmLmdldF9pbmRleF9zcWwoZGlkLCB2aWQp CiAKICAgICAgICAgcmV0dXJuIGFqYXhfcmVzcG9uc2UocmVzcG9uc2U9U1FM X2RhdGEpCiAKQEAgLTEyNTksMTMgKzEyNjIsMTQgQEAgY2xhc3MgTVZpZXdO b2RlKFZpZXdOb2RlLCBWYWN1dW1TZXR0aW5ncyk6CiAgICAgICAgICAgICAn OS4zX3BsdXMnCiAgICAgICAgICkKIAotICAgIGRlZiBnZXRTUUwoc2VsZiwg Z2lkLCBzaWQsIGRhdGEsIHZpZD1Ob25lKToKKyAgICBkZWYgZ2V0U1FMKHNl bGYsIGdpZCwgc2lkLCBkaWQsIGRhdGEsIHZpZD1Ob25lKToKICAgICAgICAg IiIiCiAgICAgICAgIFRoaXMgZnVuY3Rpb24gd2lsbCBnZW5lcmF0ZSBzcWwg ZnJvbSBtb2RlbCBkYXRhCiAgICAgICAgICIiIgogICAgICAgICBpZiB2aWQg aXMgbm90IE5vbmU6CiAgICAgICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxh dGUoIi8iLmpvaW4oCiAgICAgICAgICAgICAgICAgW3NlbGYudGVtcGxhdGVf cGF0aCwgJ3NxbC9wcm9wZXJ0aWVzLnNxbCddKSwKKyAgICAgICAgICAgICAg ICBkaWQ9ZGlkLAogICAgICAgICAgICAgICAgIHZpZD12aWQsCiAgICAgICAg ICAgICAgICAgZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQKICAg ICAgICAgICAgICkKQEAgLTE0NTIsNiArMTQ1Niw3IEBAIGNsYXNzIE1WaWV3 Tm9kZShWaWV3Tm9kZSwgVmFjdXVtU2V0dGluZ3MpOgogICAgICAgICBTUUxf ZGF0YSA9ICcnCiAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIu am9pbigKICAgICAgICAgICAgIFtzZWxmLnRlbXBsYXRlX3BhdGgsICdzcWwv cHJvcGVydGllcy5zcWwnXSksCisgICAgICAgICAgICBkaWQ9ZGlkLAogICAg ICAgICAgICAgdmlkPXZpZCwKICAgICAgICAgICAgIGRhdGxhc3RzeXNvaWQ9 c2VsZi5kYXRsYXN0c3lzb2lkCiAgICAgICAgICkKQEAgLTE1MzAsNyArMTUz NSw3IEBAIGNsYXNzIE1WaWV3Tm9kZShWaWV3Tm9kZSwgVmFjdXVtU2V0dGlu Z3MpOgogICAgICAgICBTUUxfZGF0YSArPSBTUUwKICAgICAgICAgU1FMX2Rh dGEgKz0gc2VsZi5nZXRfcnVsZV9zcWwodmlkKQogICAgICAgICBTUUxfZGF0 YSArPSBzZWxmLmdldF90cmlnZ2VyX3NxbCh2aWQpCi0gICAgICAgIFNRTF9k YXRhICs9IHNlbGYuZ2V0X2luZGV4X3NxbCh2aWQpCisgICAgICAgIFNRTF9k YXRhICs9IHNlbGYuZ2V0X2luZGV4X3NxbChkaWQsIHZpZCkKICAgICAgICAg U1FMX2RhdGEgPSBTUUxfZGF0YS5zdHJpcCgnXG4nKQogICAgICAgICByZXR1 cm4gYWpheF9yZXNwb25zZShyZXNwb25zZT1TUUxfZGF0YSkKIApAQCAtMTU3 Niw3ICsxNTgxLDcgQEAgY2xhc3MgTVZpZXdOb2RlKFZpZXdOb2RlLCBWYWN1 dW1TZXR0aW5ncyk6CiAgICAgICAgICIiIgogICAgICAgICBTUUwgPSByZW5k ZXJfdGVtcGxhdGUoIi8iLmpvaW4oCiAgICAgICAgICAgICBbc2VsZi50ZW1w bGF0ZV9wYXRoLCAnc3FsL3Byb3BlcnRpZXMuc3FsJ10KLSAgICAgICAgKSwg dmlkPXZpZCwgZGF0bGFzdHN5c29pZD1zZWxmLmRhdGxhc3RzeXNvaWQpCisg ICAgICAgICksIGRpZD1kaWQsIHZpZD12aWQsIGRhdGxhc3RzeXNvaWQ9c2Vs Zi5kYXRsYXN0c3lzb2lkKQogICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYu Y29ubi5leGVjdXRlX2RpY3QoU1FMKQogICAgICAgICBpZiBub3Qgc3RhdHVz OgogICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihl cnJvcm1zZz1yZXMpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3 cy90ZW1wbGF0ZXMvbXZpZXcvanMvbXZpZXcuanMgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy92aWV3cy90ZW1wbGF0ZXMvbXZpZXcvanMvbXZpZXcuanMKaW5kZXggZTIz M2I1Yy4uZTMyNTk0YyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmll d3MvdGVtcGxhdGVzL212aWV3L2pzL212aWV3LmpzCisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3ZpZXdzL3RlbXBsYXRlcy9tdmlldy9qcy9tdmlldy5qcwpAQCAt MTI2LDcgKzEyNiw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIGFs ZXJ0aWZ5LCBwZ0Jyb3dzZXIsIENvZGVNaXJyb3IpIHsKICAgICAgICAgICBw Z0Jyb3dzZXIuTm9kZS5Nb2RlbC5wcm90b3R5cGUuaW5pdGlhbGl6ZS5hcHBs eSh0aGlzLCBhcmd1bWVudHMpOwogICAgICAgICB9LAogICAgICAgICBkZWZh dWx0czogewotICAgICAgICAgIHNwY25hbWU6ICdwZ19kZWZhdWx0JywKKyAg ICAgICAgICBzcGNuYW1lOiB1bmRlZmluZWQsCiAgICAgICAgICAgdG9hc3Rf YXV0b3ZhY3V1bV9lbmFibGVkOiBmYWxzZSwKICAgICAgICAgICBhdXRvdmFj dXVtX2VuYWJsZWQ6IGZhbHNlCiAgICAgICAgIH0sCmRpZmYgLS1naXQgYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy92aWV3cy90ZW1wbGF0ZXMvbXZpZXcvcGcvOS4zX3Bs dXMvc3FsL3Byb3BlcnRpZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmlld3Mv dGVtcGxhdGVzL212aWV3L3BnLzkuM19wbHVzL3NxbC9wcm9wZXJ0aWVzLnNx bAppbmRleCA4YTcwNTIyLi5lYjM2YzkxIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy92aWV3cy90ZW1wbGF0ZXMvbXZpZXcvcGcvOS4zX3BsdXMvc3Fs L3Byb3BlcnRpZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL3Rl bXBsYXRlcy9tdmlldy9wZy85LjNfcGx1cy9zcWwvcHJvcGVydGllcy5zcWwK QEAgLTYsNyArNiwxMSBAQCBTRUxFQ1QKICAgICBjLnJlbG5hbWUgQVMgbmFt ZSwKICAgICBjLnJlbHRhYmxlc3BhY2UgQVMgc3Bjb2lkLAogICAgIGMucmVs aXNwb3B1bGF0ZWQgQVMgd2l0aF9kYXRhLAotICAgIChDQVNFIFdIRU4gbGVu Z3RoKHNwYy5zcGNuYW1lKSA+IDAgVEhFTiBzcGMuc3BjbmFtZSBFTFNFICdw Z19kZWZhdWx0JyBFTkQpIGFzIHNwY25hbWUsCisgICAgQ0FTRSBXSEVOIGxl bmd0aChzcGNuYW1lKSA+IDAgVEhFTiBzcGNuYW1lIEVMU0UKKyAgICAgICAg KFNFTEVDVCBzcC5zcGNuYW1lIEZST00gcGdfZGF0YWJhc2UgZHRiCisgICAg ICAgIEpPSU4gcGdfdGFibGVzcGFjZSBzcCBPTiBkdGIuZGF0dGFibGVzcGFj ZT1zcC5vaWQKKyAgICAgICAgV0hFUkUgZHRiLm9pZCA9IHt7IGRpZCB9fTo6 b2lkKQorICAgIEVORCBhcyBzcGNuYW1lLAogICAgIGMucmVsYWNsLAogICAg IG5zcC5uc3BuYW1lIGFzIHNjaGVtYSwKICAgICBwZ19nZXRfdXNlcmJ5aWQo Yy5yZWxvd25lcikgQVMgb3duZXIsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy92aWV3cy90ZW1wbGF0ZXMvbXZpZXcvcGcvOS40X3BsdXMvc3FsL3By b3BlcnRpZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmlld3MvdGVtcGxhdGVz L212aWV3L3BnLzkuNF9wbHVzL3NxbC9wcm9wZXJ0aWVzLnNxbAppbmRleCA4 YTcwNTIyLi5lYjM2YzkxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92 aWV3cy90ZW1wbGF0ZXMvbXZpZXcvcGcvOS40X3BsdXMvc3FsL3Byb3BlcnRp ZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL3RlbXBsYXRlcy9t dmlldy9wZy85LjRfcGx1cy9zcWwvcHJvcGVydGllcy5zcWwKQEAgLTYsNyAr NiwxMSBAQCBTRUxFQ1QKICAgICBjLnJlbG5hbWUgQVMgbmFtZSwKICAgICBj LnJlbHRhYmxlc3BhY2UgQVMgc3Bjb2lkLAogICAgIGMucmVsaXNwb3B1bGF0 ZWQgQVMgd2l0aF9kYXRhLAotICAgIChDQVNFIFdIRU4gbGVuZ3RoKHNwYy5z cGNuYW1lKSA+IDAgVEhFTiBzcGMuc3BjbmFtZSBFTFNFICdwZ19kZWZhdWx0 JyBFTkQpIGFzIHNwY25hbWUsCisgICAgQ0FTRSBXSEVOIGxlbmd0aChzcGNu YW1lKSA+IDAgVEhFTiBzcGNuYW1lIEVMU0UKKyAgICAgICAgKFNFTEVDVCBz cC5zcGNuYW1lIEZST00gcGdfZGF0YWJhc2UgZHRiCisgICAgICAgIEpPSU4g cGdfdGFibGVzcGFjZSBzcCBPTiBkdGIuZGF0dGFibGVzcGFjZT1zcC5vaWQK KyAgICAgICAgV0hFUkUgZHRiLm9pZCA9IHt7IGRpZCB9fTo6b2lkKQorICAg IEVORCBhcyBzcGNuYW1lLAogICAgIGMucmVsYWNsLAogICAgIG5zcC5uc3Bu YW1lIGFzIHNjaGVtYSwKICAgICBwZ19nZXRfdXNlcmJ5aWQoYy5yZWxvd25l cikgQVMgb3duZXIsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3 cy90ZW1wbGF0ZXMvbXZpZXcvcHBhcy85LjNfcGx1cy9zcWwvcHJvcGVydGll cy5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3cy90ZW1wbGF0ZXMvbXZpZXcv cHBhcy85LjNfcGx1cy9zcWwvcHJvcGVydGllcy5zcWwKaW5kZXggOGE3MDUy Mi4uZWIzNmM5MSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmlld3Mv dGVtcGxhdGVzL212aWV3L3BwYXMvOS4zX3BsdXMvc3FsL3Byb3BlcnRpZXMu c3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3ZpZXdzL3RlbXBsYXRlcy9tdmll dy9wcGFzLzkuM19wbHVzL3NxbC9wcm9wZXJ0aWVzLnNxbApAQCAtNiw3ICs2 LDExIEBAIFNFTEVDVAogICAgIGMucmVsbmFtZSBBUyBuYW1lLAogICAgIGMu cmVsdGFibGVzcGFjZSBBUyBzcGNvaWQsCiAgICAgYy5yZWxpc3BvcHVsYXRl ZCBBUyB3aXRoX2RhdGEsCi0gICAgKENBU0UgV0hFTiBsZW5ndGgoc3BjLnNw Y25hbWUpID4gMCBUSEVOIHNwYy5zcGNuYW1lIEVMU0UgJ3BnX2RlZmF1bHQn IEVORCkgYXMgc3BjbmFtZSwKKyAgICBDQVNFIFdIRU4gbGVuZ3RoKHNwY25h bWUpID4gMCBUSEVOIHNwY25hbWUgRUxTRQorICAgICAgICAoU0VMRUNUIHNw LnNwY25hbWUgRlJPTSBwZ19kYXRhYmFzZSBkdGIKKyAgICAgICAgSk9JTiBw Z190YWJsZXNwYWNlIHNwIE9OIGR0Yi5kYXR0YWJsZXNwYWNlPXNwLm9pZAor ICAgICAgICBXSEVSRSBkdGIub2lkID0ge3sgZGlkIH19OjpvaWQpCisgICAg RU5EIGFzIHNwY25hbWUsCiAgICAgYy5yZWxhY2wsCiAgICAgbnNwLm5zcG5h bWUgYXMgc2NoZW1hLAogICAgIHBnX2dldF91c2VyYnlpZChjLnJlbG93bmVy KSBBUyBvd25lciwK --f403045ea3c4bedbef05479a509d Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --f403045ea3c4bedbef05479a509d--