Release 0.1.2

Bugfix release.

Changes:
*  Fix search
*  Fix history view
*  Bulk query for history removing
*  Execute for Periodic task and Template from API
*  Hide secret data via `encrypted` label
*  Add revision on Project page

See merge request cloud/polemarch!49

Author: onegreyonewhite

.gitlab-ci.yml

@@ -1,3 +1,4 @@
+# set to local images because too long execution
 image: onegreyonewhite/tox:tox
 
 variables:
@@ -16,6 +17,7 @@ stages:
 
 .branch_tests_template: &branch_tests
   stage: test
+  image: git.vst.lan/vst/tests:tox
   variables:
     TOX_ENVS: ""
   script:
@@ -37,6 +39,7 @@ stages:
 
 .pack_tamplate: &packing-test
   stage: packaging-test
+  image: git.vst.lan/vst/tests:tox
   variables:
     MYSQL_ROOT_PASSWORD: 'polemarch'
     MYSQL_DATABASE: 'polemarch'
@@ -61,9 +64,9 @@ stages:
     - dist/
   allow_failure: false
   only:
-    - /^issue_.*$/
+    # - /^issue_.*$/
     - developer
-    - master
+    # - master
     - make_bin_packages
   retry: 2
 
@@ -83,6 +86,7 @@ stages:
 ###########################################
 code_style:
   stage: code_standarts
+  image: git.vst.lan/vst/tests:tox
   script:
    - make test ENVS=flake,pylint
   cache:
@@ -91,6 +95,7 @@ code_style:
       - .tox/flake
   only:
     - /^.{0,}issue_.*$/
+    - developer
   retry: 2
 
 py27-django111-coverage:
@@ -116,7 +121,7 @@ default_rpm_tests:
 
 default_oracle_tests:
   <<: *packing-test
-  image: onegreyonewhite/tox:oracle
+  image: git.vst.lan/vst/tests:oracle
   script:
    - cat /etc/hosts
    - make rpm RELEASE=${CI_BUILD_ID}
@@ -128,7 +133,7 @@ default_oracle_tests:
 
 default_deb_tests:
   <<: *packing-test
-  image: onegreyonewhite/tox:ubuntu
+  image: git.vst.lan/vst/tests:ubuntu
   script:
    - cat /etc/hosts
    - make deb RELEASE=${CI_BUILD_ID}
@@ -161,12 +166,10 @@ py35-django111:
 py36-django111:
   <<: *tests_template
 
-
 pep8_checks:
   stage: code_standarts
   only:
    - master
-   - developer
   script:
    - make test ENVS=flake
   allow_failure: false
@@ -176,7 +179,6 @@ pylint_checks:
   stage: code_standarts
   only:
    - master
-   - developer
   script:
    - make test ENVS=pylint
   allow_failure: false
@@ -201,7 +203,7 @@ release_deb:
   stage: release
   only:
    - tags
-  image: onegreyonewhite/tox:ubuntu
+  image: git.vst.lan/vst/tests:ubuntu
   script:
    - make deb
   allow_failure: false

polemarch/__init__.py

@@ -1,6 +1,6 @@
 from .environment import prepare_environment
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 
 def _main(**kwargs):
     # pylint: disable=unused-variable

polemarch/api/v1/serializers.py

@@ -514,6 +514,13 @@ class Meta:
                   'vars',
                   'url',)
 
+    def execute(self):
+        inventory = self.instance.inventory
+        history_id = self.instance.execute(sync=False)
+        rdata = dict(detail="Started at inventory {}.".format(inventory),
+                     history_id=history_id)
+        return Response(rdata, 201)
+
 
 class TemplateSerializer(_WithVariablesSerializer):
     data = DictField(required=True, write_only=True)
@@ -557,11 +564,15 @@ class Meta:
             'owner',
             'data',
         )
