From d7d8d717bb6a8eb36ca93b630910197a9422dab0 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix@sebix.at>
Date: Wed, 7 May 2025 12:19:26 +0200
Subject: [PATCH] maint: Removed obsolete JSON configuration file rewriter

---
 CHANGELOG.md                        |  1 +
 MANIFEST.in                         |  2 +-
 debian/rules                        |  1 -
 intelmq/bin/rewrite_config_files.py | 48 -----------------------------
 4 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100755 intelmq/bin/rewrite_config_files.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 470d2c9c53..726d99b7ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
 
 ### Tools
 - `intelmq.bin.intelmq_psql_initdb`: Use `JSONB` type by default, Postgres supports it since version 9 (PR#2597 by Sebastian Wagner).
+- `intelmq.bin.rewrite_config_files`: Removed obsolete JSON configuration file rewriter (PR#2613 by Sebastian Wagner).
 
 ### Contrib
 
diff --git a/MANIFEST.in b/MANIFEST.in
index c99d0aa446..fa24827472 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,7 +10,7 @@ graft intelmq/tests
 include COPYRIGHT
 include LICENSE
 include CHANGELOG.md
-recursive-exclude intelmq/bin intelmq_gen_feeds_docs.py intelmq_gen_harm_docs.py rewrite_config_files.py
+recursive-exclude intelmq/bin intelmq_gen_feeds_docs.py intelmq_gen_harm_docs.py
 exclude .*
 global-exclude *~
 global-exclude *.py[co]
diff --git a/debian/rules b/debian/rules
index 438e18d6c6..67dab327ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,6 @@ override_dh_auto_build:
 	# $(MAKE) docs
 
 override_dh_auto_install: $(BOTDOCS)
-	rm intelmq/bin/rewrite_config_files.py
 	sed -i -e '/#!\/usr\/bin\//d' intelmq/bin/*.py
 	sed -i -f debian/sedfile intelmq/etc/* setup.py contrib/logrotate/intelmq contrib/logcheck/logcheck.logfiles
 	dh_auto_install
diff --git a/intelmq/bin/rewrite_config_files.py b/intelmq/bin/rewrite_config_files.py
deleted file mode 100755
index 9d23572a3b..0000000000
--- a/intelmq/bin/rewrite_config_files.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-FileCopyrightText: 2016 Sebastian Wagner
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-# -*- coding: utf-8 -*-
-
-import argparse
-import glob
-import json
-import os
-import traceback
-
-
-def rewrite(fobj):
-    text = json.load(fobj)
-    clean = json.dumps(text, indent=4, sort_keys=True, separators=(',', ': ')) + '\n'
-    fobj.seek(0)
-    fobj.write(clean)
-    fobj.truncate()
-
-
-if __name__ == '__main__':  # pragma: no cover
-    DESCRIPTION = """
-    Rewrites JSON configuration files for developers of intelmq.
-
-    Corrections:
-        Indentation, sorting, separators
-    """
-    parser = argparse.ArgumentParser(prog='rewrite_config_files.py',
-                                     description="Test files")
-    parser.add_argument('-c', '--config',
-                        help='Path to the intelmq directory containing'
-                             'etc/*.conf',
-                        default='.')
-    args = parser.parse_args()
-
-    config_file_path = args.config
-
-    try:
-        for fn in glob.glob(os.path.join(config_file_path, 'etc/*.conf')):
-            with open(fn, 'r+') as f:
-                rewrite(f)
-
-    except OSError:
-        traceback.print_exc()
-        print('Could not open files. Wrong directory? Also see the --help.')