[FAL-2030] Updates kombu package to support multi-tenant redis authentication

cms/envs/production.py

@@ -403,6 +403,7 @@ def get_env_setting(setting):
 BROKER_TRANSPORT_OPTIONS = {
     'fanout_patterns': True,
     'fanout_prefix': True,
+    **ENV_TOKENS.get('CELERY_BROKER_TRANSPORT_OPTIONS', {})
 }
 
 # Message expiry time in seconds

lms/envs/production.py

@@ -519,6 +519,7 @@ def get_env_setting(setting):
 BROKER_TRANSPORT_OPTIONS = {
     'fanout_patterns': True,
     'fanout_prefix': True,
+    **ENV_TOKENS.get('CELERY_BROKER_TRANSPORT_OPTIONS', {})
 }
 
 # Block Structures

requirements/constraints.txt

@@ -8,6 +8,12 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
+# kombu needs additional functionality to support multi-tenant redis
+# This branch backports the following PRs to kombu 4.6.11, because celery 4.4.7 has requirement kombu<4.7,>=4.6.10
+# https://github.com/celery/kombu/pull/1351
+# https://github.com/celery/kombu/pull/1349
+# https://github.com/celery/kombu/pull/1376
+git+https://github.com/open-craft/kombu.git@gabor/FAL-2030-4.6.11#egg=kombu==4.6.11.1
 
 # This file contains all common constraints for edx-repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

requirements/edx-sandbox/py35.txt

@@ -80,7 +80,7 @@ pytz==2021.1
     # via matplotlib
 random2==1.0.1
     # via -r requirements/edx-sandbox/py35.in
-regex==2021.8.21
+regex==2021.8.28
     # via nltk
 scipy==1.2.1
     # via

requirements/edx-sandbox/py38.txt

@@ -24,7 +24,7 @@ decorator==4.4.2
     # via networkx
 joblib==1.0.1
     # via nltk
-kiwisolver==1.3.1
+kiwisolver==1.3.2
     # via matplotlib
 lxml==4.5.0
     # via
@@ -71,7 +71,7 @@ python-dateutil==2.4.0
     #   matplotlib
 random2==1.0.1
     # via -r requirements/edx-sandbox/py38.in
-regex==2021.8.21
+regex==2021.8.28
     # via nltk
 scipy==1.7.1
     # via

requirements/edx/base.txt

@@ -64,7 +64,7 @@ beautifulsoup4==4.9.3
     # via pynliner
 billiard==3.6.4.0
     # via celery
-bleach==4.0.0
+bleach==4.1.0
     # via
     #   -r requirements/edx/base.in
     #   django-wiki
@@ -142,7 +142,6 @@ cryptography==3.4.8
     #   -r requirements/edx/base.in
     #   django-fernet-fields
     #   edx-enterprise
-    #   py2neo
     #   pyjwt
     #   social-auth-core
 cssutils==2.3.0
@@ -300,7 +299,7 @@ django-model-utils==4.1.1
     #   edxval
     #   ora2
     #   super-csv
-django-mptt==0.13.1
+django-mptt==0.13.2
     # via
     #   -r requirements/edx/base.in
     #   django-wiki
@@ -381,8 +380,6 @@ djangorestframework==3.12.4
     #   super-csv
 djangorestframework-xml==2.0.0
     # via edx-enterprise
-docker==5.0.0
-    # via py2neo
 docopt==0.6.2
     # via xmodule
 docutils==0.17.1
@@ -474,7 +471,7 @@ edx-opaque-keys[django]==2.2.2
     #   xmodule
 edx-organizations==6.10.0
     # via -r requirements/edx/base.in
-edx-proctoring==3.23.9
+edx-proctoring==3.24.0
     # via
     #   -r requirements/edx/base.in
     #   edx-proctoring-proctortrack
@@ -519,8 +516,6 @@ elasticsearch==7.13.4
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   edx-search
-english==2020.7.0
-    # via py2neo
 enmerkar==0.7.1
     # via enmerkar-underscore
 enmerkar-underscore==2.1.0
