From 6d7b0c9a15786190cd0d25854a3456157f8af5cf Mon Sep 17 00:00:00 2001 From: Jeff Albert Date: Thu, 15 Sep 2016 14:52:57 -0400 Subject: [PATCH 1/2] Fixed issue when invalid resource type is used it would return all tags. Behavoir differed from that of AWS behavior --- moto/ec2/models.py | 3 +-- setup.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/moto/ec2/models.py b/moto/ec2/models.py index e65d7fd44..f90ceae9f 100755 --- a/moto/ec2/models.py +++ b/moto/ec2/models.py @@ -846,8 +846,7 @@ class TagBackend(object): resource_id_filters.append(re.compile(simple_aws_filter_to_re(value))) if tag_filter == 'resource-type': for value in filters[tag_filter]: - if value in self.VALID_TAG_RESOURCE_FILTER_TYPES: - resource_type_filters.append(value) + resource_type_filters.append(value) if tag_filter == 'value': for value in filters[tag_filter]: value_filters.append(re.compile(simple_aws_filter_to_re(value))) diff --git a/setup.py b/setup.py index e079dbac0..928f28c75 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ extras_require = { setup( name='moto', - version='0.4.26', + version='0.4.27', description='A library that allows your python tests to easily' ' mock out the boto library', author='Steve Pulec', From d3b2bdace2d3a84370c58fd1f1b36a7b38836706 Mon Sep 17 00:00:00 2001 From: Jeff Albert Date: Fri, 16 Sep 2016 23:31:07 -0400 Subject: [PATCH 2/2] Reverted version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 928f28c75..e079dbac0 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ extras_require = { setup( name='moto', - version='0.4.27', + version='0.4.26', description='A library that allows your python tests to easily' ' mock out the boto library', author='Steve Pulec',