Skip to content

Commit b7e09b4

Browse files
committed
update api specs
1 parent 1eb3659 commit b7e09b4

File tree

4 files changed

+97
-160
lines changed

4 files changed

+97
-160
lines changed

services/api-server/openapi.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2650,6 +2650,7 @@
26502650
"type": "null"
26512651
}
26522652
],
2653+
"deprecated": true,
26532654
"title": "Cluster Id"
26542655
},
26552656
"deprecated": true
@@ -4628,6 +4629,7 @@
46284629
"type": "null"
46294630
}
46304631
],
4632+
"deprecated": true,
46314633
"title": "Cluster Id"
46324634
},
46334635
"deprecated": true
@@ -6182,11 +6184,18 @@
61826184
"title": "Version"
61836185
},
61846186
"released": {
6185-
"additionalProperties": {
6186-
"type": "string",
6187-
"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-]+)*)?$"
6188-
},
6189-
"type": "object",
6187+
"anyOf": [
6188+
{
6189+
"additionalProperties": {
6190+
"type": "string",
6191+
"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-]+)*)?$"
6192+
},
6193+
"type": "object"
6194+
},
6195+
{
6196+
"type": "null"
6197+
}
6198+
],
61906199
"title": "Released",
61916200
"description": "Maps every route's path tag with a released version"
61926201
},

services/catalog/openapi.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -628,17 +628,11 @@
628628
},
629629
"image": {
630630
"type": "string",
631-
"maxLength": 2083,
632-
"minLength": 1,
633-
"format": "uri",
634631
"title": "Image",
635632
"description": "Url to the badge"
636633
},
637634
"url": {
638635
"type": "string",
639-
"maxLength": 2083,
640-
"minLength": 1,
641-
"format": "uri",
642636
"title": "Url",
643637
"description": "Link to the status"
644638
}
@@ -3550,7 +3544,10 @@
35503544
"thumbnail": {
35513545
"anyOf": [
35523546
{
3553-
"type": "string"
3547+
"type": "string",
3548+
"maxLength": 2083,
3549+
"minLength": 1,
3550+
"format": "uri"
35543551
},
35553552
{
35563553
"type": "null"

services/director-v2/openapi.json

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,17 +1458,13 @@
14581458
},
14591459
"url": {
14601460
"type": "string",
1461-
"minLength": 1,
1462-
"format": "uri",
14631461
"title": "Url",
14641462
"description": "the link where to get the status of the task"
14651463
},
14661464
"stop_url": {
14671465
"anyOf": [
14681466
{
1469-
"type": "string",
1470-
"minLength": 1,
1471-
"format": "uri"
1467+
"type": "string"
14721468
},
14731469
{
14741470
"type": "null"
@@ -2447,6 +2443,9 @@
24472443
},
24482444
"type": "array"
24492445
},
2446+
"propertyNames": {
2447+
"format": "uuid"
2448+
},
24502449
"type": "object",
24512450
"title": "Adjacency List",
24522451
"description": "The adjacency list of the current pipeline in terms of {NodeID: [successor NodeID]}"
@@ -2469,6 +2468,9 @@
24692468
"additionalProperties": {
24702469
"$ref": "#/components/schemas/NodeState"
24712470
},
2471+
"propertyNames": {
2472+
"format": "uuid"
2473+
},
24722474
"type": "object",
24732475
"title": "Node States",
24742476
"description": "The states of each of the computational nodes in the pipeline"
@@ -2978,9 +2980,16 @@
29782980
"description": "contains harware information so we know on which hardware to run the service"
29792981
},
29802982
"product_name": {
2981-
"type": "string",
2983+
"anyOf": [
2984+
{
2985+
"type": "string"
2986+
},
2987+
{
2988+
"type": "null"
2989+
}
2990+
],
29822991
"title": "Product Name",
2983-
"description": "Current product upon which this service is scheduled. If set to None, the current product is undefined. Mostly for backwards compatibility"
2992+
"description": "Current product upon which this service is scheduledIf set to None, the current product is undefined. Mostly for backwards compatibility"
29842993
}
29852994
},
29862995
"additionalProperties": true,
@@ -3000,7 +3009,8 @@
30003009
"service_resources",
30013010
"request_dns",
30023011
"request_scheme",
3003-
"request_simcore_user_agent"
3012+
"request_simcore_user_agent",
3013+
"proxy_service_name"
30043014
],
30053015
"title": "SchedulerData"
30063016
},
@@ -3106,9 +3116,7 @@
31063116
"download_link": {
31073117
"anyOf": [
31083118
{
3109-
"type": "string",
3110-
"minLength": 1,
3111-
"format": "uri"
3119+
"type": "string"
31123120
},
31133121
{
31143122
"type": "null"
@@ -3128,8 +3136,15 @@
31283136
"properties": {
31293137
"nodes_outputs": {
31303138
"additionalProperties": {
3139+
"propertyNames": {
3140+
"maxLength": 100,
3141+
"minLength": 1
3142+
},
31313143
"type": "object"
31323144
},
3145+
"propertyNames": {
3146+
"format": "uuid"
3147+
},
31333148
"type": "object",
31343149
"title": "Nodes Outputs"
31353150
}

0 commit comments

Comments
 (0)