MIME-Version: 1.0
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Mon, 4 Oct 2021 14:07:18 +0530
Message-ID: 
 <CAM9w-_=cFuPtGz1+6O1PGHCU=G6TSDfy1a_pW7-GZ6reswJQHg@mail.gmail.com>
Subject: [pgAdmin][RM6837] Foreign key issues in edit mode
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000004649bb05cd82d4a7"
Archived-At: 
 <https://www.postgresql.org/message-id/CAM9w-_%3DcFuPtGz1%2B6O1PGHCU%3DG6TSDfy1a_pW7-GZ6reswJQHg%40mail.gmail.com>
Precedence: bulk

--0000000000004649bb05cd82d4a7
Content-Type: multipart/alternative; boundary="0000000000004649b705cd82d4a5"

--0000000000004649b705cd82d4a5
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Attached patch fixes:
1. Couple of foreign key issues in edit mode. Fixes #6837
2. Table "Of type" related issues. Fixes #6825

Please review.

-- 
Thanks,
Aditya Toshniwal
pgAdmin Hacker | Software Architect | *edbpostgres.com*
<http://edbpostgres.com>
"Don't Complain about Heat, Plant a TREE"

--0000000000004649b705cd82d4a5
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-family:verdana,=
sans-serif">Hi Hackers,</div><div class=3D"gmail_default" style=3D"font-fam=
ily:verdana,sans-serif"><br></div><div class=3D"gmail_default" style=3D"fon=
t-family:verdana,sans-serif">Attached patch fixes:</div><div class=3D"gmail=
_default" style=3D"font-family:verdana,sans-serif">1. Couple of foreign key=
 issues in edit mode. Fixes #6837</div><div class=3D"gmail_default" style=
=3D"font-family:verdana,sans-serif">2. Table &quot;Of type&quot; related is=
sues. Fixes #6825</div><div class=3D"gmail_default" style=3D"font-family:ve=
rdana,sans-serif"><br></div><div class=3D"gmail_default" style=3D"font-fami=
ly:verdana,sans-serif">Please review.</div><div><br></div>-- <br><div dir=
=3D"ltr" data-smartmail=3D"gmail_signature"><div dir=3D"ltr"><div dir=3D"lt=
r"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div><font size=3D"2"=
 color=3D"#000000" face=3D"arial, sans-serif">Thanks,</font><div><span styl=
e=3D"color:rgb(34,34,34)"><span style=3D"color:rgb(18,22,70)"><font face=3D=
"arial, sans-serif">Aditya Toshniwal</font></span></span><font size=3D"2" c=
olor=3D"#000000" face=3D"verdana, sans-serif"><br></font></div><div><span s=
tyle=3D"color:rgb(18,22,70);font-family:Arial,sans-serif">pgAdmin Hacker</s=
pan><font size=3D"2" color=3D"#000000" style=3D"font-family:verdana,sans-se=
rif">=C2=A0| </font><font size=3D"2" color=3D"#000000" face=3D"arial, sans-=
serif">Software Architect</font><font size=3D"2" color=3D"#000000"><font fa=
ce=3D"verdana, sans-serif">=C2=A0| </font><a href=3D"http://edbpostgres.com=
" target=3D"_blank"><font face=3D"arial, sans-serif" color=3D"#000000"><b>e=
dbpostgres.com</b></font></a></font></div><div><font color=3D"#38761d" size=
=3D"1"><font face=3D"arial, sans-serif">&quot;Don&#39;t Complain about Heat=
, Plant a TREE&quot;</font></font></div></div></div></div></div></div></div=
></div></div>

--0000000000004649b705cd82d4a5--

