Skip to content

Commit 7ac768d

Browse files
pcrespovpcrespov
committed
removes calls to catalog update_service
1 parent 3bdc8a2 commit 7ac768d

File tree

4 files changed

+30
-366
lines changed

4 files changed

+30
-366
lines changed

‎services/catalog/openapi.json‎

Lines changed: 23 additions & 285 deletions
Original file line numberDiff line numberDiff line change
@@ -603,92 +603,6 @@
603603
}
604604
}
605605
}
606-
},
607-
"patch": {
608-
"tags": [
609-
"services"
610-
],
611-
"summary": "Update Service",
612-
"operationId": "update_service_v0_services__service_key___service_version__patch",
613-
"parameters": [
614-
{
615-
"name": "service_key",
616-
"in": "path",
617-
"required": true,
618-
"schema": {
619-
"type": "string",
620-
"pattern": "^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$",
621-
"title": "Service Key"
622-
}
623-
},
624-
{
625-
"name": "service_version",
626-
"in": "path",
627-
"required": true,
628-
"schema": {
629-
"type": "string",
630-
"pattern": "^(0|[1-9]\\d*)(\\.(0|[1-9]\\d*)){2}(-(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*)(\\.(0|[1-9]\\d*|\\d*[-a-zA-Z][-\\da-zA-Z]*))*)?(\\+[-\\da-zA-Z]+(\\.[-\\da-zA-Z-]+)*)?$",
631-
"title": "Service Version"
632-
}
633-
},
634-
{
635-
"name": "user_id",
636-
"in": "query",
637-
"required": true,
638-
"schema": {
639-
"type": "integer",
640-
"title": "User Id"
641-
}
642-
},
643-
{
644-
"name": "x-simcore-products-name",
645-
"in": "header",
646-
"required": false,
647-
"schema": {
648-
"anyOf": [
649-
{
650-
"type": "string"
651-
},
652-
{
653-
"type": "null"
654-
}
655-
],
656-
"title": "X-Simcore-Products-Name"
657-
}
658-
}
659-
],
660-
"requestBody": {
661-
"required": true,
662-
"content": {
663-
"application/json": {
664-
"schema": {
665-
"$ref": "#/components/schemas/ServiceUpdate"
666-
}
667-
}
668-
}
669-
},
670-
"responses": {
671-
"200": {
672-
"description": "Successful Response",
673-
"content": {
674-
"application/json": {
675-
"schema": {
676-
"$ref": "#/components/schemas/ServiceGet"
677-
}
678-
}
679-
}
680-
},
681-
"422": {
682-
"description": "Validation Error",
683-
"content": {
684-
"application/json": {
685-
"schema": {
686-
"$ref": "#/components/schemas/HTTPValidationError"
687-
}
688-
}
689-
}
690-
}
691-
}
692606
}
693607
}
694608
},
@@ -2693,6 +2607,18 @@
26932607
"description": "Display name: short, human readable name for the node"
26942608
},
26952609
"thumbnail": {
2610+
"anyOf": [
2611+
{
2612+
"type": "string"
2613+
},
2614+
{
2615+
"type": "null"
2616+
}
2617+
],
2618+
"title": "Thumbnail",
2619+
"description": "URL to the service thumbnail"
2620+
},
2621+
"icon": {
26962622
"anyOf": [
26972623
{
26982624
"type": "string",
@@ -2704,8 +2630,8 @@
27042630
"type": "null"
27052631
}
27062632
],
2707-
"title": "Thumbnail",
2708-
"description": "url to the thumbnail"
2633+
"title": "Icon",
2634+
"description": "URL to the service icon"
27092635
},
27102636
"description": {
27112637
"type": "string",
@@ -2728,7 +2654,7 @@
27282654
}
27292655
],
27302656
"title": "Version Display",
2731-
"description": "A user-friendly or marketing name for the release. This can be used to reference the release in a more readable and recognizable format, such as 'Matterhorn Release,' 'Spring Update,' or 'Holiday Edition.' This name is not used for version comparison but is useful for communication and documentation purposes."
2657+
"description": "A user-friendly or marketing name for the release.This can be used to reference the release in a more readable and recognizable format, such as 'Matterhorn Release,' 'Spring Update,' or 'Holiday Edition.' This name is not used for version comparison but is useful for communication and documentation purposes."
27322658
},
27332659
"deprecated": {
27342660
"anyOf": [
@@ -2766,7 +2692,7 @@
27662692
"anyOf": [
27672693
{
27682694
"additionalProperties": {
2769-
"$ref": "#/components/schemas/ServiceGroupAccessRights"
2695+
"$ref": "#/components/schemas/ServiceGroupAccessRightsV2"
27702696
},
27712697
"type": "object"
27722698
},
@@ -2951,23 +2877,22 @@
29512877
],
29522878
"title": "ServiceGet"
29532879
},
2954-
"ServiceGroupAccessRights": {
2880+
"ServiceGroupAccessRightsV2": {
29552881
"properties": {
2956-
"execute_access": {
2882+
"execute": {
29572883
"type": "boolean",
2958-
"title": "Execute Access",
2959-
"description": "defines whether the group can execute the service",
2884+
"title": "Execute",
29602885
"default": false
29612886
},
2962-
"write_access": {
2887+
"write": {
29632888
"type": "boolean",
2964-
"title": "Write Access",
2965-
"description": "defines whether the group can modify the service",
2889+
"title": "Write",
29662890
"default": false
29672891
}
29682892
},
2893+
"additionalProperties": false,
29692894
"type": "object",
2970-
"title": "ServiceGroupAccessRights"
2895+
"title": "ServiceGroupAccessRightsV2"
29712896
},
29722897
"ServiceInput": {
29732898
"properties": {
@@ -3368,193 +3293,6 @@
33683293
],
33693294
"title": "ServiceType"
33703295
},
3371-
"ServiceUpdate": {
3372-
"properties": {
3373-
"accessRights": {
3374-
"anyOf": [
3375-
{
3376-
"additionalProperties": {
3377-
"$ref": "#/components/schemas/ServiceGroupAccessRights"
3378-
},
3379-
"type": "object"
3380-
},
3381-
{
3382-
"type": "null"
3383-
}
3384-
],
3385-
"title": "Accessrights",
3386-
"description": "service access rights per group id"
3387-
},
3388-
"name": {
3389-
"anyOf": [
3390-
{
3391-
"type": "string"
3392-
},
3393-
{
3394-
"type": "null"
3395-
}
3396-
],
3397-
"title": "Name"
3398-
},
3399-
"thumbnail": {
3400-
"anyOf": [
3401-
{
3402-
"type": "string",
3403-
"maxLength": 2083,
3404-
"minLength": 1,
3405-
"format": "uri"
3406-
},
3407-
{
3408-
"type": "null"
3409-
}
3410-
],
3411-
"title": "Thumbnail"
3412-
},
3413-
"description": {
3414-
"anyOf": [
3415-
{
3416-
"type": "string"
3417-
},
3418-
{
3419-
"type": "null"
3420-
}
3421-
],
3422-
"title": "Description"
3423-
},
3424-
"description_ui": {
3425-
"type": "boolean",
3426-
"title": "Description Ui",
3427-
"default": false
3428-
},
3429-
"version_display": {
3430-
"anyOf": [
3431-
{
3432-
"type": "string"
3433-
},
3434-
{
3435-
"type": "null"
3436-
}
3437-
],
3438-
"title": "Version Display"
3439-
},
3440-
"deprecated": {
3441-
"anyOf": [
3442-
{
3443-
"type": "string",
3444-
"format": "date-time"
3445-
},
3446-
{
3447-
"type": "null"
3448-
}
3449-
],
3450-
"title": "Deprecated",
3451-
"description": "Owner can set the date to retire the service. Three possibilities:If None, the service is marked as `published`;If now<deprecated the service is marked as deprecated;If now>=deprecated, the service is retired"
3452-
},
3453-
"classifiers": {
3454-
"anyOf": [
3455-
{
3456-
"items": {
3457-
"type": "string"
3458-
},
3459-
"type": "array"
3460-
},
3461-
{
3462-
"type": "null"
3463-
}
3464-
],
3465-
"title": "Classifiers"
3466-
},
3467-
"quality": {
3468-
"type": "object",
3469-
"title": "Quality",
3470-
"default": {}
3471-
}
3472-
},
3473-
"type": "object",
3474-
"required": [
3475-
"name",
3476-
"thumbnail",
3477-
"description",
3478-
"classifiers"
3479-
],
3480-
"title": "ServiceUpdate",
3481-
"example": {
3482-
"accessRights": {
3483-
"1": {
3484-
"execute_access": false,
3485-
"write_access": false
3486-
},
3487-
"2": {
3488-
"execute_access": true,
3489-
"write_access": true
3490-
},
3491-
"44": {
3492-
"execute_access": false,
3493-
"write_access": false
3494-
}
3495-
},
3496-
"classifiers": [
3497-
"RRID:SCR_018997",
3498-
"RRID:SCR_019001"
3499-
],
3500-
"description": "An interesting service that does something",
3501-
"name": "My Human Readable Service Name",
3502-
"quality": {
3503-
"annotations": {
3504-
"certificationLink": "",
3505-
"certificationStatus": "Uncertified",
3506-
"documentation": "",
3507-
"limitations": "",
3508-
"purpose": "",
3509-
"standards": "",
3510-
"vandv": ""
3511-
},
3512-
"enabled": true,
3513-
"tsr": {
3514-
"r01": {
3515-
"level": 3,
3516-
"references": ""
3517-
},
3518-
"r02": {
3519-
"level": 2,
3520-
"references": ""
3521-
},
3522-
"r03": {
3523-
"level": 0,
3524-
"references": ""
3525-
},
3526-
"r04": {
3527-
"level": 0,
3528-
"references": ""
3529-
},
3530-
"r05": {
3531-
"level": 2,
3532-
"references": ""
3533-
},
3534-
"r06": {
3535-
"level": 0,
3536-
"references": ""
3537-
},
3538-
"r07": {
3539-
"level": 0,
3540-
"references": ""
3541-
},
3542-
"r08": {
3543-
"level": 1,
3544-
"references": ""
3545-
},
3546-
"r09": {
3547-
"level": 0,
3548-
"references": ""
3549-
},
3550-
"r10": {
3551-
"level": 0,
3552-
"references": ""
3553-
}
3554-
}
3555-
}
3556-
}
3557-
},
35583296
"Spread": {
35593297
"properties": {
35603298
"SpreadDescriptor": {

‎services/catalog/src/simcore_service_catalog/api/rest/_services.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ async def get_service(
268268
return service_data
269269

270270

271-
@router.patch(
272-
"/{service_key:path}/{service_version}",
273-
response_model=ServiceGet,
274-
**RESPONSE_MODEL_POLICY,
275-
)
271+
# @router.patch(
272+
# "/{service_key:path}/{service_version}",
273+
# response_model=ServiceGet,
274+
# **RESPONSE_MODEL_POLICY,
275+
# )
276276
async def update_service(
277277
# pylint: disable=too-many-arguments
278278
user_id: int,

0 commit comments

Comments
 (0)