Enable json's sort_keys for .habcache files

MHendricks · MHendricks · commit 6d3b79d609a5 · 2024-11-05T16:03:22.000-08:00
This makes it so the resulting json data is consistently ordered.
diff --git a/hab/cache.py b/hab/cache.py
@@ -222,7 +222,7 @@ def save_cache(self, resolver, site_file, version=1):
         cache = self.generate_cache(resolver, site_file, version=version)
 
         with cache_file.open("w") as fle:
-            json.dump(cache, fle, indent=4, cls=utils.HabJsonEncoder)
+            json.dump(cache, fle, indent=4, sort_keys=True, cls=utils.HabJsonEncoder)
         return cache_file
 
     def site_cache_path(self, path):
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -50,7 +50,7 @@ def generate_habcached_site_file(config_root, dest):
     }
 
     with site_file.open("w") as fle:
-        json.dump(data, fle, indent=4)
+        json.dump(data, fle, indent=4, sort_keys=True)
 
     return site_file
 
diff --git a/tests/site_main_check.habcache b/tests/site_main_check.habcache

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def generate_habcached_site_file(config_root, dest):`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`with site_file.open("w") as fle:`
`53`		`- json.dump(data, fle, indent=4)`
	`53`	`+ json.dump(data, fle, indent=4, sort_keys=True)`
`54`	`54`
`55`	`55`	`return site_file`
`56`	`56`