refactor: more of the same

lms/envs/production.py

@@ -79,16 +79,8 @@ def get_env_setting(setting):
 LMS_ROOT_URL = None
 CMS_BASE = 'studio.edx.org'
 CELERY_EVENT_QUEUE_TTL = None
-# COMPREHENSIVE_THEME_LOCALE_PATHS contain the paths to themes locale directories e.g.
-# "COMPREHENSIVE_THEME_LOCALE_PATHS" : [
-#        "/edx/src/edx-themes/conf/locale"
-#    ],
-COMPREHENSIVE_THEME_LOCALE_PATHS = ENV_TOKENS.get('COMPREHENSIVE_THEME_LOCALE_PATHS', [])
-# PREPEND_LOCALE_PATHS contain the paths to locale directories to load first e.g.
-# "PREPEND_LOCALE_PATHS" : [
-#        "/edx/my-locale"
-#    ],
-PREPEND_LOCALE_PATHS = ENV_TOKENS.get('PREPEND_LOCALE_PATHS', [])
+COMPREHENSIVE_THEME_LOCALE_PATHS = []
+PREPEND_LOCALE_PATHS = []
 COURSE_LISTINGS = {}
 COMMENTS_SERVICE_URL = ''
 COMMENTS_SERVICE_KEY = ''
@@ -113,6 +105,14 @@ def get_env_setting(setting):
 BROKER_USE_SSL = False
 SESSION_INACTIVITY_TIMEOUT_IN_SECONDS = None
 ENABLE_REQUIRE_THIRD_PARTY_AUTH = False
+GOOGLE_ANALYTICS_TRACKING_ID = None
+GOOGLE_ANALYTICS_LINKEDIN = None
+GOOGLE_SITE_VERIFICATION_ID = None
+BRANCH_IO_KEY = None
+REGISTRATION_CODE_LENGTH = ENV_TOKENS.get('REGISTRATION_CODE_LENGTH', 8)
+FACEBOOK_API_VERSION = None
+FACEBOOK_APP_SECRET = None
+FACEBOOK_APP_ID = None
 
 # TODO make a note about axing these
 # SSL external authentication settings
@@ -428,91 +428,27 @@ def get_env_setting(setting):
     THIRD_PARTY_AUTH_CUSTOM_AUTH_FORMS = _YAML_TOKENS.get('THIRD_PARTY_AUTH_CUSTOM_AUTH_FORMS', {})
 
 ##### OAUTH2 Provider ##############
-if FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
-    OAUTH_ENFORCE_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_SECURE', True)
-    OAUTH_ENFORCE_CLIENT_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_CLIENT_SECURE', True)
+if FEATURES['ENABLE_OAUTH2_PROVIDER']:
+    OAUTH_ENFORCE_SECURE = True
+    OAUTH_ENFORCE_CLIENT_SECURE = True
     # Defaults for the following are defined in lms.envs.common
