DBTP-457 Add DBT PaaS CodeBuild configuration

README.md

@@ -3,3 +3,4 @@
 A [Wagtail](https://www.wagtail.io)-based intranet for the Department for Business & Trade.
 
 Project documentation is available [here](https://uktrade.github.io/digital-workspace-v2/).
+

buildpack.json

@@ -0,0 +1,13 @@
+{
+  "buildpacks": [
+    {
+      "paketo-buildpacks": "python"
+    },
+    {
+      "paketo-buildpacks": "nodejs"
+    },
+    {
+      "fagiani" : "run"
+    }
+  ]
+}

codebuild/process.yml

@@ -0,0 +1,12 @@
+application:
+  name: intranet
+  process:
+    # The way DBT PaaS works currently we need one entry
+    # here for each of the entries in the Procfile.
+    # The only actual different in the three images created
+    # is the process they start up with.
+    # There is a plan ensure it only needs to build one
+    # image in the near future.
+    - web
+    - beat # celery beat
+    - worker # celery worker

codebuild/web/buildspec.yml

@@ -0,0 +1,20 @@
+version: 0.2
+env:
+  parameter-store:
+    SLACK_WORKSPACE_ID: "/codebuild/slack_workspace_id"
+    SLACK_CHANNEL_ID: "/codebuild/slack_channel_id"
+    SLACK_TOKEN: "/codebuild/slack_api_token"
+  variables:
+    PAKETO_BUILDER_VERSION: 0.2.443-full
+    LIFECYCLE_VERSION: 0.16.5
+
+phases:
+  # install:
+
+  pre_build:
+    commands:
+      - codebuild-breakpoint
+
+  build:
+    commands:
+      - /work/build.sh

src/config/settings/base.py

@@ -47,16 +47,14 @@
     AWS_REGION = app_bucket_creds["aws_region"]
     AWS_S3_REGION_NAME = app_bucket_creds["aws_region"]
     AWS_STORAGE_BUCKET_NAME = app_bucket_creds["bucket_name"]
+    AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID")
+    AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY")
+    AWS_S3_HOST = "s3-eu-west-2.amazonaws.com"
 else:
     AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME")
     AWS_REGION = env("AWS_REGION")
     AWS_S3_REGION_NAME = env("AWS_REGION", default="eu-west-2")
 
-# You don't seem to be able to sign S3 URLs with VCAP S3 creds
-AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID")
-AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY")
-AWS_S3_HOST = "s3-eu-west-2.amazonaws.com"
-
 # Asset path used in parser
 NEW_ASSET_PATH = env("NEW_ASSET_PATH")
 
@@ -432,6 +430,10 @@
         credentials["host"],
         credentials["port"],
     )
+elif is_copilot():
+    CELERY_BROKER_URL = (
+        env("CELERY_BROKER_URL", default=None) + "?ssl_cert_reqs=required"
+    )
 else:
     CELERY_BROKER_URL = env("CELERY_BROKER_URL", default=None)
 

src/config/settings/env.py

@@ -21,16 +21,16 @@
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 
 INSTALLED_APPS += [  # noqa F405
-    "elasticapm.contrib.django",
+    #  "elasticapm.contrib.django",
 ]
 
-ELASTIC_APM = {
-    "SERVICE_NAME": "Digital Workspace",
-    "SECRET_TOKEN": env("ELASTIC_APM_SECRET_TOKEN"),  # noqa F405
-    "SERVER_URL": env("ELASTIC_APM_SERVER_URL"),  # noqa F405
-    "ENVIRONMENT": env("APP_ENV"),  # noqa F405
-    "SERVER_TIMEOUT": env("ELASTIC_APM_SERVER_TIMEOUT", default="20s"),  # noqa F405
-}
+#  ELASTIC_APM = {
+#  "SERVICE_NAME": "Digital Workspace",
+#  "SECRET_TOKEN": env("ELASTIC_APM_SECRET_TOKEN"),  # noqa F405
+#  "SERVER_URL": env("ELASTIC_APM_SERVER_URL"),  # noqa F405
+#  "ENVIRONMENT": env("APP_ENV"),  # noqa F405
+#  "SERVER_TIMEOUT": env("ELASTIC_APM_SERVER_TIMEOUT", default="20s"),  # noqa F405
+#  }
 
 LOGGING = {
     "version": 1,

src/config/settings/test.py

@@ -2,7 +2,6 @@
 
 from .base import *  # noqa
 
-
 APP_ENV = "test"
 DEBUG = True
 TEMPLATE_DEBUG = True
@@ -18,10 +17,6 @@
     "AUTO_UPDATE": False,
 }
 
-INSTALLED_APPS += [  # noqa F405
-    "django_extensions",
-]
-
 LOGGING["handlers"] |= {  # noqa F405
     "file": {
         "level": "DEBUG",

src/extended_search/apps.py

@@ -11,5 +11,5 @@ def ready(self):
 
         search_settings.initialise_field_dict()
         search_settings.initialise_env_dict()
-        if settings.APP_ENV != "test":
+        if settings.APP_ENV not in ["test", "build"]:
             search_settings.initialise_db_dict()

src/extended_search/managers/__init__.py

@@ -27,5 +27,7 @@ def get_search_query(index_manager, query_str, model_class, *args, **kwargs):
                 query_elements,
             )
 
+    logger.info(f"Search Debug L: Query - {query}")
+    print(f"Search Debug P: Query - {query}")
     logger.debug(query)
     return query

src/search/templatetags/search.py

@@ -1,9 +1,11 @@
+import json
 from typing import Literal, Tuple
 
 from django import template
 from django.core.paginator import Paginator
 
 from search import search as search_vectors
+import logging
 
 
 register = template.Library()
@@ -37,13 +39,24 @@ def search_category(context, *, category, limit=None, show_heading=False):
     query = context["search_query"]
     page = context["page"]
 
+    logger = logging.getLogger("ANTS_LOGGER")
+    logger.info("Search Debug: In the search_category function (logger)")
+    print("Search Debug: In the search_category function (print)")
+
     search_vector = SEARCH_VECTORS[category](request)
     pinned_results = search_vector.pinned(query)
     # `list` needs to be called to force the database query to be evaluated
     # before passing the value to the paginator. If this isn't done, the
     # pages will have the pinned results removed after pagination and cause
     # the pages to have odd lengths.
     search_results = list(pinned_results) + list(search_vector.search(query))
+
+    # TODO: Remove debugging
+    try:
+        logger.info(f"Search Debug: {json.dumps(search_results)}")
+    except Exception as e:
+        logger.error(f"Search Debug Failed: {e}")
+
     count = len(search_results)
 
     if limit:

user-post.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Exit early if something goes wrong
+set -e
+
+echo "Running post build script"
+
+echo "Running pip install"
+pip install -r requirements.txt
+
+echo "Running npm ci"
+npm ci
+
+echo "Renaming .env.ci to .env"
+mv ".env.ci" ".env"
+
+cd src
+
+echo "Running collectstatic"
+python manage.py collectstatic --settings=config.settings.test --noinput
+
+echo "Renaming .env to .env.ci"
+cd ../
+mv ".env" ".env.ci"