style

Author: zhongjiajie

src/pydolphinscheduler/cli/tenants.py

@@ -39,10 +39,10 @@ java_gateway:
 default:
   # Default value for dolphinscheduler's user object
   user:
-    name: userPythonGateway1
+    name: userPythonGateway
     password: userPythonGateway
     email: userPythonGateway@dolphinscheduler.com
-    tenant: zhongjiajie
+    tenant: tenant_pydolphin
     phone: 11111111111
     state: 1
   # Default value for dolphinscheduler's workflow object

src/pydolphinscheduler/cli/users.py

@@ -28,7 +28,7 @@
 from pydolphinscheduler.core.resource import Resource
 from pydolphinscheduler.core.workflow import Workflow
 from pydolphinscheduler.exceptions import PyDSParamException
-from pydolphinscheduler.models import Project, Tenant, User
+from pydolphinscheduler.models import Project, User
 from pydolphinscheduler.tasks.switch import Branch, Default, Switch, SwitchCondition
 from pydolphinscheduler.utils.date import conv_to_schedule
 from tests.testing.task import Task
@@ -51,15 +51,14 @@ def test_workflow_key_attr(func):
     [
         ("timezone", configuration.WORKFLOW_TIME_ZONE),
         ("project", Project(configuration.WORKFLOW_PROJECT)),
-        ("tenant", Tenant(configuration.WORKFLOW_TENANT)),
         (
             "user",
             User(
                 configuration.USER_NAME,
                 configuration.USER_PASSWORD,
                 configuration.USER_EMAIL,
                 configuration.USER_PHONE,
-                configuration.WORKFLOW_TENANT,
+                configuration.USER_TENANT,
                 configuration.WORKFLOW_QUEUE,
                 configuration.USER_STATE,
             ),
@@ -148,7 +147,6 @@ def test_set_release_state_error(value):
     "set_attr,set_val,get_attr,get_val",
     [
         ("_project", "project", "project", Project("project")),
-        ("_tenant", "tenant", "tenant", Tenant("tenant")),
         ("_start_time", "2021-01-01", "start_time", datetime(2021, 1, 1)),
         ("_end_time", "2021-01-01", "end_time", datetime(2021, 1, 1)),
     ],
@@ -335,7 +333,6 @@ def test_workflow_get_define_without_task():
         "name": TEST_WORKFLOW_NAME,
         "description": None,
         "project": configuration.WORKFLOW_PROJECT,
-        "tenant": configuration.WORKFLOW_TENANT,
         "workerGroup": configuration.WORKFLOW_WORKER_GROUP,
         "warningType": configuration.WORKFLOW_WARNING_TYPE,
         "warningGroupId": 0,
@@ -458,31 +455,6 @@ def test_workflow_simple_separate():
     assert all(["task-" in task.name for task in workflow.task_list])
 
 
-@pytest.mark.parametrize(
-    "user_attrs",
-    [
-        {"tenant": "tenant_specific"},
-    ],
-)
-def test_set_workflow_user_attr(user_attrs):
-    """Test user with correct attributes if we specific assigned to workflow object."""
-    default_value = {
-        "tenant": configuration.WORKFLOW_TENANT,
-    }
-    with Workflow(TEST_WORKFLOW_NAME, **user_attrs) as workflow:
-        user = workflow.user
-        for attr in default_value:
-            # Get assigned attribute if we specific, else get default value
-            except_attr = (
-                user_attrs[attr] if attr in user_attrs else default_value[attr]
-            )
-            # Get actually attribute of user object
-            actual_attr = getattr(user, attr)
-            assert (
-                except_attr == actual_attr
-            ), f"Except attribute is {except_attr} but get {actual_attr}"
-
-
 def test_schedule_json_none_schedule():
     """Test function schedule_json with None as schedule."""
     with Workflow(

src/pydolphinscheduler/default_config.yaml

@@ -181,10 +181,10 @@ def test_get_configs_build_in():
             "userPythonGateway@dolphinscheduler.com",
             "userPythonGateway@edit.com",
         ),
+        ("default.user.tenant", "tenant_pydolphin", "edit_tenant_pydolphin"),
         ("default.user.phone", 11111111111, 22222222222),
         ("default.user.state", 1, 0),
         ("default.workflow.project", "project-pydolphin", "eidt-project-pydolphin"),
-        ("default.workflow.tenant", "tenant_pydolphin", "edit_tenant_pydolphin"),
         ("default.workflow.user", "userPythonGateway", "editUserPythonGateway"),
         ("default.workflow.queue", "queuePythonGateway", "editQueuePythonGateway"),
         ("default.workflow.worker_group", "default", "specific"),
@@ -220,7 +220,6 @@ def test_single_config_get_set_not_exists_key():
         ("USER_PHONE", "11111111111"),
         ("USER_STATE", 1),
         ("WORKFLOW_PROJECT", "project-pydolphin"),
-        ("WORKFLOW_TENANT", "tenant_pydolphin"),
         ("WORKFLOW_USER", "userPythonGateway"),
         ("WORKFLOW_QUEUE", "queuePythonGateway"),
         ("WORKFLOW_WORKER_GROUP", "default"),
@@ -249,7 +248,6 @@ def test_get_configuration(config_name: str, expect: Any):
         ("USER_PHONE", "11111111111", "22222222222"),
         ("USER_STATE", 1, 0),
         ("WORKFLOW_PROJECT", "project-pydolphin", "env-project-pydolphin"),
-        ("WORKFLOW_TENANT", "tenant_pydolphin", "env-tenant_pydolphin"),
         ("WORKFLOW_USER", "userPythonGateway", "envUserPythonGateway"),
         ("WORKFLOW_QUEUE", "queuePythonGateway", "envQueuePythonGateway"),
         ("WORKFLOW_WORKER_GROUP", "default", "custom"),

src/pydolphinscheduler/models/meta.py

@@ -58,7 +58,6 @@
         "default.user.state": (1, 0),
         "default.workflow": yaml.load("no need test"),
         "default.workflow.project": ("project-pydolphin", "project-pydolphinEdit"),
-        "default.workflow.tenant": ("tenant_pydolphin", "SmithEdit"),
         "default.workflow.user": ("userPythonGateway", "SmithEdit"),
         "default.workflow.queue": ("queuePythonGateway", "queueEdit"),
         "default.workflow.worker_group": ("default", "wgEdit"),