Use sys.exit instead of exit, reorder imports

kinder/ebs.py

@@ -8,6 +8,7 @@
 ###############################################################################
 # TODO:
 ###############################################################################
+import sys
 from re import search
 
 from kinder.ec2 import EC2  # need to work with instance parents
@@ -20,7 +21,7 @@ def __init__(self, volume_id, region, sess):
             self.conn = sess.resource("ec2", region_name=region)
         except Exception as e:
             KLog.log("issue connecting to AWS %s" % str(e), "critical")
-            exit("[!] issue connecting to AWS: %s" % str(e))
+            sys.exit("[!] issue connecting to AWS: %s" % str(e))
         # get volume reference
         self.volume = self.conn.Volume(volume_id)
         self.region = region

kinder/ec2.py

@@ -5,6 +5,8 @@
 ###############################################################################
 # TODO:
 ###############################################################################
+import sys
+
 from botocore.exceptions import ClientError
 
 from lib.krampus_logging import KLog
@@ -16,7 +18,7 @@ def __init__(self, instance_id, region, sess):
             self.conn = sess.resource("ec2", region)
         except Exception as e:
             KLog.log("issue connecting to AWS %s" % str(e), "critical")
-            exit("[!] issue connecting to AWS: %s" % str(e))
+            sys.exit("[!] issue connecting to AWS: %s" % str(e))
         # set it
         self.instance = self.getInstanceByID(instance_id)
         # verify the instance

kinder/lambda_funcs.py

@@ -5,6 +5,8 @@
 ###############################################################################
 # TODO:
 ###############################################################################
+import sys
+
 from lib.krampus_logging import KLog
 
 
@@ -14,7 +16,7 @@ def __init__(self, func_name, region, sess):
             self.conn = sess.client("lambda", region_name=region)
         except Exception as e:
             KLog.log("issue connecting to AWS %s" % str(e), "critical")
-            exit("[!] issue connecting to AWS: %s" % str(e))
+            sys.exit("[!] issue connecting to AWS: %s" % str(e))
         # get volume reference
         self.func = func_name
         self.region = region

kinder/rds.py

@@ -6,6 +6,8 @@
 # TODO:
 # add more disable groups/rules
 ###############################################################################
+import sys
+
 from lib.krampus_logging import KLog
 
 
@@ -15,7 +17,7 @@ def __init__(self, instance_name, region, sess):
             self.conn = sess.client('rds', region_name=region)
         except:
             KLog.log("issue connecting to AWS", "critical")
-            exit("[!] issue connecting to AWS")
+            sys.exit("[!] issue connecting to AWS")
         # set it
         self.name = instance_name
         self.disable_groups = ['sg-c6d41cae']

kinder/s3.py

@@ -7,6 +7,8 @@
 ###############################################################################
 # TODO:
 ###############################################################################
+import sys
+
 from lib.krampus_logging import KLog
 
 
@@ -16,7 +18,7 @@ def __init__(self, bucket_name, sess, region="us-east-1"):
             self.conn = sess.resource("s3", region_name=region)
         except:
             KLog.log("issue connecting to AWS", "critical")
-            exit("[!] issue connecting to AWS")
+            sys.exit("[!] issue connecting to AWS")
         # set it - as far as krampus is concerned the acls are the bucket
         self.bucket = self.conn.BucketAcl(bucket_name)
 

kinder/security_group.py

@@ -4,7 +4,10 @@
 # TODO:
 # no ipv6 support
 ###############################################################################
+import sys
+
 from botocore.exceptions import ClientError
+
 from lib.krampus_logging import KLog
 
 
@@ -20,7 +23,7 @@ def __init__(self, group_id, region, sess):
             self.group = False
         except:
             KLog.log("issue connecting to AWS", "critical")
-            exit("[!] issue connecting to AWS")
+            sys.exit("[!] issue connecting to AWS")
 
     # see if there is a specified range in this rule
     def hasRange(self, rules, cidr_range):

lib/krampus_tasks.py

@@ -4,22 +4,23 @@
 # TODO:
 # all these tasks should return a status to krampus.py
 ###############################################################################
-import boto3
-from botocore.exceptions import ClientError
 import json
-import time
 import sys
+import time
+
+import boto3
+from botocore.exceptions import ClientError
 
+from kinder import ebs
 # our stuff
 from kinder import ec2
 from kinder import iam
+from kinder import lambda_funcs
 from kinder import rds
 from kinder import s3
 from kinder import security_group
-from kinder import ebs
-from kinder import lambda_funcs
-from lib.krampus_logging import KLog
 from lib.aws_sessions import KSession
+from lib.krampus_logging import KLog
 
 # not sure what keys will be passed, but I do know how what krampus wants
 KEYS = {
@@ -240,7 +241,7 @@ def getTasks(self, key):
             self.json_data = json.load(self.bucket.Object(key).get()['Body'])
         except ClientError as e:
             KLog.log("failed to download tasks file: %s" % str(e), "critical")
-            exit()
+            sys.exit()
         for job in self.json_data['tasks']:
             # resolve the arn
             arn_obj = KTask.ARN(job[KEYS['arn']])