Skip to content

Commit 470fab3

Browse files
authored
Removing all deprecated endpoints and functions (#599)
* Remove Fixed Input endpoint as it is unused * Deprecated unsed API endpoints. Removed some custom validators and migrated to SURF specific. * Removed all deprecated endpoints, schemas and functions. * Added Unit test for base serializer * Black * Rc1
1 parent c16a4a1 commit 470fab3

27 files changed

+116
-1575
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.2.2
2+
current_version = 2.3.0rc1
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(rc(?P<build>\d+))?

orchestrator/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
"""This is the orchestrator workflow engine."""
1515

16-
__version__ = "2.2.2"
16+
__version__ = "2.3.0rc1"
1717

1818
from orchestrator.app import OrchestratorCore
1919
from orchestrator.settings import app_settings, oauth2_settings

orchestrator/api/api_v1/api.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,50 +17,27 @@
1717
from fastapi.routing import APIRouter
1818

1919
from orchestrator.api.api_v1.endpoints import (
20-
fixed_input,
2120
health,
2221
processes,
23-
product_blocks,
2422
products,
25-
resource_types,
2623
settings,
2724
subscription_customer_descriptions,
2825
subscriptions,
2926
translations,
3027
user,
31-
workflows,
3228
ws,
3329
)
3430
from orchestrator.security import opa_security_default
3531

3632
api_router = APIRouter()
37-
api_router.include_router(
38-
fixed_input.router,
39-
prefix="/fixed_inputs",
40-
tags=["Core", "Fixed Inputs"],
41-
dependencies=[Depends(opa_security_default)],
42-
)
4333

4434
api_router.include_router(
4535
processes.router, prefix="/processes", tags=["Core", "Processes"], dependencies=[Depends(opa_security_default)]
4636
)
4737
api_router.include_router(processes.ws_router, prefix="/processes", tags=["Core", "Processes"])
48-
49-
api_router.include_router(
50-
product_blocks.router,
51-
prefix="/product_blocks",
52-
tags=["Core", "Product Blocks"],
53-
dependencies=[Depends(opa_security_default)],
54-
)
5538
api_router.include_router(
5639
products.router, prefix="/products", tags=["Core", "Product"], dependencies=[Depends(opa_security_default)]
5740
)
58-
api_router.include_router(
59-
resource_types.router,
60-
prefix="/resource_types",
61-
tags=["Core", "Resource Types"],
62-
dependencies=[Depends(opa_security_default)],
63-
)
6441
api_router.include_router(
6542
subscriptions.router,
6643
prefix="/subscriptions",
@@ -76,9 +53,6 @@
7653
api_router.include_router(
7754
user.router, prefix="/user", tags=["Core", "User"], dependencies=[Depends(opa_security_default)]
7855
)
79-
api_router.include_router(
80-
workflows.router, prefix="/workflows", tags=["Core", "Workflows"], dependencies=[Depends(opa_security_default)]
81-
)
8256
api_router.include_router(
8357
settings.router, prefix="/settings", tags=["Core", "Settings"], dependencies=[Depends(opa_security_default)]
8458
)

orchestrator/api/api_v1/endpoints/fixed_input.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

orchestrator/api/api_v1/endpoints/processes.py

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@
2828
from more_itertools import chunked
2929
from sentry_sdk.tracing import trace
3030
from sqlalchemy import CompoundSelect, Select, select
31-
from sqlalchemy.orm import contains_eager, defer, joinedload
31+
from sqlalchemy.orm import defer, joinedload
3232
from sqlalchemy.sql.functions import count
3333
from starlette.responses import Response
3434

3535
from oauth2_lib.fastapi import OIDCUserModel
3636
from orchestrator.api.error_handling import raise_status
3737
from orchestrator.api.helpers import add_response_range
38-
from orchestrator.config.assignee import Assignee
3938
from orchestrator.db import ProcessSubscriptionTable, ProcessTable, SubscriptionTable, db
4039
from orchestrator.db.filters import Filter
4140
from orchestrator.db.filters.process import filter_processes
@@ -46,8 +45,6 @@
4645
ProcessResumeAllSchema,
4746
ProcessSchema,
4847
ProcessStatusCounts,
49-
ProcessSubscriptionBaseSchema,
50-
ProcessSubscriptionSchema,
5148
Reporter,
5249
)
5350
from orchestrator.security import oidc_user
@@ -65,7 +62,6 @@
6562
from orchestrator.services.settings import get_engine_settings
6663
from orchestrator.settings import app_settings
6764
from orchestrator.types import JSON, State
68-
from orchestrator.utils.deprecation_logger import deprecated_endpoint
6965
from orchestrator.utils.enrich_process import enrich_process
7066
from orchestrator.websocket import WS_CHANNELS, send_process_data_to_websocket, websocket_manager
7167
from orchestrator.workflow import ProcessStatus
@@ -230,46 +226,6 @@ def abort_process_endpoint(process_id: UUID, request: Request, user: str = Depen
230226
raise_status(HTTPStatus.INTERNAL_SERVER_ERROR, str(e))
231227

232228

233-
@router.get(
234-
"/process-subscriptions-by-subscription-id/{subscription_id}",
235-
response_model=list[ProcessSubscriptionSchema],
236-
deprecated=True,
237-
description="This endpoint is deprecated and will be removed in a future release. Please use the GraphQL query",
238-
dependencies=[Depends(deprecated_endpoint)],
239-
)
240-
def process_subscriptions_by_subscription_id(subscription_id: UUID) -> list[ProcessSubscriptionSchema]:
241-
stmt = (
242-
select(ProcessSubscriptionTable)
243-
.options(contains_eager(ProcessSubscriptionTable.process))
244-
.join(ProcessTable)
245-
.filter(ProcessSubscriptionTable.subscription_id == subscription_id)
246-
.order_by(ProcessTable.started_at.asc())
247-
)
248-
return list(db.session.scalars(stmt))
249-
250-
251-
@router.get(
252-
"/process-subscriptions-by-process_id/{process_id}",
253-
response_model=list[ProcessSubscriptionBaseSchema],
254-
deprecated=True,
255-
description="This endpoint is deprecated and will be removed in a future release. Please use the GraphQL query",
256-
dependencies=[Depends(deprecated_endpoint)],
257-
)
258-
def process_subscriptions_by_process_process_id(process_id: UUID) -> list[ProcessSubscriptionTable]:
259-
return list(db.session.scalars(select(ProcessSubscriptionTable).filter_by(process_id=process_id)))
260-
261-
262-
@router.get(
263-
"/statuses",
264-
response_model=list[ProcessStatus],
265-
deprecated=True,
266-
description="This endpoint is deprecated and will be removed in a future release. Please use the GraphQL query",
267-
dependencies=[Depends(deprecated_endpoint)],
268-
)
269-
def statuses() -> list[str]:
270-
return [status.value for status in ProcessStatus]
271-
272-
273229
@router.get("/status-counts", response_model=ProcessStatusCounts)
274230
def status_counts() -> ProcessStatusCounts:
275231
"""Retrieve status counts for processes and tasks."""
@@ -286,17 +242,6 @@ def status_counts() -> ProcessStatusCounts:
286242
)
287243

288244

289-
@router.get(
290-
"/assignees",
291-
response_model=list[Assignee],
292-
deprecated=True,
293-
description="This endpoint is deprecated and will be removed in a future release. Please use the GraphQL query",
294-
dependencies=[Depends(deprecated_endpoint)],
295-
)
296-
def assignees() -> list[str]:
297-
return [assignee.value for assignee in Assignee]
298-
299-
300245
@router.get("/{process_id}", response_model=ProcessSchema)
301246
def show(process_id: UUID) -> dict[str, Any]:
302247
process = _get_process(process_id)

orchestrator/api/api_v1/endpoints/product_blocks.py

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)