diff --git a/common/djangoapps/enrollment/__init__.py b/common/djangoapps/enrollment/__init__.py index c3623e65c56bff86e09692bfb2796fd4b06606ae..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/common/djangoapps/enrollment/__init__.py +++ b/common/djangoapps/enrollment/__init__.py @@ -1,9 +0,0 @@ -""" -Enrollment API helpers and settings -""" -from openedx.core.djangoapps.waffle_utils import (WaffleFlag, WaffleFlagNamespace) - -WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='enrollment_api_rate_limit') - -REDUCE_RATE_LIMIT_FOR_STAFF_FOR_ENROLLMENT_API = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'reduce_staff_rate_limit') -USE_UNIVERSAL_RATE_LIMIT_FOR_ENROLLMENT_API = WaffleFlag(WAFFLE_FLAG_NAMESPACE, 'use_universal_rate_limit') diff --git a/common/djangoapps/enrollment/views.py b/common/djangoapps/enrollment/views.py index ef86e70ad3921c2544751828968ad454cde5983a..03064f8b80981cace15e81ca61595ea1aff41d95 100644 --- a/common/djangoapps/enrollment/views.py +++ b/common/djangoapps/enrollment/views.py @@ -12,8 +12,6 @@ from django.utils.decorators import method_decorator from edx_rest_framework_extensions.authentication import JwtAuthentication from enrollment import api from enrollment.errors import CourseEnrollmentError, CourseEnrollmentExistsError, CourseModeNotFoundError -from enrollment import REDUCE_RATE_LIMIT_FOR_STAFF_FOR_ENROLLMENT_API, \ - USE_UNIVERSAL_RATE_LIMIT_FOR_ENROLLMENT_API from opaque_keys import InvalidKeyError from opaque_keys.edx.keys import CourseKey @@ -78,28 +76,7 @@ class ApiKeyPermissionMixIn(object): class EnrollmentUserThrottle(UserRateThrottle, ApiKeyPermissionMixIn): """Limit the number of requests users can make to the enrollment API.""" - # TODO: After confirming that reducing the throttle is successful, remove - # and clean up waffles. The rate limit has been increased over the course - # of a few months to account for unnecessary calls from the ecommerce - # service. These calls are no longer made and the plan is to set the - # rate limit back to its original state. LEARNER-5148 - - # Current rate limit - THROTTLE_RATES = { - 'user': '40/minute', - 'staff': '2000/minute', - } - - # Less aggressive reduction in throttle limit. This should not be necessary - if REDUCE_RATE_LIMIT_FOR_STAFF_FOR_ENROLLMENT_API.is_enabled(): - THROTTLE_RATES = { - 'user': '40/minute', - 'staff': '400/minute', - } - - # Original rate Limit before rate limit increases. - if USE_UNIVERSAL_RATE_LIMIT_FOR_ENROLLMENT_API.is_enabled(): - rate = '40/minute' + rate = '40/minute' def allow_request(self, request, view): # Use a special scope for staff to allow for a separate throttle rate