@@ -568,6 +563,8 @@ idna==3.2
     #   yarl
 inflection==0.5.1
     # via drf-yasg
+interchange==2021.0.3
+    # via py2neo
 ipaddress==1.0.23
     # via -r requirements/edx/base.in
 isodate==0.6.0
@@ -599,8 +596,10 @@ jsonfield2==3.0.3
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-kombu==4.6.11
-    # via celery
+git+https://github.com/open-craft/kombu.git@gabor/FAL-2030-4.6.11#egg=kombu==4.6.11.1
+    # via
+    #   -c requirements/edx/../constraints.txt
+    #   celery
 laboratory==1.0.2
     # via -r requirements/edx/base.in
 lazy==1.4
@@ -676,9 +675,7 @@ multidict==5.1.0
     #   yarl
 mysqlclient==2.0.3
     # via -r requirements/edx/base.in
-neotime==1.7.4
-    # via py2neo
-newrelic==6.8.0.163
+newrelic==6.8.1.164
     # via
     #   -r requirements/edx/base.in
     #   edx-django-utils
@@ -738,13 +735,11 @@ pillow==8.3.1
     #   edx-organizations
 polib==1.1.1
     # via edx-i18n-tools
-prompt-toolkit==3.0.20
-    # via py2neo
 psutil==5.8.0
     # via
     #   -r requirements/edx/paver.txt
     #   edx-django-utils
-py2neo==2021.1.5
+py2neo==2021.2.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
@@ -849,10 +844,9 @@ pytz==2021.1
     #   event-tracking
     #   fs
     #   icalendar
-    #   neotime
+    #   interchange
     #   olxcleaner
     #   ora2
-    #   py2neo
     #   tincan
     #   xblock
 pyuca==1.2
@@ -870,15 +864,14 @@ recommender-xblock==2.0.1
     # via -r requirements/edx/base.in
 redis==3.5.3
     # via -r requirements/edx/base.in
-regex==2021.8.21
+regex==2021.8.28
     # via nltk
 requests==2.26.0
     # via
     #   -r requirements/edx/paver.txt
     #   analytics-python
     #   coreapi
     #   django-oauth-toolkit
-    #   docker
     #   edx-analytics-data-api-client
     #   edx-bulk-grades
     #   edx-drf-extensions
@@ -902,7 +895,7 @@ rest-condition==1.0.3
     # via
     #   -r requirements/edx/base.in
     #   edx-drf-extensions
-ruamel.yaml==0.17.13
+ruamel.yaml==0.17.14
     # via drf-yasg
 ruamel.yaml.clib==0.2.6
     # via ruamel.yaml
@@ -923,7 +916,7 @@ semantic-version==2.8.5
     # via edx-drf-extensions
 shapely==1.7.1
     # via -r requirements/edx/base.in
-simplejson==3.17.4
+simplejson==3.17.5
     # via
     #   -r requirements/edx/base.in
     #   sailthru-client
@@ -948,14 +941,13 @@ six==1.16.0
     #   edx-i18n-tools
     #   edx-milestones
     #   edx-rbac
-    #   english
     #   event-tracking
     #   fs
     #   fs-s3fs
     #   html5lib
+    #   interchange
     #   isodate
     #   libsass
-    #   neotime
     #   pansi
     #   paver
     #   py2neo
@@ -1052,8 +1044,6 @@ voluptuous==0.12.1
     # via ora2
 watchdog==2.1.5
     # via -r requirements/edx/paver.txt
-wcwidth==0.2.5
-    # via prompt-toolkit
 web-fragments==1.1.0
     # via
     #   -r requirements/edx/base.in
@@ -1070,8 +1060,6 @@ webob==1.8.7
     # via
     #   xblock
     #   xmodule
-websocket-client==1.2.1
-    # via docker
 wrapt==1.11.2
     # via
     #   -c requirements/edx/../constraints.txt

requirements/edx/coverage.txt

@@ -21,6 +21,8 @@ jinja2-pluralize==0.3.0
 markupsafe==2.0.1
     # via jinja2
 pluggy==0.13.1
-    # via diff-cover
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   diff-cover
 pygments==2.10.0
     # via diff-cover