feat: remove ENABLE_MKTG_SITE setting and simplify marketing URL resolution

ENABLE_MKTG_SITE was a feature flag that selected between two URL resolution
strategies: MKTG_URLS (external marketing site) vs MKTG_URL_LINK_MAP (local
Django URL reversal). The local-template path is now legacy; all operators
are expected to use MKTG_URLS.

This commit removes the flag and its conditional branches, keeping the
MKTG_URLS-based behaviour unconditionally:

- Drop the setting definition and toggle annotation from openedx/envs/common.py
- Remove the override from lms/envs/devstack.py and both mock.yml files
- Simplify marketing_link() and is_marketing_link_set() in edxmako/shortcuts.py
  to always consult MKTG_URLS; drop the MKTG_URL_LINK_MAP fallback branches and
  the now-unused NoReverseMatch/reverse/set_custom_attribute/get_current_request_hostname imports
- Update validate_marketing_site_setting() in checks.py to always validate
  MKTG_URLS rather than gating validation on ENABLE_MKTG_SITE
- Trim edxmako/tests.py: remove False-path test variants and the MKTG_URL_LINK_MAP
  link-reversal test; each remaining test now exercises a single, unconditional code path

Part of #37053

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: feanil

cms/envs/mock.yml

@@ -426,7 +426,6 @@ FEATURES:
   ENABLE_LTI_PROVIDER: true
   ENABLE_MAX_FAILED_LOGIN_ATTEMPTS: true
   ENABLE_MKTG_EMAIL_OPT_IN: true
-  ENABLE_MKTG_SITE: true
   ENABLE_MOBILE_REST_API: true
   ENABLE_PASSWORD_RESET_FAILURE_EMAIL: true
   ENABLE_PROCTORED_EXAMS: true

common/djangoapps/edxmako/shortcuts.py

@@ -20,33 +20,20 @@
 from django.core.validators import URLValidator
 from django.http import HttpResponse  # pylint: disable=unused-import
 from django.template import engines
-from django.urls import NoReverseMatch, reverse
-from edx_django_utils.monitoring import set_custom_attribute
 from six.moves.urllib.parse import urljoin
 
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
-from xmodule.util.xmodule_django import get_current_request_hostname  # pylint: disable=wrong-import-order
 
 from . import Engines
 
 log = logging.getLogger(__name__)
 
 
 def marketing_link(name):
-    """Returns the correct URL for a link to the marketing site
-    depending on if the marketing site is enabled
+    """Returns the URL for a marketing site link from MKTG_URLS.
 
