Update NodeJS buildpack workaround to only be present in Package.json

Author: emileswarts

.copilot/phases/install.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
 set -e
-
-# Add commands below to run as part of the install phase

.copilot/phases/post_build.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
 set -e
-
-# Add commands below to run as part of the post_build phase

.copilot/phases/pre_build.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
 set -e
-
-# Add commands below to run as part of the pre_build phase

Procfile

@@ -1,5 +1,4 @@
 web: scripts/web-worker-entrypoint.sh
-app: scripts/web-worker-entrypoint.sh
 worker: celery -A common.celery worker -O fair -l info -Q standard
 beat: celery -A common.celery beat -l info
 rule-check-worker: celery -A common.celery worker -O fair -l info -Q rule-check --concurrency 1

common/views.py

@@ -317,9 +317,7 @@ def check_s3(self) -> Tuple[str, int]:
                     endpoint_url=settings.S3_ENDPOINT_URL,
                     region_name=settings.HMRC_PACKAGING_S3_REGION_NAME,
                 )
-            client.head_bucket(
-                Bucket=settings.HMRC_PACKAGING_STORAGE_BUCKET_NAME,
-            )
+            client.head_bucket(Bucket=settings.HMRC_PACKAGING_STORAGE_BUCKET_NAME)
             return "OK", 200
         except (ClientError, EndpointConnectionError):
             return "S3 health check failed", 503
@@ -441,14 +439,10 @@ def get_context_data(self, **kwargs):
             data["APP_UPDATED_TIME"] = AppInfoView.timestamp_to_datetime_string(
                 os.path.getmtime(__file__),
             )
-            last_transaction = Transaction.objects.order_by(
-                "updated_at",
-            ).last()
+            last_transaction = Transaction.objects.order_by("updated_at").last()
             data["LAST_TRANSACTION_TIME"] = (
                 format(
-                    last_transaction.updated_at.strftime(
-                        AppInfoView.DATETIME_FORMAT,
-                    ),
+                    last_transaction.updated_at.strftime(AppInfoView.DATETIME_FORMAT),
                 )
                 if last_transaction
                 else "No transactions"
@@ -535,9 +529,7 @@ def get_object(self, queryset: Optional[QuerySet] = None) -> Model:
         try:
             obj = queryset.get()
         except queryset.model.DoesNotExist:
-            raise Http404(
-                f"No {self.model.__name__} matching the query {self.kwargs}",
-            )
+            raise Http404(f"No {self.model.__name__} matching the query {self.kwargs}")
 
         return obj
 
@@ -670,15 +662,10 @@ def get_ordering(self):
             self,
             "sort_by_fields",
         ), "SortingMixin requires class attribute sort_by_fields to be set"
-        assert isinstance(
-            self.sort_by_fields,
-            list,
-        ), "sort_by_fields must be a list"
+        assert isinstance(self.sort_by_fields, list), "sort_by_fields must be a list"
 
         if sort_by and sort_by in self.sort_by_fields:
-            if hasattr(self, "custom_sorting") and self.custom_sorting.get(
-                sort_by,
-            ):
+            if hasattr(self, "custom_sorting") and self.custom_sorting.get(sort_by):
                 sort_by = self.custom_sorting.get(sort_by)
 
             if ordered == "desc":
@@ -691,19 +678,11 @@ def get_ordering(self):
 
 
 def handler403(request, *args, **kwargs):
-    return TemplateResponse(
-        request=request,
-        template="common/403.jinja",
-        status=403,
-    )
+    return TemplateResponse(request=request, template="common/403.jinja", status=403)
 
 
 def handler500(request, *args, **kwargs):
-    return TemplateResponse(
-        request=request,
-        template="common/500.jinja",
-        status=500,
-    )
+    return TemplateResponse(request=request, template="common/500.jinja", status=500)
 
 
 class MaintenanceView(TemplateView):

package.json

@@ -44,7 +44,7 @@
     "clean": "rm -f ./run/static/webpack_bundles/*",
     "heroku-prebuild": "",
     "heroku-postbuild": "npm run build",
-    "start": "echo starting",
+    "start": "bash scripts/web-worker-entrypoint.sh",
     "test": "jest",
     "lint:js": "npx eslint . --ext .jsx,.js",
     "lint:js:fix": "npx eslint . --ext .jsx,.js --fix",

settings/common.py

@@ -282,7 +282,7 @@
     ALLOWED_HOSTS = setup_allowed_hosts(ALLOWED_HOSTS)
 # Govuk PaaS
 elif "VCAP_APPLICATION" in os.environ:
-    # Under PaaS, if ALLOW_PAAS_URIS is set fetch trusted domains from VCAP_APPLICATION env var
+    # Under PaaS, if ALLOW_PAAS_URIS is set, fetch trusted domains from VCAP_APPLICATION env var
     paas_hosts = json.loads(os.environ["VCAP_APPLICATION"])["uris"]
     ALLOWED_HOSTS.extend(paas_hosts)
 
@@ -861,7 +861,6 @@
     },
 }
 
-
 TRANSACTION_SCHEMA = os.getenv("TRANSACTION_SCHEMA", "workbaskets.models.SEED_FIRST")
 
 # Default max number of objects that will be accurately counted by LimitedPaginator.