Revert: revert generic retirement update (#35317)
* Revert "fix: change settings config to empty list not dict" This reverts commitb65550c796. * Revert "fix: dependencies again" This reverts commitc06416bed7. * Revert "feat: updated user retirement docs" This reverts commitc9641b35d4. * Revert "fix: install dependencies" This reverts commita5442b2409. * Revert "Revert "fix: dependencies"" This reverts commit4cde950007. * Revert "fix: dependencies" This reverts commit8a1c30ebc5. * Revert "fix: Add CI update for tests" This reverts commit64098b6dab. * Revert "fix: tests" This reverts commit5e636dea16. * Revert "fix: generalize internal services" This reverts commite8f9db428d. * Revert "fix: quality" This reverts commit77ca0f754a. * Revert "feat: Commerce Coordinator step in retirement pipeline" This reverts commitc24c87499f.
This commit is contained in:
@@ -490,21 +490,3 @@ class LicenseManagerApi(BaseApiClient):
|
||||
except HttpDoesNotExistException:
|
||||
LOG.info("No license manager data found for user")
|
||||
return True
|
||||
|
||||
|
||||
class GenericRetirementApi(BaseApiClient):
|
||||
"""
|
||||
Generic API client.
|
||||
"""
|
||||
def __init__(self, lms_base_url, api_base_url, client_id, client_secret, retirement_url_path):
|
||||
super().__init__(lms_base_url, api_base_url, client_id, client_secret)
|
||||
self.retirement_url_path = retirement_url_path
|
||||
|
||||
@_retry_lms_api()
|
||||
def retire_learner(self, learner):
|
||||
"""
|
||||
Performs the learner retirement step for additonal services.
|
||||
"""
|
||||
data = {'edx_lms_user_id': learner['user']['id']}
|
||||
api_url = self.get_api_url(self.retirement_url_path)
|
||||
return self._request('POST', api_url, json=data)
|
||||
|
||||
@@ -16,11 +16,9 @@ import unicodedata
|
||||
|
||||
import yaml
|
||||
from six import text_type
|
||||
from django.conf import settings
|
||||
|
||||
from scripts.user_retirement.utils.edx_api import LmsApi # pylint: disable=wrong-import-position
|
||||
from scripts.user_retirement.utils.edx_api import CredentialsApi, EcommerceApi, GenericRetirementApi, \
|
||||
LicenseManagerApi
|
||||
from scripts.user_retirement.utils.edx_api import CredentialsApi, EcommerceApi, LicenseManagerApi
|
||||
from scripts.user_retirement.utils.thirdparty_apis.amplitude_api import \
|
||||
AmplitudeApi # pylint: disable=wrong-import-position
|
||||
from scripts.user_retirement.utils.thirdparty_apis.braze_api import BrazeApi # pylint: disable=wrong-import-position
|
||||
@@ -174,19 +172,15 @@ def _setup_all_apis_or_exit(fail_func, fail_code, config):
|
||||
hubspot_from_address = config.get('hubspot_from_address', None)
|
||||
hubspot_alert_email = config.get('hubspot_alert_email', None)
|
||||
|
||||
required_services = [
|
||||
('BRAZE', braze_api_key),
|
||||
('AMPLITUDE', amplitude_api_key),
|
||||
('ECOMMERCE', ecommerce_base_url),
|
||||
('CREDENTIALS', credentials_base_url),
|
||||
('SEGMENT', segment_base_url),
|
||||
('HUBSPOT', hubspot_api_key),
|
||||
]
|
||||
extra_services = [(service['name'], service['service_base_url']) for service in settings.EXTRA_SERVICES_TO_RETIRE_FROM]
|
||||
all_services = required_services + extra_services
|
||||
|
||||
for state in config['retirement_pipeline']:
|
||||
for service, service_url in (all_services):
|
||||
for service, service_url in (
|
||||
('BRAZE', braze_api_key),
|
||||
('AMPLITUDE', amplitude_api_key),
|
||||
('ECOMMERCE', ecommerce_base_url),
|
||||
('CREDENTIALS', credentials_base_url),
|
||||
('SEGMENT', segment_base_url),
|
||||
('HUBSPOT', hubspot_api_key),
|
||||
):
|
||||
if state[2] == service and service_url is None:
|
||||
fail_func(fail_code, 'Service URL is not configured, but required for state {}'.format(state))
|
||||
|
||||
@@ -241,15 +235,5 @@ def _setup_all_apis_or_exit(fail_func, fail_code, config):
|
||||
segment_auth_token,
|
||||
segment_workspace_slug
|
||||
)
|
||||
|
||||
for service_config in settings.EXTRA_SERVICES_TO_RETIRE_FROM:
|
||||
service_name = service_config['name']
|
||||
config[service_name] = GenericRetirementApi(
|
||||
lms_base_url,
|
||||
service_config['service_base_url'],
|
||||
client_id,
|
||||
client_secret,
|
||||
service_config['retirement_url_path']
|
||||
)
|
||||
except Exception as exc: # pylint: disable=broad-except
|
||||
fail_func(fail_code, 'Unexpected error occurred!', exc)
|
||||
|
||||
Reference in New Issue
Block a user