+
+    def execute(self, request):
+        serializer = OneProjectSerializer(self.instance.project)
+        return self.instance.execute(serializer, request.user)
+
+
 ###################################
 # Subclasses for operations
 # with hosts and groups
-
-
 class _InventoryOperations(_WithVariablesSerializer):
 
     def hosts_operations(self, method, data):
@@ -696,30 +707,29 @@ def sync(self):
         data = dict(detail="Sync with {}.".format(self.instance.repository))
         return Response(data, 200)
 
-    def _execution(self, kind, request):
-        data = dict(request.data)
+    def _execution(self, kind, data, user):
         inventory = data.pop("inventory")
         try:
             inventory = Inventory.objects.get(id=int(inventory))
-            if not inventory.viewable_by(request.user):  # nocv
+            if not inventory.viewable_by(user):  # nocv
                 raise PermissionDenied(
                     "You don't have permission to inventory."
                 )
         except ValueError:
             pass
         history_id = self.instance.execute(
             kind, str(data.pop(kind)), inventory,
-            initiator=request.user.id, **data
+            initiator=user.id, **data
         )
         rdata = dict(detail="Started at inventory {}.".format(inventory),
                      history_id=history_id)
         return Response(rdata, 201)
 
     def execute_playbook(self, request):
-        return self._execution("playbook", request)
+        return self._execution("playbook", dict(request.data), request.user)
 
     def execute_module(self, request):
-        return self._execution("module", request)
+        return self._execution("module", dict(request.data), request.user)
 
 
 class PermissionsSerializer(_SignalSerializer):

polemarch/api/v1/views.py

@@ -147,6 +147,11 @@ class PeriodicTaskViewSet(base.LimitedPermissionMixin, base.ModelViewSetSet):
     serializer_class_one = serializers.OnePeriodictaskSerializer
     filter_class = filters.PeriodicTaskFilter
 
+    @detail_route(methods=["post"])
+    def execute(self, request, *args, **kwargs):
+        serializer = self.get_serializer(self.get_object())
+        return serializer.execute().resp
+
 
 class HistoryViewSet(base.LimitedPermissionMixin, base.HistoryModelViewSet):
     model = serializers.models.History
@@ -190,6 +195,11 @@ class TemplateViewSet(base.PermissionMixin, base.ModelViewSetSet):
     def supported_kinds(self, request):
         return base.Response(self.model.template_fields, 200).resp
 
+    @detail_route(methods=["post"])
+    def execute(self, request, *args, **kwargs):
+        obj = self.get_object()
+        return self.get_serializer(obj).execute(request).resp
+
 
 class HookViewSet(base.ModelViewSetSet):
     model = serializers.models.Hook
@@ -210,14 +220,21 @@ class BulkViewSet(rest_views.APIView):
     serializer_classes = serializers
 
     _op_types = {
+        "get": "perform_get",
         "add": "perform_create",
         "set": "perform_update",
         "del": "perform_delete",
         "mod": "perform_modify"
     }
-    _allowed_types = [
-        'host', 'group', 'inventory', 'project', 'periodictask', 'template'
-    ]
+    _allowed_types = {
+        'host': _op_types.keys(),
+        'group': _op_types.keys(),
+        'inventory': _op_types.keys(),
+        'project': _op_types.keys(),
+        'periodictask': _op_types.keys(),
+        'template': _op_types.keys(),
+        'history': ['del', "get"]
+    }
 
     def get_serializer_class(self, item):
         if item not in self._allowed_types:
@@ -229,14 +246,19 @@ def get_serializer(self, *args, **kwargs):
         kwargs["context"] = {'request': self.request}
         return self.get_serializer_class(kwargs.pop("item"))(*args, **kwargs)
 
-    def get_object(self, item, pk):
+    def get_object(self, item, pk, access="editable"):
         serializer_class = self.get_serializer_class(item)
         model = serializer_class.Meta.model
         obj = model.objects.get(pk=pk)
