feat: paas-service plan 支持多租户

sdks/paas-service/CHANGES.md

@@ -1,4 +1,6 @@
 # 版本历史
+## 2.0.2
+- Support multi tenant 
 
 ## 2.0.1
 - Support querying service instance with parameter to_be_deleted 

sdks/paas-service/paas_service/__init__.py

@@ -16,6 +16,6 @@
 We undertake not to change the open source license (MIT license) applicable
 to the current version of the project delivered to anyone in the future.
 """
-__version__ = '2.0.1'
+__version__ = '2.0.2'
 
 default_app_config = 'paas_service.apps.PaaSServiceConfig'

sdks/paas-service/paas_service/constants.py

@@ -28,3 +28,5 @@ class Category(int, Enum):
 
 # Login 服务的重定向链接字段名
 REDIRECT_FIELD_NAME = "c_url"
+
+DEFAULT_TENANT_ID = "default"

sdks/paas-service/paas_service/migrations/0009_plan_display_name_plan_tenant_id.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.16 on 2025-01-09 13:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('paas_service', '0008_auto_20220426_0429'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='plan',
+            name='display_name',
+            field=models.CharField(default='', max_length=64, verbose_name='方案展示名称'),
+        ),
+        migrations.AddField(
+            model_name='plan',
+            name='tenant_id',
+            field=models.CharField(default='default', help_text='所属租户', max_length=128),
+        ),
+    ]

sdks/paas-service/paas_service/models.py

@@ -28,9 +28,10 @@
 from django.utils.translation import gettext_lazy as _
 from jsonfield import JSONField
 from translated_fields import TranslatedField
-
 from blue_krill.models.fields import EncryptField
 
+from paas_service.constants import DEFAULT_TENANT_ID
+
 # Base Models start
 
 
@@ -214,6 +215,8 @@ def render_instance_data(request: HttpRequest, instance: ServiceInstance) -> Dic
 
 class Plan(UuidAuditedModel):
     name = models.CharField(verbose_name='方案名称', max_length=64)
+    display_name = models.CharField("方案展示名称", max_length=64, default="")
+    tenant_id = models.CharField(help_text="所属租户", max_length=128, default=DEFAULT_TENANT_ID)
 
     # the "properties" field stores custom properties of a plan object. the property itself is
     # nothing more than a simple annotation. But the service hub which it was registed to may

sdks/paas-service/pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "paas_service"
-version = "2.0.1"
+version = "2.0.2"
 description = "A Django application for developing BK-PaaS add-on services."
 readme = "README.md"
 authors = ["blueking <[email protected]>"]

sdks/paas-service/setup.py

@@ -31,7 +31,7 @@
 setup(
     long_description=readme,
     name='paas_service',
-    version='2.0.0',
+    version='2.0.2',
     python_requires='<3.12,>=3.8',
     author='blueking',
     author_email='[email protected]',