--0000000000004649bb05cd82d4a7
Content-Type: application/octet-stream; name="RM6837_6825.patch"
Content-Disposition: attachment; filename="RM6837_6825.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kucegkmi0>
X-Attachment-Id: f_kucegkmi0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19jb25zdHJhaW50L3N0YXRp
Yy9qcy9jaGVja19jb25zdHJhaW50LnVpLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf
Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2NoZWNr
X2NvbnN0cmFpbnQvc3RhdGljL2pzL2NoZWNrX2NvbnN0cmFpbnQudWkuanMKaW5kZXggZTFkNjRh
YzFhLi5hYWY1M2RiZjQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy
b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19j
b25zdHJhaW50L3N0YXRpYy9qcy9jaGVja19jb25zdHJhaW50LnVpLmpzCisrKyBiL3dlYi9wZ2Fk
bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxl
cy9jb25zdHJhaW50cy9jaGVja19jb25zdHJhaW50L3N0YXRpYy9qcy9jaGVja19jb25zdHJhaW50
LnVpLmpzCkBAIC0yMiw3ICsyMiw3IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIENoZWNrQ29uc3Ry
YWludFNjaGVtYSBleHRlbmRzIEJhc2VVSVNjaGVtYSB7CiAgICAgaWYoXy5pc1VuZGVmaW5lZCh0
aGlzLm5vZGVJbmZvKSkgewogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIHJldHVybiBf
LmlzVW5kZWZpbmVkKHRoaXMubm9kZUluZm9bJ3RhYmxlJ10pOworICAgIHJldHVybiBfLmlzVW5k
ZWZpbmVkKHRoaXMubm9kZUluZm9bJ2NoZWNrX2NvbnN0cmFpbnQnXSk7CiAgIH0KIAogICBpc1Jl
YWRvbmx5KHN0YXRlKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n
cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVz
aW9uX2NvbnN0cmFpbnQvc3RhdGljL2pzL2V4Y2x1c2lvbl9jb25zdHJhaW50LnVpLmpzIGIvd2Vi
L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv
dGFibGVzL2NvbnN0cmFpbnRzL2V4Y2x1c2lvbl9jb25zdHJhaW50L3N0YXRpYy9qcy9leGNsdXNp
b25fY29uc3RyYWludC51aS5qcwppbmRleCA1ZjY0ZTU4Y2QuLmU0MDVjMGFjOSAxMDA2NDQKLS0t
IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj
aGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2V4Y2x1c2lvbl9jb25zdHJhaW50L3N0YXRpYy9qcy9l
eGNsdXNpb25fY29uc3RyYWludC51aS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl
cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhj
bHVzaW9uX2NvbnN0cmFpbnQvc3RhdGljL2pzL2V4Y2x1c2lvbl9jb25zdHJhaW50LnVpLmpzCkBA
IC0yMTMsNyArMjEzLDcgQEAgZXhwb3J0IGRlZmF1bHQgY2xhc3MgRXhjbHVzaW9uQ29uc3RyYWlu
dFNjaGVtYSBleHRlbmRzIEJhc2VVSVNjaGVtYSB7CiAgICAgaWYoXy5pc1VuZGVmaW5lZCh0aGlz
Lm5vZGVJbmZvKSkgewogICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIHJldHVybiBfLmlz
VW5kZWZpbmVkKHRoaXMubm9kZUluZm9bJ3RhYmxlJ10pOworICAgIHJldHVybiBfLmlzVW5kZWZp
bmVkKHRoaXMubm9kZUluZm9bJ2V4Y2x1c2lvbl9jb25zdHJhaW50J10pOwogICB9CiAKICAgaW5p
dGlhbGlzZShkYXRhKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n
cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZm9yZWln
bl9rZXkvc3RhdGljL2pzL2ZvcmVpZ25fa2V5LnVpLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z
ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRz
L2ZvcmVpZ25fa2V5L3N0YXRpYy9qcy9mb3JlaWduX2tleS51aS5qcwppbmRleCA1YzEwZDA3N2Qu
Ljk3OWI3MDcwNiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz
L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5
L3N0YXRpYy9qcy9mb3JlaWduX2tleS51aS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Nl
cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMv
Zm9yZWlnbl9rZXkvc3RhdGljL2pzL2ZvcmVpZ25fa2V5LnVpLmpzCkBAIC0xNDksNyArMTQ5LDcg
QEAgZXhwb3J0IGRlZmF1bHQgY2xhc3MgRm9yZWlnbktleVNjaGVtYSBleHRlbmRzIEJhc2VVSVNj
aGVtYSB7CiAgICAgaWYoXy5pc1VuZGVmaW5lZChub2RlSW5mbykpIHsKICAgICAgIHJldHVybiB0
cnVlOwogICAgIH0KLSAgICByZXR1cm4gXy5pc1VuZGVmaW5lZChub2RlSW5mb1sndGFibGUnXSk7
CisgICAgcmV0dXJuIF8uaXNVbmRlZmluZWQobm9kZUluZm9bJ2ZvcmVpZ25fa2V5J10pOwogICB9
CiAKICAgY2hhbmdlQ29sdW1uT3B0aW9ucyhjb2x1bW5zKSB7CkBAIC0yMjIsMTIgKzIyMiwxNCBA
QCBleHBvcnQgZGVmYXVsdCBjbGFzcyBGb3JlaWduS2V5U2NoZW1hIGV4dGVuZHMgQmFzZVVJU2No
ZW1hIHsKICAgICAgIGlkOiAnY29udmFsaWRhdGVkJywgbGFiZWw6IGdldHRleHQoJ1ZhbGlkYXRl
ZD8nKSwKICAgICAgIHR5cGU6ICdzd2l0Y2gnLCBncm91cDogZ2V0dGV4dCgnRGVmaW5pdGlvbicp
LAogICAgICAgcmVhZG9ubHk6IChzdGF0ZSk9PnsKLSAgICAgICAgLy8gSWYgd2UgYXJlIGluIHRh
YmxlIGVkaXQgbW9kZSB0aGVuCi0gICAgICAgIGlmKG9iai5pblRhYmxlICYmIG9iai50b3AgJiYg
IW9iai50b3AuaXNOZXcoKSkgewotICAgICAgICAgIHJldHVybiAhKF8uaXNVbmRlZmluZWQoc3Rh
dGUub2lkKSB8fCAhc3RhdGUuY29udmFsaWRhdGVkKTsKLSAgICAgICAgfQotICAgICAgICBpZigh
b2JqLmlzTmV3KHN0YXRlKSAmJiBvYmoub3JpZ0RhdGEuY29udmFsaWRhdGVkKSB7Ci0gICAgICAg
ICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmKCFvYmouaXNOZXcoc3RhdGUpKSB7CisgICAgICAg
ICAgbGV0IG9yaWdEYXRhID0ge307CisgICAgICAgICAgaWYob2JqLmluVGFibGUgJiYgb2JqLnRv
cCkgeworICAgICAgICAgICAgb3JpZ0RhdGEgPSBfLmZpbmQob2JqLnRvcC5vcmlnRGF0YVsnZm9y
ZWlnbl9rZXknXSwgKHIpPT5yLmNpZCA9PSBzdGF0ZS5jaWQpOworICAgICAgICAgIH0gZWxzZSB7
CisgICAgICAgICAgICBvcmlnRGF0YSA9IG9iai5vcmlnRGF0YTsKKyAgICAgICAgICB9CisgICAg
ICAgICAgcmV0dXJuIG9yaWdEYXRhLmNvbnZhbGlkYXRlZDsKICAgICAgICAgfQogICAgICAgICBy
ZXR1cm4gZmFsc2U7CiAgICAgICB9LApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z
ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRz
L2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3ByaW1hcnlfa2V5LnVpLmpzIGIvd2ViL3BnYWRt
aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz
L2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3ByaW1hcnlfa2V5LnVpLmpz
CmluZGV4IDhlYjY3YjJjYi4uNTJlMmNhNWE0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93
c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3Ry
YWludHMvaW5kZXhfY29uc3RyYWludC9zdGF0aWMvanMvcHJpbWFyeV9rZXkudWkuanMKKysrIGIv
d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt
YXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3ByaW1hcnlf
a2V5LnVpLmpzCkBAIC0zMSw3ICszMSw3IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIFByaW1hcnlL
ZXlTY2hlbWEgZXh0ZW5kcyBCYXNlVUlTY2hlbWEgewogICAgIGlmKF8uaXNVbmRlZmluZWQodGhp
cy5ub2RlSW5mbykpIHsKICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KLSAgICByZXR1cm4gXy5p
c1VuZGVmaW5lZCh0aGlzLm5vZGVJbmZvWyd0YWJsZSddKTsKKyAgICByZXR1cm4gXy5pc1VuZGVm
aW5lZCh0aGlzLm5vZGVJbmZvWydwcmltYXJ5X2tleSddKTsKICAgfQogCiAgIGNoYW5nZUNvbHVt
bk9wdGlvbnMoY29sdW1ucykgewpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2
ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2lu
ZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3VuaXF1ZV9jb25zdHJhaW50LnVpLmpzIGIvd2ViL3Bn
YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi
bGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3VuaXF1ZV9jb25zdHJh
aW50LnVpLmpzCmluZGV4IDdiOTFhMGI1ZS4uMGJkYzMwNzE5IDEwMDY0NAotLS0gYS93ZWIvcGdh
ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJs
ZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9zdGF0aWMvanMvdW5pcXVlX2NvbnN0cmFp
bnQudWkuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv
ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3Rh
dGljL2pzL3VuaXF1ZV9jb25zdHJhaW50LnVpLmpzCkBAIC0zMiw3ICszMiw3IEBAIGV4cG9ydCBk
ZWZhdWx0IGNsYXNzIFVuaXF1ZUNvbnN0cmFpbnRTY2hlbWEgZXh0ZW5kcyBCYXNlVUlTY2hlbWEg
ewogICAgIGlmKF8uaXNVbmRlZmluZWQodGhpcy5ub2RlSW5mbykpIHsKICAgICAgIHJldHVybiB0
cnVlOwogICAgIH0KLSAgICByZXR1cm4gXy5pc1VuZGVmaW5lZCh0aGlzLm5vZGVJbmZvWyd0YWJs
ZSddKTsKKyAgICByZXR1cm4gXy5pc1VuZGVmaW5lZCh0aGlzLm5vZGVJbmZvWyd1bmlxdWVfY29u
c3RyYWludCddKTsKICAgfQogCiAgIGNoYW5nZUNvbHVtbk9wdGlvbnMoY29sdW1ucykgewpkaWZm
IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh
c2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9qcy90YWJsZS51aS5qcyBiL3dlYi9wZ2FkbWluL2Jy
b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0
aWMvanMvdGFibGUudWkuanMKaW5kZXggNjhkMWVlZDkzLi4zMzQ0YmU1ZDggMTAwNjQ0Ci0tLSBh
L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl
bWFzL3RhYmxlcy9zdGF0aWMvanMvdGFibGUudWkuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl
ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9q
cy90YWJsZS51aS5qcwpAQCAtNjUwLDcgKzY1MCwxMiBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBU
YWJsZVNjaGVtYSBleHRlbmRzIEJhc2VVSVNjaGVtYSB7CiAgICAgICAgICAgICBvYmouY2hhbmdl
Q29sdW1uT3B0aW9ucyhmaW5hbENvbHMpOwogICAgICAgICAgICAgcmV0dXJuIHsKICAgICAgICAg
ICAgICAgY29sdW1uczogZmluYWxDb2xzLAotICAgICAgICAgICAgICBwcmltYXJ5X2tleTogW10K
KyAgICAgICAgICAgICAgcHJpbWFyeV9rZXk6IFtdLAorICAgICAgICAgICAgICBmb3JlaWduX2tl
eTogW10sCisgICAgICAgICAgICAgIGV4Y2x1ZGVfY29uc3RyYWludDogW10sCisgICAgICAgICAg
ICAgIHVuaXF1ZV9jb25zdHJhaW50OiBbXSwKKyAgICAgICAgICAgICAgcGFydGl0aW9uX2tleXM6
IFtdLAorICAgICAgICAgICAgICBwYXJ0aXRpb25zOiBbXSwKICAgICAgICAgICAgIH07CiAgICAg
ICAgICAgfSk7CiAgICAgICAgIH07CmRpZmYgLS1naXQgYS93ZWIvcmVncmVzc2lvbi9qYXZhc2Ny
aXB0L3NjaGVtYV91aV9maWxlcy9mb3JlaWduX2tleS51aS5zcGVjLmpzIGIvd2ViL3JlZ3Jlc3Np
b24vamF2YXNjcmlwdC9zY2hlbWFfdWlfZmlsZXMvZm9yZWlnbl9rZXkudWkuc3BlYy5qcwppbmRl
eCA3ZjA5MjhiMmIuLjBiZDhjMGY5NCAxMDA2NDQKLS0tIGEvd2ViL3JlZ3Jlc3Npb24vamF2YXNj
cmlwdC9zY2hlbWFfdWlfZmlsZXMvZm9yZWlnbl9rZXkudWkuc3BlYy5qcworKysgYi93ZWIvcmVn
cmVzc2lvbi9qYXZhc2NyaXB0L3NjaGVtYV91aV9maWxlcy9mb3JlaWduX2tleS51aS5zcGVjLmpz
CkBAIC0xNzEsNyArMTcxLDcgQEAgZGVzY3JpYmUoJ0ZvcmVpZ25LZXlTY2hlbWEnLCAoKT0+ewog
ICAgIGxldCBzdGF0ZSA9IHtjb2x1bW5zOiBbe2xvY2FsX2NvbHVtbjogJ2lkJ31dfTsKICAgICBs
ZXQgYWN0aW9uT2JqID0ge29sZFN0YXRlOntuYW1lOiAnZmtuYW1lJ319OwogCi0gICAgc2NoZW1h
T2JqLm5vZGVJbmZvID0ge3RhYmxlOiB7fX07CisgICAgc2NoZW1hT2JqLm5vZGVJbmZvID0ge2Zv
cmVpZ25fa2V5OiB7fX07CiAgICAgc3RhdGUuYXV0b2luZGV4ID0gdHJ1ZTsKICAgICBzdGF0ZS5u
YW1lID0gJ2ZrbmFtZSc7CiAgICAgZXhwZWN0KGdldEZpZWxkRGVwQ2hhbmdlKHNjaGVtYU9iaiwg
J2F1dG9pbmRleCcpKHN0YXRlLCBudWxsLCBudWxsLCBhY3Rpb25PYmopKS50b0VxdWFsKHsKQEAg
LTE5Nyw3ICsxOTcsNyBAQCBkZXNjcmliZSgnRm9yZWlnbktleVNjaGVtYScsICgpPT57CiAgICAg
ZXhwZWN0KGdldEZpZWxkRGVwQ2hhbmdlKHNjaGVtYU9iaiwgJ2F1dG9pbmRleCcpKHN0YXRlLCBu
dWxsLCBudWxsLCBhY3Rpb25PYmopKS50b0VxdWFsKHt9KTsKIAogICAgIHN0YXRlLm9pZCA9IG51
bGw7Ci0gICAgc2NoZW1hT2JqLm5vZGVJbmZvID0ge307CisgICAgc2NoZW1hT2JqLm5vZGVJbmZv
ID0ge3RhYmxlOiB7fX07CiAgICAgc2NoZW1hT2JqLnRvcCA9IHNjaGVtYU9iajsKICAgICBleHBl
Y3QoZ2V0RmllbGREZXBDaGFuZ2Uoc2NoZW1hT2JqLCAnYXV0b2luZGV4Jykoc3RhdGUsIG51bGws
IG51bGwsIGFjdGlvbk9iaikpLnRvRXF1YWwoewogICAgICAgYXV0b2luZGV4OiBmYWxzZSwKZGlm
ZiAtLWdpdCBhL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvc2NoZW1hX3VpX2ZpbGVzL3RhYmxl
LnVpLnNwZWMuanMgYi93ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L3NjaGVtYV91aV9maWxlcy90
YWJsZS51aS5zcGVjLmpzCmluZGV4IGM2ODZlOGQ4Ni4uMGRkZjlhY2NkIDEwMDY0NAotLS0gYS93
ZWIvcmVncmVzc2lvbi9qYXZhc2NyaXB0L3NjaGVtYV91aV9maWxlcy90YWJsZS51aS5zcGVjLmpz
CisrKyBiL3dlYi9yZWdyZXNzaW9uL2phdmFzY3JpcHQvc2NoZW1hX3VpX2ZpbGVzL3RhYmxlLnVp
LnNwZWMuanMKQEAgLTE3Miw2ICsxNzIsMTEgQEAgZGVzY3JpYmUoJ1RhYmxlU2NoZW1hJywgKCk9
PnsKICAgICAgICAgZXhwZWN0KGRlcENoYW5nZSgpKS50b0VxdWFsKHsKICAgICAgICAgICBjb2x1
bW5zOiBvZnR5cGVDb2x1bW5zLAogICAgICAgICAgIHByaW1hcnlfa2V5OiBbXSwKKyAgICAgICAg
ICBmb3JlaWduX2tleTogW10sCisgICAgICAgICAgZXhjbHVkZV9jb25zdHJhaW50OiBbXSwKKyAg
ICAgICAgICB1bmlxdWVfY29uc3RyYWludDogW10sCisgICAgICAgICAgcGFydGl0aW9uX2tleXM6
IFtdLAorICAgICAgICAgIHBhcnRpdGlvbnM6IFtdLAogICAgICAgICB9KTsKICAgICAgICAgZXhw
ZWN0KHNjaGVtYU9iai5jaGFuZ2VDb2x1bW5PcHRpb25zKS50b0hhdmVCZWVuQ2FsbGVkV2l0aChv
ZnR5cGVDb2x1bW5zKTsKICAgICAgICAgZG9uZSgpOwpAQCAtMjA4LDYgKzIxMywxMSBAQCBkZXNj
cmliZSgnVGFibGVTY2hlbWEnLCAoKT0+ewogICAgICAgICBleHBlY3QoZGVwQ2hhbmdlKCkpLnRv
RXF1YWwoewogICAgICAgICAgIGNvbHVtbnM6IG9mdHlwZUNvbHVtbnMsCiAgICAgICAgICAgcHJp
bWFyeV9rZXk6IFtdLAorICAgICAgICAgIGZvcmVpZ25fa2V5OiBbXSwKKyAgICAgICAgICBleGNs
dWRlX2NvbnN0cmFpbnQ6IFtdLAorICAgICAgICAgIHVuaXF1ZV9jb25zdHJhaW50OiBbXSwKKyAg
ICAgICAgICBwYXJ0aXRpb25fa2V5czogW10sCisgICAgICAgICAgcGFydGl0aW9uczogW10sCiAg
ICAgICAgIH0pOwogICAgICAgICBleHBlY3Qoc2NoZW1hT2JqLmNoYW5nZUNvbHVtbk9wdGlvbnMp
LnRvSGF2ZUJlZW5DYWxsZWRXaXRoKG9mdHlwZUNvbHVtbnMpOwogICAgICAgICBkb25lKCk7Cg==
--0000000000004649bb05cd82d4a7--