diff --git a/detect_secrets/core/audit.py b/detect_secrets/core/audit.py index 6146a3326..daa5987a8 100644 --- a/detect_secrets/core/audit.py +++ b/detect_secrets/core/audit.py @@ -331,7 +331,7 @@ def print_audit_results(baseline_filename): baseline, baseline_filename, ), - indent=2, + indent='\t', sort_keys=True, ), ) diff --git a/detect_secrets/core/baseline.py b/detect_secrets/core/baseline.py index 41692f266..04c867503 100644 --- a/detect_secrets/core/baseline.py +++ b/detect_secrets/core/baseline.py @@ -340,7 +340,7 @@ def format_baseline_for_output(baseline): return json.dumps( baseline, - indent=2, + indent='\t', sort_keys=True, separators=(',', ': '), ) diff --git a/detect_secrets/core/report/output.py b/detect_secrets/core/report/output.py index a3abcba06..4a8b1a8b9 100644 --- a/detect_secrets/core/report/output.py +++ b/detect_secrets/core/report/output.py @@ -70,7 +70,7 @@ def print_json_report( if fail_on_audited_real: secrets += audited_real_secrets - print(json.dumps({'stats': stats, 'secrets': secrets}, indent=4)) + print(json.dumps({'stats': stats, 'secrets': secrets}, indent='\t')) def print_table_report( diff --git a/detect_secrets/core/secrets_collection.py b/detect_secrets/core/secrets_collection.py index d3948c647..bcc8c0f7e 100644 --- a/detect_secrets/core/secrets_collection.py +++ b/detect_secrets/core/secrets_collection.py @@ -479,7 +479,7 @@ def json(self): def __str__(self): # pragma: no cover return json.dumps( self.json(), - indent=2, + indent='\t', sort_keys=True, ) diff --git a/tests/core/report/output_test.py b/tests/core/report/output_test.py index 6a433dff9..e63916008 100644 --- a/tests/core/report/output_test.py +++ b/tests/core/report/output_test.py @@ -641,13 +641,13 @@ def test_print_json_report_no_failed_conditions( assert ( captured.out == """{ - "stats": { - "reviewed": 3, - "live": 0, - "unaudited": 0, - "audited_real": 0 - }, - "secrets": [] +\t"stats": { +\t\t"reviewed": 3, +\t\t"live": 0, +\t\t"unaudited": 0, +\t\t"audited_real": 0 +\t}, +\t"secrets": [] }\n""" ) @@ -674,32 +674,32 @@ def test_print_json_report_failed_conditions( assert ( captured.out == """{ - "stats": { - "reviewed": 3, - "live": 1, - "unaudited": 1, - "audited_real": 1 - }, - "secrets": [ - { - "failed_condition": "Live", - "filename": "will_be_mocked", - "line": 90, - "type": "Private key" - }, - { - "failed_condition": "Unaudited", - "filename": "will_be_mocked", - "line": 120, - "type": "Hex High Entropy String" - }, - { - "failed_condition": "Audited as real", - "filename": "will_be_mocked", - "line": 60, - "type": "Hex High Entropy String" - } - ] +\t"stats": { +\t\t"reviewed": 3, +\t\t"live": 1, +\t\t"unaudited": 1, +\t\t"audited_real": 1 +\t}, +\t"secrets": [ +\t\t{ +\t\t\t"failed_condition": "Live", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 90, +\t\t\t"type": "Private key" +\t\t}, +\t\t{ +\t\t\t"failed_condition": "Unaudited", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 120, +\t\t\t"type": "Hex High Entropy String" +\t\t}, +\t\t{ +\t\t\t"failed_condition": "Audited as real", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 60, +\t\t\t"type": "Hex High Entropy String" +\t\t} +\t] }\n""" ) @@ -722,18 +722,18 @@ def test_print_json_report_only_live( assert ( captured.out == """{ - "stats": { - "reviewed": 3, - "live": 1 - }, - "secrets": [ - { - "failed_condition": "Live", - "filename": "will_be_mocked", - "line": 90, - "type": "Private key" - } - ] +\t"stats": { +\t\t"reviewed": 3, +\t\t"live": 1 +\t}, +\t"secrets": [ +\t\t{ +\t\t\t"failed_condition": "Live", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 90, +\t\t\t"type": "Private key" +\t\t} +\t] }\n""" ) @@ -756,18 +756,18 @@ def test_print_json_report_only_unaudited( assert ( captured.out == """{ - "stats": { - "reviewed": 3, - "unaudited": 1 - }, - "secrets": [ - { - "failed_condition": "Unaudited", - "filename": "will_be_mocked", - "line": 120, - "type": "Hex High Entropy String" - } - ] +\t"stats": { +\t\t"reviewed": 3, +\t\t"unaudited": 1 +\t}, +\t"secrets": [ +\t\t{ +\t\t\t"failed_condition": "Unaudited", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 120, +\t\t\t"type": "Hex High Entropy String" +\t\t} +\t] }\n""" ) @@ -790,18 +790,18 @@ def test_print_json_report_only_audited_true( assert ( captured.out == """{ - "stats": { - "reviewed": 3, - "audited_real": 1 - }, - "secrets": [ - { - "failed_condition": "Audited as real", - "filename": "will_be_mocked", - "line": 60, - "type": "Hex High Entropy String" - } - ] +\t"stats": { +\t\t"reviewed": 3, +\t\t"audited_real": 1 +\t}, +\t"secrets": [ +\t\t{ +\t\t\t"failed_condition": "Audited as real", +\t\t\t"filename": "will_be_mocked", +\t\t\t"line": 60, +\t\t\t"type": "Hex High Entropy String" +\t\t} +\t] }\n""" ) diff --git a/tests/pre_commit_hook_test.py b/tests/pre_commit_hook_test.py index bbe873504..3e79c953c 100644 --- a/tests/pre_commit_hook_test.py +++ b/tests/pre_commit_hook_test.py @@ -338,7 +338,7 @@ def _create_old_baseline(has_result=True, use_private_key_scan=True): baseline['exclude_regex'] = '' return json.dumps( baseline, - indent=2, + indent='\t', sort_keys=True, ) @@ -359,7 +359,7 @@ def _create_baseline(has_result=True, use_private_key_scan=True, audited=True, v } return json.dumps( baseline, - indent=2, + indent='\t', sort_keys=True, )