wip

.env.django

@@ -51,8 +51,6 @@ POSTGRES_DB=redbox-core
 POSTGRES_PASSWORD=insecure
 CONTACT_EMAIL=redbox-support@cabinetoffice.gov.uk
 POSTGRES_HOST=db
-CORE_API_HOST=core-api
-CORE_API_PORT=5002
 EMAIL_BACKEND_TYPE=CONSOLE
 GOV_NOTIFY_API_KEY=f4k3_k3y
 FROM_EMAIL=test@example.com

.env.example

@@ -58,8 +58,6 @@ POSTGRES_DB=redbox-core
 POSTGRES_PASSWORD=insecure
 CONTACT_EMAIL=redbox-support@cabinetoffice.gov.uk
 POSTGRES_HOST=db
-CORE_API_HOST=core-api
-CORE_API_PORT=5002
 EMAIL_BACKEND_TYPE=CONSOLE
 GOV_NOTIFY_API_KEY=f4k3_k3y
 FROM_EMAIL=test@example.com

.env.integration

@@ -41,8 +41,6 @@ POSTGRES_DB=redbox-core
 POSTGRES_PASSWORD=insecure
 CONTACT_EMAIL=redbox-support@cabinetoffice.gov.uk
 POSTGRES_HOST=db
-CORE_API_HOST=core-api
-CORE_API_PORT=5002
 
 EMAIL_BACKEND_TYPE=CONSOLE
 GOV_NOTIFY_API_KEY=f4k3_k3y

.env.test

@@ -56,8 +56,6 @@ POSTGRES_DB=redbox-core
 POSTGRES_PASSWORD=insecure
 CONTACT_EMAIL=redbox-support@cabinetoffice.gov.uk
 POSTGRES_HOST=localhost
-CORE_API_HOST=localhost
-CORE_API_PORT=5002
 EMAIL_BACKEND_TYPE=FILE
 GOV_NOTIFY_API_KEY=f4k3_k3y
 FROM_EMAIL=test@example.com

.github/workflows/ai.yml

@@ -52,7 +52,6 @@ jobs:
     - name: Run DeepEval Unit Tests
       run: |
         cp .env core-api/.env
-        cd core-api
         poetry install
         poetry run deepeval test run tests/test_ai.py --mark ai
 

.github/workflows/python-app.yml

@@ -20,35 +20,6 @@ permissions:
   contents: read
 
 jobs:
-  test-core-api:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.12"
-
-    - name: Set up Poetry
-      uses: abatilo/actions-poetry@v2
-      with:
-        poetry-version: 1.7.0
-
-    - name: Build Containers
-      run: |
-        mkdir -p data/elastic/
-        chmod 777 data/elastic/
-        cp .env.test .env
-        docker compose up -d --wait elasticsearch
-
-    - name: Test core with pytest
-      run: |
-        make test-core-api
-
-
   test-redbox:
 
     runs-on: ubuntu-latest

Makefile

@@ -32,10 +32,6 @@ build:
 rebuild: stop prune ## Rebuild all images
 	docker compose build --no-cache
 
-.PHONY: test-core-api
-test-core-api: ## Test core-api
-	cd core-api && poetry install --with dev && poetry run python -m pytest  --cov=core_api -v --cov-report=term-missing --cov-fail-under=75
-
 .PHONY: test-ai
 test-ai: ## Test code with live LLM
 	cd redbox-core && poetry install --with dev && poetry run python -m pytest -m "ai" --cov=redbox -v --cov-report=term-missing --cov-fail-under=80
@@ -131,7 +127,6 @@ AUTO_APPLY_RESOURCES = module.django-app.aws_ecs_task_definition.aws-ecs-task \
                        module.worker.data.aws_ecs_task_definition.main \
                        aws_secretsmanager_secret.django-app-secret \
                        aws_secretsmanager_secret.worker-secret \
-                       aws_secretsmanager_secret.core-api-secret \
                        module.django-lambda.aws_lambda_function.lambda_function
 
 target_modules = $(foreach resource,$(AUTO_APPLY_RESOURCES),-target $(resource))
@@ -178,7 +173,7 @@ docker_push:
 
 .PHONY: docker_update_tag
 docker_update_tag:
-	for service in django-app core-api worker; do \
+	for service in django-app worker; do \
 		MANIFEST=$$(aws ecr batch-get-image --repository-name $(ECR_REPO_NAME)-$$service --image-ids imageTag=$(IMAGE_TAG) --query 'images[].imageManifest' --output text) ; \
 		aws ecr put-image --repository-name $(ECR_REPO_NAME)-$$service --image-tag $(tag) --image-manifest "$$MANIFEST" ; \
 	done
@@ -259,7 +254,7 @@ release: ## Deploy app
 
 .PHONY: eval_backend
 eval_backend:  ## Runs the only the necessary backend for evaluation BUCKET_NAME
-	docker compose up -d --wait core-api --build
+	docker compose up -d --wait worker --build
 	docker exec -it $$(docker ps -q --filter "name=minio") mc mb data/${BUCKET_NAME}
 
 .PHONY: help