diff --git a/cms/envs/common.py b/cms/envs/common.py index 8f2959c95c..8939c6721c 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1967,6 +1967,11 @@ ENTERPRISE_API_CACHE_TIMEOUT = 3600 # Value is in seconds # The default value of this needs to be a 16 character string ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = {} +# The setting key maps to the channel code (e.g. 'SAP' for success factors), Channel code is defined as +# part of django model of each integrated channel in edx-enterprise. +# The absence of a key/value pair translates to NO LIMIT on the number of "chunks" transmitted per cycle. +INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT = {} + BASE_COOKIE_DOMAIN = 'localhost' # This limits the type of roles that are submittable via the `student` app's manual enrollment diff --git a/cms/envs/production.py b/cms/envs/production.py index 263d4284bf..264003a216 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -528,6 +528,10 @@ ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = ENV_TOKENS.get( 'ENTERPRISE_CATALOG_INTERNAL_ROOT_URL', ENTERPRISE_CATALOG_INTERNAL_ROOT_URL ) +INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT = ENV_TOKENS.get( + 'INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT', + INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT +) ############### Settings for Retirement ##################### RETIREMENT_SERVICE_WORKER_USERNAME = ENV_TOKENS.get( diff --git a/lms/envs/common.py b/lms/envs/common.py index d8a8a1a37e..6ec091e8d2 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3613,6 +3613,12 @@ ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = {} ENTERPRISE_CUSTOMER_SUCCESS_EMAIL = "customersuccess@edx.org" ENTERPRISE_INTEGRATIONS_EMAIL = "enterprise-integrations@edx.org" + +# The setting key maps to the channel code (e.g. 'SAP' for success factors), Channel code is defined as +# part of django model of each integrated channel in edx-enterprise. +# The absence of a key/value pair translates to NO LIMIT on the number of "chunks" transmitted per cycle. +INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT = {} + ############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ###################### # The LMS communicates with the Enterprise service via the EdxRestApiClient class # These default settings are utilized by the LMS when interacting with the service, diff --git a/lms/envs/production.py b/lms/envs/production.py index a50e72ead0..3f0ae47128 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -853,6 +853,10 @@ ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = ENV_TOKENS.get( 'ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER', ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER ) +INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT = ENV_TOKENS.get( + 'INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT', + INTEGRATED_CHANNELS_API_CHUNK_TRANSMISSION_LIMIT +) ############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ###################### # The LMS communicates with the Enterprise service via the EdxRestApiClient class diff --git a/requirements/constraints.txt b/requirements/constraints.txt index c5885cd0c1..f5aa605818 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -40,7 +40,7 @@ drf-yasg<1.17.1 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.6.8 +edx-enterprise==3.7.0 # Upgrading to 2.12.0 breaks several test classes due to API changes, need to update our code accordingly factory-boy==2.8.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a290c6bc40..5fdf3748bd 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -99,7 +99,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in edx-django-utils==3.7.3 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.6.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-i18n-tools==0.5.3 # via ora2 edx-milestones==0.3.0 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, lti-consumer-xblock, xmodule diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6989a65056..dd5feee3fb 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -110,7 +110,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt edx-django-utils==3.7.3 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.6.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.5.2 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ef9015dd23..1fa77d69ea 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -107,7 +107,7 @@ edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt edx-django-utils==3.7.3 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.1.1 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.6.8 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2 edx-lint==1.5.2 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt