test to see if this resets commits

.gitignore

@@ -19,6 +19,7 @@ __pycache__
 /static
 /tags
 /venv
+/venv_311
 /.python-version
 /coverage/
 .idea/

Dockerfile

@@ -1,4 +1,4 @@
-FROM 593291632749.dkr.ecr.eu-west-1.amazonaws.com/node:18.12.1-slim AS jsdep
+FROM public.ecr.aws/docker/library/node:20.11.1 AS build-node
 COPY package.json package-lock.json ./
 COPY jest.config.js controlpanel/frontend/static /src/
 
@@ -9,7 +9,7 @@ RUN ./node_modules/.bin/sass --load-path=node_modules/ --style=compressed src/ap
 WORKDIR /src
 RUN /node_modules/.bin/jest
 
-FROM 593291632749.dkr.ecr.eu-west-1.amazonaws.com/python:3.9-slim-buster AS base
+FROM public.ecr.aws/docker/library/python:3.12-alpine3.18 AS base
 
 ARG HELM_VERSION=3.14.1
 ARG HELM_TARBALL=helm-v${HELM_VERSION}-linux-amd64.tar.gz
@@ -22,18 +22,20 @@ ENV DJANGO_SETTINGS_MODULE="controlpanel.settings" \
   HELM_DATA_HOME=/tmp/helm/data
 
 # create a user to run as
-RUN addgroup -gid 1000 controlpanel && \
-  adduser -uid 1000 --gid 1000 controlpanel
+RUN addgroup -g 1000 controlpanel \
+    && adduser -G controlpanel -u 1000 controlpanel -D
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
+RUN apk update \
+    && apk add --no-cache \
         postgresql-client \
         wget \
         gcc \
-        libcurl4-gnutls-dev \
+        curl-dev \
         python3-dev \
-        libgnutls28-dev \
-        libssl-dev \
+        gnutls-dev \
+        openssl-dev \
+        libffi-dev \
+        musl-dev \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/controlpanel
@@ -65,13 +67,13 @@ COPY docker docker
 COPY tests tests
 
 # install javascript dependencies
-COPY --from=jsdep dist/app.css dist/app.js static/
-COPY --from=jsdep node_modules/accessible-autocomplete/dist/ static/accessible-autocomplete
-COPY --from=jsdep node_modules/govuk-frontend static/govuk-frontend
-COPY --from=jsdep node_modules/@ministryofjustice/frontend/moj static/ministryofjustice-frontend
-COPY --from=jsdep node_modules/html5shiv/dist static/html5-shiv
-COPY --from=jsdep node_modules/jquery/dist static/jquery
-COPY --from=jsdep node_modules/jquery-ui/dist/ static/jquery-ui
+COPY --from=build-node dist/app.css dist/app.js static/
+COPY --from=build-node node_modules/accessible-autocomplete/dist/ static/accessible-autocomplete
+COPY --from=build-node node_modules/govuk-frontend static/govuk-frontend
+COPY --from=build-node node_modules/@ministryofjustice/frontend/moj static/ministryofjustice-frontend
+COPY --from=build-node node_modules/html5shiv/dist static/html5-shiv
+COPY --from=build-node node_modules/jquery/dist static/jquery
+COPY --from=build-node node_modules/jquery-ui/dist/ static/jquery-ui
 
 # empty .env file to prevent warning messages
 RUN touch .env

doc/running.md

@@ -27,8 +27,8 @@ versions of the services.
 
 ## 1. Required Dependencies
 
