REL: 3.0.0 Release candidate 1

CHANGELOG.rst

@@ -1,5 +1,5 @@
 .. 
-   SPDX-FileCopyrightText: 2020 Birger Schacht
+   SPDX-FileCopyrightText: 2020-2021 Birger Schacht, Sebastian Wagner
    SPDX-License-Identifier: AGPL-3.0-or-later
 
 CHANGELOG
@@ -9,7 +9,28 @@ CHANGELOG
 3.0.0 (unreleased)
 ------------------
 
-The API endpoint ``/api/config`` no longer provides the ``BOTS`` file, as it was removed from IntelMQ. The new endpoint ``/api/bots`` provides the same information.
+- The API endpoint ``/api/config`` no longer provides the ``BOTS`` file, as it was removed from IntelMQ. The new endpoint ``/api/bots`` provides the same information.
+- Adapt the configuration file handling to IntelMQ 3.0 (PR#30 by Birger Schacht).
+  In IntelMQ 3 the defaults.conf and the pipeline.conf were dropped,
+  therefore access to those files via the API is not useful anymore.
+  At the same time, the runtime.conf now includes pipeline configuration
+  and is stored as a YAML file. Given those changes, the whole
+  configuration file handling had to be rewritten: There are now 3 API
+  endpoints:
+  * ``/api/runtime`` to read (get) and write (post) the runtime configuration
+  * ``/api/positions`` to read (get) and write (post) the positions configuration
+  * ``/api/harmonization`` to read (get) the harmonization information
+  Everything is still done using JSON objects, the conversion to YAML is
+  done internally.
+  The removal of the ``save_file`` method also includes the removal of some
+  sanity checks that ran before the file was saved. Some of those should
+  probably be part of intelmq itself (i.e. checking for allowed characters
+  in bot names).
+- fix json output and add error handling (PR#31 by Birger Schacht, fixes #14):
+  Hug can not simply return a string that contains json. Therefore the
+  content of the files first has to converted to a JSON object.
+  This commit also implements simple error handling in case the files do
+  not exists or can not be created.
 
 
 2.3.1 (2021-03-25)

debian/changelog

@@ -1,6 +1,12 @@
+intelmq-api (3.0.0~rc1-1) unstable; urgency=low
+
+  * Update to 3.0.0 Release candidate 1.
+
+ -- Sebastian Wagner <[email protected]>  Fri, 25 Jun 2021 10:56:45 +0200
+
 intelmq-api (2.3.1-1) unstable; urgency=medium
 
-  * Uodate to 2.3.1.
+  * Update to 2.3.1.
 
  -- Sebastian Wagner <[email protected]>  Thu, 25 Mar 2021 11:13:33 +0100
 

intelmq_api/version.py

@@ -3,5 +3,5 @@
 SPDX-FileCopyrightText: 2020 Birger Schacht
 SPDX-License-Identifier: AGPL-3.0-or-later
 """
-__version_info__ = (2, 3, 1)
+__version_info__ = (3, 0, 0, 'rc1')
 __version__ = '.'.join(map(str, __version_info__))