Skip to content

Commit 9ea3cb6

Browse files
committed
rm header on creation
1 parent 774c98f commit 9ea3cb6

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

packages/service-library/src/servicelib/common_headers.py

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
X_DYNAMIC_SIDECAR_REQUEST_DNS: Final[str] = "X-Dynamic-Sidecar-Request-DNS"
55
X_DYNAMIC_SIDECAR_REQUEST_SCHEME: Final[str] = "X-Dynamic-Sidecar-Request-Scheme"
66
X_FORWARDED_PROTO: Final[str] = "X-Forwarded-Proto"
7-
X_SIMCORE_API_JOB_PARENT_RESOURCE_NAME: Final[str] = (
8-
"X-Simcore-Api-Job-Parent-Resource-Name"
9-
)
107
X_SIMCORE_PARENT_NODE_ID: Final[str] = "X-Simcore-Parent-Node-Id"
118
X_SIMCORE_PARENT_PROJECT_UUID: Final[str] = "X-Simcore-Parent-Project-Uuid"
129
X_SIMCORE_USER_AGENT: Final[str] = "X-Simcore-User-Agent"

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ async def create_job(
127127
new_project: ProjectGet = await webserver_api.create_project(
128128
project_in,
129129
is_hidden=hidden,
130-
job_parent_resource_name=pre_job.runner_name,
131130
parent_project_uuid=x_simcore_parent_project_uuid,
132131
parent_node_id=x_simcore_parent_node_id,
133132
)

services/api-server/src/simcore_service_api_server/api/routes/studies.py

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ async def clone_study(
9090
hidden=False,
9191
parent_project_uuid=x_simcore_parent_project_uuid,
9292
parent_node_id=x_simcore_parent_node_id,
93-
job_parent_resource_name=None, # this resource is NOT a job
9493
)
9594
return _create_study_from_project(project)
9695

services/api-server/src/simcore_service_api_server/services_http/webserver.py

-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
from pydantic import PositiveInt
4444
from servicelib.aiohttp.long_running_tasks.server import TaskStatus
4545
from servicelib.common_headers import (
46-
X_SIMCORE_API_JOB_PARENT_RESOURCE_NAME,
4746
X_SIMCORE_PARENT_NODE_ID,
4847
X_SIMCORE_PARENT_PROJECT_UUID,
4948
)
@@ -295,7 +294,6 @@ async def create_project(
295294
project: ProjectCreateNew,
296295
*,
297296
is_hidden: bool,
298-
job_parent_resource_name: str,
299297
parent_project_uuid: ProjectID | None,
300298
parent_node_id: NodeID | None,
301299
) -> ProjectGet:
@@ -304,7 +302,6 @@ async def create_project(
304302
headers = {
305303
X_SIMCORE_PARENT_PROJECT_UUID: parent_project_uuid,
306304
X_SIMCORE_PARENT_NODE_ID: parent_node_id,
307-
X_SIMCORE_API_JOB_PARENT_RESOURCE_NAME: job_parent_resource_name,
308305
}
309306

310307
response = await self.client.post(
@@ -326,14 +323,12 @@ async def clone_project(
326323
hidden: bool,
327324
parent_project_uuid: ProjectID | None,
328325
parent_node_id: NodeID | None,
329-
job_parent_resource_name: str | None = None,
330326
) -> ProjectGet:
331327
# POST /projects --> 202 Accepted
332328
query_params = {"from_study": project_id, "hidden": hidden}
333329
_headers = {
334330
X_SIMCORE_PARENT_PROJECT_UUID: parent_project_uuid,
335331
X_SIMCORE_PARENT_NODE_ID: parent_node_id,
336-
X_SIMCORE_API_JOB_PARENT_RESOURCE_NAME: job_parent_resource_name,
337332
}
338333

339334
response = await self.client.post(

services/api-server/tests/unit/api_solvers/conftest.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ def mocked_webserver_service_api(
4949
def mocked_rpc_webserver_service_api(
5050
app: FastAPI, mocker: MockerFixture
5151
) -> dict[str, MockType]:
52-
from simcore_service_api_server.services_rpc.wb_api_server import projects_rpc
52+
# from simcore_service_api_server.services_rpc.wb_api_server import projects_rpc
53+
from servicelib.rabbitmq.rpc_interfaces.webserver import projects as projects_rpc
5354

5455
settings: ApplicationSettings = app.state.settings
5556
assert settings.API_SERVER_WEBSERVER

0 commit comments

Comments
 (0)