Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove ENABLE_VIDEO_URL_REWRITE

Browse Source 
The temporary waffle flag ENABLE_VIDEO_URL_REWRITE is no
longer needed, becaues the rollout is complete.
See https://openedx.atlassian.net/browse/PROD-62

ARCHBOM-1304
This commit is contained in:
Robert Raposa
2020-06-23 11:19:32 -04:00
parent 5c0fd63f13
commit 624012e11c
3 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lms/djangoapps/course_api/blocks/tests/test_api.py
View File

@@ -20,7 +20,6 @@ from xmodule.modulestore.tests.factories import SampleCourseFactory, check_mongo
from xmodule.modulestore.tests.sample_courses import BlockInfo from xmodule.modulestore.tests.sample_courses import BlockInfo
from ..api import get_blocks from ..api import get_blocks
from ..toggles import ENABLE_VIDEO_URL_REWRITE
class TestGetBlocks(SharedModuleStoreTestCase): class TestGetBlocks(SharedModuleStoreTestCase):
@@ -159,10 +158,7 @@ class TestGetBlocksMobileHack(SharedModuleStoreTestCase):
assert_containment(str(empty_container_key), blocks['blocks']) assert_containment(str(empty_container_key), blocks['blocks'])
@patch('xmodule.video_module.VideoBlock.student_view_data') @patch('xmodule.video_module.VideoBlock.student_view_data')
@ddt.data( def test_video_urls_rewrite(self, video_data_patch):
True, False
)
def test_video_urls_rewrite(self, waffle_flag_value, video_data_patch):
""" """
Verify the video blocks returned have their URL re-written for Verify the video blocks returned have their URL re-written for
encoded videos. encoded videos.
@@ -179,17 +175,13 @@ class TestGetBlocksMobileHack(SharedModuleStoreTestCase):
} }
} }
} }
with override_waffle_flag(ENABLE_VIDEO_URL_REWRITE, waffle_flag_value): blocks = get_blocks(
blocks = get_blocks( self.request, self.course.location, requested_fields=['student_view_data'], student_view_data=['video']
self.request, self.course.location, requested_fields=['student_view_data'], student_view_data=['video'] )
)
video_block_key = str(self.course.id.make_usage_key('video', 'sample_video')) video_block_key = str(self.course.id.make_usage_key('video', 'sample_video'))
video_block_data = blocks['blocks'][video_block_key] video_block_data = blocks['blocks'][video_block_key]
for video_data in six.itervalues(video_block_data['student_view_data']['encoded_videos']): for video_data in six.itervalues(video_block_data['student_view_data']['encoded_videos']):
if waffle_flag_value: self.assertNotIn('cloudfront', video_data['url'])
self.assertNotIn('cloudfront', video_data['url'])
else:
self.assertIn('cloudfront', video_data['url'])
@ddt.ddt @ddt.ddt
@@ -243,7 +235,7 @@ class TestGetBlocksQueryCounts(TestGetBlocksQueryCountsBase):
self._get_blocks( self._get_blocks(
course, course,
expected_mongo_queries=0, expected_mongo_queries=0,
expected_sql_queries=13 if with_storage_backing else 12, expected_sql_queries=11 if with_storage_backing else 10,
) )
@ddt.data( @ddt.data(
@@ -260,9 +252,9 @@ class TestGetBlocksQueryCounts(TestGetBlocksQueryCountsBase):
clear_course_from_cache(course.id) clear_course_from_cache(course.id)
if with_storage_backing: if with_storage_backing:
num_sql_queries = 23 num_sql_queries = 21
else: else:
num_sql_queries = 13 num_sql_queries = 11
self._get_blocks( self._get_blocks(
course, course,

17
lms/djangoapps/course_api/blocks/toggles.py
View File

@@ -26,20 +26,3 @@ HIDE_ACCESS_DENIALS_FLAG = WaffleFlag(
flag_undefined_default=False flag_undefined_default=False
) )
# Waffle course override to rewrite video URLs for videos that have encodings available.
# .. toggle_name: course_blocks_api.enable_video_url_rewrite
# .. toggle_implementation: CourseWaffleFlag
# .. toggle_default: False
# .. toggle_description: Controlled rollout for video URL re-write utility to serve videos from edX CDN.
# .. toggle_category: course api
# .. toggle_use_cases: monitored_rollout
# .. toggle_creation_date: 2019-09-24
# .. toggle_expiration_date: ??
# .. toggle_warnings: None
# .. toggle_tickets: PROD-62
# .. toggle_status: supported
ENABLE_VIDEO_URL_REWRITE = CourseWaffleFlag(
waffle_namespace=COURSE_BLOCKS_API_NAMESPACE,
flag_name="enable_video_url_rewrite",
flag_undefined_default=True
)

4
lms/djangoapps/course_api/blocks/transformers/blocks_api.py
View File

@@ -10,7 +10,6 @@ from .block_depth import BlockDepthTransformer
from .navigation import BlockNavigationTransformer from .navigation import BlockNavigationTransformer
from .student_view import StudentViewTransformer from .student_view import StudentViewTransformer
from .video_urls import VideoBlockURLTransformer from .video_urls import VideoBlockURLTransformer
from ..toggles import ENABLE_VIDEO_URL_REWRITE
class BlocksAPITransformer(BlockStructureTransformer): class BlocksAPITransformer(BlockStructureTransformer):
@@ -69,5 +68,4 @@ class BlocksAPITransformer(BlockStructureTransformer):
BlockCountsTransformer(self.block_types_to_count).transform(usage_info, block_structure) BlockCountsTransformer(self.block_types_to_count).transform(usage_info, block_structure)
BlockDepthTransformer(self.depth).transform(usage_info, block_structure) BlockDepthTransformer(self.depth).transform(usage_info, block_structure)
BlockNavigationTransformer(self.nav_depth).transform(usage_info, block_structure) BlockNavigationTransformer(self.nav_depth).transform(usage_info, block_structure)
if ENABLE_VIDEO_URL_REWRITE.is_enabled(block_structure.root_block_usage_key.course_key): VideoBlockURLTransformer().transform(usage_info, block_structure)
VideoBlockURLTransformer().transform(usage_info, block_structure)