From 7c7d7d8b6f1b3867f5ffa1e8f848e515634a382e Mon Sep 17 00:00:00 2001 From: Tim McCormack Date: Mon, 28 Mar 2022 20:38:34 +0000 Subject: [PATCH] feat: Allow REST_FRAMEWORK to be configured by (shallow) merge (#30112) ARCHBOM-2073 --- cms/envs/production.py | 4 ++++ lms/envs/production.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cms/envs/production.py b/cms/envs/production.py index dcbf702014..8b29e3d3f3 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -83,6 +83,7 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f: 'CELERY_QUEUES', 'MKTG_URL_LINK_MAP', 'MKTG_URL_OVERRIDES', + 'REST_FRAMEWORK', ] for key in KEYS_WITH_MERGED_VALUES: if key in __config_copy__: @@ -629,3 +630,6 @@ DISCUSSIONS_MICROFRONTEND_URL = ENV_TOKENS.get('DISCUSSIONS_MICROFRONTEND_URL', ################### Discussions micro frontend Feedback URL################### DISCUSSIONS_MFE_FEEDBACK_URL = ENV_TOKENS.get('DISCUSSIONS_MFE_FEEDBACK_URL', DISCUSSIONS_MFE_FEEDBACK_URL) + +############## DRF overrides ############## +REST_FRAMEWORK.update(ENV_TOKENS.get('REST_FRAMEWORK', {})) diff --git a/lms/envs/production.py b/lms/envs/production.py index e74cff6b58..611a9870fc 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -82,6 +82,7 @@ with codecs.open(CONFIG_FILE, encoding='utf-8') as f: 'CELERY_QUEUES', 'MKTG_URL_LINK_MAP', 'MKTG_URL_OVERRIDES', + 'REST_FRAMEWORK', ] for key in KEYS_WITH_MERGED_VALUES: if key in __config_copy__: @@ -1064,3 +1065,6 @@ DISCUSSIONS_MICROFRONTEND_URL = ENV_TOKENS.get('DISCUSSIONS_MICROFRONTEND_URL', ################### Discussions micro frontend Feedback URL################### DISCUSSIONS_MFE_FEEDBACK_URL = ENV_TOKENS.get('DISCUSSIONS_MFE_FEEDBACK_URL', DISCUSSIONS_MFE_FEEDBACK_URL) + +############## DRF overrides ############## +REST_FRAMEWORK.update(ENV_TOKENS.get('REST_FRAMEWORK', {}))