Merge remote-tracking branch 'origin/master' into pwnage101/ENT-11563

Author: kiram15

lms/djangoapps/grades/tests/test_events.py

@@ -4,6 +4,7 @@
 
 from unittest import mock
 from unittest.mock import patch
+import pytest
 
 from ccx_keys.locator import CCXLocator
 from django.utils.timezone import now
@@ -299,7 +300,7 @@ def test_filter_exception_is_logged_and_raised(
 
         from lms.djangoapps.grades.events import course_grade_passed_first_time
 
-        with self.assertRaisesRegex(Exception, "boom"):
+        with pytest.raises(Exception, "boom"):
             course_grade_passed_first_time(self.user.id, self.course.id)
 
         mock_log.exception.assert_called_once_with(

lms/envs/common.py

@@ -3281,22 +3281,6 @@ def _should_send_certificate_events(settings):
 #     The project ID should be obtained from the Google Cloud Console when creating a reCAPTCHA
 RECAPTCHA_PROJECT_ID = None
 
-# .. setting_name: OPEN_EDX_FILTERS_CONFIG
-# .. setting_default: {}
-# .. setting_description: Configuration dict for openedx-filters pipeline steps.
-#    Keys are filter type strings; values are dicts with 'fail_silently' (bool) and
-#    'pipeline' (list of dotted-path strings to PipelineStep subclasses).
-OPEN_EDX_FILTERS_CONFIG = {
-    "org.openedx.learning.account.settings.read_only_fields.requested.v1": {
-        "fail_silently": True,
-        "pipeline": ["enterprise.filters.accounts.AccountSettingsReadOnlyFieldsStep"],
-    },
-    "org.openedx.learning.dashboard.render.started.v1": {
-        "fail_silently": False,
-        "pipeline": ["enterprise.filters.dashboard.DashboardContextEnricher"],
-    },
-}
-
 ############################## Miscellaneous ###############################
 
 # To limit the number of courses displayed on learner dashboard
@@ -3309,15 +3293,3 @@ def _should_send_certificate_events(settings):
 SSL_AUTH_DN_FORMAT_STRING = (
     "/C=US/ST=Massachusetts/O=Massachusetts Institute of Technology/OU=Client CA v1/CN={0}/emailAddress={1}"
 )
-
-# .. setting_name: OPEN_EDX_FILTERS_CONFIG
-# .. setting_default: {}
-# .. setting_description: Configuration dict for openedx-filters pipeline steps.
-#    Keys are filter type strings; values are dicts with 'fail_silently' (bool) and
-#    'pipeline' (list of dotted-path strings to PipelineStep subclasses).
-OPEN_EDX_FILTERS_CONFIG = {
-    "org.openedx.learning.grade.context.requested.v1": {
-        "fail_silently": True,
-        "pipeline": ["enterprise.filters.grades.GradeEventContextEnricher"],
-    },
-}

lms/envs/production.py

@@ -85,7 +85,6 @@ def get_env_setting(setting):
             'EVENT_BUS_PRODUCER_CONFIG',
             'DEFAULT_FILE_STORAGE',
             'STATICFILES_STORAGE',
-            'OPEN_EDX_FILTERS_CONFIG',
         ]
     })
 
@@ -280,19 +279,6 @@ def get_env_setting(setting):
     EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST  # noqa: F405
 )
 
-# Merge OPEN_EDX_FILTERS_CONFIG from YAML into the default defined in common.py.
-# Pipeline steps from YAML are appended after steps defined in common.py.
-# The fail_silently value from YAML takes precedence over the one in common.py.
-for _filter_type, _filter_config in _YAML_TOKENS.get('OPEN_EDX_FILTERS_CONFIG', {}).items():
-    if _filter_type in OPEN_EDX_FILTERS_CONFIG:  # noqa: F405
-        OPEN_EDX_FILTERS_CONFIG[_filter_type]['pipeline'].extend(  # noqa: F405
-            _filter_config.get('pipeline', [])
-        )
-        if 'fail_silently' in _filter_config:
-            OPEN_EDX_FILTERS_CONFIG[_filter_type]['fail_silently'] = _filter_config['fail_silently']  # noqa: F405
-    else:
-        OPEN_EDX_FILTERS_CONFIG[_filter_type] = _filter_config  # noqa: F405
-
 if ENABLE_THIRD_PARTY_AUTH:  # noqa: F405
     AUTHENTICATION_BACKENDS = _YAML_TOKENS.get('THIRD_PARTY_AUTH_BACKENDS', [
         'social_core.backends.google.GoogleOAuth2',
@@ -530,19 +516,6 @@ def get_env_setting(setting):
     _YAML_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {})
 )
 
-# Merge OPEN_EDX_FILTERS_CONFIG from YAML into the default defined in common.py.
-# Pipeline steps from YAML are appended after steps defined in common.py.
-# The fail_silently value from YAML takes precedence over the one in common.py.
-for _filter_type, _filter_config in _YAML_TOKENS.get('OPEN_EDX_FILTERS_CONFIG', {}).items():
-    if _filter_type in OPEN_EDX_FILTERS_CONFIG:
-        OPEN_EDX_FILTERS_CONFIG[_filter_type]['pipeline'].extend(
-            _filter_config.get('pipeline', [])
-        )
-        if 'fail_silently' in _filter_config:
-            OPEN_EDX_FILTERS_CONFIG[_filter_type]['fail_silently'] = _filter_config['fail_silently']
-    else:
-        OPEN_EDX_FILTERS_CONFIG[_filter_type] = _filter_config
-
 #######################################################################################################################
 # HEY! Don't add anything to the end of this file.
 # Add your defaults to common.py instead!