PR fixes and more lint error fixes

Lauren Frederick · whummer · commit 6ff360533f66 · 2019-04-24T01:41:31.000+02:00
diff --git a/localstack/services/awslambda/lambda_api.py b/localstack/services/awslambda/lambda_api.py
@@ -964,9 +964,7 @@ def update_event_source_mapping(mapping_uuid):
     if not mapping_uuid:
         return jsonify({})
     function_name = data.get('FunctionName') or ''
-    enabled = data.get('Enabled')
-    if enabled is None:
-        enabled = True
+    enabled = data.get('Enabled', True)
     batch_size = data.get('BatchSize') or 100
     mapping = update_event_source(mapping_uuid, function_name, enabled, batch_size)
     return jsonify(mapping)
diff --git a/localstack/services/awslambda/lambda_executors.py b/localstack/services/awslambda/lambda_executors.py
@@ -420,7 +420,7 @@ def get_docker_container_status(self, func_arn):
             # Check if the container is already running
             # Note: filtering by *exact* name using regex filter '^...$' seems unstable on some
             # systems. Therefore, we use a combination of filter and grep to get the results.
-            cmd = ('docker ps -a --filter name=\'%s\' '
+            cmd = ("docker ps -a --filter name='%s' "
                    '--format "{{ .Status }} - {{ .Names }}" '
                    '| grep -w "%s" | cat') % (container_name, container_name)
             LOG.debug('Getting status for container "%s": %s' % (container_name, cmd))
diff --git a/tests/unit/test_sns_listener.py b/tests/unit/test_sns_listener.py
@@ -170,7 +170,7 @@ def test_filter_policy():
         (
             'exact string filter on an array',
             {'filter': 'soccer'},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},
             True
         ),
         (
@@ -200,7 +200,7 @@ def test_filter_policy():
         (
             'or string filter match with an array',
             {'filter': ['soccer', 'basketball']},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},
             True
         ),
         (
@@ -218,7 +218,7 @@ def test_filter_policy():
         (
             'or string filter no match with an array',
             {'filter': ['volleyball', 'basketball']},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},
             False
         ),
         (
@@ -242,7 +242,7 @@ def test_filter_policy():
         (
             'prefix string filter match with an array',
             {'filter': [{'prefix': 'soc'}]},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},
             True
         ),
         (
@@ -332,7 +332,7 @@ def test_filter_policy():
         (
             'logical OR with match on an array',
             {'filter': ['test1', 'test2', {'prefix': 'typ'}]},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'test1\', \'other\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['test1', 'other']"}},
             True
         ),
         (
@@ -344,7 +344,7 @@ def test_filter_policy():
         (
             'logical OR no match on an array',
             {'filter': ['test1', 'test2', {'prefix': 'typ'}]},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'anything\', \'something\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['anything', 'something']"}},
             False
         ),
         (
@@ -422,7 +422,7 @@ def test_filter_policy():
         (
             'multiple conditions on an array',
             {'filter': ['test1', 'test2', {'prefix': 'som'}]},
-            {'filter': {'Type': 'String.Array', 'Value': '[\'anything\', \'something\']'}},
+            {'filter': {'Type': 'String.Array', 'Value': "['anything', 'something']"}},
             True
         )
     ]

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ def test_filter_policy():`
`170`	`170`	`(`
`171`	`171`	`'exact string filter on an array',`
`172`	`172`	`{'filter': 'soccer'},`
`173`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},`
	`173`	`+ {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},`
`174`	`174`	`True`
`175`	`175`	`),`
`176`	`176`	`(`
`@@ -200,7 +200,7 @@ def test_filter_policy():`
`200`	`200`	`(`
`201`	`201`	`'or string filter match with an array',`
`202`	`202`	`{'filter': ['soccer', 'basketball']},`
`203`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},`
	`203`	`+ {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},`
`204`	`204`	`True`
`205`	`205`	`),`
`206`	`206`	`(`
`@@ -218,7 +218,7 @@ def test_filter_policy():`
`218`	`218`	`(`
`219`	`219`	`'or string filter no match with an array',`
`220`	`220`	`{'filter': ['volleyball', 'basketball']},`
`221`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},`
	`221`	`+ {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},`
`222`	`222`	`False`
`223`	`223`	`),`
`224`	`224`	`(`
`@@ -242,7 +242,7 @@ def test_filter_policy():`
`242`	`242`	`(`
`243`	`243`	`'prefix string filter match with an array',`
`244`	`244`	`{'filter': [{'prefix': 'soc'}]},`
`245`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'soccer\', \'rugby\', \'hockey\']'}},`
	`245`	`+ {'filter': {'Type': 'String.Array', 'Value': "['soccer', 'rugby', 'hockey']"}},`
`246`	`246`	`True`
`247`	`247`	`),`
`248`	`248`	`(`
`@@ -332,7 +332,7 @@ def test_filter_policy():`
`332`	`332`	`(`
`333`	`333`	`'logical OR with match on an array',`
`334`	`334`	`{'filter': ['test1', 'test2', {'prefix': 'typ'}]},`
`335`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'test1\', \'other\']'}},`
	`335`	`+ {'filter': {'Type': 'String.Array', 'Value': "['test1', 'other']"}},`
`336`	`336`	`True`
`337`	`337`	`),`
`338`	`338`	`(`
`@@ -344,7 +344,7 @@ def test_filter_policy():`
`344`	`344`	`(`
`345`	`345`	`'logical OR no match on an array',`
`346`	`346`	`{'filter': ['test1', 'test2', {'prefix': 'typ'}]},`
`347`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'anything\', \'something\']'}},`
	`347`	`+ {'filter': {'Type': 'String.Array', 'Value': "['anything', 'something']"}},`
`348`	`348`	`False`
`349`	`349`	`),`
`350`	`350`	`(`
`@@ -422,7 +422,7 @@ def test_filter_policy():`
`422`	`422`	`(`
`423`	`423`	`'multiple conditions on an array',`
`424`	`424`	`{'filter': ['test1', 'test2', {'prefix': 'som'}]},`
`425`		`- {'filter': {'Type': 'String.Array', 'Value': '[\'anything\', \'something\']'}},`
	`425`	`+ {'filter': {'Type': 'String.Array', 'Value': "['anything', 'something']"}},`
`426`	`426`	`True`
`427`	`427`	`)`
`428`	`428`	`]`