-    OAUTH_EXPIRE_DELTA = datetime.timedelta(
-        days=ENV_TOKENS.get('OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS', OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS)
-    )
-    OAUTH_EXPIRE_DELTA_PUBLIC = datetime.timedelta(
-        days=ENV_TOKENS.get('OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS', OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS)
-    )
-
-
-##### GOOGLE ANALYTICS IDS #####
-GOOGLE_ANALYTICS_ACCOUNT = AUTH_TOKENS.get('GOOGLE_ANALYTICS_ACCOUNT')
-GOOGLE_ANALYTICS_TRACKING_ID = AUTH_TOKENS.get('GOOGLE_ANALYTICS_TRACKING_ID')
-GOOGLE_ANALYTICS_LINKEDIN = AUTH_TOKENS.get('GOOGLE_ANALYTICS_LINKEDIN')
-GOOGLE_SITE_VERIFICATION_ID = ENV_TOKENS.get('GOOGLE_SITE_VERIFICATION_ID')
-GOOGLE_ANALYTICS_4_ID = AUTH_TOKENS.get('GOOGLE_ANALYTICS_4_ID')
-
-##### BRANCH.IO KEY #####
-BRANCH_IO_KEY = AUTH_TOKENS.get('BRANCH_IO_KEY')
-
-#### Course Registration Code length ####
-REGISTRATION_CODE_LENGTH = ENV_TOKENS.get('REGISTRATION_CODE_LENGTH', 8)
-
-# Which access.py permission names to check;
-# We default this to the legacy permission 'see_exists'.
-COURSE_CATALOG_VISIBILITY_PERMISSION = ENV_TOKENS.get(
-    'COURSE_CATALOG_VISIBILITY_PERMISSION',
-    COURSE_CATALOG_VISIBILITY_PERMISSION
-)
-COURSE_ABOUT_VISIBILITY_PERMISSION = ENV_TOKENS.get(
-    'COURSE_ABOUT_VISIBILITY_PERMISSION',
-    COURSE_ABOUT_VISIBILITY_PERMISSION
-)
-
-DEFAULT_COURSE_VISIBILITY_IN_CATALOG = ENV_TOKENS.get(
-    'DEFAULT_COURSE_VISIBILITY_IN_CATALOG',
-    DEFAULT_COURSE_VISIBILITY_IN_CATALOG
-)
-
-DEFAULT_MOBILE_AVAILABLE = ENV_TOKENS.get(
-    'DEFAULT_MOBILE_AVAILABLE',
-    DEFAULT_MOBILE_AVAILABLE
-)
-
-# Enrollment API Cache Timeout
-ENROLLMENT_COURSE_DETAILS_CACHE_TIMEOUT = ENV_TOKENS.get('ENROLLMENT_COURSE_DETAILS_CACHE_TIMEOUT', 60)
-
-# Ecommerce Orders API Cache Timeout
-ECOMMERCE_ORDERS_API_CACHE_TIMEOUT = ENV_TOKENS.get('ECOMMERCE_ORDERS_API_CACHE_TIMEOUT', 3600)
-
-if FEATURES.get('ENABLE_COURSEWARE_SEARCH') or \
-   FEATURES.get('ENABLE_DASHBOARD_SEARCH') or \
-   FEATURES.get('ENABLE_COURSE_DISCOVERY') or \
-   FEATURES.get('ENABLE_TEAMS'):
+    OAUTH_EXPIRE_DELTA = datetime.timedelta(days=OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS)
+    OAUTH_EXPIRE_DELTA_PUBLIC = datetime.timedelta(days=OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS)
+
+if (
+   FEATURES['ENABLE_COURSEWARE_SEARCH'] or
+   FEATURES['ENABLE_DASHBOARD_SEARCH'] or
+   FEATURES['ENABLE_COURSE_DISCOVERY'] or
+   FEATURES['ENABLE_TEAMS']
+):
     # Use ElasticSearch as the search engine herein
     SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
-    SEARCH_FILTER_GENERATOR = ENV_TOKENS.get('SEARCH_FILTER_GENERATOR', SEARCH_FILTER_GENERATOR)
-
-SEARCH_SKIP_INVITATION_ONLY_FILTERING = ENV_TOKENS.get(
-    'SEARCH_SKIP_INVITATION_ONLY_FILTERING',
-    SEARCH_SKIP_INVITATION_ONLY_FILTERING,
-)
-SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING = ENV_TOKENS.get(
-    'SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING',
-    SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING,
-)
-
-SEARCH_COURSEWARE_CONTENT_LOG_PARAMS = ENV_TOKENS.get(
-    'SEARCH_COURSEWARE_CONTENT_LOG_PARAMS',
-    SEARCH_COURSEWARE_CONTENT_LOG_PARAMS,
-)
 
 # TODO: Once we have successfully upgraded to ES7, switch this back to ELASTIC_SEARCH_CONFIG.
-ELASTIC_SEARCH_CONFIG = ENV_TOKENS.get('ELASTIC_SEARCH_CONFIG_ES7', [{}])
-
-# Facebook app
-FACEBOOK_API_VERSION = AUTH_TOKENS.get("FACEBOOK_API_VERSION")
-FACEBOOK_APP_SECRET = AUTH_TOKENS.get("FACEBOOK_APP_SECRET")
-FACEBOOK_APP_ID = AUTH_TOKENS.get("FACEBOOK_APP_ID")
+ELASTIC_SEARCH_CONFIG = _YAML_TOKENS.get('ELASTIC_SEARCH_CONFIG_ES7', [{}])
 
-XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
-XBLOCK_SETTINGS.setdefault("VideoBlock", {})["licensing_enabled"] = FEATURES.get("LICENSING", False)
-XBLOCK_SETTINGS.setdefault("VideoBlock", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.get('YOUTUBE_API_KEY', YOUTUBE_API_KEY)
+XBLOCK_SETTINGS.setdefault("VideoBlock", {})["licensing_enabled"] = FEATURES["LICENSING"]
+XBLOCK_SETTINGS.setdefault("VideoBlock", {})['YOUTUBE_API_KEY'] = YOUTUBE_API_KEY
 
 ##### Custom Courses for EdX #####
 if FEATURES.get('CUSTOM_COURSES_EDX'):