public inbox for [email protected]  

help / color / mirror / Atom feed

From: Yogesh Mahajan <[email protected]>
To: pgadmin-hackers <[email protected]>
Cc: Khushboo Vashi <[email protected]>
Subject: [Patch] - AWS Cloud Deployment fixes
Date: Thu, 3 Mar 2022 19:03:22 +0530
Message-ID: <CAMa=N=Mh9y+SockU4Nki=kf=aZAXiN7Jbikggsuqd4E93V0c-g@mail.gmail.com> (raw)

Hi,

Please find the attached patch to fix the below issues in AWS cloud
deployment:

1.Console error logged for db version 9.6.1 due to boto3 version update
2.Unmask Access Key field
3.Update supported DB version list to postgres 10 & 10+.

Thanks,
Yogesh Mahajan
EnterpriseDB


Attachments:

  [application/octet-stream] cloud_deployment_fixes_v1.patch (1.8K, 3-cloud_deployment_fixes_v1.patch)
  download | inline diff:
diff --git a/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js b/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
index 593deb601..f26a6c199 100644
--- a/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
+++ b/web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
@@ -88,7 +88,7 @@ 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: 'password',
+        id: 'aws_access_key', label: gettext('AWS access key'), type: 'text',
         mode: ['create'], noEmpty: true,
       }, {
         id: 'aws_secret_access_key', label: gettext('AWS secret access key'), type: 'password',
diff --git a/web/pgadmin/misc/cloud/utils/rds.py b/web/pgadmin/misc/cloud/utils/rds.py
index 177e0aaae..9c32cbbf1 100644
--- a/web/pgadmin/misc/cloud/utils/rds.py
+++ b/web/pgadmin/misc/cloud/utils/rds.py
@@ -122,7 +122,7 @@ def get_aws_db_instances(eng_version):
         return False, 'Session has not created yet.'
 
     if not eng_version or eng_version == '' or eng_version == 'undefined':
-        eng_version = '9.6.1'
+        eng_version = '10.17'
 
     rds_obj = pickle.loads(session['aws']['aws_rds_obj'])
     res = rds_obj.get_available_db_instance_class(
@@ -148,7 +148,8 @@ def get_aws_db_versions():
 
     rds_obj = pickle.loads(session['aws']['aws_rds_obj'])
     db_versions = rds_obj.get_available_db_version()
-    res = db_versions['DBEngineVersions']
+    res = list(filter(lambda val: not val['EngineVersion'].startswith('9.6'),
+                      db_versions['DBEngineVersions']))
     versions = []
     for value in res:
         versions.append({

view thread (2+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected]
  Subject: Re: [Patch] - AWS Cloud Deployment fixes
  In-Reply-To: <CAMa=N=Mh9y+SockU4Nki=kf=aZAXiN7Jbikggsuqd4E93V0c-g@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox