zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-06 16:32:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update validation for instance filters to allow 'tag:key=value'. Fixes https://trello.com/c/VH9Vnd8z.

Browse Source
This commit is contained in:
Chris Church
2014-12-17 02:31:33 -05:00
parent ee97e83b2c
commit 844e1b7343
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/inventory.py
View File

@@ -1017,7 +1017,7 @@ class InventorySourceOptions(BaseModel):
if self.source != 'ec2':
return ''
invalid_filters = []
instance_filter_re = re.compile(r'^(?:tag:.+)|(?:[a-z][a-z\.-]*[a-z])=.*$')
instance_filter_re = re.compile(r'^((tag:.+)|([a-z][a-z\.-]*[a-z]))=.*$')
for instance_filter in instance_filters.split(','):
instance_filter = instance_filter.strip()
if not instance_filter:
@@ -1026,6 +1026,8 @@ class InventorySourceOptions(BaseModel):
invalid_filters.append(instance_filter)
continue
instance_filter_name = instance_filter.split('=', 1)[0]
if instance_filter_name.startswith('tag:'):
continue
if instance_filter_name not in self.INSTANCE_FILTER_NAMES:
invalid_filters.append(instance_filter)
if invalid_filters: