The following issues related to cloud deployment have been resolved:

- 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

web/pgacloud/utils/misc.py

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

web/pgadmin/misc/cloud/__init__.py

@@ -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/',

web/pgadmin/misc/cloud/static/js/cloud.js

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

web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js

@@ -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,
+      options: this.instanceOpts,
-      controlProps: { allowClear: false },
       deps: ['aws_db_version', 'aws_db_instance_class'],
       depChange: (state, source)=> {
         if (source[0] == 'aws_db_instance_class') {

web/pgadmin/misc/cloud/utils/__init__.py

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

web/pgadmin/static/js/components/FormComponents.jsx

@@ -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 */