From e5878d19de64486524e8e42c5c8d5ace79946a5a Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 5 Oct 2018 15:37:34 -0500 Subject: [PATCH] AWS: check dbname attribute before accessing (#46253) Check dbname attribute in instance before accessing it in RDS module Fixes: #38210 Signed-off-by: Abhijeet Kasurde --- lib/ansible/modules/cloud/amazon/rds.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/rds.py b/lib/ansible/modules/cloud/amazon/rds.py index d9b0d87280..16ab2fd97a 100644 --- a/lib/ansible/modules/cloud/amazon/rds.py +++ b/lib/ansible/modules/cloud/amazon/rds.py @@ -716,8 +716,7 @@ class RDSDBInstance: d["endpoint"] = None d["port"] = None d["vpc_security_groups"] = None - if self.instance.DBName: - d['DBName'] = self.instance.DBName + d['DBName'] = self.instance.DBName if hasattr(self.instance, 'DBName') else None # ReadReplicaSourceDBInstanceIdentifier may or may not exist try: d["replication_source"] = self.instance.ReadReplicaSourceDBInstanceIdentifier @@ -810,8 +809,7 @@ class RDS2DBInstance: else: d['endpoint'] = None d['port'] = None - if self.instance["DBName"]: - d['DBName'] = self.instance['DBName'] + d['DBName'] = self.instance['DBName'] if hasattr(self.instance, 'DBName') else None return d