-The Control Panel app requires Python 3.8+ It has been confirmed to work
-with Python 3.8.12.
+The Control Panel app requires Python 3.12. It has been confirmed to work
+with Python 3.12.2.
 
 Install python dependencies with the following command:
 ```sh

requirements.dev.txt

@@ -1,12 +1,12 @@
-black==24.3.0
-django-debug-toolbar==3.2.4
+black==24.2.0
+django-debug-toolbar==4.3.0
 django-debug-toolbar-requests==1.0.5
-django-elasticsearch-debug-toolbar==2.0.0
-flake8==6.0.0
+django-elasticsearch-debug-toolbar==3.0.2
+flake8==7.0.0
 ipdb==0.13.13
-ipython==8.13.2
-isort==5.12.0
-pre-commit==2.20.0
-pylint==2.17.4
-pylint-django==2.4.4
-pandas==1.5.2
+ipython==8.21.0
+isort==5.13.2
+pandas==2.2.0
+pre-commit==3.6.1
+pylint==3.0.3
+pylint-django==2.5.5

requirements.txt

@@ -1,39 +1,38 @@
-asgiref==3.7.2
-auth0-python==4.5.0
-authlib==1.3.0
-beautifulsoup4==4.12.2
-boto3==1.34.64
-celery[sqs]==5.3.1
+asgiref==3.8.1
+auth0-python==4.7.0
+beautifulsoup4==4.12.3
+boto3==1.34.41
+celery[sqs]==5.3.6
 channels==4.0.0
 channels-redis==4.2.0
-daphne==4.0.0
-Django==4.2.11
+daphne==4.1.0
+Django==5.0.4
 django-crequest==2018.5.11
 django-extensions==3.2.3
-django-filter==24.1
+django-filter==23.5
 django-prometheus==2.3.1
 django-redis==5.4.0
-django-simple-history==3.3.0
-django-structlog==2.2.0
+django-simple-history==3.4.0
+django-structlog==7.1.0
 djangorestframework==3.14.0
 djproxy==2.3.6
 elasticsearch-dsl==7.4.1
-gunicorn==20.1.0
+gunicorn==21.2.0
 Jinja2==3.1.3
 kubernetes==25.3.0
-MarkupSafe==2.1.3
-model-mommy==2.0.0
-moto==1.3.14
+MarkupSafe==2.1.5
+model-bakery==1.17.0
+moto==5.0.1
 mozilla-django-oidc==4.0.0
 psycopg2-binary==2.9.9
 PyNaCl==1.5.0
-pytest==7.3.1
-pytest-django==4.5.2
+pytest==8.0.0
+pytest-django==4.8.0
 python-dotenv==1.0.1
 python-jose==3.3.0
 pyyaml==6.0.1
 rules==3.3
-sentry-sdk==1.40.5
+sentry-sdk==1.40.4
 slackclient==2.9.4
-urllib3==1.26.18
-uvicorn[standard]==0.28.0
+urllib3==2.0.7
+uvicorn[standard]==0.27.1

tests/api/cluster/test_access_to_s3buckets.py

@@ -3,7 +3,7 @@
 
 # Third-party
 import pytest
-from model_mommy import mommy
+from model_bakery import baker
 
 # First-party/Local
 from controlpanel.api.cluster import App, RoleGroup, User
@@ -32,7 +32,7 @@ def grant_policy_bucket_access():
     ) as grant_policy_bucket_access_action:
         yield grant_policy_bucket_access_action
 
-@pytest.yield_fixture
+@pytest.fixture
 def grant_policy_folder_access():
     with patch(
         "controlpanel.api.cluster.AWSPolicy.grant_folder_access"
@@ -47,14 +47,14 @@ def enable_db_for_all_tests(db):
 
 @pytest.fixture
 def bucket():
-    return mommy.prepare("api.S3Bucket")
+    return baker.prepare("api.S3Bucket")
 
 
 @pytest.fixture
 def entities(bucket, users):
     return {
-        "app": App(mommy.prepare("api.App")),
-        "group": RoleGroup(mommy.prepare("api.IAMManagedPolicy")),
+        "app": App(baker.prepare("api.App")),
+        "group": RoleGroup(baker.prepare("api.IAMManagedPolicy")),
         "user": User(users["normal_user"]),
     }
 

tests/api/cluster/test_bucket.py

@@ -4,7 +4,7 @@
 # Third-party
 import pytest
 from django.conf import settings
-from model_mommy import mommy
+from model_bakery import baker
 
 # First-party/Local
 from controlpanel.api import cluster
@@ -18,7 +18,7 @@ def enable_db_for_all_tests(db):
 
 @pytest.fixture
 def bucket():
-    return mommy.prepare("api.S3Bucket", name="test-bucket")
+    return baker.prepare("api.S3Bucket", name="test-bucket")
 
 
 def test_arn(bucket):

tests/api/cluster/test_group.py

@@ -3,7 +3,7 @@
 
 # Third-party
 import pytest
-from model_mommy import mommy
+from model_bakery import baker
 
 # First-party/Local
 from controlpanel.api import cluster
@@ -16,7 +16,7 @@ def enable_db_for_all_tests(db):
 
 @pytest.fixture
 def iam_managed_policy():
-    return mommy.make("api.IAMManagedPolicy", name="test")
+    return baker.make("api.IAMManagedPolicy", name="test")
 
 
 def test_arn(settings, iam_managed_policy):

tests/api/cluster/test_user.py

@@ -1,5 +1,5 @@
 # Standard library
-from unittest.mock import MagicMock, call, patch
+from unittest.mock import call, patch
 
 # Third-party
 import pytest
@@ -26,18 +26,19 @@ def test_create(helm, settings, users):
             call(
                 f"bootstrap-user-{user.slug}",
                 "mojanalytics/bootstrap-user",
-                f"--namespace=user-{user.slug}",
-                f"--set=Username={user.slug},",
-                f"Efsvolume={settings.EFS_VOLUME}",
+                f"--namespace=cpanel",
+                f"--set=Username={user.slug}",
             ),
             call(
-                f"config-user-{user.slug}",
-                "mojanalytics/config-user",
+                f"provision-user-{user.slug}",
+                "mojanalytics/provision-user",
                 f"--namespace=user-{user.slug}",
-                f"--set=Username={user.slug}",
+                (f"--set=Username={user.slug},Efsvolume={settings.EFS_VOLUME},"
+                 "OidcDomain=oidc.idp.example.com,Email=,Fullname="),
             ),
         ]
-        helm.upgrade_release.has_calls(expected_calls)
+
+        helm.upgrade_release.assert_has_calls(expected_calls)
 
 
 def test_reset_home(helm, users):
@@ -52,6 +53,7 @@ def test_reset_home(helm, users):
             f"--set=Username={user.slug}",
         ),
     ]
+
     helm.upgrade_release.assert_has_calls(expected_calls)
 
 
@@ -74,10 +76,9 @@ def test_delete(aws_delete_role, helm, users):
     cluster.User(user).delete()
     aws_delete_role.assert_called_with(user.iam_role_name)
     expected_calls = [
-        call(f"user-{user.slug}", "chart-release"),
-        call("cpanel", "chart-release"),
+        call('user-bob', 'chart-release', dry_run=False),
     ]
-    helm.delete.has_calls(expected_calls)
+    helm.delete.assert_has_calls(expected_calls)
 
 
 def test_delete_eks_with_no_releases(aws_delete_role, helm, users):

tests/api/filters/test_app_filter.py

@@ -1,17 +1,17 @@
 # Third-party
-from model_mommy import mommy
+from model_bakery import baker
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 
 class AppFilterTest(APITestCase):
     def setUp(self):
-        self.superuser = mommy.make("api.User", is_superuser=True)
-        self.app_admin = mommy.make("api.User", is_superuser=False)
-        self.app_1 = mommy.make("api.App", name="App 1")
-        self.app_2 = mommy.make("api.App", name="App 2")
-        mommy.make("api.UserApp", user=self.app_admin, app=self.app_1, is_admin=True)
-        mommy.make("api.UserApp", user=self.app_admin, app=self.app_2, is_admin=True)
+        self.superuser = baker.make("api.User", is_superuser=True)
+        self.app_admin = baker.make("api.User", is_superuser=False)
+        self.app_1 = baker.make("api.App", name="App 1")
+        self.app_2 = baker.make("api.App", name="App 2")
+        baker.make("api.UserApp", user=self.app_admin, app=self.app_1, is_admin=True)
+        baker.make("api.UserApp", user=self.app_admin, app=self.app_2, is_admin=True)
 
     def test_everyone_see_everything(self):
         for user in [self.superuser, self.app_admin]: