Merge: v3 to dev (#9160)

* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>

apps/ops/api/adhoc.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
 
-from rest_framework import viewsets
+from rest_framework_bulk import BulkModelViewSet
 
-from orgs.mixins.api import OrgBulkModelViewSet
+from common.mixins import CommonApiMixin
 from ..models import AdHoc
 from ..serializers import (
     AdHocSerializer
@@ -14,7 +14,9 @@ __all__ = [
 ]
 
 
-class AdHocViewSet(OrgBulkModelViewSet):
+class AdHocViewSet(CommonApiMixin, BulkModelViewSet):
     serializer_class = AdHocSerializer
     permission_classes = ()
-    model = AdHoc
+
+    def get_queryset(self):
+        return AdHoc.objects.filter(creator=self.request.user)

apps/ops/api/job.py

@@ -1,12 +1,13 @@
 from rest_framework import viewsets
+from rest_framework_bulk import BulkModelViewSet
 
+from common.mixins import CommonApiMixin
 from ops.models import Job, JobExecution
 from ops.serializers.job import JobSerializer, JobExecutionSerializer
 
 __all__ = ['JobViewSet', 'JobExecutionViewSet']
 
 from ops.tasks import run_ops_job_execution
-from orgs.mixins.api import OrgBulkModelViewSet
 
 
 def set_task_to_serializer_data(serializer, task):
@@ -15,13 +16,12 @@ def set_task_to_serializer_data(serializer, task):
     setattr(serializer, "_data", data)
 
 
-class JobViewSet(OrgBulkModelViewSet):
+class JobViewSet(CommonApiMixin, BulkModelViewSet):
     serializer_class = JobSerializer
-    model = Job
     permission_classes = ()
 
     def get_queryset(self):
-        query_set = super().get_queryset()
+        query_set = Job.objects.filter(creator=self.request.user)
         if self.action != 'retrieve':
             return query_set.filter(instant=False)
         return query_set
@@ -45,11 +45,10 @@ class JobViewSet(OrgBulkModelViewSet):
         set_task_to_serializer_data(serializer, task)
 
 
-class JobExecutionViewSet(OrgBulkModelViewSet):
+class JobExecutionViewSet(CommonApiMixin, BulkModelViewSet):
     serializer_class = JobExecutionSerializer
     http_method_names = ('get', 'post', 'head', 'options',)
     permission_classes = ()
-    model = JobExecution
 
     def perform_create(self, serializer):
         instance = serializer.save()
@@ -57,7 +56,8 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
         set_task_to_serializer_data(serializer, task)
 
     def get_queryset(self):
-        query_set = super().get_queryset()
+        query_set = JobExecution.objects.filter(creator=self.request.user)
+        query_set = query_set.filter(creator=self.request.user)
         job_id = self.request.query_params.get('job_id')
         if job_id:
             query_set = query_set.filter(job_id=job_id)

apps/ops/api/playbook.py

@@ -2,7 +2,9 @@ import os
 import zipfile
 
 from django.conf import settings
+from rest_framework_bulk import BulkModelViewSet
 
+from common.mixins import CommonApiMixin
 from orgs.mixins.api import OrgBulkModelViewSet
 from ..exception import PlaybookNoValidEntry
 from ..models import Playbook
@@ -17,7 +19,7 @@ def unzip_playbook(src, dist):
         fz.extract(file, dist)
 
 
-class PlaybookViewSet(OrgBulkModelViewSet):
+class PlaybookViewSet(CommonApiMixin, BulkModelViewSet):
     serializer_class = PlaybookSerializer
     permission_classes = ()
     model = Playbook

apps/ops/migrations/0028_auto_20221205_1627.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.14 on 2022-12-05 08:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ops', '0027_auto_20221024_1709'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='job',
+            old_name='owner',
+            new_name='creator',
+        ),
+        migrations.RemoveField(
+            model_name='adhoc',
+            name='org_id',
+        ),
+        migrations.RemoveField(
+            model_name='job',
+            name='org_id',
+        ),
+        migrations.RemoveField(
+            model_name='jobexecution',
+            name='org_id',
+        ),
+        migrations.RemoveField(
+            model_name='playbook',
+            name='org_id',
+        ),
+    ]

apps/ops/models/adhoc.py

@@ -4,15 +4,15 @@ import uuid
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from common.db.models import JMSBaseModel
 from common.utils import get_logger
-from orgs.mixins.models import JMSOrgBaseModel
 
 __all__ = ["AdHoc"]
 
 logger = get_logger(__file__)
 
 
-class AdHoc(JMSOrgBaseModel):
+class AdHoc(JMSBaseModel):
     class Modules(models.TextChoices):
         shell = 'shell', _('Shell')
         winshell = 'win_shell', _('Powershell')
@@ -26,7 +26,6 @@ class AdHoc(JMSOrgBaseModel):
     creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
     comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
 
