Skip to content
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

Jump to bottom

Fix bug where FilterGroups were required, when technically they are not #1424

Merged
merged 1 commit into from
Jun 12, 2019
Merged

Fix bug where FilterGroups were required, when technically they are not #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/test_codebuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ def test_filter(self):
]).validate()

def test_filter_no_filtergroup(self):
match = "'FilterGroups is required when creating triggers'"
with self.assertRaisesRegexp(KeyError, match):
codebuild.ProjectTriggers().validate()
codebuild.ProjectTriggers(Webhook=True).validate()
# Technically this is valid, not sure why you would want this though?
codebuild.ProjectTriggers().validate()

def test_filter_not_list(self):
match = "<type 'int'>, expected <type 'list'>"
Expand Down
32 changes: 18 additions & 14 deletions troposphere/codebuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,22 +241,26 @@ class ProjectTriggers(AWSProperty):
}

def validate(self):
if 'FilterGroups' not in self.properties:
raise KeyError('FilterGroups is required when creating triggers')
if not isinstance(self.FilterGroups, list):
self._raise_type('FilterGroups', self.FilterGroups, list)
for counti, elem in enumerate(self.properties.get('FilterGroups')):
if not isinstance(elem, list):
self._raise_type(
'FilterGroups[{}]'.format(counti),
self.FilterGroups[counti], list
)
for countj, hook in enumerate(self.FilterGroups[counti]):
if not isinstance(hook, WebhookFilter):
""" FilterGroups, if set, needs to be a list of a list of
WebhookFilters
"""
filter_groups = self.properties.get('FilterGroups')
if filter_groups is not None:
if not isinstance(filter_groups, list):
self._raise_type('FilterGroups', filter_groups, list)

for counti, elem in enumerate(filter_groups):
if not isinstance(elem, list):
self._raise_type(
'FilterGroups[{}][{}]'.format(counti, countj),
hook, WebhookFilter
'FilterGroups[{}]'.format(counti),
filter_groups[counti], list
)
for countj, hook in enumerate(filter_groups[counti]):
if not isinstance(hook, WebhookFilter):
self._raise_type(
'FilterGroups[{}][{}]'.format(counti, countj),
hook, WebhookFilter
)


def validate_status(status):
Expand Down