From: Levitt Olivier <olivier.levitt@insee.fr>
To: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
CC: "pgadmin-hackers@postgresql.org" <pgadmin-hackers@postgresql.org>
Subject: RE: [Pgadmin] [Docker] servers.json import fails when running in
 desktop mode
Thread-Topic: [Pgadmin] [Docker] servers.json import fails when running in
 desktop mode
Thread-Index: AdWxw/5mh4Tw4ureSMOAZO6Y6Qg44gAbe9mAAHBXvOE=
Date: Mon, 16 Dec 2019 09:48:14 +0000
Message-ID: 
 <74F4D0C2ACDFA04BA40C6475ADAE217529FA40C2@pdexchbalwst03.ad.insee.intra>
References: 
 <74F4D0C2ACDFA04BA40C6475ADAE217529FA3FDA@pdexchbalwst03.ad.insee.intra>,<CAG7mmow_n3Gn0xz7FRFktg20jza8jJSJnMRKg7Xd6=NYBXmhsw@mail.gmail.com>
In-Reply-To: 
 <CAG7mmow_n3Gn0xz7FRFktg20jza8jJSJnMRKg7Xd6=NYBXmhsw@mail.gmail.com>
Accept-Language: en-GB, fr-FR, en-US
Content-Language: en-GB
Content-Type: multipart/mixed;
	boundary="_002_74F4D0C2ACDFA04BA40C6475ADAE217529FA40C2pdexchbalwst03a_"
MIME-Version: 1.0
Precedence: bulk

--_002_74F4D0C2ACDFA04BA40C6475ADAE217529FA40C2pdexchbalwst03a_
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

Here is a patch (first contribution \o/) that solves the issue by importing=
 the servers.json anonymously when running in DESKTOP mode. =20
There may be a better way to check if we are running in DESKTOP mode or not=
 but checking PGADMIN_CONFIG_SERVER_MODE should be enough when running pgad=
min4 in docker. =20

Regards,
Olivier Levitt


________________________________________
From: Ashesh Vashi [ashesh.vashi@enterprisedb.com]
Sent: 14 December 2019 05:52
To: Levitt Olivier
Cc: pgadmin-hackers@postgresql.org
Subject: Re: [Pgadmin] [Docker] servers.json import fails when running in d=
esktop mode

<http://www.linkedin.com/in/asheshvashi>

On Sat, Dec 14, 2019 at 3:53 AM Levitt Olivier <olivier.levitt@insee.fr<mai=
lto:olivier.levitt@insee.fr>> wrote:
Hi,

When running the docker image in desktop mode (PGADMIN_CONFIG_SERVER_MODE=
=3DFalse), no user is created. That is expected behaviour.
But then the code that imports the servers.json pre-configuration fails as =
it ties the import to the default user.

I think line 40 of entrypoint.sh (https://git.postgresql.org/gitweb/?p=3Dpg=
admin4.git;a=3Dblob;f=3Dpkg/docker/entrypoint.sh;h=3D47d14bf2d415777c64b221=
fb1fc75d61c5e3cecc;hb=3DHEAD) should not specify a user when running in dek=
stop mode.
I tested it without --user parameter and it successfully imported the serve=
rs.json configuration.

Should I submit a patch ? First time contributing to Pgadmin :)
Please do.


--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company<http://www.enterprisedb.c=
om>


http://www.linkedin.com/in/asheshvashi

Regards,
Olivier Levitt


--_002_74F4D0C2ACDFA04BA40C6475ADAE217529FA40C2pdexchbalwst03a_
Content-Type: text/x-patch; name="import_servers_on_desktop_mode.diff"
Content-Description: import_servers_on_desktop_mode.diff
Content-Disposition: attachment;
	filename="import_servers_on_desktop_mode.diff"; size=978;
	creation-date="Mon, 16 Dec 2019 09:30:28 GMT";
	modification-date="Mon, 16 Dec 2019 09:30:28 GMT"
Content-Transfer-Encoding: base64

ZGlmZiAtLWdpdCBhL3BrZy9kb2NrZXIvZW50cnlwb2ludC5zaCBiL3BrZy9kb2NrZXIvZW50cnlw
b2ludC5zaAppbmRleCA0N2QxNGJmMmQuLmU4NDM0MzI5ZCAxMDA3NTUKLS0tIGEvcGtnL2RvY2tl
ci9lbnRyeXBvaW50LnNoCisrKyBiL3BrZy9kb2NrZXIvZW50cnlwb2ludC5zaApAQCAtMzcsNyAr
MzcsMTMgQEAgaWYgWyAhIC1mIC92YXIvbGliL3BnYWRtaW4vcGdhZG1pbjQuZGIgXTsgdGhlbgog
ICAgIGV4cG9ydCBQR0FETUlOX1NFUlZFUl9KU09OX0ZJTEU9JHtQR0FETUlOX1NFUlZFUl9KU09O
X0ZJTEU6LS9wZ2FkbWluNC9zZXJ2ZXJzLmpzb259CiAgICAgIyBQcmUtbG9hZCBhbnkgcmVxdWly
ZWQgc2VydmVycwogICAgIGlmIFsgLWYgIiR7UEdBRE1JTl9TRVJWRVJfSlNPTl9GSUxFfSIgXTsg
dGhlbgotICAgICAgICAvdXNyL2xvY2FsL2Jpbi9weXRob24gL3BnYWRtaW40L3NldHVwLnB5IC0t
bG9hZC1zZXJ2ZXJzICIke1BHQURNSU5fU0VSVkVSX0pTT05fRklMRX0iIC0tdXNlciAke1BHQURN
SU5fREVGQVVMVF9FTUFJTH0KKyAgICAgICAgIyBXaGVuIHJ1bm5pbmcgaW4gRGVza3RvcCBtb2Rl
LCBubyB1c2VyIGlzIGNyZWF0ZWQKKyAgICAgICAgIyBzbyB3ZSBoYXZlIHRvIGltcG9ydCBzZXJ2
ZXJzIGFub255bW91c2x5CisgICAgICAgIGlmIFsgIiR7UEdBRE1JTl9DT05GSUdfU0VSVkVSX01P
REV9IiA9ICJGYWxzZSIgXTsgdGhlbgorICAgICAgICAgICAgL3Vzci9sb2NhbC9iaW4vcHl0aG9u
IC9wZ2FkbWluNC9zZXR1cC5weSAtLWxvYWQtc2VydmVycyAiJHtQR0FETUlOX1NFUlZFUl9KU09O
X0ZJTEV9IiAKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgL3Vzci9sb2NhbC9iaW4vcHl0aG9u
IC9wZ2FkbWluNC9zZXR1cC5weSAtLWxvYWQtc2VydmVycyAiJHtQR0FETUlOX1NFUlZFUl9KU09O
X0ZJTEV9IiAtLXVzZXIgJHtQR0FETUlOX0RFRkFVTFRfRU1BSUx9CisgICAgICAgIGZpCiAgICAg
ZmkKIGZpCiAK

--_002_74F4D0C2ACDFA04BA40C6475ADAE217529FA40C2pdexchbalwst03a_--