From 5e88b0c2b27abbc831a2af74407aa2caffb411a2 Mon Sep 17 00:00:00 2001 From: Chris Gates Date: Mon, 16 Apr 2018 15:08:43 -0400 Subject: [PATCH] lambda config and pep8 --- libs/aws_lambda.py | 19 +++++-------------- modules/aws_lambda.py | 5 ++--- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/libs/aws_lambda.py b/libs/aws_lambda.py index d4299fb..5e8e632 100644 --- a/libs/aws_lambda.py +++ b/libs/aws_lambda.py @@ -14,18 +14,14 @@ pp = pprint.PrettyPrinter(indent=5, width=80) regions = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'ca-central-1', 'eu-central-1', 'eu-west-1', 'eu-west-2', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', ] -def list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY): +def list_functions(): print("### Listing Lambda Functions ###") try: for region in regions: - client = boto3.client( - 'lambda', - aws_access_key_id=AWS_ACCESS_KEY_ID, - aws_secret_access_key=AWS_SECRET_ACCESS_KEY, - region_name=region - ) + client = boto3.client('lambda', region_name=region) response = client.list_functions() + # print(response) if response.get('Functions') is None: print("{} likely does not have Lambda permissions\n" .format(AWS_ACCESS_KEY_ID)) @@ -49,16 +45,11 @@ def list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY): print("CTRL-C received, exiting...") -def list_event_source_mappings(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY): +def list_event_source_mappings(): print("### Listing Lambda Event Source Mappings ###") try: for region in regions: - client = boto3.client( - 'lambda', - aws_access_key_id=AWS_ACCESS_KEY_ID, - aws_secret_access_key=AWS_SECRET_ACCESS_KEY, - region_name=region - ) + client = boto3.client('lambda', region_name=region) response = client.list_event_source_mappings() diff --git a/modules/aws_lambda.py b/modules/aws_lambda.py index 525b031..4af3bbe 100644 --- a/modules/aws_lambda.py +++ b/modules/aws_lambda.py @@ -2,12 +2,11 @@ This file is used to list lambda functions and event mappings ''' from libs.aws_lambda import * -from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY def step_lambda_list_functions(): - list_functions(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) + list_functions() def step_lambda_list_event_source_mappings(): - list_event_source_mappings(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY) + list_event_source_mappings()