Skip to content

Not enforcing the role to be set in config #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Not enforcing the role to be set in config #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cffdc
Not enforcing the role to be set in config
jarosser06 Jun 2, 2016
fdfc3dd
WIP
jarosser06 Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions lambda_uploader/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,25 @@
basestring = str

REQUIRED_PARAMS = {u'name': basestring, u'description': basestring,
u'region': basestring, u'handler': basestring,
u'role': basestring, u'timeout': int, u'memory': int}
u'handler': basestring}
REQUIRED_UPLOADER_PARAMS = {u'memory': int, u'timeout': int,
u'handler': basestring}
REQUIRED_VPC_PARAMS = {u'subnets': list, u'security_groups': list}

DEFAULT_PARAMS = {u'requirements': [], u'publish': False,
u'alias': None, u'alias_description': None,
u'ignore': [], u'extra_files': [], u'vpc': None,
u's3_bucket': None, u's3_key': None}
u's3_bucket': None, u's3_key': None, u'role': None,
u'timeout': 3, u'memory': 128, u'region': None}


class Config(object):
def __init__(self, pth, config_file=None, role=None):
def __init__(self, pth, config_file=None, role=None, region=None):
self._path = pth
self._config = None
self._load_config(config_file)
if role is not None:
self._config['role'] = role
self._config['role'] = role
self._config['region'] = region
self._set_defaults()
if self._config['vpc']:
self._validate_vpc()
Expand Down
3 changes: 3 additions & 0 deletions lambda_uploader/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ def main(arv=None):
parser.add_argument('--virtualenv', '-e',
help='use specified virtualenv instead of making one',
default=None)
parser.add_argument('--region', dest='region',
help='Region to upload lambda function to',
const=True)
parser.add_argument('--extra-files', '-x',
action='append',
help='include file or directory path in package',
Expand Down