Merge pull request #137 from kuettai/main

Added handling for RDS CACert, Fix #136

requirements.txt

@@ -1,4 +1,4 @@
-boto3~=1.26.114
+boto3~=1.33.13
 packaging~=23.1
 XlsxWriter~=3.1.0
 netaddr~=0.9.0

services/rds/drivers/RdsCommon.py

@@ -18,6 +18,7 @@ def __init__(self, db, rdsClient, ctClient, cwClient):
         self.rdsClient = rdsClient
         self.cwClient = cwClient
         self.ctClient = ctClient
+        self.certInfo = None
 
         self.__configPrefix = 'rds::' + db['Engine'] + '::' + db['EngineVersion'] + '::'
         self.isCluster = True
@@ -42,6 +43,10 @@ def getCAInfo(self):
         if self.isCluster == True:
             return
 
+        if not 'CACertificateIdentifier'in self.db:
+            _warn("Unable to locate CACertificateIdentifier")
+            return
+
         ca = self.db['CACertificateIdentifier']
         k = 'RDSCaInfo::' + ca
 
@@ -452,6 +457,9 @@ def _checkOldSnapshots(self):
             self.results['ManualSnapshotTooOld'] = [-1, days]
 
     def _checkCAExpiry(self):
+        if self.certInfo == None:
+            return
+
         if self.isCluster == False and self.certInfo['isExpireIn365days'] == True:
             exp = self.certInfo['ValidTill'].strftime("%Y-%m-%d")
             self.results['CACertExpiringIn365days'] = [-1, "Expired on {}, ({} days left)".format(exp, self.certInfo['expiredInDays'])]