Merge pull request #51 from Yelp/fix-null-labels

Fix null labels

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: git://github.com/pre-commit/pre-commit-hooks
-  rev: v1.2.3
+  rev: v2.2.1
   hooks:
     - id: check-added-large-files
     - id: check-docstring-first
@@ -14,7 +14,7 @@ repos:
     - id: requirements-txt-fixer
     - id: trailing-whitespace
 - repo: git://github.com/Yelp/detect-secrets
-  rev: 0.9.1
+  rev: v0.12.2
   hooks:
     - id: detect-secrets
       args: ['--baseline', '.secrets.baseline']

.secrets.baseline

@@ -1,6 +1,9 @@
 {
-  "exclude_regex": "tests/.*",
+  "exclude": {
-  "generated_at": "2018-07-12T23:43:31Z",
+    "files": "tests/.*",
+    "lines": null
+  },
+  "generated_at": "2019-04-24T14:36:38Z",
   "plugins_used": [
     {
       "base64_limit": 4.5,
@@ -15,5 +18,5 @@
     }
   ],
   "results": {},
-  "version": "0.9.1"
+  "version": "0.12.2"
 }

docker_custodian/docker_gc.py

@@ -76,21 +76,25 @@ def filter_excluded_containers(containers, exclude_container_labels):
 
 
 def should_exclude_container_with_labels(container, exclude_container_labels):
-    for exclude_label in exclude_container_labels:
+    if container['Labels']:
-        if exclude_label.value:
+        for exclude_label in exclude_container_labels:
-            matching_keys = fnmatch.filter(
+            if exclude_label.value:
-                container['Labels'].keys(),
+                matching_keys = fnmatch.filter(
-                exclude_label.key,
+                    container['Labels'].keys(),
-            )
+                    exclude_label.key,
-            label_values_to_check = [
+                )
-                container['Labels'][matching_key]
+                label_values_to_check = [
-                for matching_key in matching_keys
+                    container['Labels'][matching_key]
-            ]
+                    for matching_key in matching_keys
-            if fnmatch.filter(label_values_to_check, exclude_label.value):
+                ]
-                return True
+                if fnmatch.filter(label_values_to_check, exclude_label.value):
-        else:
+                    return True
-            if fnmatch.filter(container['Labels'].keys(), exclude_label.key):
+            else:
-                return True
+                if fnmatch.filter(
+                    container['Labels'].keys(),
+                    exclude_label.key
+                ):
+                    return True
     return False
 
 

tests/docker_gc_test.py

@@ -75,6 +75,7 @@ def test_filter_excluded_containers():
         {'Labels': {'too': 'lol'}},
         {'Labels': {'toots': 'lol'}},
         {'Labels': {'foo': 'bar'}},
+        {'Labels': None},
     ]
     result = docker_gc.filter_excluded_containers(mock_containers, None)
     assert mock_containers == list(result)
@@ -86,7 +87,11 @@ def test_filter_excluded_containers():
         mock_containers,
         exclude_labels,
     )
-    assert [mock_containers[0], mock_containers[2]] == list(result)
+    assert [
+        mock_containers[0],
+        mock_containers[2],
+        mock_containers[4]
+    ] == list(result)
     exclude_labels = [
         docker_gc.ExcludeLabel(key='too*', value='lol'),
     ]
@@ -94,7 +99,11 @@ def test_filter_excluded_containers():
         mock_containers,
         exclude_labels,
     )
-    assert [mock_containers[0], mock_containers[3]] == list(result)
+    assert [
+        mock_containers[0],
+        mock_containers[3],
+        mock_containers[4]
+    ] == list(result)
 
 
 def test_cleanup_images(mock_client, now):