From ae4c19f6b6d477f426ae9844142ac380088b4e29 Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Thu, 14 Jun 2018 14:03:16 -0700 Subject: [PATCH 1/2] [baseline output] Add sorted_keys=True to json.dumps --- detect_secrets/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/detect_secrets/main.py b/detect_secrets/main.py index dfe05d9fd..9704a11ac 100644 --- a/detect_secrets/main.py +++ b/detect_secrets/main.py @@ -38,6 +38,7 @@ def main(argv=None): args.scan ).format_for_baseline_output(), indent=2, + sort_keys=True ) ) From e15d0a99697900273abe96ca1387446f22c439dd Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Thu, 14 Jun 2018 14:29:23 -0700 Subject: [PATCH 2/2] [baseline output] Add sort_keys=True to all call-sites --- detect_secrets/core/secrets_collection.py | 6 +++++- detect_secrets/pre_commit_hook.py | 1 + tests/pre_commit_hook_test.py | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/detect_secrets/core/secrets_collection.py b/detect_secrets/core/secrets_collection.py index 3949078a6..eaea44432 100644 --- a/detect_secrets/core/secrets_collection.py +++ b/detect_secrets/core/secrets_collection.py @@ -325,7 +325,11 @@ def json(self): return output def __str__(self): # pragma: no cover - return json.dumps(self.json(), indent=2) + return json.dumps( + self.json(), + indent=2, + sort_keys=True + ) def __getitem__(self, key): # pragma: no cover return self.data[key] diff --git a/detect_secrets/pre_commit_hook.py b/detect_secrets/pre_commit_hook.py index e6093d9b2..16c30c6ee 100644 --- a/detect_secrets/pre_commit_hook.py +++ b/detect_secrets/pre_commit_hook.py @@ -58,6 +58,7 @@ def main(argv=None): json.dumps( baseline_collection.format_for_baseline_output(), indent=2, + sort_keys=True ) ) diff --git a/tests/pre_commit_hook_test.py b/tests/pre_commit_hook_test.py index 982e13618..ee126d975 100644 --- a/tests/pre_commit_hook_test.py +++ b/tests/pre_commit_hook_test.py @@ -166,4 +166,8 @@ def _create_baseline(): }, } - return json.dumps(baseline, indent=2) + return json.dumps( + baseline, + indent=2, + sort_keys=True + )