-
     @property
     def row_count(self):
         if len(self.args) == 0:

apps/ops/models/job.py

@@ -11,12 +11,12 @@ from celery import current_task
 
 __all__ = ["Job", "JobExecution"]
 
+from common.db.models import JMSBaseModel
 from ops.ansible import JMSInventory, AdHocRunner, PlaybookRunner
 from ops.mixin import PeriodTaskModelMixin
-from orgs.mixins.models import JMSOrgBaseModel
 
 
-class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
+class Job(JMSBaseModel, PeriodTaskModelMixin):
     class Types(models.TextChoices):
         adhoc = 'adhoc', _('Adhoc')
         playbook = 'playbook', _('Playbook')
@@ -40,7 +40,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
     timeout = models.IntegerField(default=60, verbose_name=_('Timeout (Seconds)'))
     playbook = models.ForeignKey('ops.Playbook', verbose_name=_("Playbook"), null=True, on_delete=models.SET_NULL)
     type = models.CharField(max_length=128, choices=Types.choices, default=Types.adhoc, verbose_name=_("Type"))
-    owner = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
+    creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
     assets = models.ManyToManyField('assets.Asset', verbose_name=_("Assets"))
     runas = models.CharField(max_length=128, default='root', verbose_name=_('Runas'))
     runas_policy = models.CharField(max_length=128, choices=RunasPolicies.choices, default=RunasPolicies.skip,
@@ -96,7 +96,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
         ordering = ['date_created']
 
 
-class JobExecution(JMSOrgBaseModel):
+class JobExecution(JMSBaseModel):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     task_id = models.UUIDField(null=True)
     status = models.CharField(max_length=16, verbose_name=_('Status'), default='running')

apps/ops/models/playbook.py

@@ -5,11 +5,11 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from common.db.models import JMSBaseModel
 from ops.exception import PlaybookNoValidEntry
-from orgs.mixins.models import JMSOrgBaseModel
 
 
-class Playbook(JMSOrgBaseModel):
+class Playbook(JMSBaseModel):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     name = models.CharField(max_length=128, verbose_name=_('Name'), null=True)
     path = models.FileField(upload_to='playbooks/')

apps/ops/serializers/adhoc.py

@@ -4,11 +4,10 @@ from __future__ import unicode_literals
 from rest_framework import serializers
 
 from common.drf.fields import ReadableHiddenField
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 from ..models import AdHoc
 
 
-class AdHocSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerializer):
+class AdHocSerializer(serializers.ModelSerializer):
     creator = ReadableHiddenField(default=serializers.CurrentUserDefault())
     row_count = serializers.IntegerField(read_only=True)
     size = serializers.IntegerField(read_only=True)

apps/ops/serializers/job.py

@@ -3,11 +3,10 @@ from rest_framework import serializers
 from common.drf.fields import ReadableHiddenField
 from ops.mixin import PeriodTaskSerializerMixin
 from ops.models import Job, JobExecution
-from orgs.mixins.serializers import BulkOrgResourceModelSerializer
 
 
-class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin):
-    owner = ReadableHiddenField(default=serializers.CurrentUserDefault())
+class JobSerializer(serializers.ModelSerializer, PeriodTaskSerializerMixin):
+    creator = ReadableHiddenField(default=serializers.CurrentUserDefault())
     run_after_save = serializers.BooleanField(label=_("Run after save"), read_only=True, default=False, required=False)
 
     class Meta:
@@ -15,7 +14,7 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin):
         read_only_fields = ["id", "date_last_run", "date_created", "date_updated", "average_time_cost",
                             "run_after_save"]
         fields = read_only_fields + [
-            "name", "instant", "type", "module", "args", "playbook", "assets", "runas_policy", "runas", "owner",
+            "name", "instant", "type", "module", "args", "playbook", "assets", "runas_policy", "runas", "creator",
             "use_parameter_define",
             "parameters_define",
             "timeout",
@@ -27,10 +26,12 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin):
 
 
 class JobExecutionSerializer(serializers.ModelSerializer):
+    creator = ReadableHiddenField(default=serializers.CurrentUserDefault())
+
     class Meta:
         model = JobExecution
         read_only_fields = ["id", "task_id", "timedelta", "time_cost", 'is_finished', 'date_start', 'date_created',
-                            'is_success', 'task_id', 'short_id', 'job_type']
+                            'is_success', 'task_id', 'short_id', 'job_type', 'creator']
         fields = read_only_fields + [
             "job", "parameters"
         ]

apps/ops/serializers/playbook.py

@@ -12,7 +12,7 @@ def parse_playbook_name(path):
     return file_name.split(".")[-2]
 
 
-class PlaybookSerializer(BulkOrgResourceModelSerializer, serializers.ModelSerializer):
+class PlaybookSerializer(serializers.ModelSerializer):
     creator = ReadableHiddenField(default=serializers.CurrentUserDefault())
     path = serializers.FileField(required=False)