Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1etrQ7-0006B7-67 for pgadmin-hackers@arkaria.postgresql.org; Thu, 08 Mar 2018 09:01:03 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1etrQ5-0007tC-IJ for pgadmin-hackers@arkaria.postgresql.org; Thu, 08 Mar 2018 09:01:01 +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.89) (envelope-from ) id 1etrQ4-0007sl-Sz for pgadmin-hackers@lists.postgresql.org; Thu, 08 Mar 2018 09:01:01 +0000 Received: from mail-ot0-x244.google.com ([2607:f8b0:4003:c0f::244]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1etrPx-0000QS-7V for pgadmin-hackers@postgresql.org; Thu, 08 Mar 2018 09:00:59 +0000 Received: by mail-ot0-x244.google.com with SMTP id f11so4741269otj.12 for ; Thu, 08 Mar 2018 01:00:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=DPYNrPXUrS3+9aj8P7rYogHmd5QYBY8arlrSRFtYL2c=; b=KrFrd1dUK7/sChu3J+qDXcR3clEKjGzvyhwoBcM2Yq4MHl5V+rcTGA8QPNcGxTf+F2 SjeNyOlQsk2sFP+r7poaRlIgPcB4iKA0pw6tfCLFdMsIjS/NqUlVVkGX1ZZ74x+a+LFd Li+1yaFrwf242mAl5WTjwW4tuftxqyEv5jsxvfrh5Ka8kJrsTLA0ODp9LH2OCUp6OGEJ UqSpR9LF54lpLQ1lX0QdecAUAYcW+O+tKBOBG/GWw5rp4TmpktTpy8fXgH2Ihc/rFbfE IeOKWOD09Sh6EBMYYXS2FDOr5xINoBckiJKNNMRScKtZL8Xc4fRMMEb7Dwd5XaiNA7GP nhug== 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=DPYNrPXUrS3+9aj8P7rYogHmd5QYBY8arlrSRFtYL2c=; b=hFWvha1SHn4hvRCZSAQgApkZugyb9joS4mT8Xy3T+v276S4xausk55eL5fdYX/Unmu AHf9xtG46HvxUCK9gcFBB6ZbfzIDNpfmO4FJYCr9f+x9tcOxgAVKoE+IAnys3FO0jKSy 6THCeUkOXydjUYVnwTUcmDfjCTpBxDpX+P9ZP5BixwmY6JOEM+UHQ5HMSKDnQTfpdCFK GoxnXfKHvKC6/y8SsytJ064v28rCNc9Z87ZA81sj7f1QAGVY/a8KATtXM+ryXMLk6C9i TrNf9fL6PQtpyONBEC4YCZl6mCN1KzGFDSaofZvOtTIDdykMIw1sw2zi55yGvcFJN0Jh tkfw== X-Gm-Message-State: AElRT7FpNysned4cT+5gzWzZM6fzEK2ahHNOhOd4DFMSImgnrmOcuEin R8zpS1UPX9Qs5iiyDx8CltTEIk9XqMzKoYppcuswyA== X-Google-Smtp-Source: AG47ELudIajnPbmiJC61Xy5CqJmMM07gVwy1h/Wo3cRQ61ZXhgrBoi1V/1q16ofHMIMrc9nzTHCSd+Q2RKRWvkExzxc= X-Received: by 10.157.41.199 with SMTP id g7mr19129888otd.155.1520499652214; Thu, 08 Mar 2018 01:00:52 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.8.150 with HTTP; Thu, 8 Mar 2018 01:00:31 -0800 (PST) In-Reply-To: References: From: Murtuza Zabuawala Date: Thu, 8 Mar 2018 14:30:31 +0530 Message-ID: Subject: Re: [pgAdmin4][RM#2989] To fix the issue in Table node To: Dave Page Cc: Joao De Almeida Pereira , pgadmin-hackers Content-Type: multipart/mixed; boundary="001a113ecb26a804490566e2e931" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a113ecb26a804490566e2e931 Content-Type: multipart/alternative; boundary="001a113ecb26a804450566e2e92f" --001a113ecb26a804450566e2e92f Content-Type: text/plain; charset="UTF-8" Hi Dave, Please find updated patch & updated test case to cover that as well. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Wed, Mar 7, 2018 at 9:59 PM, Dave Page wrote: > Hi > > On Wed, Mar 7, 2018 at 2:59 PM, Murtuza Zabuawala enterprisedb.com> wrote: > >> Hi Dave, >> >> PFA updated patch. >> >> > Using your example on the ticket, I added a "character varying (32)" > column with NOT NULL to the table. When I then edit the column, and turn > off NOT NULL (making no other changes), the SQL generated is: > > ALTER TABLE public.test_drop > ALTER COLUMN col2 TYPE character varying (32) COLLATE > pg_catalog."default"; > ALTER TABLE public.test_drop > ALTER COLUMN col2 DROP NOT NULL; > > I didn't see that when turning off NOT NULL for col1. > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a113ecb26a804450566e2e92f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

Please= find updated patch & updated test case to cover that as well.



--
Regards,
Murtuza Z= abuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The En= terprise PostgreSQL Company
=

On Wed, Mar 7, 2018 at 9:59 PM, Dave Page <= dpage@pgadmin.org> wrote:
<= div dir=3D"ltr">Hi

On Wed, Mar 7, 2018 at 2:59 PM, Murtuza Zabuawala &l= t;m= urtuza.zabuawala@enterprisedb.com> wrote:
Hi Dave,

PFA updated patch.


Using your example on the ticket, I added a "character varying (32)= " column with NOT NULL to the table. When I then edit the column, and = turn off NOT NULL (making no other changes), the SQL generated is:

ALTER TABLE public.test_drop
=C2=A0 =C2=A0 = ALTER COLUMN col2 TYPE character varying (32) COLLATE pg_catalog."defa= ult";
ALTER TABLE public.test_drop
=C2=A0 =C2=A0 A= LTER COLUMN col2 DROP NOT NULL;

I didn't= see that when turning off NOT NULL for col1.

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

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL= Company
--001a113ecb26a804450566e2e92f-- --001a113ecb26a804490566e2e931 Content-Type: application/octet-stream; name="RM_2989_v2.diff" Content-Disposition: attachment; filename="RM_2989_v2.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jeia6vt30 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb2x1bW4vX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29s dW1uL19faW5pdF9fLnB5CmluZGV4IDJiMWFjOTIuLmYxYmE2ZjYgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9jb2x1bW4vX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbHVtbi9fX2luaXRfXy5w eQpAQCAtMzY0LDIwICszNjQsOSBAQCBjbGFzcyBDb2x1bW5zVmlldyhQR0NoaWxkTm9kZVZpZXcs IERhdGFUeXBlUmVhZGVyKToKICAgICAgICAgZGF0YVsnYXR0bGVuJ10gPSBOb25lCiAgICAgICAg IGRhdGFbJ2F0dHByZWNpc2lvbiddID0gTm9uZQogCi0gICAgICAgIGltcG9ydCByZQotCi0gICAg ICAgICMgSWYgd2UgaGF2ZSBsZW5ndGggJiBwcmVjaXNpb24gYm90aAotICAgICAgICBpZiBsZW5n dGggYW5kIHByZWNpc2lvbjoKLSAgICAgICAgICAgIG1hdGNoT2JqID0gcmUuc2VhcmNoKHInKFxk KyksKFxkKyknLCBmdWxsdHlwZSkKLSAgICAgICAgICAgIGlmIG1hdGNoT2JqOgotICAgICAgICAg ICAgICAgIGRhdGFbJ2F0dGxlbiddID0gbWF0Y2hPYmouZ3JvdXAoMSkKLSAgICAgICAgICAgICAg ICBkYXRhWydhdHRwcmVjaXNpb24nXSA9IG1hdGNoT2JqLmdyb3VwKDIpCi0gICAgICAgIGVsaWYg bGVuZ3RoOgotICAgICAgICAgICAgIyBJZiB3ZSBoYXZlIGxlbmd0aCBvbmx5Ci0gICAgICAgICAg ICBtYXRjaE9iaiA9IHJlLnNlYXJjaChyJyhcZCspJywgZnVsbHR5cGUpCi0gICAgICAgICAgICBp ZiBtYXRjaE9iajoKLSAgICAgICAgICAgICAgICBkYXRhWydhdHRsZW4nXSA9IG1hdGNoT2JqLmdy b3VwKDEpCi0gICAgICAgICAgICAgICAgZGF0YVsnYXR0cHJlY2lzaW9uJ10gPSBOb25lCisgICAg ICAgIHNlbGYuc2V0X2xlbmd0aF9wcmVjaXNpb24oCisgICAgICAgICAgICBsZW5ndGgsIHByZWNp c2lvbiwgZnVsbHR5cGUsIGRhdGEKKyAgICAgICAgKQogCiAgICAgICAgICMgV2UgbmVlZCB0byBm ZXRjaCBpbmhlcml0ZWQgdGFibGVzIGZvciBlYWNoIHRhYmxlCiAgICAgICAgIFNRTCA9IHJlbmRl cl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLApkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv dGFibGVzL3Rlc3RzL3Rlc3RfdGFibGVfY29sdW1uX3VwZGF0ZS5weSBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZXN0 cy90ZXN0X3RhYmxlX2NvbHVtbl91cGRhdGUucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uMTMyMWQ2ZgotLS0gL2Rldi9udWxsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZXN0cy90ZXN0 X3RhYmxlX2NvbHVtbl91cGRhdGUucHkKQEAgLTAsMCArMSw5NiBAQAorIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMKKyMKKyMgcGdBZG1pbiA0IC0gUG9zdGdyZVNRTCBUb29scworIworIyBDb3B5cmlnaHQgKEMp IDIwMTMgLSAyMDE4LCBUaGUgcGdBZG1pbiBEZXZlbG9wbWVudCBUZWFtCisjIFRoaXMgc29mdHdh cmUgaXMgcmVsZWFzZWQgdW5kZXIgdGhlIFBvc3RncmVTUUwgTGljZW5jZQorIworIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMKKworaW1wb3J0IGpzb24KK2ltcG9ydCB1dWlkCisKK2Zyb20gcGdhZG1pbi5icm93 c2VyLnNlcnZlcl9ncm91cHMuc2VydmVycy5kYXRhYmFzZXMuc2NoZW1hcy50ZXN0cyBpbXBvcnQg XAorICAgIHV0aWxzIGFzIHNjaGVtYV91dGlscworZnJvbSBwZ2FkbWluLmJyb3dzZXIuc2VydmVy X2dyb3Vwcy5zZXJ2ZXJzLmRhdGFiYXNlcy50ZXN0cyBpbXBvcnQgdXRpbHMgYXMgXAorICAgIGRh dGFiYXNlX3V0aWxzCitmcm9tIHBnYWRtaW4udXRpbHMucm91dGUgaW1wb3J0IEJhc2VUZXN0R2Vu ZXJhdG9yCitmcm9tIHJlZ3Jlc3Npb24gaW1wb3J0IHBhcmVudF9ub2RlX2RpY3QKK2Zyb20gcmVn cmVzc2lvbi5weXRob25fdGVzdF91dGlscyBpbXBvcnQgdGVzdF91dGlscyBhcyB1dGlscworZnJv bSAuIGltcG9ydCB1dGlscyBhcyB0YWJsZXNfdXRpbHMKKworCitjbGFzcyBUYWJsZU5vdE51bGxV cGRhdGVUZXN0Q2FzZShCYXNlVGVzdEdlbmVyYXRvcik6CisgICAgIiIiVGhpcyBjbGFzcyB3aWxs IGFkZCBuZXcgY29sbGF0aW9uIHVuZGVyIHNjaGVtYSBub2RlLiIiIgorICAgIHNjZW5hcmlvcyA9 IFsKKyAgICAgICAgKCdVcGRhdGUgVGFibGUgd2l0aCBub3QgbnVsbCBmaWVsZCcsIGRpY3QodXJs PScvYnJvd3Nlci90YWJsZS9vYmovJykpLAorICAgIF0KKworICAgIGRlZiBzZXRVcChzZWxmKToK KyAgICAgICAgc2VsZi5kYl9uYW1lID0gcGFyZW50X25vZGVfZGljdFsiZGF0YWJhc2UiXVstMV1b ImRiX25hbWUiXQorICAgICAgICBzY2hlbWFfaW5mbyA9IHBhcmVudF9ub2RlX2RpY3RbInNjaGVt YSJdWy0xXQorICAgICAgICBzZWxmLnNlcnZlcl9pZCA9IHNjaGVtYV9pbmZvWyJzZXJ2ZXJfaWQi XQorICAgICAgICBzZWxmLmRiX2lkID0gc2NoZW1hX2luZm9bImRiX2lkIl0KKyAgICAgICAgZGJf Y29uID0gZGF0YWJhc2VfdXRpbHMuY29ubmVjdF9kYXRhYmFzZSgKKyAgICAgICAgICAgIHNlbGYs IHV0aWxzLlNFUlZFUl9HUk9VUCwgc2VsZi5zZXJ2ZXJfaWQsIHNlbGYuZGJfaWQKKyAgICAgICAg KQorICAgICAgICBpZiBub3QgZGJfY29uWydkYXRhJ11bImNvbm5lY3RlZCJdOgorICAgICAgICAg ICAgcmFpc2UgRXhjZXB0aW9uKCJDb3VsZCBub3QgY29ubmVjdCB0byBkYXRhYmFzZSB0byBhZGQg YSB0YWJsZS4iKQorICAgICAgICBzZWxmLnNjaGVtYV9pZCA9IHNjaGVtYV9pbmZvWyJzY2hlbWFf aWQiXQorICAgICAgICBzZWxmLnNjaGVtYV9uYW1lID0gc2NoZW1hX2luZm9bInNjaGVtYV9uYW1l Il0KKyAgICAgICAgc2NoZW1hX3Jlc3BvbnNlID0gc2NoZW1hX3V0aWxzLnZlcmlmeV9zY2hlbWFz KHNlbGYuc2VydmVyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5kYl9uYW1lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5zY2hlbWFfbmFtZSkKKyAgICAgICAgaWYgbm90 IHNjaGVtYV9yZXNwb25zZToKKyAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiQ291bGQgbm90 IGZpbmQgdGhlIHNjaGVtYSB0byBhZGQgYSB0YWJsZS4iKQorCisgICAgICAgIHNlbGYudGFibGVf bmFtZSA9ICJ0ZXN0X3RhYmxlX2NvbHVtbl9wdXRfJXMiICUgKHN0cih1dWlkLnV1aWQ0KCkpWzE6 OF0pCisKKyAgICAgICAgY3VzdG9tX3NxbCA9ICdjb2x1bW5fMSAiY2hhciIgTk9UIE5VTEwsICcg XAorICAgICAgICAgICAgICAgICAgICAgJ2NvbHVtbl8yIGNoYXJhY3RlciB2YXJ5aW5nKDEwKSBO T1QgTlVMTCcKKworICAgICAgICBzZWxmLnRhYmxlX2lkID0gdGFibGVzX3V0aWxzLmNyZWF0ZV90 YWJsZSgKKyAgICAgICAgICAgIHNlbGYuc2VydmVyLAorICAgICAgICAgICAgc2VsZi5kYl9uYW1l LAorICAgICAgICAgICAgc2VsZi5zY2hlbWFfbmFtZSwKKyAgICAgICAgICAgIHNlbGYudGFibGVf bmFtZSwKKyAgICAgICAgICAgIGN1c3RvbV9zcWwKKyAgICAgICAgKQorCisgICAgZGVmIHJ1blRl c3Qoc2VsZik6CisgICAgICAgICIiIlRoaXMgZnVuY3Rpb24gd2lsbCBmZXRjaCBhZGRlZCB0YWJs ZSB1bmRlciBzY2hlbWEgbm9kZS4iIiIKKyAgICAgICAgdGFibGVfcmVzcG9uc2UgPSB0YWJsZXNf dXRpbHMudmVyaWZ5X3RhYmxlKAorICAgICAgICAgICAgc2VsZi5zZXJ2ZXIsIHNlbGYuZGJfbmFt ZSwgc2VsZi50YWJsZV9pZAorICAgICAgICApCisgICAgICAgIGlmIG5vdCB0YWJsZV9yZXNwb25z ZToKKyAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbigiQ291bGQgbm90IGZpbmQgdGhlIHRhYmxl IHRvIHVwZGF0ZS4iKQorCisgICAgICAgIGRhdGEgPSB7CisgICAgICAgICAgICAiaWQiOiBzZWxm LnRhYmxlX2lkLAorICAgICAgICAgICAgImNvbHVtbnMiOiB7CisgICAgICAgICAgICAgICAgImNo YW5nZWQiOiBbCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICJhdHRudW0iOiAxLAorICAgICAgICAgICAgICAgICAgICAgICAgImF0dG5vdG51bGwiOiBGYWxz ZQorICAgICAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgICAgICAgICAiYXR0bnVtIjogMiwKKyAgICAgICAgICAgICAgICAgICAgICAgICJh dHRub3RudWxsIjogRmFsc2UKKyAgICAgICAgICAgICAgICAgICAgfQorCisgICAgICAgICAgICAg ICAgXQorICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgcmVzcG9uc2UgPSBzZWxm LnRlc3Rlci5wdXQoCisgICAgICAgICAgICBzZWxmLnVybCArIHN0cih1dGlscy5TRVJWRVJfR1JP VVApICsgJy8nICsKKyAgICAgICAgICAgIHN0cihzZWxmLnNlcnZlcl9pZCkgKyAnLycgKyBzdHIo c2VsZi5kYl9pZCkgKyAnLycgKworICAgICAgICAgICAgc3RyKHNlbGYuc2NoZW1hX2lkKSArICcv JyArIHN0cihzZWxmLnRhYmxlX2lkKSwKKyAgICAgICAgICAgIGRhdGE9anNvbi5kdW1wcyhkYXRh KSwgZm9sbG93X3JlZGlyZWN0cz1UcnVlCisgICAgICAgICkKKworICAgICAgICBzZWxmLmFzc2Vy dEVxdWFscyhyZXNwb25zZS5zdGF0dXNfY29kZSwgMjAwKQorCisgICAgZGVmIHRlYXJEb3duKHNl bGYpOgorICAgICAgICAjIERpc2Nvbm5lY3QgdGhlIGRhdGFiYXNlCisgICAgICAgIGRhdGFiYXNl X3V0aWxzLmRpc2Nvbm5lY3RfZGF0YWJhc2Uoc2VsZiwgc2VsZi5zZXJ2ZXJfaWQsIHNlbGYuZGJf aWQpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVzdHMvdXRpbHMucHkgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVz dHMvdXRpbHMucHkKaW5kZXggNGNlYzMyMy4uYjcyMjE0NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L3Rlc3RzL3V0aWxzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZXN0cy91dGlscy5weQpAQCAtMTUsNyAr MTUsOCBAQCBpbXBvcnQgdHJhY2ViYWNrCiBmcm9tIHJlZ3Jlc3Npb24ucHl0aG9uX3Rlc3RfdXRp bHMgaW1wb3J0IHRlc3RfdXRpbHMgYXMgdXRpbHMKIAogCi1kZWYgY3JlYXRlX3RhYmxlKHNlcnZl ciwgZGJfbmFtZSwgc2NoZW1hX25hbWUsIHRhYmxlX25hbWUpOgorZGVmIGNyZWF0ZV90YWJsZShz ZXJ2ZXIsIGRiX25hbWUsIHNjaGVtYV9uYW1lLCB0YWJsZV9uYW1lLAorICAgICAgICAgICAgICAg ICBjdXN0b21fY29sdW1uX3NxbD1Ob25lKToKICAgICAiIiIKICAgICBUaGlzIGZ1bmN0aW9uIGNy ZWF0ZXMgYSB0YWJsZSB1bmRlciBwcm92aWRlZCBzY2hlbWEuCiAgICAgOnBhcmFtIHNlcnZlcjog c2VydmVyIGRldGFpbHMKQEAgLTM5LDkgKzQwLDEzIEBAIGRlZiBjcmVhdGVfdGFibGUoc2VydmVy LCBkYl9uYW1lLCBzY2hlbWFfbmFtZSwgdGFibGVfbmFtZSk6CiAgICAgICAgIG9sZF9pc29sYXRp b25fbGV2ZWwgPSBjb25uZWN0aW9uLmlzb2xhdGlvbl9sZXZlbAogICAgICAgICBjb25uZWN0aW9u LnNldF9pc29sYXRpb25fbGV2ZWwoMCkKICAgICAgICAgcGdfY3Vyc29yID0gY29ubmVjdGlvbi5j dXJzb3IoKQotICAgICAgICBxdWVyeSA9ICJDUkVBVEUgVEFCTEUgJXMuJXMoaWQgc2VyaWFsIFVO SVFVRSBOT1QgTlVMTCwgbmFtZSB0ZXh0LCIgXAotICAgICAgICAgICAgICAgICIgbG9jYXRpb24g dGV4dCkiICVcCi0gICAgICAgICAgICAgICAgKHNjaGVtYV9uYW1lLCB0YWJsZV9uYW1lKQorICAg ICAgICBpZiBjdXN0b21fY29sdW1uX3NxbDoKKyAgICAgICAgICAgIHF1ZXJ5ID0gIkNSRUFURSBU QUJMRSAlcy4lcyglcykiICUgXAorICAgICAgICAgICAgICAgICAgICAoc2NoZW1hX25hbWUsIHRh YmxlX25hbWUsIGN1c3RvbV9jb2x1bW5fc3FsKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg cXVlcnkgPSAiQ1JFQVRFIFRBQkxFICVzLiVzKGlkIHNlcmlhbCBVTklRVUUgTk9UIE5VTEwsICIg XAorICAgICAgICAgICAgICAgICAgICAibmFtZSB0ZXh0LCBsb2NhdGlvbiB0ZXh0KSIgJSBcCisg ICAgICAgICAgICAgICAgICAgIChzY2hlbWFfbmFtZSwgdGFibGVfbmFtZSkKICAgICAgICAgcGdf Y3Vyc29yLmV4ZWN1dGUocXVlcnkpCiAgICAgICAgIGNvbm5lY3Rpb24uc2V0X2lzb2xhdGlvbl9s ZXZlbChvbGRfaXNvbGF0aW9uX2xldmVsKQogICAgICAgICBjb25uZWN0aW9uLmNvbW1pdCgpCmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvdXRpbHMucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdXRpbHMucHkKaW5kZXgg NDU0MDNkMS4uZjZkMWIyMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3V0aWxzLnB5CisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy91dGlscy5weQpAQCAtMTc0OCwzOSArMTc0OCwyMCBAQCBjbGFzcyBCYXNlVGFibGVW aWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2xkX2Rh dGFbJ2F0dHR5cG1vZCddCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAKLSAgICAgICAgICAg ICAgICAgICAgICAgIGRlZiBnZXRfdHlwZV9hdHRyKGtleSwgZGF0YSk6Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIiIiVXRpbGl0eSBmdW5jdGlvbiIiIgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIGtleSBpbiBkYXRhOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXR1cm4gZGF0YVtrZXldCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIE5v bmUKLQogICAgICAgICAgICAgICAgICAgICAgICAgIyBJZiB0aGUgY29sdW1uIGRhdGEgdHlwZSBo YXMgbm90IGNoYW5nZWQgdGhlbiBmZXRjaAogICAgICAgICAgICAgICAgICAgICAgICAgIyBvbGQg bGVuZ3RoIGFuZCBwcmVjaXNpb24KICAgICAgICAgICAgICAgICAgICAgICAgIGlmICdlbGVtb2lk JyBpbiBvbGRfZGF0YSBhbmQgJ2NsdHlwZScgbm90IGluIGM6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbGVuZ3RoLCBwcmVjaXNpb24sIHR5cGV2YWwgPSBcCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNlbGYuZ2V0X2xlbmd0aF9wcmVjaXNpb24ob2xkX2RhdGFbJ2VsZW1v aWQnXSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIFNldCBwcm9wZXIgdmFsdWVzIGZv ciBvbGQgZGF0YQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuc2V0X2xlbmd0aF9w cmVjaXNpb24oCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxlbmd0aCwgcHJlY2lz aW9uLCBmdWxsdHlwZSwgb2xkX2RhdGEKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICApCiAK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIElmIHdlIGhhdmUgbGVuZ3RoICYgcHJlY2lz aW9uIGJvdGgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiBsZW5ndGggYW5kIHByZWNp c2lvbjoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbWF0Y2hPYmogPSByZS5zZWFy Y2gocicoXGQrKSwoXGQrKScsIGZ1bGx0eXBlKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpZiBtYXRjaE9iajoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNb J2F0dGxlbiddID0gZ2V0X3R5cGVfYXR0cigKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnYXR0bGVuJywgYwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKSBvciBtYXRjaE9iai5ncm91cCgxKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY1snYXR0cHJlY2lzaW9uJ10gPSBnZXRfdHlwZV9hdHRyKAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdhdHRwcmVjaXNpb24nLCBjCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICApIG9yIG1hdGNoT2JqLmdyb3VwKDIpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgZWxpZiBsZW5ndGg6Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICMgSWYgd2UgaGF2ZSBsZW5ndGggb25seQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtYXRjaE9iaiA9IHJlLnNlYXJjaChyJyhcZCspJywgZnVsbHR5cGUpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGlmIG1hdGNoT2JqOgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY1snYXR0bGVuJ10gPSBnZXRfdHlwZV9hdHRyKAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhdHRsZW4nLCBjCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICApIG9yIG1hdGNoT2JqLmdyb3VwKDEpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjWydhdHRwcmVjaXNpb24nXSA9IE5vbmUKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjWydhdHRsZW4nXSA9IE5vbmUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y1snYXR0cHJlY2lzaW9uJ10gPSBOb25lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBT ZXQgcHJvcGVyIHZhbHVlcyBmb3IgaW4gbmV3IGRhdGEKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZWxmLnNldF9sZW5ndGhfcHJlY2lzaW9uKAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBsZW5ndGgsIHByZWNpc2lvbiwgZnVsbHR5cGUsIGMsIG9sZF9kYXRhCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAnY2x0 eXBlJyBpbiBjOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHR5cGVuYW1lID0gY1snY2x0 eXBlJ10KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3R5cGVzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdHlwZXMvX19pbml0 X18ucHkKaW5kZXggYTVlZDU2YS4uMjE2N2E2NCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdHlwZXMvX19pbml0 X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvdHlwZXMvX19pbml0X18ucHkKQEAgLTQzOSwyMyArNDM5LDE1IEBAIGNs YXNzIFR5cGVWaWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVSZWFkZXIpOgogICAgICAgICAg ICAgICAgIGlmICdlbGVtb2lkJyBpbiByb3c6CiAgICAgICAgICAgICAgICAgICAgIGlzX3RsZW5n dGgsIGlzX3ByZWNpc2lvbiwgdHlwZXZhbCA9IHNlbGYuZ2V0X2xlbmd0aF9wcmVjaXNpb24ocm93 WydlbGVtb2lkJ10pCiAKLSAgICAgICAgICAgICAgICAjIEJlbG93IGxvZ2ljIHdpbGwgYWxsb3cg dXMgdG8gc3BsaXQgbGVuZ3RoLCBwcmVjaXNpb24gZnJvbSB0eXBlIG5hbWUgZm9yIGdyaWQKLSAg ICAgICAgICAgICAgICBpbXBvcnQgcmUKLSAgICAgICAgICAgICAgICB0X2xlbiA9IE5vbmUKLSAg ICAgICAgICAgICAgICB0X3ByZWMgPSBOb25lCi0KLSAgICAgICAgICAgICAgICAjIElmIHdlIGhh dmUgbGVuZ3RoICYgcHJlY2lzaW9uIGJvdGgKLSAgICAgICAgICAgICAgICBpZiBpc190bGVuZ3Ro IGFuZCBpc19wcmVjaXNpb246Ci0gICAgICAgICAgICAgICAgICAgIG1hdGNoT2JqID0gcmUuc2Vh cmNoKHInKFxkKyksKFxkKyknLCByb3dbJ2Z1bGx0eXBlJ10pCi0gICAgICAgICAgICAgICAgICAg IGlmIG1hdGNoT2JqOgotICAgICAgICAgICAgICAgICAgICAgICAgdF9sZW4gPSBtYXRjaE9iai5n cm91cCgxKQotICAgICAgICAgICAgICAgICAgICAgICAgdF9wcmVjID0gbWF0Y2hPYmouZ3JvdXAo MikKLSAgICAgICAgICAgICAgICBlbGlmIGlzX3RsZW5ndGg6Ci0gICAgICAgICAgICAgICAgICAg ICMgSWYgd2UgaGF2ZSBsZW5ndGggb25seQotICAgICAgICAgICAgICAgICAgICBtYXRjaE9iaiA9 IHJlLnNlYXJjaChyJyhcZCspJywgcm93WydmdWxsdHlwZSddKQotICAgICAgICAgICAgICAgICAg ICBpZiBtYXRjaE9iajoKLSAgICAgICAgICAgICAgICAgICAgICAgIHRfbGVuID0gbWF0Y2hPYmou Z3JvdXAoMSkKLSAgICAgICAgICAgICAgICAgICAgICAgIHRfcHJlYyA9IE5vbmUKKyAgICAgICAg ICAgICAgICBkYXRhID0geworICAgICAgICAgICAgICAgICAgICAnYXR0bGVuJzogTm9uZSwKKyAg ICAgICAgICAgICAgICAgICAgJ2F0dHByZWNpc2lvbic6IE5vbmUKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgc2VsZi5zZXRfbGVuZ3RoX3ByZWNpc2lvbigKKyAgICAgICAgICAg ICAgICAgICAgaXNfdGxlbmd0aCwgaXNfcHJlY2lzaW9uLCByb3dbJ2Z1bGx0eXBlJ10sIGRhdGEK KyAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgdF9sZW4gPSBkYXRhWydhdHRsZW4n XQorICAgICAgICAgICAgICAgIHRfcHJlYyA9IGRhdGFbJ2F0dHByZWNpc2lvbiddCiAKIAogICAg ICAgICAgICAgICAgIHR5cGVfbmFtZSA9IERhdGFUeXBlUmVhZGVyLnBhcnNlX3R5cGVfbmFtZShy b3dbJ3R5cG5hbWUnXSkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3V0aWxzLnB5IGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdXRpbHMucHkKaW5k ZXggZGRlYmQ1ZS4uYjY4Y2Y4YiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdXRpbHMucHkKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdXRp bHMucHkKQEAgLTgsNyArOCw3IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCiAiIiJTY2hlbWEgY29s bGVjdGlvbiBub2RlIGhlbHBlciBjbGFzcyIiIgotCitpbXBvcnQgcmUKIGltcG9ydCBqc29uCiAK IGZyb20gZmxhc2sgaW1wb3J0IHJlbmRlcl90ZW1wbGF0ZQpAQCAtMzIwLDYgKzMyMCw1MCBAQCBj bGFzcyBEYXRhVHlwZVJlYWRlcjoKIAogICAgICAgICByZXR1cm4gdHlwZV9uYW1lCiAKKyAgICBA Y2xhc3NtZXRob2QKKyAgICBkZWYgc2V0X2xlbmd0aF9wcmVjaXNpb24oY2xzLCBsZW5ndGgsIHBy ZWNpc2lvbiwgZnVsbHR5cGUsIGRhdGEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9s ZF9kYXRhPU5vbmUpOgorICAgICAgICAiIiIKKyAgICAgICAgUGFyc2UgbGVuZ3RoICYgcHJlY2lz aW9uIGZyb20gZGF0YXR5cGUgYW5kIHRoZW4gYXNzaWduIGl0IHRvIGRhdGF0eXBlCisgICAgICAg IGFjY29yZGluZyB0byBjbGllbnQgZm9ybWF0CisKKyAgICAgICAgQXJnczoKKyAgICAgICAgICAg IGxlbmd0aDogQm9vbGVhbiBmbGFnIGZvciBsZW5ndGgKKyAgICAgICAgICAgIHByZWNpc2lvbjog Qm9vbGVhbiBmbGFnIGZvciBwcmVjaXNpb24KKyAgICAgICAgICAgIGZ1bGx0eXBlOiBUeXBlIG5h bWUgd2l0aCBsZW5ndGggJiBwcmVjaXNpb24KKyAgICAgICAgICAgIGRhdGE6IE5ldyB2YWx1ZXMK KyAgICAgICAgICAgIG9sZF9kYXRhOiBPbGQgdmFsdWVzCisgICAgICAgICIiIgorICAgICAgICAj IElmIHdlIGhhdmUgbGVuZ3RoICYgcHJlY2lzaW9uIGJvdGgKKworICAgICAgICBnZXRfdmFsaWRf dmFsdWUgPSBsYW1iZGEgdmFsOiB2YWwgaWYgdmFsIGFuZCBpbnQodmFsKSAhPSAtMSBlbHNlIE5v bmUKKworICAgICAgICBpZiBsZW5ndGggYW5kIHByZWNpc2lvbjoKKyAgICAgICAgICAgIG1hdGNo T2JqID0gcmUuc2VhcmNoKHInKFxkKyksKFxkKyknLCBmdWxsdHlwZSkKKyAgICAgICAgICAgIGlm IG1hdGNoT2JqOgorICAgICAgICAgICAgICAgIGF0dGxlbiA9IGdldF92YWxpZF92YWx1ZShkYXRh LmdldCgnYXR0bGVuJywgTm9uZSkpCisgICAgICAgICAgICAgICAgZGF0YVsnYXR0bGVuJ10gPSBh dHRsZW4gb3IgbWF0Y2hPYmouZ3JvdXAoMSkKKyAgICAgICAgICAgICAgICBhdHRwcmVjaXNpb24g PSBnZXRfdmFsaWRfdmFsdWUoZGF0YS5nZXQoJ2F0dHByZWNpc2lvbicsIE5vbmUpKQorICAgICAg ICAgICAgICAgIGRhdGFbJ2F0dHByZWNpc2lvbiddID0gYXR0cHJlY2lzaW9uIG9yIG1hdGNoT2Jq Lmdyb3VwKDIpCisgICAgICAgIGVsaWYgbGVuZ3RoOgorICAgICAgICAgICAgIyBJZiB3ZSBoYXZl IGxlbmd0aCBvbmx5CisgICAgICAgICAgICBtYXRjaE9iaiA9IHJlLnNlYXJjaChyJyhcZCspJywg ZnVsbHR5cGUpCisgICAgICAgICAgICBpZiBtYXRjaE9iajoKKyAgICAgICAgICAgICAgICBhdHRs ZW4gPSBnZXRfdmFsaWRfdmFsdWUoZGF0YS5nZXQoJ2F0dGxlbicsIE5vbmUpKQorICAgICAgICAg ICAgICAgIGRhdGFbJ2F0dGxlbiddID0gYXR0bGVuIG9yIG1hdGNoT2JqLmdyb3VwKDEpCisgICAg ICAgICAgICAgICAgZGF0YVsnYXR0cHJlY2lzaW9uJ10gPSBOb25lCisgICAgICAgIGVsc2U6Cisg ICAgICAgICAgICAjIFVzZSB0aGUgb2xkIHZhbHVlcyB0byBhdm9pZCB1bm5lY2Vzc2FyeQorICAg ICAgICAgICAgaWYgb2xkX2RhdGE6CisgICAgICAgICAgICAgICAgaWYgJ2F0dGxlbicgaW4gb2xk X2RhdGE6CisgICAgICAgICAgICAgICAgICAgIGlmIG9sZF9kYXRhWydhdHRsZW4nXSAhPSAnLTEn OgorICAgICAgICAgICAgICAgICAgICAgICAgZGF0YVsnYXR0bGVuJ10gPSBvbGRfZGF0YS5nZXQo J2F0dGxlbicsIE5vbmUpCisgICAgICAgICAgICAgICAgICAgIGlmICdhdHRwcmVjaXNpb24nIGlu IG9sZF9kYXRhOgorICAgICAgICAgICAgICAgICAgICAgICAgaWYgb2xkX2RhdGFbJ2F0dHByZWNp c2lvbiddICE9ICctMSc6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YVsnYXR0cHJl Y2lzaW9uJ10gPSBvbGRfZGF0YS5nZXQoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdhdHRwcmVjaXNpb24nLCBOb25lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKQorCiAK IGRlZiB0cmlnZ2VyX2RlZmluaXRpb24oZGF0YSk6CiAgICAgIiIiCg== --001a113ecb26a804490566e2e931--