Add support for iRODS 5.0.x

Author: stsnel

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   integrity checks, rather than running all of them. This can be useful
   on larger environments, where running all checks would be very time-consuming
   or even not feasible.
+* Add support for iRODS 5.0.x
 
 ## [1.0.0] - 2022-11-08
 

README.md

@@ -14,7 +14,8 @@ This script checks the iRODS ICAT database for unexpected issues, specifically:
 - Data objects with too few replicas (the default minimum is one replica)
 - Missing indexes
 
-The present version of the script is suitable for Postgresql databases. It is compatible with iRODS 4.2.x and 4.3.x.
+The present version of the script is suitable for PostgreSQL databases. It is compatible
+with iRODS 4.2.x, 4.3.x. and 5.0.x.
 
 # Requirements
 

icat_tools/utils.py

@@ -6,16 +6,22 @@
 def read_database_config(config_filename):
     with open(config_filename) as configfile:
         data = json.load(configfile)
-    return data['plugin_configuration']['database']['postgres']
+    if 'postgres' in data['plugin_configuration']['database']:
+        # This basically translates an iRODS 4.2.x/4.3.x format
+        # database configuration into iRODS 5.0 format
+        return {k.replace("db_", "", 1): v for (k, v) in
+                data['plugin_configuration']['database']['postgres'].items()}
+    else:
+        return data['plugin_configuration']['database']
 
 
 def get_connection_database(config):
     try:
-        connection = psycopg2.connect(user=config['db_username'],
-                                      password=config['db_password'],
-                                      host=config['db_host'],
-                                      port=config['db_port'],
-                                      database=config['db_name'])
+        connection = psycopg2.connect(user=config['username'],
+                                      password=config['password'],
+                                      host=config['host'],
+                                      port=config['port'],
+                                      database=config['name'])
     except (Exception, psycopg2.Error) as error:
         print("Error while connecting to database: ", error)
         sys.exit(1)