From 5004022a1c88cad6a6c7267a255e9e91f08c96cc Mon Sep 17 00:00:00 2001
From: carnal0wnage <chris@carnal0wnage.com>
Date: Fri, 13 Apr 2018 02:32:36 -0400
Subject: [PATCH] rds updates

---
 libs/rds.py                  | 18 +++++++++++++-----
 modules/rds.py               | 10 ++++++++++
 rds_describe_db_instances.py |  4 ----
 3 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 modules/rds.py
 delete mode 100644 rds_describe_db_instances.py

diff --git a/libs/rds.py b/libs/rds.py
index 58ea635..77ef53e 100644
--- a/libs/rds.py
+++ b/libs/rds.py
@@ -9,7 +9,7 @@ regions = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'ca-central-1', '
 
 
 def describe_db_instances(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
-    print("doing stuff")
+    print("### Printing RDS DB instances  ###")
     try:
         for region in regions:
             client = boto3.client(
@@ -19,10 +19,18 @@ def describe_db_instances(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY):
                 region_name=region
             )
 
-            instances = client.describe_db_instances()
-            for r in instances['DBInstances']:
-                for i in r['Instances']:
-                    pp.pprint(i)
+            response = client.describe_db_instances()
+            # print(response)
+            if response.get('DBInstances') is None:
+                print("{} likely does not have RDS permissions\n" .format(AWS_ACCESS_KEY_ID))
+            elif len(response['DBInstances']) <= 0:
+                print("[-] DescribeDBInstances allowed for {} but no results [-]" .format(region))
+            else:
+                print("### {} RDS DB Instances ###" .format(region))
+                for r in response['DBInstances']:
+                    for i in r['Instances']:
+                        pp.pprint(i)
+        print("\n")
 
     except botocore.exceptions.ClientError as e:
         if e.response['Error']['Code'] == 'InvalidClientTokenId':
diff --git a/modules/rds.py b/modules/rds.py
new file mode 100644
index 0000000..26278c0
--- /dev/null
+++ b/modules/rds.py
@@ -0,0 +1,10 @@
+'''
+rds module
+'''
+
+
+from libs.rds import *
+from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
+
+def step_rds_describe_db_instances():
+     describe_db_instances(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
diff --git a/rds_describe_db_instances.py b/rds_describe_db_instances.py
deleted file mode 100644
index 6ea63ec..0000000
--- a/rds_describe_db_instances.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from libs.rds import *
-from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
-
-describe_db_instances(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)