-    Since the marketing site is enabled by a setting, we have two
-    possible URLs for certain links. This function is to decides
-    which URL should be provided.
+    MKTG_URL_OVERRIDES take priority. Falls back to '#' if the link is not configured.
     """
-    # link_map maps URLs from the marketing site to the old equivalent on
-    # the Django site
-    link_map = settings.MKTG_URL_LINK_MAP
-    enable_mktg_site = configuration_helpers.get_value(
-        'ENABLE_MKTG_SITE',
-        settings.FEATURES.get('ENABLE_MKTG_SITE', False)
-    )
     marketing_urls = configuration_helpers.get_value(
         'MKTG_URLS',
         settings.MKTG_URLS
@@ -66,7 +53,7 @@ def marketing_link(name):
             log.debug("Invalid link set for link %s: %s", name, err)
             return '#'
 
-    if enable_mktg_site and name in marketing_urls:
+    if name in marketing_urls:
         # special case for when we only want the root marketing URL
         if name == 'ROOT':
             return marketing_urls.get('ROOT')
@@ -81,23 +68,9 @@ def marketing_link(name):
         # URLs in the MKTG_URLS setting
         # e.g. urljoin('https://marketing.com', 'https://open-edx.org/about') >>> 'https://open-edx.org/about'
         return urljoin(marketing_urls.get('ROOT'), marketing_urls.get(name))
-    # only link to the old pages when the marketing site isn't on
-    elif not enable_mktg_site and name in link_map:
-        # don't try to reverse disabled marketing links
-        if link_map[name] is not None:
-            host_name = get_current_request_hostname()  # pylint: disable=unused-variable  # noqa: F841
-            if link_map[name].startswith('http'):
-                return link_map[name]
-            else:
-                try:
-                    return reverse(link_map[name])
-                except NoReverseMatch:
-                    log.debug("Cannot find corresponding link for name: %s", name)
-                    set_custom_attribute('unresolved_marketing_link', name)
-                    return '#'
-    else:
-        log.debug("Cannot find corresponding link for name: %s", name)
-        return '#'
+
+    log.debug("Cannot find corresponding link for name: %s", name)
+    return '#'
 
 
 def is_any_marketing_link_set(names):
@@ -112,20 +85,11 @@ def is_marketing_link_set(name):
     """
     Returns a boolean if a given named marketing link is configured.
     """
-
-    enable_mktg_site = configuration_helpers.get_value(
-        'ENABLE_MKTG_SITE',
-        settings.FEATURES.get('ENABLE_MKTG_SITE', False)
-    )
     marketing_urls = configuration_helpers.get_value(
         'MKTG_URLS',
         settings.MKTG_URLS
     )
-
-    if enable_mktg_site:
-        return name in marketing_urls
-    else:
-        return name in settings.MKTG_URL_LINK_MAP
+    return name in marketing_urls
 
 
 def marketing_link_context_processor(request):

common/djangoapps/edxmako/tests.py

@@ -3,12 +3,10 @@
 from unittest.mock import Mock, patch
 
 import ddt
-from django.conf import settings
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.test.utils import override_settings
-from django.urls import reverse
 from edx_django_utils.cache import RequestCache
 
 from common.djangoapps.edxmako import LOOKUP, add_lookup
@@ -33,92 +31,36 @@ class ShortcutsTests(UrlResetMixin, TestCase):
 
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'ABOUT': '/about-us'})
     def test_marketing_link(self):
-        with override_settings(MKTG_URL_LINK_MAP={'ABOUT': self._get_test_url_name()}):
-            # test marketing site on
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-                expected_link = 'https://dummy-root/about-us'
-                link = marketing_link('ABOUT')
-                assert link == expected_link
-            # test marketing site off
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-                expected_link = reverse(self._get_test_url_name())
-                link = marketing_link('ABOUT')
-                assert link == expected_link
+        expected_link = 'https://dummy-root/about-us'
+        link = marketing_link('ABOUT')
+        assert link == expected_link
+
+    @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'ABOUT': '/about-us'})
+    def test_marketing_link_unconfigured(self):
+        assert marketing_link('NOT_CONFIGURED') == '#'
 
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'ABOUT': '/about-us'})
     def test_is_marketing_link_set(self):
-        with override_settings(MKTG_URL_LINK_MAP={'ABOUT': self._get_test_url_name()}):
-            # test marketing site on
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-                assert is_marketing_link_set('ABOUT')
-                assert not is_marketing_link_set('NOT_CONFIGURED')
-            # test marketing site off
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-                assert is_marketing_link_set('ABOUT')
-                assert not is_marketing_link_set('NOT_CONFIGURED')
+        assert is_marketing_link_set('ABOUT')
+        assert not is_marketing_link_set('NOT_CONFIGURED')
 
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'ABOUT': '/about-us'})
     def test_is_any_marketing_link_set(self):
-        with override_settings(MKTG_URL_LINK_MAP={'ABOUT': self._get_test_url_name()}):
-            # test marketing site on
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-                assert is_any_marketing_link_set(['ABOUT'])
-                assert is_any_marketing_link_set(['ABOUT', 'NOT_CONFIGURED'])
-                assert not is_any_marketing_link_set(['NOT_CONFIGURED'])
-            # test marketing site off
-            with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-                assert is_any_marketing_link_set(['ABOUT'])
-                assert is_any_marketing_link_set(['ABOUT', 'NOT_CONFIGURED'])
-                assert not is_any_marketing_link_set(['NOT_CONFIGURED'])
-
-    def _get_test_url_name(self):  # pylint: disable=missing-function-docstring
-        if settings.ROOT_URLCONF == 'lms.urls':
-            # return any lms url name
-            return 'dashboard'
-        else:
-            # return any cms url name
-            return 'organizations'
+        assert is_any_marketing_link_set(['ABOUT'])
+        assert is_any_marketing_link_set(['ABOUT', 'NOT_CONFIGURED'])
+        assert not is_any_marketing_link_set(['NOT_CONFIGURED'])
 
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'TOS': '/tos'})
     @override_settings(MKTG_URL_OVERRIDES={'TOS': 'https://edx.org'})
     def test_override_marketing_link_valid(self):
-        expected_link = 'https://edx.org'
-        # test marketing site on
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-            link = marketing_link('TOS')
-            assert link == expected_link
-        # test marketing site off
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-            link = marketing_link('TOS')
-            assert link == expected_link
+        link = marketing_link('TOS')
+        assert link == 'https://edx.org'
 
     @override_settings(MKTG_URLS={'ROOT': 'https://dummy-root', 'TOS': '/tos'})
     @override_settings(MKTG_URL_OVERRIDES={'TOS': '123456'})
     def test_override_marketing_link_invalid(self):
-        expected_link = '#'
-        # test marketing site on
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': True}):
-            link = marketing_link('TOS')
-            assert link == expected_link
-        # test marketing site off
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-            link = marketing_link('TOS')
-            assert link == expected_link
-
-    @skip_unless_lms
-    def test_link_map_url_reverse(self):
-        url_link_map = {
-            'ABOUT': 'dashboard',
-            'BAD_URL': 'foobarbaz',
-        }
-
-        with patch.dict('django.conf.settings.FEATURES', {'ENABLE_MKTG_SITE': False}):
-            with override_settings(MKTG_URL_LINK_MAP=url_link_map):
-                link = marketing_link('ABOUT')
-                assert link == '/dashboard'
-
-                link = marketing_link('BAD_URL')
-                assert link == '#'
+        link = marketing_link('TOS')
+        assert link == '#'
 
 
 class AddLookupTests(TestCase):

docs/docs_settings.py

@@ -29,7 +29,6 @@
 # Settings that will fail if we enable them, and we don't need them for docs anyway.
 FEATURES["RUN_AS_ANALYTICS_SERVER_ENABLED"] = False  # noqa: F405
 FEATURES["ENABLE_SOFTWARE_SECURE_FAKE"] = False  # noqa: F405
-FEATURES["ENABLE_MKTG_SITE"] = False  # noqa: F405
 
 INSTALLED_APPS.extend(  # noqa: F405
     [

lms/envs/common.py

@@ -401,8 +401,8 @@
 # .. toggle_name: settings.ENABLE_COURSE_HOME_REDIRECT
 # .. toggle_implementation: DjangoSetting
 # .. toggle_default: True
-# .. toggle_description: When enabled, along with the ENABLE_MKTG_SITE feature toggle, users who attempt to access a
-#   course "about" page will be redirected to the course home url.
+# .. toggle_description: When enabled, users who attempt to access a course "about" page will be redirected to the
+#   course home url.
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2019-01-15
 # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/19604

lms/envs/devstack.py

@@ -423,7 +423,6 @@ def should_show_debug_toolbar(request):  # pylint: disable=missing-function-docs
 # Toggle this off if you don't want anything to do with enterprise in devstack.
 ENABLE_ENTERPRISE_INTEGRATION = True
 
-ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)  # noqa: F405
 MARKETING_SITE_ROOT = os.environ.get('MARKETING_SITE_ROOT', 'http://localhost:8080')  # noqa: F405
 
 MKTG_URLS = {

lms/envs/mock.yml

@@ -582,7 +582,6 @@ FEATURES:
   ENABLE_INTEGRITY_SIGNATURE: true
   ENABLE_MAX_FAILED_LOGIN_ATTEMPTS: true
   ENABLE_MKTG_EMAIL_OPT_IN: true
-  ENABLE_MKTG_SITE: true
   ENABLE_MOBILE_REST_API: true
   ENABLE_NEW_BULK_EMAIL_EXPERIENCE: true
   ENABLE_ORA_MOBILE_SUPPORT: true

openedx/core/djangoapps/common_initialization/checks.py

@@ -33,19 +33,18 @@ def validate_marketing_site_setting(app_configs, **kwargs):  # pylint: disable=u
     Validates marketing site related settings.
     """
     errors = []
