Skip to content

Commit

Permalink
fix: Drop discovery retirement steps
Browse files Browse the repository at this point in the history
Using discovery steps in the pipeline lead to KeyError in the tubular
because there is no support for `retire_one_learner` script in context
of Discovery.

YT:
- https://youtrack.raccoongang.com/issue/PhU-399

Co-authored-by: Florian Haas <[email protected]>
  • Loading branch information
dyudyunov and fghaas committed Jul 31, 2024
1 parent 9599c65 commit 2d3d233
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Unreleased

* [Bug fix] Complete the removal of (not-ever-working) support for the Ecommerce service, by also removing references to that service from the `openedx-lms-common-settings` patch.
* [Bug fix] Remove references to the (not-ever-working) Discovery service.

## Version 3.3.1 (2024-07-03)

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ appropriate one:
Limitations
------------

This plugin cannot be used for retiring accounts in the [Open edX E-Commerce Service](https://github.com/openedx/ecommerce).[^ecom]
This plugin cannot be used for retiring accounts in the [Open edX E-Commerce Service](https://github.com/openedx/ecommerce),[^ecom] nor the [Course Discovery Service](https://github.com/openedx/course-discovery).[^discovery].

[^ecom]: See [Issue #36](https://github.com/hastexo/tutor-contrib-retirement/issues/36) in this repository for a related discussion of missing functionality in E-Commerce account retirement.
[^ecom]: See [Issue #36](https://github.com/hastexo/tutor-contrib-retirement/issues/36) for background.
[^discovery]: See [Issue #39](https://github.com/hastexo/tutor-contrib-retirement/issues/39) for background.


Installation
Expand Down
5 changes: 0 additions & 5 deletions tutorretirement/patches/openedx-lms-common-settings
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ RETIREMENT_STATES = [
'FORUMS_COMPLETE',
{% endif %}

{% if DISCOVERY_HOST is defined %}
'RETIRING_DISCOVERY',
'DISCOVERY_COMPLETE',
{% endif %}

{% if NOTES_HOST is defined %}
'RETIRING_NOTES',
'NOTES_COMPLETE',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ client_secret: {{ RETIREMENT_EDX_OAUTH2_CLIENT_SECRET }}

base_urls:
lms: {{ "https" if ENABLE_HTTPS else "http" }}://{{ LMS_HOST }}
{% if DISCOVERY_HOST is defined %}discovery: {{ "https" if ENABLE_HTTPS else "http" }}://{{ DISCOVERY_HOST }}{% endif %}
{% if NOTES_HOST is defined %}notes: {{ "https" if ENABLE_HTTPS else "http" }}://{{ NOTES_HOST }}{% endif %}

retirement_pipeline:
{% if FORUM_VERSION is defined %}- [ 'RETIRING_FORUMS', 'FORUMS_COMPLETE', 'LMS', 'retirement_retire_forum' ]{% endif %}
{% if DISCOVERY_HOST is defined %}- [ 'RETIRING_DISCOVERY', 'DISCOVERY_COMPLETE', 'DISCOVERY', 'replace_usernames' ]{% endif %}
{% if NOTES_HOST is defined %}- [ 'RETIRING_NOTES', 'NOTES_COMPLETE', 'LMS', 'retirement_retire_notes' ]{% endif %}
- [ 'RETIRING_EMAIL_LISTS', 'EMAIL_LISTS_COMPLETE', 'LMS', 'retirement_retire_mailings' ]
- [ 'RETIRING_ENROLLMENTS', 'ENROLLMENTS_COMPLETE', 'LMS', 'retirement_unenroll' ]
Expand Down

0 comments on commit 2d3d233

Please sign in to comment.