fix: Clean autoconfig (#1698)

* fix: Clean up autoconfig

* Update lockfile and add --clear

* Try commenting out admin creation

* Clean aimmo runner

.codecov.yml

@@ -19,7 +19,6 @@ ignore:
   - "aimmo_runner/**/*"
   - "test_utils/*"
   - "setup.py"
-  - "aimmo/csp_config.py"
 
 comment:
   layout: "reach, diff, flags, files"

.gitignore

@@ -71,7 +71,7 @@ db.sqlite3
 *.iml
 
 # static folder
-example_project/example_project/static/
+static/
 
 # Created during minikube testing
 test-bin/

aimmo_runner/runner.py

@@ -2,20 +2,17 @@
 
 import logging
 import os
-import sys
-import time
 
 import django
+import sys
 from django.conf import settings
 
 from .shell_api import log, run_command, run_command_async
 
 ROOT_DIR_LOCATION = os.path.abspath(os.path.dirname((os.path.dirname(__file__))))
 
 _MANAGE_PY = os.path.join(ROOT_DIR_LOCATION, "example_project", "manage.py")
-_FRONTEND_BUNDLER_JS = os.path.join(
-    ROOT_DIR_LOCATION, "game_frontend", "djangoBundler.js"
-)
+_FRONTEND_BUNDLER_JS = os.path.join(ROOT_DIR_LOCATION, "game_frontend", "djangoBundler.js")
 
 PROCESSES = []
 
@@ -27,25 +24,18 @@ def create_superuser_if_missing(username, password):
         User.objects.get_by_natural_key(username)
     except User.DoesNotExist:
         log("Creating superuser %s with password %s" % (username, password))
-        User.objects.create_superuser(
-            username=username, email="admin@admin.com", password=password
-        )
+        User.objects.create_superuser(username=username, email="admin@admin.com", password=password)
 
 
 def build_worker_package():
-    run_command(
-        [os.path.join(ROOT_DIR_LOCATION, "aimmo_runner", "build_worker_wheel.sh")],
-        capture_output=True,
-    )
+    run_command([os.path.join(ROOT_DIR_LOCATION, "aimmo_runner", "build_worker_wheel.sh")], capture_output=True)
 
 
 def build_frontend(using_cypress, capture_output):
     if using_cypress:
         run_command(["node", _FRONTEND_BUNDLER_JS], capture_output=capture_output)
     else:
-        frontend_bundler = run_command_async(
-            ["node", _FRONTEND_BUNDLER_JS], capture_output=capture_output
-        )
+        frontend_bundler = run_command_async(["node", _FRONTEND_BUNDLER_JS], capture_output=capture_output)
         PROCESSES.append(frontend_bundler)
 
 
@@ -63,13 +53,7 @@ def start_game_servers(build_target, server_args):
     os.environ["AIMMO_MODE"] = "minikube"
 
 
-def run(
-    server_wait=True,
-    using_cypress=False,
-    capture_output=False,
-    test_env=False,
-    build_target=None,
-):
+def run(server_wait=True, using_cypress=False, capture_output=False, test_env=False, build_target=None):
     logging.basicConfig()
 
     build_worker_package()
@@ -90,31 +74,18 @@ def run(
 
     build_frontend(using_cypress, capture_output)
 
-    run_command(
-        ["pip", "install", "-e", ROOT_DIR_LOCATION], capture_output=capture_output
-    )
+    run_command(["pip", "install", "-e", ROOT_DIR_LOCATION], capture_output=capture_output)
 
     if not test_env:
-        run_command(
-            ["python", _MANAGE_PY, "migrate", "--noinput"],
-            capture_output=capture_output,
-        )
-        run_command(
-            ["python", _MANAGE_PY, "collectstatic", "--noinput"],
-            capture_output=capture_output,
-        )
-
-    create_superuser_if_missing(username="admin", password="admin")
+        run_command(["python", _MANAGE_PY, "migrate", "--noinput"], capture_output=capture_output)
+        run_command(["python", _MANAGE_PY, "collectstatic", "--noinput", "--clear"], capture_output=capture_output)
 
     server_args = []
     if not using_cypress:
         start_game_servers(build_target, server_args)
 
     os.environ["SERVER_ENV"] = "local"
-    server = run_command_async(
-        ["python", _MANAGE_PY, "runserver"] + server_args,
-        capture_output=capture_output,
-    )
+    server = run_command_async(["python", _MANAGE_PY, "runserver"] + server_args, capture_output=capture_output)
     PROCESSES.append(server)
 
     if server_wait:

example_project/manage.py

@@ -5,7 +5,7 @@
 from kubernetes.config import load_kube_config
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example_project.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
     from django.core.management import execute_from_command_line
 

example_project/example_project/settings.py → example_project/settings.py

@@ -1,12 +1,12 @@
 """Django settings for example_project project."""
-import os
 import mimetypes
+import os
 
 from django.http import Http404
 from kubernetes.client.api.custom_objects_api import CustomObjectsApi
 from kubernetes.client.api_client import ApiClient
 
-from aimmo.csp_config import *  # Still keeping the config file, seems cleaner?
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
 ALLOWED_HOSTS = ["*"]
 
@@ -29,36 +29,37 @@
 
 TIME_ZONE = "Europe/London"
 LANGUAGE_CODE = "en-gb"
-STATIC_ROOT = os.path.join(os.path.dirname(__file__), "static")
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
-SECRET_KEY = "not-a-secret"
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "aimmo/static")]
 
 mimetypes.add_type("application/wasm", ".wasm", True)
 
