Fix issues #69 and #70

.gitignore

@@ -3,11 +3,11 @@ test.py
 crossAccounts.json
 output.zip
 __fork/*.json
-adminlte/**XX/
-adminlte/**/*.html
-adminlte/**/*.xlsx
-adminlte/**/error.txt
-
+adminlte/aws/**/
+adminlte/aws/**/*.html
+adminlte/aws/**/*.xlsx
+adminlte/aws/**/error.txt
+.~c9_invoke*
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

README.md

@@ -79,7 +79,7 @@ screener --regions ap-southeast-1,us-east-1 --services rds,iam
 
 **Example 5: Run in the Singapore region, filter resources based on tags (e.g: Name=env Values=prod and Name=department Values=hr,coe)**
 ```
-screener --regions ap-southeast-1 --filters env=prod%department=hr,coe
+screener --regions ap-southeast-1 --tags env=prod%department=hr,coe
 ```
 
 **Example 6: Run in all regions and all services**

services/kms/kms.reporter.json

@@ -24,5 +24,25 @@
       "ref": [
           "[Best practices for AWS KMS grants]<https://docs.aws.amazon.com/kms/latest/developerguide/grants.html#grant-best-practices>"
       ]
+  },
+  "KeyInPendingDeletion":{
+    "category": "O",
+      "^description": "[Informational], no action needed. {$COUNT} KMS key is under Pending Deletion Stage.",
+      "downtime": 0,
+      "slowness": 0,
+      "additionalCost": 0,
+      "needFullTest": 0,
+      "criticality": "I",
+      "shortDesc": "[Info] No Action Needed"
+  },
+  "DisabledKey":{
+    "category": "O",
+      "^description": "[Informational], no action needed. {$COUNT} KMS key is under Disabled Stage.",
+      "downtime": 0,
+      "slowness": 0,
+      "additionalCost": 0,
+      "needFullTest": 0,
+      "criticality": "I",
+      "shortDesc": "[Info] No Action Needed"
   }
 }

utils/CfnTrail.py

@@ -52,7 +52,7 @@ def createStack(self):
                 TemplateBody=self.ymlBody
             )
             msg = "Empty CF stacked created successfully, name:" + self.getStackName()
-            _info(msg)
+            _info(msg, alwaysPrint=True)
 
         except botocore.exceptions.ClientError as e:
             ecode = e.response['Error']['Code']
@@ -68,7 +68,7 @@ def deleteStack(self):
             )
 
             msg = "Empty CF stacked deleted successfully, name:" + self.getStackName()
-            _info(msg)
+            _info(msg, alwaysPrint=True)
         except botocore.exceptions.ClientError as e:
             ecode = e.response['Error']['Code']
             emsg = e.response['Error']['Message']

utils/Tools.py

@@ -12,8 +12,8 @@ def _pr(s, forcePrint = False):
     if forcePrint or DEBUG == True:
         print(s)
 
-def _info(s):
-    _printStatus("info", s)
+def _info(s, alwaysPrint = False):
+    _printStatus("info", s, alwaysPrint)
 
 def _warn(s):
     _printStatus("\033[1;41m__!! WARNING !!__\033[0m", s, forcePrint=True)