-        if not obj.editable_by(self.request.user):
+        if not getattr(obj, access + "_by")(self.request.user):
             raise PermissionDenied("You don't have permission to this object.")
         return obj
 
+    def perform_get(self, item, pk):
+        obj = self.get_object(item, pk, access="viewable")
+        serializer = self.get_serializer(obj, item=item)
+        return base.Response(serializer.data, 200).resp_dict
+
     def perform_create(self, item, data):
         serializer = self.get_serializer(data=data, item=item)
         serializer.is_valid(raise_exception=True)
@@ -261,12 +283,20 @@ def perform_modify(self, item, pk, data, method, data_type):
         operation = getattr(serializer, "{}_operations".format(data_type))
         return operation(method, data).resp_dict
 
+    def _check_type(self, op_type, item):
+        allowed_types = self._allowed_types.get(item, [])
+        if op_type not in allowed_types:
+            raise serializers.exceptions.UnsupportedMediaType(
+                media_type=op_type
+            )
+
     @transaction.atomic
     def post(self, request, *args, **kwargs):
         operations = request.data
         results = []
         for operation in operations:
             op_type = operation.pop("type")
+            self._check_type(op_type, operation.get("item", None))
             perf_method = getattr(self, self._op_types[op_type])
             result = perf_method(**operation)
             result['type'] = op_type

polemarch/main/models/tasks.py

@@ -18,6 +18,7 @@
 from django.contrib.auth.models import User
 from django.db.models import functions as dbfunc, Count
 from django.utils.timezone import now
+from rest_framework.exceptions import UnsupportedMediaType
 
 from .base import ForeignKeyACL
 
@@ -142,10 +143,10 @@ def get_schedule(self):
             return crontab(**self.crontab_kwargs)
         return float(self.schedule)
 
-    def execute(self):
-        self.project.execute(
+    def execute(self, sync=True):
+        return self.project.execute(
             self.kind, self.mode, self.inventory,
-            sync=True, save_result=self.save_result,
+            sync=sync, save_result=self.save_result,
             initiator=self.id, initiator_type="scheduler",
             **self.vars
         )
@@ -181,6 +182,11 @@ class Meta:
     template_fields["Host"] = ["name", "vars"]
     template_fields["Group"] = template_fields["Host"] + ["children"]
 
+    _exec_types = {
+        "Task": "playbook",
+        "Module": "module",
+    }
+
     def get_data(self):
         data = json.loads(self.template_data)
         if "project" in self.template_fields[self.kind] and self.project:
@@ -192,6 +198,17 @@ def get_data(self):
                 data['inventory'] = self.inventory
         return data
 
+    def execute(self, serializer, user):
+        # pylint: disable=protected-access
+        tp = self._exec_types.get(self.kind, None)
+        if tp is None:
+            raise UnsupportedMediaType(media_type=self.kind)
+        data = self.get_data()
+        data.pop("project", None)
+        vars = data.pop("vars", {})
+        data.update(vars)
+        return serializer._execution(tp, data, user)
+
     def _convert_to_data(self, value):
         if isinstance(value, (six.string_types, six.text_type)):
             return json.loads(value)

polemarch/main/models/utils.py

@@ -188,16 +188,17 @@ def error_handler(self, exception):
             self.history.status = default_code
 
     def execute(self, target, inventory, history, project, **extra_args):
-        self.prepare(target, inventory, history, project)
-        self.history.status = "OK"
         try:
+            self.prepare(target, inventory, history, project)
+            self.history.status = "OK"
             extra = self.__parse_extra_args(**extra_args)
             args = self.get_args(self.target, extra.args)
             self.history.raw_stdout = self.executor.execute(args, self.workdir)
         except Exception as exception:
             self.error_handler(exception)
         finally:
-            self.inventory_object.close()
+            inventory_object = getattr(self, "inventory_object", None)
+            inventory_object and inventory_object.close()
             self.history.stop_time = timezone.now()
             self.history.save()