Tweak input parsing for tags and update help text

Author: abiola-aws

enableDetective.py

@@ -46,7 +46,7 @@ class ParseCommaSeparatedKeyValuePairsAction(argparse.Action):
         def __call__(self, parser, namespace, values, option_string=None):
             setattr(namespace, self.dest, dict())
             for kv_pairs in values.split(","):
-                key, value = kv_pairs.split('=', 1)
+                key, _, value = kv_pairs.partition('=')
                 getattr(namespace, self.dest)[key] = value
 
    # Setup command line arguments
@@ -66,7 +66,9 @@ def __call__(self, parser, namespace, values, option_string=None):
                               'all available regions enabled.'))
     parser.add_argument('--tags',
                         action=ParseCommaSeparatedKeyValuePairsAction,
-                        help="Tags to be added to any newly enabled Detective graphs.")
+                        help='Comma-separated list of tag key-value pairs to be added '
+                             'to any newly enabled Detective graphs. Values are optional '
+                             'and are separated from keys by the equal sign (i.e. \'=\')')
     return parser.parse_args(args)
 
 

tests/test_scripts.py

@@ -26,13 +26,14 @@ def test_setup_command_line_enableDetective():
     assert args.master_account == '000000000001'
     assert args.tags == None
 
-    args = enableDetective.setup_command_line("--master_account 123456789012 --assume_role detectiveAdmin --input_file accounts.csv --tags TagKey1=TagValue1,TagKey2=TagValue2,TagKey3=TagValue3,TagKey4=,TagKey5=TagValue5".split(" "))
+    args = enableDetective.setup_command_line("--master_account 123456789012 --assume_role detectiveAdmin --input_file accounts.csv --tags TagKey1=TagValue1,TagKey2=TagValue2,TagKey3=TagValue3,TagKey4=,TagKey5=TagValue5,TagKey6".split(" "))
     assert args.tags == {
         "TagKey1": "TagValue1",
         "TagKey2": "TagValue2",
         "TagKey3": "TagValue3",
         "TagKey4": "",
         "TagKey5": "TagValue5",
+        "TagKey6": "",
     }
 
     # Wrong master account