-    if settings.FEATURES.get('ENABLE_MKTG_SITE'):
-        if not hasattr(settings, 'MKTG_URLS'):
-            errors.append(
-                Error(
-                    'ENABLE_MKTG_SITE is True, but MKTG_URLS is not defined.',
-                    id='common.djangoapps.common_initialization.E002',
-                )
+    if not hasattr(settings, 'MKTG_URLS'):
+        errors.append(
+            Error(
+                'MKTG_URLS is not defined.',
+                id='common.djangoapps.common_initialization.E002',
             )
-        if not settings.MKTG_URLS.get('ROOT'):
-            errors.append(
-                Error(
-                    'There is no ROOT defined in MKTG_URLS.',
-                    id='common.djangoapps.common_initialization.E003',
-                )
+        )
+    elif not settings.MKTG_URLS.get('ROOT'):
+        errors.append(
+            Error(
+                'There is no ROOT defined in MKTG_URLS.',
+                id='common.djangoapps.common_initialization.E003',
             )
+        )
     return errors

openedx/envs/common.py

@@ -1121,16 +1121,6 @@ def add_optional_apps(optional_apps, installed_apps):
 # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/2749
 EMBARGO = False
 
-# .. toggle_name: ENABLE_MKTG_SITE
-# .. toggle_implementation: DjangoSetting
-# .. toggle_default: False
-# .. toggle_description: Toggle to enable alternate urls for marketing links.
-# .. toggle_use_cases: open_edx
-# .. toggle_creation_date: 2014-03-24
-# .. toggle_warning: When this is enabled, the MKTG_URLS setting should be defined. The use case of this feature
-#   toggle is uncertain.
-ENABLE_MKTG_SITE = False
-
 # Expose Mobile REST API.
 ENABLE_MOBILE_REST_API = False