diff --git a/.copilot/phases/pre_build.sh b/.copilot/phases/pre_build.sh index f2a503f87b..53c4d3640d 100644 --- a/.copilot/phases/pre_build.sh +++ b/.copilot/phases/pre_build.sh @@ -2,5 +2,5 @@ set -e -sed -i '15 s/build_exporter/build_exporter_dbt/' package.json -sed -i '15 s/build_caseworker/build_caseworker_dbt/' package.json +sed -i '15 s/build_exporter/build_exporter/' package.json +sed -i '15 s/build_caseworker/build_caseworker/' package.json diff --git a/conf/base.py b/conf/base.py index ded6f4d022..1661278cb9 100644 --- a/conf/base.py +++ b/conf/base.py @@ -3,7 +3,6 @@ from environ import Env import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration -from django_log_formatter_ecs import ECSFormatter from django_log_formatter_asim import ASIMFormatter from dbt_copilot_python.utility import is_copilot @@ -165,10 +164,7 @@ LOGIN_URL = reverse_lazy("auth:login") -if IS_ENV_DBT_PLATFORM: - DATA_DIR = BASE_DIR -else: - DATA_DIR = os.path.dirname(BASE_DIR) +DATA_DIR = BASE_DIR STATICFILES_FINDERS = ( "django.contrib.staticfiles.finders.FileSystemFinder", @@ -228,11 +224,6 @@ LOGGING.update({"formatters": {"asim_formatter": {"()": ASIMFormatter}}}) LOGGING.update({"handlers": {"asim": {"class": "logging.StreamHandler", "formatter": "asim_formatter"}}}) LOGGING.update({"root": {"handlers": ["asim"], "level": LOG_LEVEL}}) -elif IS_ENV_GOV_PAAS: - REDIS_URL = VCAP_SERVICES["redis"][0]["credentials"]["uri"] - LOGGING.update({"formatters": {"ecs_formatter": {"()": ECSFormatter}}}) - LOGGING.update({"handlers": {"ecs": {"class": "logging.StreamHandler", "formatter": "ecs_formatter"}}}) - LOGGING.update({"root": {"handlers": ["ecs"], "level": LOG_LEVEL}}) else: # Local configurations and CircleCI REDIS_URL = env.str("REDIS_URL", "") diff --git a/package.json b/package.json index 9feddce8ed..6b05a645af 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,8 @@ "description": "Combined repo for LITE exporter and caseworker frontends", "private": true, "scripts": { - "build_exporter": "parcel build ./exporter/assets/javascripts/main.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", - "build_caseworker": "parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", - "build_exporter_dbt": "NODE_OPTIONS='' parcel build ./exporter/assets/javascripts/main.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", - "build_caseworker_dbt": "NODE_OPTIONS='' parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", + "build_exporter": "NODE_OPTIONS='' parcel build ./exporter/assets/javascripts/main.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", + "build_caseworker": "NODE_OPTIONS='' parcel build ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch_exporter": "PARCEL_WORKERS=0 parcel watch --port 8400 ./exporter/assets/javascripts/{main,head}.js ./exporter/assets/javascripts/cookie-policy-form.js --dist-dir exporter/assets/built --public-url /assets/", "watch_caseworker": "PARCEL_WORKERS=0 parcel watch --port 8401 ./caseworker/assets/javascripts/{main,head,bookmarks,cookie-policy-form,search-cases,desnz,tau,tau-edit,tau-multiple-assessment-edit,case-filters,refusal-review-consolidate,search-products}.js --dist-dir caseworker/assets/built --public-url /assets/", "watch": "rm -rf .parcel-cache && npm run build_exporter && npm run build_caseworker && concurrently 'npm run watch_exporter' 'npm run watch_caseworker'",