Browse Source

HUE-8758 [connector] Add test to install_connector_examples API

Romain 5 years ago
parent
commit
7ec0de6515

+ 5 - 1
apps/about/src/about/templates/admin_wizard.mako

@@ -344,7 +344,11 @@ ${ layout.menubar(section='quick_start') }
     $(button).button('loading');
     $(button).button('loading');
     $.post(button.data("sample-url"), function(data) {
     $.post(button.data("sample-url"), function(data) {
       if (data.status == 0) {
       if (data.status == 0) {
-        $(document).trigger('info','${ _("Examples refreshed") }');
+        if (data.message) {
+          $(document).trigger('info', data.message);
+        } else {
+          $(document).trigger('info', '${ _("Examples refreshed") }');
+        }
         if ($(button).data("is-connector")) {
         if ($(button).data("is-connector")) {
           huePubSub.publish('cluster.config.refresh.config');
           huePubSub.publish('cluster.config.refresh.config');
         }
         }

+ 8 - 3
desktop/core/src/desktop/lib/connectors/api.py

@@ -135,15 +135,20 @@ def test_connector(request):
 @admin_required
 @admin_required
 @api_error_handler
 @api_error_handler
 def install_connector_examples(request):
 def install_connector_examples(request):
+  message = []
+
   try:
   try:
-    _create_connector_examples()
+    added, skipped = _create_connector_examples()
+    if added:
+      message.append('Added connectors: ' + ', '.join(added))
+    if skipped:
+      message.append('Already installed connectors: ' + ', '.join(skipped))
   except Exception as e:
   except Exception as e:
     raise PopupException(_('Error installing connector examples: %s') % e)
     raise PopupException(_('Error installing connector examples: %s') % e)
 
 
   update_app_permissions()
   update_app_permissions()
 
 
-  return JsonResponse({'status': 0})
-
+  return JsonResponse({'status': 0, 'message': '. '.join(message)})
 
 
 
 
 def _group_by_category(conns):
 def _group_by_category(conns):

+ 76 - 0
desktop/core/src/desktop/lib/connectors/api_tests.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+## -*- coding: utf-8 -*-
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import sys
+import unittest
+
+from django.urls import reverse
+from nose.plugins.skip import SkipTest
+from nose.tools import assert_equal, assert_true, assert_false
+
+from desktop.auth.backend import rewrite_user, is_admin
+from desktop.conf import ENABLE_CONNECTORS, ENABLE_ORGANIZATIONS
+from desktop.lib.connectors.api import _get_installed_connectors
+from desktop.lib.django_test_util import make_logged_in_client
+
+from useradmin.models import User, update_app_permissions, get_default_user_group, Connector
+from useradmin.permissions import HuePermission, GroupPermission
+
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
+
+
+class TestApi(object):
+
+  def setUp(self):
+    self.client = make_logged_in_client(username="admin_test_connector", recreate=True, is_superuser=False, is_admin=True)
+    self.user = User.objects.get(username="admin_test_connector")
+
+  @classmethod
+  def setUpClass(cls):
+    cls._class_resets = [
+      ENABLE_CONNECTORS.set_for_testing(True),
+    ]
+
+  @classmethod
+  def tearDownClass(cls):
+    for reset in cls._class_resets:
+      reset()
+
+
+  def test_install_connector_examples(self):
+
+    with patch('desktop.lib.connectors.api._create_connector_examples') as _create_connector_examples:
+      with patch('desktop.lib.connectors.api.update_app_permissions') as update_app_permissions:
+        _create_connector_examples.return_value = ['Connector 1'], ['Connector 2']
+
+        response = self.client.post(
+          reverse('connectors.api.install_connector_examples')
+        )
+        data = json.loads(response.content)
+
+        assert_equal(200, response.status_code)
+        assert_equal(
+            'Added connectors: Connector 1. '
+            'Already installed connectors: Connector 2',
+            data['message'],
+            data
+        )

+ 18 - 13
desktop/core/src/desktop/lib/connectors/models.py

@@ -96,13 +96,10 @@ else:
 
 
 
 
 def _get_installed_connectors(category=None, categories=None, dialect=None, interface=None, user=None):
 def _get_installed_connectors(category=None, categories=None, dialect=None, interface=None, user=None):
-  from desktop.auth.backend import is_admin, is_hue_admin
-
-  if not Connector.objects.exists() and user and is_hue_admin(user):
-    _create_connector_examples()
-
+  from desktop.auth.backend import is_admin
 
 
   connectors_objects = Connector.objects.all()
   connectors_objects = Connector.objects.all()
+
   if user is not None and not is_admin(user):  # Apply Permissions
   if user is not None and not is_admin(user):  # Apply Permissions
     connectors_objects = connectors_objects.filter(huepermission__in=user.get_permissions())
     connectors_objects = connectors_objects.filter(huepermission__in=user.get_permissions())
 
 
@@ -172,15 +169,23 @@ def _augment_connector_properties(connector):
 
 
 
 
 def _create_connector_examples():
 def _create_connector_examples():
+  added = []
+  skipped = []
+
   for connector in _get_connector_examples():
   for connector in _get_connector_examples():
-    Connector.objects.create(
-      name=connector['nice_name'],
-      description=connector['description'],
-      dialect=connector['dialect'],
-      settings=json.dumps(connector['settings'])
-    )
-
-  return Connector.objects.all()
+    name ='%(nice_name)s (%(dialect)s)' % connector
+    if not Connector.objects.filter(name=connector['nice_name']).exists():
+      connector = Connector.objects.create(
+        name=connector['nice_name'],
+        description=connector['description'],
+        dialect=connector['dialect'],
+        settings=json.dumps(connector['settings'])
+      )
+      result.append(name)
+    else:
+      skipped.append(name)
+
+  return added, skipped
 
 
 
 
 def _get_connector_examples():
 def _get_connector_examples():