Rebase against distributed-system-analysis#1937

This includes more change than it should, because I'd originally
segregated the database files into a `db` directory while Nikhil
went with `database`.

lib/pbench/cli/server/shell.py

@@ -8,7 +8,7 @@
 
 from pbench.common.exceptions import BadConfig, ConfigFileNotSpecified
 from pbench.server.api import create_app, get_server_config
-from pbench.server.db.database import Database
+from pbench.server.database.database import Database
 from pbench.common.logger import get_pbench_logger
 
 

lib/pbench/server/api/resources/upload_api.py

@@ -9,7 +9,7 @@
 from flask import request, jsonify
 from werkzeug.utils import secure_filename
 from pbench.server.utils import filesize_bytes
-from pbench.server.db.models.tracker import Dataset, States
+from pbench.server.database.models.tracker import Dataset, States
 
 
 ALLOWED_EXTENSIONS = {"xz"}

lib/pbench/server/api/resources/users_api.py

@@ -92,13 +92,13 @@ def post(self):
 
         first_name = user_data.get("first_name")
         if not first_name:
-            self.logger.warning("Missing firstName field")
-            abort(400, message="Missing firstName field")
+            self.logger.warning("Missing first_name field")
+            abort(400, message="Missing first_name field")
 
         last_name = user_data.get("last_name")
         if not last_name:
-            self.logger.warning("Missing lastName field")
-            abort(400, message="Missing lastName field")
+            self.logger.warning("Missing last_name field")
+            abort(400, message="Missing last_name field")
 
         try:
             user = User(
@@ -325,8 +325,8 @@ def get(self, username):
                     "message": "Success"/"failure message",
                     "data": {
                         "username": <username>,
-                        "firstName": <firstName>,
-                        "lastName": <lastName>,
+                        "first_name": <firstName>,
+                        "last_name": <lastName>,
                         "registered_on": registered_on,
                     }
                 }

lib/pbench/server/database/database.py

@@ -21,24 +21,18 @@ def get_engine_uri(config, logger):
             )
             return None
 
-        # return f"postgresql+{psql_driver}://{psql_username}:{psql_password}@{psql_host}:{psql_port}/{psql_db}"
-
-    @staticmethod
-    def init_engine(server_config, logger):
-        try:
-            return create_engine(Database.get_engine_uri(server_config, logger))
-        except Exception:
-            logger.exception("Exception while creating a sqlalchemy engine")
-            return None
-
     @staticmethod
     def init_db(server_config, logger):
+        # Attach the logger to the base class for models to find
+        if not hasattr(Database.Base, "logger"):
+            Database.Base.logger = logger
+
         # Make sure all the models are imported before this function gets called
         # so that they will be registered properly on the metadata. Otherwise
         # metadata will not have any tables and create_all functionality will do nothing
 
         Database.Base.query = Database.db_session.query_property()
-
+        Database.db_session.remove()  # Remove the placeholder static session
         engine = create_engine(Database.get_engine_uri(server_config, logger))
         Database.Base.metadata.create_all(bind=engine)
         Database.db_session.configure(bind=engine)

lib/pbench/server/db/models/tracker.py → lib/pbench/server/database/models/tracker.py

@@ -16,7 +16,7 @@
 from sqlalchemy.orm import relationship, validates
 from sqlalchemy.exc import SQLAlchemyError
 
-from pbench.server.db.database import Database
+from pbench.server.database.database import Database
 
 
 class DatasetError(Exception):

lib/pbench/server/indexing_tarballs.py

@@ -21,7 +21,7 @@
     es_index,
     VERSION,
 )
-from pbench.server.db.models.tracker import (
+from pbench.server.database.models.tracker import (
     Dataset,
     States,
     Metadata,

lib/pbench/server/utils.py

@@ -2,7 +2,7 @@
 import sys
 import shutil
 
-from pbench.server.db.models.tracker import Dataset, States, DatasetNotFound
+from pbench.server.database.models.tracker import Dataset, States, DatasetNotFound
 
 
 def rename_tb_link(tb, dest, logger):

lib/pbench/test/unit/server/test_requests.py

@@ -4,7 +4,7 @@
 
 from pathlib import Path
 from werkzeug.utils import secure_filename
-from pbench.server.db.models.tracker import Dataset, States
+from pbench.server.database.models.tracker import Dataset, States
 
 
 class TestHostInfo:

lib/pbench/test/unit/server/test_state_tracker.py

@@ -1,5 +1,5 @@
 import pytest
-from pbench.server.db.models.tracker import (
+from pbench.server.database.models.tracker import (
     Dataset,
     States,
     Metadata,

lib/pbench/test/unit/server/test_user_auth.py

@@ -60,7 +60,7 @@ def test_registration_missing_fields(client, server_config):
                 },
             )
             data = response.json
-            assert data["message"] == "Missing firstName field"
+            assert data["message"] == "Missing first_name field"
             assert response.content_type == "application/json"
             assert response.status_code == 400
 

server/bin/pbench-backup-tarballs.py

@@ -16,12 +16,12 @@
 from pbench.server.report import Report
 from pbench.server.s3backup import S3Config, Status, NoSuchKey
 from pbench.server.utils import rename_tb_link, quarantine
-from pbench.server.db.models.tracker import (
+from pbench.server.database.models.tracker import (
     Dataset,
     Metadata,
     DatasetError,
 )
-from pbench.server.db.database import Database
+from pbench.server.database.database import Database
 
 
 _NAME_ = "pbench-backup-tarballs"

server/bin/pbench-index.py

@@ -12,7 +12,7 @@
 from pathlib import Path
 from argparse import ArgumentParser
 from configparser import Error as ConfigParserError
-from pbench.server.db.database import Database
+from pbench.server.database.database import Database
 
 from pbench.common.exceptions import (
     BadConfig,

server/bin/pbench-reindex.py

@@ -25,12 +25,12 @@
 from pbench import BadConfig
 import pbench.server
 from pbench.server import PbenchServerConfig
-from pbench.server.db.models.tracker import (
+from pbench.server.database.models.tracker import (
     Dataset,
     Metadata,
     DatasetError,
 )
-from pbench.server.db.database import Database
+from pbench.server.database.database import Database
 from pbench.common.logger import get_pbench_logger
 
 

server/bin/pbench-server-prep-shim-002.py

@@ -23,8 +23,8 @@
 from pbench.server import PbenchServerConfig
 from pbench.server.report import Report
 from pbench.server.utils import quarantine
-from pbench.server.db.models.tracker import Dataset, States, DatasetError
-from pbench.server.db.database import Database
+from pbench.server.database.models.tracker import Dataset, States, DatasetError
+from pbench.server.database.database import Database
 
 
 _NAME_ = "pbench-server-prep-shim-002"

server/bin/pbench-state-manager.py

@@ -19,8 +19,8 @@
 
 from pbench import BadConfig
 from pbench.server import PbenchServerConfig
-from pbench.server.db.models.tracker import Dataset, States
-from pbench.server.db.database import Database
+from pbench.server.database.models.tracker import Dataset, States
+from pbench.server.database.database import Database
 from pbench.common.logger import get_pbench_logger