Rafayghafoor/test trigger

.dockerignore

@@ -89,7 +89,6 @@ test_root/paver_logs/
 test_root/uploads/
 **/django-pyfs
 **/.tox/
-common/test/db_cache/bok_choy_*.yaml
 common/test/data/badges/*.png
 
 ### Installation artifacts

.github/actions/unit-tests/action.yml

@@ -27,7 +27,7 @@ runs:
 
     - name: save pytest warnings json file
       if: success()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-warnings-json
         path: |

.github/pull_request_template.md

@@ -1,10 +1,13 @@
 <!--
 
-🌴🌴
-🌴🌴🌴🌴         🌴 Note: Palm is in support. Fixes you make on master may still be needed on Palm.
-    🌴🌴🌴🌴     If so, make another pull request against the open-release/palm.master branch,
-🌴🌴🌴🌴         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
-🌴🌴
+🌳🌳
+🌳🌳🌳🌳         🌳 Note: Quince is in support. Fixes you make on master may still be needed on Quince.
+    🌳🌳🌳🌳     If so, make another pull request against the open-release/quince.master branch,
+🌳🌳🌳🌳         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
+🌳🌳
+
+🌴🌴🌴🌴🌴🌴     🌴 Note: the Palm release is still supported.
+                Please consider whether your change should be applied to Palm as well.
 
 Please give your pull request a short but descriptive title.
 Use conventional commits to separate and summarize commits logically:

.github/workflows/js-tests.yml

@@ -23,7 +23,7 @@ jobs:
       run: git fetch --depth=1 origin master
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/publish-ci-docker-image.yml

@@ -13,8 +13,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      # This has to happen after checkout in order for gh to work.
+      - name: "Cancel scheduled job on forks"
+        if: github.repository != 'openedx/edx-platform' && github.event_name == 'schedule'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          gh run cancel "${{ github.run_id }}"
+          gh run watch "${{ github.run_id }}"
+
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_SECRET_ACCESS_KEY }}

.github/workflows/quality-checks.yml

@@ -35,7 +35,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 

.github/workflows/static-assets-check.yml

@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install libxmlsec1-dev pkg-config
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -64,8 +64,8 @@ jobs:
 
     - name: Run Static Assets Check
       env:
-        LMS_CFG: lms/envs/bok_choy.yml
-        CMS_CFG: cms/envs/bok_choy.yml
+        LMS_CFG: lms/envs/minimal.yml
+        CMS_CFG: lms/envs/minimal.yml
 
       run: |
         paver update_assets lms

.github/workflows/unit-test-shards.json

@@ -2,7 +2,6 @@
   "lms-1": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/badges/",
       "lms/djangoapps/branding/",
       "lms/djangoapps/bulk_email/",
       "lms/djangoapps/bulk_enroll/",
@@ -78,7 +77,7 @@
       "lms/tests.py"
     ]
   },
-  "openedx-1": {
+  "openedx-1-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -116,7 +115,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-2": {
+  "openedx-2-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/geoinfo/",
@@ -159,7 +158,7 @@
       "openedx/tests/"
     ]
   },
-  "openedx-3": {
+  "openedx-1-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -197,7 +196,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-4": {
+  "openedx-2-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/content_tagging/",
@@ -258,22 +257,28 @@
       "cms/djangoapps/contentstore/"
     ]
   },
-  "common-1": {
+  "common-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "common-2": {
+  "common-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "xmodule-1": {
+  "xmodule-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "xmodule/"
     ]
+  },
+  "xmodule-with-cms": {
+    "settings": "cms.envs.test",
+    "paths": [
+      "xmodule/"
+    ]
   }
 }

.github/workflows/unit-tests-gh-hosted.yml

@@ -26,15 +26,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
       - uses: actions/checkout@v2

.github/workflows/unit-tests.yml

@@ -27,15 +27,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     # We expect Django 4.0 to fail, so don't stop when it fails.
     continue-on-error: ${{ matrix.django-version == '4.0' }}
 
@@ -101,7 +102,7 @@ jobs:
         run: sudo chown runner:runner -R .*
       - uses: actions/checkout@v3
       - name: collect pytest warnings files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: pytest-warnings-json
           path: test_root/log

.gitignore

@@ -86,7 +86,6 @@ test_root/paver_logs/
 test_root/uploads/
 django-pyfs
 .tox/
-common/test/db_cache/bok_choy_*.yaml
 common/test/data/badges/*.png
 
 ### Installation artifacts

Dockerfile

@@ -153,10 +153,11 @@ FROM base as production
 USER app
 
 ENV EDX_PLATFORM_SETTINGS='docker-production'
-ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
-ENV SERVICE_PORT "${SERVICE_PORT}"
+ENV SERVICE_VARIANT="${SERVICE_VARIANT}"
+ENV SERVICE_PORT="${SERVICE_PORT}"
 ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS"
 EXPOSE ${SERVICE_PORT}
+
 CMD gunicorn \
     -c /edx/app/edxapp/edx-platform/${SERVICE_VARIANT}/docker_${SERVICE_VARIANT}_gunicorn.py \
     --name ${SERVICE_VARIANT} \
@@ -187,6 +188,6 @@ RUN ln -s "$(pwd)/cms/envs/devstack-experimental.yml" "/edx/etc/studio.yml"
 RUN touch ../edxapp_env
 
 ENV EDX_PLATFORM_SETTINGS='devstack_docker'
-ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
+ENV SERVICE_VARIANT="${SERVICE_VARIANT}"
 EXPOSE ${SERVICE_PORT}
 CMD ./manage.py ${SERVICE_VARIANT} runserver 0.0.0.0:${SERVICE_PORT}

README.rst

@@ -134,7 +134,7 @@ Reporting Security Issues
 *************************
 
 Please do not report security issues in public. Please email
-security@edx.org.
+security@openedx.org.
 
 .. _individual contributor agreement: https://openedx.org/cla
 .. _CONTRIBUTING: https://github.com/openedx/.github/blob/master/CONTRIBUTING.md

b

@@ -0,0 +1 @@
+ttttests

cms/djangoapps/contentstore/asset_storage_handlers.py

@@ -43,6 +43,7 @@
     'direction': '',
     'asset_type': '',
     'text_search': '',
+    'display_name': '',
 }
 
 
@@ -61,7 +62,9 @@ def handle_assets(request, course_key_string=None, asset_key_string=None):
             sort: the asset field to sort by (defaults to 'date_added')
             direction: the sort direction (defaults to 'descending')
             asset_type: the file type to filter items to (defaults to All)
-            text_search: string to filter results by file name (defaults to '')
+            text_search: string to perform a search on filenames (defaults to '')
+            display_name: string to filter results by exact display name (defaults to '').
+                Use the display_name parameter multiple times to filter by multiple filenames.
     POST
         json: create or update an asset. The only updating that can be done is changing the lock state.
     PUT
@@ -172,6 +175,9 @@ def _assets_json(request, course_key):
 
         filter_parameters.update(_get_content_type_filter_for_mongo(request_options['requested_asset_type']))
 
+    if request_options['requested_display_names']:
+        filter_parameters.update(_get_displayname_filter_for_mongo(request_options['requested_display_names']))
+
     if request_options['requested_text_search']:
         filter_parameters.update(_get_displayname_search_filter_for_mongo(request_options['requested_text_search']))
 
@@ -223,13 +229,18 @@ def _parse_request_to_dictionary(request):
         'requested_sort_direction': _get_requested_attribute(request, 'direction'),
         'requested_asset_type': _get_requested_attribute(request, 'asset_type'),
         'requested_text_search': _get_requested_attribute(request, 'text_search'),
+        'requested_display_names': _get_requested_attribute_list(request, 'display_name'),
     }
 
 
 def _get_requested_attribute(request, attribute):
     return request.GET.get(attribute, REQUEST_DEFAULTS.get(attribute))
 
 
+def _get_requested_attribute_list(request, attribute):
+    return request.GET.getlist(attribute, REQUEST_DEFAULTS.get(attribute))
+
+
 def _get_error_if_invalid_parameters(requested_filter):
     """Function for returning error messages on filters"""
     requested_file_types = _get_requested_file_types_from_requested_filter(requested_filter)
@@ -303,6 +314,24 @@ def _get_mongo_expression_for_type_filter(requested_file_types):
     }
 
 
+def _get_displayname_filter_for_mongo(displaynames):
+    """
+    Construct and return pymongo query dict, filtering for the given list of displaynames.
+    """
+    filters = []
+
+    for displayname in displaynames:
+        filters.append({
+            'displayname': {
+                '$eq': displayname,
+            },
+        })
+
+    return {
+        '$or': filters,
+    }
+
+
 def _get_displayname_search_filter_for_mongo(text_search):
     """
     Return a pymongo query dict for the given search string, using case insensitivity.

cms/djangoapps/contentstore/exams.py

@@ -109,7 +109,7 @@ def get_exam_type(is_proctored, is_practice, is_onboarding):
         if is_onboarding:
             exam_type = 'onboarding'
         elif is_practice:
-            exam_type = 'practice_proctored'
+            exam_type = 'practice'
         else:
             exam_type = 'proctored'
     else:

cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py

@@ -34,7 +34,11 @@ def add_arguments(self, parser):
     def replace_all_library_source_blocks_ids(self, v1_to_v2_lib_map):
         """A method to replace 'source_library_id' in all relevant blocks."""
 
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
+
+        # Following is used for debugging and should be removed
+        for course_id_string in course_id_strings:
+            log.info(course_id_string)
 
         # Use Celery to distribute the workload
         tasks = group(
@@ -57,7 +61,7 @@ def replace_all_library_source_blocks_ids(self, v1_to_v2_lib_map):
 
     def validate(self, v1_to_v2_lib_map):
         """ Validate that replace_all_library_source_blocks_ids was successful"""
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
         tasks = group(validate_all_library_source_blocks_ids_for_course.s(course_id, v1_to_v2_lib_map) for course_id in course_id_strings)  # lint-amnesty, pylint: disable=line-too-long
         results = tasks.apply_async()
 
@@ -79,7 +83,7 @@ def validate(self, v1_to_v2_lib_map):
 
     def undo(self, v1_to_v2_lib_map):
         """ undo the changes made by replace_all_library_source_blocks_ids"""
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
 
         # Use Celery to distribute the workload
         tasks = group(

cms/djangoapps/contentstore/rest_api/serializers/__init__.py

@@ -0,0 +1,4 @@
+"""
+Serializers for all contentstore API versions
+"""
+from .common import StrictSerializer

cms/djangoapps/contentstore/rest_api/v0/__init__.py

@@ -0,0 +1,12 @@
+"""
+Views for v0 contentstore API.
+"""
+
+from cms.djangoapps.contentstore.rest_api.v0.views.assets import (
+    AssetsCreateRetrieveView,
+    AssetsUpdateDestroyView
+)
+from cms.djangoapps.contentstore.rest_api.v0.views.xblock import (
+    XblockView,
+    XblockCreateView
+)