-ROOT_URLCONF = "example_project.urls"
+SECRET_KEY = "not-a-secret"
+ROOT_URLCONF = "urls"
 
 WSGI_APPLICATION = "example_project.wsgi.application"
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 INSTALLED_APPS = [
+    "game",
+    "pipeline",
+    "portal",
+    "aimmo",
+    "common",
     "django.contrib.admin",
     "django.contrib.admindocs",
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
-    "django.contrib.sites",
     "django.contrib.staticfiles",
-    "aimmo",
-    "game",
-    "portal",
-    "common",
     "django_js_reverse",
-    "rest_framework",
     "django_otp",
     "django_otp.plugins.otp_static",
     "django_otp.plugins.otp_totp",
+    "rest_framework",
     "sekizai",  # for javascript and css management
 ]
 
@@ -99,6 +100,37 @@
     "django.contrib.messages.middleware.MessageMiddleware",
 ]
 
+PIPELINE = {
+    "SASS_ARGUMENTS": "--quiet",
+    "COMPILERS": ("game.pipeline_compilers.LibSassCompiler",),
+    "STYLESHEETS": {
+        "css": {
+            "source_filenames": (
+                os.path.join(BASE_DIR, "static/portal/sass/bootstrap.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/colorbox.scss"),
+                os.path.join(BASE_DIR, "static/portal/sass/styles.scss"),
+            ),
+            "output_filename": "portal.css",
+        },
+        "popup": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/portal/sass/partials/_popup.scss"),),
+            "output_filename": "popup.css",
+        },
+        "game-scss": {
+            "source_filenames": (os.path.join(BASE_DIR, "static/game/sass/game.scss"),),
+            "output_filename": "game.css",
+        },
+    },
+    "CSS_COMPRESSOR": None,
+}
+
+STATICFILES_FINDERS = [
+    "pipeline.finders.PipelineFinder",
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
+STATICFILES_STORAGE = "pipeline.storage.PipelineStorage"
+
 # This is used in common to enable/disable the OneTrust cookie management script
 COOKIE_MANAGEMENT_ENABLED = False
 
@@ -138,3 +170,5 @@ def get_game_url_base_and_path(game_id: int) -> str:
     from example_project.local_settings import *  # pylint: disable=E0611
 except ImportError:
     pass
+
+from common.csp_config import *