From d71a77012ad248f1bfa6c6023a26e8cc30aab3c5 Mon Sep 17 00:00:00 2001 From: Thiago Monteiro Date: Tue, 18 Jun 2024 14:07:54 +0000 Subject: [PATCH] client+ / prevent project create on operator --- requirements.txt | 2 +- runner.py | 16 ++++++++++------ setup.py | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index ab2e0e3..1b45c08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -git+https://github.com/tercen/tercen_python_client@0.10.7 +git+https://github.com/tercen/tercen_python_client@0.11.1 diff --git a/runner.py b/runner.py index 9c9c6ca..52e5255 100644 --- a/runner.py +++ b/runner.py @@ -133,11 +133,14 @@ def run_with_params(params, mode="cli"): client = params["client"] # Running as operator # Create temp project on which to run tests - project = Project() - project.name = 'template_test_' + ''.join(random.choices(string.ascii_uppercase + string.digits, k=12)) - project.acl.owner = params['user'] - project = client.projectService.create(project) - params["projectId"] = project.id + if mode == "cli": + project = Project() + project.name = 'template_test_' + ''.join(random.choices(string.ascii_uppercase + string.digits, k=12)) + project.acl.owner = params['user'] + project = client.projectService.create(project) + params["projectId"] = project.id + else: + project = tercenCtx.client.projectService.get(params["projectId"]) # Clone the template project from git into the temp project importTask = GitProjectTask() @@ -297,7 +300,8 @@ def run(argv): # stepId="1ba15e7c-6c3e-4521-81f2-d19fa58a57b9") tercenCtx = ctx.TercenContext() params["client"] = tercenCtx.context.client - + wkf = tercenCtx.client.workflowService.get(tercenCtx.get_workflow_id()) + params["projectId"] = wkf.projectId opMem = tercenCtx.operator_property('Memory', typeFn=int, default=-1) gitToken = tercenCtx.operator_property('Github Token', typeFn=str, default="") diff --git a/setup.py b/setup.py index 4d6997f..4561d08 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ packages=["workflow_funcs", "workflow_runner"], package_dir={'workflow_funcs': 'workflow_funcs', "workflow_runner":'.' }, install_requires=[ - 'tercen_python_client @ git+https://github.com/tercen/tercen_python_client@0.10.7' + 'tercen_python_client @ git+https://github.com/tercen/tercen_python_client@0.11.1' ], entry_points={ "console_scripts": [