Merge pull request #1523 from coreos-inc/verb-tag-cache-fix

Add a uniqueness hash to derived image storage to break caching over …

util/canonicaljson.py

@@ -0,0 +1,18 @@
+import collections
+
+def canonicalize(json_obj):
+  """This function canonicalizes a Python object that will be serialized as JSON.
+
+  Args:
+    json_obj (object): the Python object that will later be serialized as JSON.
+
+  Returns:
+    object: json_obj now sorted to its canonical form.
+
+  """
+  if isinstance(json_obj, collections.MutableMapping):
+    sorted_obj = sorted({key: canonicalize(val) for key, val in json_obj.items()}.items())
+    return collections.OrderedDict(sorted_obj)
+  elif isinstance(json_obj, (list, tuple)):
+    return [canonicalize(val) for val in json_obj]
+  return json_obj

util/security/fingerprint.py

@@ -1,26 +1,7 @@
-import collections
 import json
 
 from hashlib import sha256
-
-
-def canonicalize(json_obj):
-  """This function canonicalizes a Python object that will be serialized as JSON.
-
-  Args:
-    json_obj (object): the Python object that will later be serialized as JSON.
-
-  Returns:
-    object: json_obj now sorted to its canonical form.
-
-  """
-  if isinstance(json_obj, collections.MutableMapping):
-    sorted_obj = sorted({key: canonicalize(val) for key, val in json_obj.items()}.items())
-    return collections.OrderedDict(sorted_obj)
-  elif isinstance(json_obj, (list, tuple)):
-    return [canonicalize(val) for val in json_obj]
-  return json_obj
-
+from util.canonicaljson import canonicalize
 
 def canonical_kid(jwk):
   """This function returns the SHA256 hash of a canonical JWK.