diff --git a/libs/ec2.py b/libs/ec2.py index 4db6b39..1c355d8 100644 --- a/libs/ec2.py +++ b/libs/ec2.py @@ -88,6 +88,9 @@ def describe_instances(): if e.response['Error']['Code'] == 'UnauthorizedOperation': print('{} : (UnauthorizedOperation) when calling the DescribeInstances -- sure you have ec2 permissions?' .format(AWS_ACCESS_KEY_ID)) sys.exit() + elif e.response['Error']['Code'] == 'AuthFailure': + print('{} : (AuthFailure) when calling the DescribeInstances -- key is invalid or no permissions.' .format(AWS_ACCESS_KEY_ID)) + sys.exit() else: print(e) if len(response['Reservations']) <= 0: @@ -132,6 +135,9 @@ def describe_instances_basic(): if e.response['Error']['Code'] == 'UnauthorizedOperation': print('{} : (UnauthorizedOperation) when calling the DescribeInstances -- sure you have ec2 permissions?' .format(AWS_ACCESS_KEY_ID)) sys.exit() + elif e.response['Error']['Code'] == 'AuthFailure': + print('{} : (AuthFailure) when calling the DescribeInstances -- key is invalid or no permissions for region.' .format(AWS_ACCESS_KEY_ID)) + sys.exit() else: print(e) if len(response['Reservations']) <= 0: diff --git a/weirdAAL.py b/weirdAAL.py index 19fb37c..91dca42 100755 --- a/weirdAAL.py +++ b/weirdAAL.py @@ -17,7 +17,7 @@ import builtins os.environ['AWS_SHARED_CREDENTIALS_FILE'] = '.env' # If you want to use a transparent + supports SSL proxy you can put it here -# os.environ['HTTPS_PROXY'] = 'https://127.0.0.1:8888' +# os.environ['HTTPS_PROXY'] = 'https://149.56.108.133:3128' sys.path.append("modules") for module in all_modules: @@ -67,8 +67,8 @@ def method_create(): try: perform_credential_check() except: - print("Please supply keys as outlined in our README.md file") - # exit(1) + print("Check the above error message and fix to use weirdAAL") + sys.exit(1) if (args.list): pass