ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 11:10:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AWS: check dbname attribute before accessing (#46253)

Browse source 
Check dbname attribute in instance before accessing it in RDS module

Fixes: #38210

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2018-10-05 15:37:34 -05:00 • committed by Ryan Brown
parent a4c9f57b38
commit e5878d19de
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/amazon/rds.py
View file

@ -716,8 +716,7 @@ class RDSDBInstance:
d["endpoint"] = None d["endpoint"] = None
d["port"] = None d["port"] = None
d["vpc_security_groups"] = None d["vpc_security_groups"] = None
if self.instance.DBName: d['DBName'] = self.instance.DBName if hasattr(self.instance, 'DBName') else None
d['DBName'] = self.instance.DBName
# ReadReplicaSourceDBInstanceIdentifier may or may not exist # ReadReplicaSourceDBInstanceIdentifier may or may not exist
try: try:
d["replication_source"] = self.instance.ReadReplicaSourceDBInstanceIdentifier d["replication_source"] = self.instance.ReadReplicaSourceDBInstanceIdentifier
@ -810,8 +809,7 @@ class RDS2DBInstance:
else: else:
d['endpoint'] = None d['endpoint'] = None
d['port'] = None d['port'] = None
if self.instance["DBName"]: d['DBName'] = self.instance['DBName'] if hasattr(self.instance, 'DBName') else None
d['DBName'] = self.instance['DBName']
return d return d