Skip to content

Commit

Permalink
openapi: Updated CWL links and bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
@jerstlouis
jerstlouis committed Jun 10, 2024
1 parent 1df9bb7 commit 03607c4
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 57 deletions.
142 changes: 97 additions & 45 deletions openapi/ogcapi-processes.bundled.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4079,7 +4079,7 @@
},
"attribution": {
"type": "string",
"title": "attribution for the API",
"title": "attribution for the Processes API",
"description": "The `attribution` should be short and intended for presentation to a user, for example, in a corner of a map. Parts of the text can be links to other resources if additional information is needed. The string can include HTML markup."
},
"links": {
Expand Down Expand Up @@ -4826,7 +4826,8 @@
],
"default": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
}
}
},
"additionalProperties": false
},
"descriptionType": {
"type": "object",
Expand Down Expand Up @@ -4916,6 +4917,20 @@
"schema"
],
"properties": {
"valuePassing": {
"type": "array",
"items": {
"type": "string",
"enum": [
"byValue",
"byReference"
]
},
"default": [
"byValue",
"byReference"
]
},
"minOccurs": {
"type": "integer",
"default": 1
Expand All @@ -4942,7 +4957,7 @@
]
},
"inputValue": {
"oneOf": [
"anyOf": [
{
"$ref": "#/components/schemas/inputValueNoObject"
},
Expand Down Expand Up @@ -4986,18 +5001,47 @@
]
},
"metadata": {
"type": "object",
"properties": {
"title": {
"type": "string"
},
"role": {
"type": "string"
"oneOf": [
{
"allOf": [
{
"$ref": "#/components/schemas/link"
},
{
"type": "object",
"properties": {
"role": {
"type": "string"
}
}
}
]
},
"href": {
"type": "string"
{
"type": "object",
"properties": {
"role": {
"type": "string"
},
"title": {
"type": "string"
},
"lang": {
"type": "string"
},
"value": {
"oneOf": [
{
"type": "string"
},
{
"type": "object"
}
]
}
}
}
}
]
},
"output": {
"type": "object",
Expand Down Expand Up @@ -5053,7 +5097,8 @@
"type": "string",
"format": "uri-reference"
}
}
},
"additionalProperties": false
},
"results": {
"additionalProperties": {
Expand Down Expand Up @@ -5151,63 +5196,40 @@
]
},
"not": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
},
"allOf": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
}
},
"oneOf": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
}
},
"anyOf": {
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
}
},
"items": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
},
"properties": {
"type": "object",
"properties": {},
"additionalProperties": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
}
]
"$ref": "#/components/schemas/schema"
}
},
"additionalProperties": {
"oneOf": [
{
"$ref": "#/components/schemas/reference"
"$ref": "#/components/schemas/schema"
},
{
"type": "boolean"
Expand Down Expand Up @@ -5324,6 +5346,9 @@
"message": {
"type": "string"
},
"exception": {
"$ref": "#/components/schemas/exception"
},
"created": {
"type": "string",
"format": "date-time"
Expand Down Expand Up @@ -5367,7 +5392,33 @@
{
"description": "Resource containing an executable or runtime information for executing the process.",
"type": "object",
"required": [
"type",
"image"
],
"properties": {
"type": {
"description": "Type of execution unit.",
"type": "string",
"enum": [
"docker",
"oci"
]
},
"image": {
"description": "Container image reference for the execution unit.",
"type": "string"
},
"deployment": {
"description": "Deployment information for the execution unit.",
"type": "string",
"enum": [
"local",
"remote",
"hpc",
"cloud"
]
},
"config": {
"type": "object",
"description": "Hardware requirements and configuration properties for executing the process.",
Expand Down Expand Up @@ -5409,6 +5460,7 @@
"example": {
"type": "docker",
"image": "mydocker/ndvi:latest",
"deployment": "local",
"config": {
"cpuMin": 2,
"cpuMax": 5,
Expand Down
6 changes: 3 additions & 3 deletions openapi/paths/processes-dru/pDeploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ post:
$ref: "../../schemas/processes-dru/ogcapppkg.yaml"
application/cwl:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+json:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+yaml:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
responses:
201:
$ref: "../../schemas/processes-core/processSummary.yaml"
Expand Down
6 changes: 3 additions & 3 deletions openapi/paths/processes-dru/pProcessDescriptionReplaceUndeploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ put:
$ref: "../../schemas/processes-dru/ogcapppkg.yaml"
application/cwl:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+json:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+yaml:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
responses:
204:
$ref: "../../responses/processes-dru/rEmpty.yaml"
Expand Down
6 changes: 3 additions & 3 deletions openapi/paths/processes-dru/pProcessListDeploy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ post:
$ref: "../../schemas/processes-dru/ogcapppkg.yaml"
application/cwl:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+json:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+yaml:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
responses:
201:
$ref: "../../schemas/processes-core/processSummary.yaml"
Expand Down
6 changes: 3 additions & 3 deletions openapi/paths/processes-dru/pReplace.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ put:
$ref: "../../schemas/processes-dru/ogcapppkg.yaml"
application/cwl:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+json:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
application/cwl+yaml:
schema:
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/1.2.1_proposed/json-schema/cwl.yaml"
$ref: "https://raw.githubusercontent.com/common-workflow-language/cwl-v1.2/main/json-schema/cwl.yaml"
responses:
204:
$ref: "../../responses/processes-dru/rEmpty.yaml"
Expand Down

0 comments on commit 03607c4

Please sign in to comment.