paas-migration

.circleci/config.yml

@@ -9,17 +9,20 @@ commands:
          command: |
             python3 -m venv venv
             echo ". venv/bin/activate" >> $BASH_ENV
-            . venv/bin/activate  # 
+            . venv/bin/activate
             pip install --upgrade pip
             pip install poetry==1.6.1
-            poetry export --dev --without-hashes -f requirements.txt -o requirements-dev.txt
+            poetry export --with dev --without-hashes -f requirements.txt -o requirements-dev.txt
             pip install -r requirements-dev.txt
 
   restore_dependency_cache:
     description: "Restore dependency cache."
     steps:
       - restore_cache:
-          key: deps2-{{ .Branch }}-{{ checksum "requirements-dev.txt" }}
+          keys:
+            - deps2-{{ .Branch }}-{{ checksum "requirements-dev.txt" }} 
+            - deps2-{{ .Branch }}-
+            - deps2-
 
   save_dependency_cache:
     description: "Save dependency cache."
@@ -32,7 +35,7 @@ commands:
 jobs:
   code_quality:
     docker:
-      - image: cimg/python:3.9.5
+      - image: cimg/python:3.9.20
     steps:
       - checkout
       - restore_dependency_cache
@@ -48,7 +51,7 @@ jobs:
             pflake8 trade_remedies_api --config pyproject.toml
   test_and_fitness_functions:
     docker:
-      - image: cimg/python:3.9.5
+      - image: cimg/python:3.9.20
         environment:
           DATABASE_URL: psql://ubuntu@localhost:5432/trade_remedies
           DJANGO_SETTINGS_MODULE: config.settings.test

.copilot/config.yml

@@ -0,0 +1,4 @@
+repository: api
+builder:
+  name: paketobuildpacks/builder-jammy-base
+  version: 0.4.240

.copilot/image_build_run.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+export CASE_WORKER_ENVIRONMENT_KEY="example"
+export DJANGO_SECRET_KEY="example"
+export PUBLIC_ENVIRONMENT_KEY="example"
+export DATABASE_URL=psql://postgres:postgres@localhost:5432/trade_remedies
+
+#python ./trade_remedies_api/manage.py collectstatic --noinput

.copilot/phases/build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Exit early if something goes wrong
+set -e
+
+# Add commands below to run as part of the build phase

.copilot/phases/install.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Exit early if something goes wrong
+set -e
+
+# Add commands below to run as part of the install phase

.copilot/phases/post_build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Exit early if something goes wrong
+set -e
+
+# Add commands below to run as part of the post_build phase

.copilot/phases/pre_build.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Exit early if something goes wrong
+set -e
+
+if [ -f "./.gitmodules" ]; then
+  echo ".gitmodules file exists. Modifying URLs..."
+    account_id=$(echo $CODESTAR_CONNECTION_ARN | cut -d':' -f5)
+    connection_id=$(echo $CODESTAR_CONNECTION_ARN | cut -d'/' -f2)
+    git_clone_base_url="https://codestar-connections.eu-west-2.amazonaws.com/git-http/$account_id/eu-west-2/$connection_id/uktrade"
+
+    git config --global credential.helper '!aws codecommit credential-helper $@'
+    git config --global credential.UseHttpPath true
+
+    sed -i "s|url = [email protected]:uktrade/\(.*\).git|url = $git_clone_base_url/\1.git|g" ./.gitmodules
+
+    git submodule update --init --remote --recursive
+
+else
+  echo ".gitmodules file does not exist. No URLs to update."
+fi
+
+# Add commands below to run as part of the pre_build phase

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.15
+FROM python:3.9.20
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -11,3 +11,5 @@ RUN pip install -r requirements-dev.txt
 
 ADD . /app
 WORKDIR /app
+RUN pip install -r requirements.txt
+ADD . /app

Makefile

@@ -18,5 +18,7 @@ help:
 	@echo -e "$(COLOUR_YELLOW)make prod-requirements$(COLOUR_NONE) : Generate prod requirements (requires local pip-compile)"
 
 all-requirements:
+	poetry lock
 	poetry export --without-hashes -f requirements.txt -o requirements.txt
 	poetry export --with dev --without-hashes -f requirements.txt -o requirements-dev.txt
+	pip install -r requirements-dev.txt

Procfile

@@ -1,3 +1,3 @@
 web: scripts/entry.sh
 celery_worker: cd trade_remedies_api && celery -A config worker -l $CELERY_LOGLEVEL
-celery_beat: cd trade_remedies_api && celery -A config beat -l $CELERY_LOGLEVEL
+celery_beat: cd trade_remedies_api && celery -A config beat -l $CELERY_LOGLEVEL -s /tmp/celerybeat-schedule

docker-compose.yml

@@ -2,18 +2,26 @@ version: "3"
 services:
   api:
     build:
-       context: .
+      context: .
     ports:
       - "8000:8000"
     volumes:
       - ./trade_remedies_api:/app/
-      - ./requirements.in:/app/requirements.in/
-      - ./requirements:/app/requirements/
+      - ./requirements-dev.txt:/app/requirements-dev.txt
     env_file:
       - local.env
-    command: python manage.py runserver 0.0.0.0:8000
+    command: >
+      /bin/sh -c "
+      python manage.py migrate &&
+      python manage.py load_sysparams &&
+      python manage.py notify_env &&
+      python manage.py collectstatic --noinput &&
+      python manage.py runserver 0.0.0.0:8000
+      "
     environment:
       - DJANGO_SETTINGS_MODULE=config.settings.local
+    depends_on:
+      - postgres
   celery:
     build:
        context: .
@@ -25,21 +33,10 @@ services:
     environment:
       - DJANGO_SETTINGS_MODULE=config.settings.local
       - DATABASE_URL=psql://postgres:postgres@postgres:5432/trade_remedies
-  apitest:
-    build:
-       context: .
-    ports:
-      - "8003:8000"
-    volumes:
-      - ./trade_remedies_api:/app/
-    env_file:
-      - local.env
-    command: python manage.py runserver 0.0.0.0:8000
-    environment:
-      - DJANGO_SETTINGS_MODULE=config.settings.bdd
-      - DATABASE_URL=psql://postgres:postgres@postgres:5432/trade_remedies_api_test
+    depends_on:
+      - api
   postgres:
-    image: postgres:12
+    image: postgres:17
     ports:
       - "5432:5432"
     volumes:
@@ -48,10 +45,18 @@ services:
     environment:
       POSTGRES_DB: trade_remedies
       POSTGRES_PASSWORD: postgres
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      interval: 2s
+      timeout: 2s
+      retries: 5
+
   redis:
-    image: redis:alpine
+    image: redis:7.4.1
+    command: ["redis-server", "--save", ""]  # Disable RDB snapshot saving
     ports:
       - "6379:6379"
+
   opensearch:
     image: opensearchproject/opensearch:2.13.0
     restart: unless-stopped
@@ -61,4 +66,4 @@ services:
     environment:
       - discovery.type=single-node
       - plugins.security.disabled=true
-      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=odR$YG8t$fcLe5X3
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD=coRrecth0rseba++ery9.23.2007staple$

pii-ner-exclude.txt

@@ -1,3 +1,6 @@
+linux
+ENV PYTHONDONTWRITEBYTECODE 1
+update -y && apt
 PUB
 ref
 " Returns the mime type for this file
@@ -2192,3 +2195,5 @@ django-db-geventpool==4.0.0
 Holborn
 the third party
 terminated_at
+GUNICORN_ACCESS_LOG_FORMAT
+GUNICORN_ENABLE_ASYNC_PSYCOPG2