Version Bump 4.2.1

More Detail on the SQL charset check

See merge request allianceauth/allianceauth!1635

allianceauth/__init__.py

@@ -5,7 +5,7 @@ manage online service access.
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 
-__version__ = '4.2.0'
+__version__ = '4.2.1'
 __title__ = 'Alliance Auth'
 __url__ = 'https://gitlab.com/allianceauth/allianceauth'
 NAME = f'{__title__} v{__version__}'

allianceauth/checks.py

@@ -140,11 +140,19 @@ def sql_settings(app_configs, **kwargs) -> List[CheckMessage]:
     errors: List[CheckMessage] = []
     for connection in db.connections.all():
         if connection.vendor == "mysql":
-            if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
-                errors.append(Error("SQL Charset is not set correctly", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            try:
+                if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4":
+                    errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            except KeyError:
+                errors.append(Error(f"SQL Charset is not set to utf8mb4 DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+
             # This hasn't actually been set on AA yet
-            # if connection.settings_dict["OPTIONS"]["charset"] != "utf8mb4_unicode_ci":
-            #     errors.append(Error("SQL Collation is not set correctly", hint="", id="allianceauth.checks.B002"))
+            # try:
+            #     if connection.settings_dict["OPTIONS"]["collation"] != "utf8mb4_unicode_ci":
+            #         errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+            # except KeyError:
+            #     errors.append(Error(f"SQL Collation is not set to utf8mb4_unicode_ci DB:{connection.alias}", hint="https://gitlab.com/allianceauth/allianceauth/-/commit/89be2456fb2d741b86417e889da9b6129525bec8", id="allianceauth.checks.B001"))
+
         # if connection.vendor == "sqlite":
 
     return errors

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.2.0
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v4.2.1
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.11-slim
-ARG AUTH_VERSION=v4.2.0
+ARG AUTH_VERSION=v4.2.1
 ARG AUTH_PACKAGE=allianceauth==${AUTH_VERSION}
 ENV AUTH_USER=allianceauth
 ENV AUTH_GROUP=allianceauth