IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

The following issues related to cloud deployment have been resolved:

Browse Source 
- Masking the credentials input fields
- The loading symbol doesn't work while reloading the options in the select control
- Reduce the wizard opening timeout
- urllib library upgrade impacts host IP fetch

refs #7177
This commit is contained in:
Khushboo Vashi 2022-03-02 19:02:35 +05:30 committed by Akshay Joshi
parent 83660ec9ed
commit 69069e9af3
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgacloud/utils/misc.py
View File

@ -16,16 +16,14 @@ def get_my_ip():
""" Return the public IP of this host """
http = urllib3.PoolManager()
try:
external_ip = http.request.urlopen(
'https://ident.me').read().decode('utf8')
external_ip = http.request('GET', 'https://ident.me').data
except Exception:
try:
external_ip = http.request.urlopen(
'https://ifconfig.me/ip').read().decode('utf8')
external_ip = http.request('GET', 'https://ifconfig.me/ip').data
except Exception:
external_ip = '127.0.0.1'
return external_ip
return '{}/{}'.format(external_ip, 32)
def get_random_id():

4
web/pgadmin/misc/cloud/__init__.py
View File

@ -114,7 +114,9 @@ def script():
methods=['GET'], endpoint='get_host_ip')
@login_required
def get_host_ip():
return make_json_response(data=get_my_ip())
"""test"""
ip = get_my_ip()
return make_json_response(data=ip)
@blueprint.route('/verify_credentials/',

2
web/pgadmin/misc/cloud/static/js/cloud.js
View File

@ -128,7 +128,7 @@ define('pgadmin.misc.cloud', [
return setTimeout((function () {
ReactDOM.unmountComponentAtNode(document.getElementById('cloudWizardDlg'));
return Alertify.cloudWizardDialog().destroy();
}), 500);
}), 10);
},
}
};

7
web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
View File

@ -88,10 +88,10 @@ class CloudDBCredSchema extends BaseUISchema {
noEmpty: true,
helpMessage: gettext('The cloud instance will be deployed in the selected region.')
},{
id: 'aws_access_key', label: gettext('AWS access key'), type: 'text',
id: 'aws_access_key', label: gettext('AWS access key'), type: 'password',
mode: ['create'], noEmpty: true,
}, {
id: 'aws_secret_access_key', label: gettext('AWS secret access key'), type: 'text',
id: 'aws_secret_access_key', label: gettext('AWS secret access key'), type: 'password',
mode: ['create'], noEmpty: true,
}, {
id: 'aws_session_token', label: gettext('AWS session token'), type: 'multiline',
@ -205,8 +205,7 @@ export class InstanceSchema extends BaseUISchema {
], noEmpty: true, orientation: 'vertical',
},{
id: 'aws_instance_type', label: gettext('Instance type'),
options: this.instanceOpts, noEmpty: true,
controlProps: { allowClear: false },
options: this.instanceOpts,
deps: ['aws_db_version', 'aws_db_instance_class'],
depChange: (state, source)=> {
if (source[0] == 'aws_db_instance_class') {

8
web/pgadmin/misc/cloud/utils/__init__.py
View File

@ -14,13 +14,11 @@ def get_my_ip():
""" Return the public IP of this host """
http = urllib3.PoolManager()
try:
external_ip = http.request.urlopen(
'https://ident.me').read().decode('utf8')
external_ip = http.request('GET', 'https://ident.me').data
except Exception:
try:
external_ip = http.request.urlopen(
'https://ifconfig.me/ip').read().decode('utf8')
external_ip = http.request('GET', 'https://ifconfig.me/ip').data
except Exception:
external_ip = '127.0.0.1'
return external_ip
return '{}/{}'.format(external_ip, 32)

1
web/pgadmin/static/js/components/FormComponents.jsx
View File

@ -762,6 +762,7 @@ export const InputSelect = forwardRef(({
if(typeof options === 'function') {
optPromise = options();
}
setFinalOptions([[], true]);
Promise.resolve(optPromise)
.then((res)=>{
/* If component unmounted, dont update state */