Skip to content

Commit a1b7478

Browse files
authored
[api] Skip connector_id validation in _setup_notebook_examples for spark example to install (#4114)
1 parent 6bb1aad commit a1b7478

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

desktop/core/src/desktop/api2.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,11 +1489,8 @@ def _setup_oozie_examples(request):
14891489

14901490

14911491
def _setup_notebook_examples(request):
1492-
connector_id = request.POST.get('connector_id')
1493-
if not connector_id:
1494-
return JsonResponse({'message': "Missing parameter: connector_id is required."}, status=400)
1492+
connector = Connector.objects.get(id=request.POST.get('connector_id'))
14951493

1496-
connector = Connector.objects.get(id=connector_id)
14971494
if connector:
14981495
dialect = connector.dialect
14991496
db_name = request.POST.get('database_name', 'default')

desktop/core/src/desktop/api2_tests.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -869,14 +869,6 @@ def test_setup_hive_impala_examples_calls_command(self):
869869
dialect='impala', db_name='test_db', user=request.user, request=request, interpreter='mock_interpreter'
870870
)
871871

872-
def test_setup_notebook_examples_missing_connector_id(self):
873-
request = Mock(method='POST', POST={}, user=Mock())
874-
875-
response = _setup_notebook_examples(request)
876-
877-
assert response.status_code == 400
878-
assert json.loads(response.content.decode('utf-8'))['message'] == 'Missing parameter: connector_id is required.'
879-
880872
def test_setup_notebook_examples_existing_connector(self):
881873
with patch('desktop.api2.Connector.objects.get') as mock_get_connector:
882874
with patch('desktop.api2.beeswax_install_examples.Command.handle') as mock_command:
@@ -895,7 +887,7 @@ def test_setup_notebook_examples_connector_none(self):
895887
with patch('desktop.api2.Connector.objects.get') as mock_get_connector:
896888
with patch('desktop.api2.beeswax_install_examples.Command.handle') as mock_beeswax_install_command:
897889
with patch('desktop.api2.notebook_setup.Command.handle') as mock_notebook_setup_command:
898-
request = Mock(method='POST', POST={'app_name': 'notebook', 'dialect': 'spark', 'connector_id': '1'}, user=Mock())
890+
request = Mock(method='POST', POST={'app_name': 'notebook', 'dialect': 'spark'}, user=Mock())
899891
mock_get_connector.return_value = None
900892

901893
_setup_notebook_examples(request)

0 commit comments

Comments
 (0)