Skip to content

Commit 4ebf2d9

Browse files
committed
Merge remote-tracking branch 'origin/draft' into master, v1.1.0
2 parents 81dd248 + 0ccbcaf commit 4ebf2d9

File tree

9 files changed

+690
-285
lines changed

9 files changed

+690
-285
lines changed

.github/workflows/docs.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Deploy API Spec
2+
on:
3+
release:
4+
types: [published]
5+
push:
6+
branches:
7+
- draft
8+
- master
9+
jobs:
10+
deploy:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
node-version: [14.x]
15+
steps:
16+
- name: Inject env variables
17+
uses: rlespinasse/github-slug-action@v3.x
18+
- uses: actions/setup-node@v1
19+
- uses: actions/checkout@v2
20+
- run: |
21+
npm install
22+
npm run build
23+
- name: clone gh-pages and clean-up
24+
if: ${{ env.GITHUB_REF_SLUG == 'master' }}
25+
run: |
26+
git clone --branch gh-pages https://github.com/Open-EO/openeo-api.git gh-pages
27+
find gh-pages -maxdepth 1 -type f -delete
28+
rm -rf gh-pages/assets/
29+
- name: create empty gh-pages folder
30+
if: ${{ env.GITHUB_REF_SLUG != 'master' }}
31+
run: mkdir gh-pages
32+
- run: |
33+
cp redoc.html gh-pages/index.html
34+
cp errors.json gh-pages/errors.json
35+
cp -rv assets/. gh-pages/assets/
36+
- name: deploy to root (master)
37+
uses: peaceiris/actions-gh-pages@v3
38+
if: ${{ env.GITHUB_REF_SLUG == 'master' }}
39+
with:
40+
github_token: ${{ secrets.GITHUB_TOKEN }}
41+
publish_dir: gh-pages
42+
user_name: 'openEO CI'
43+
user_email: openeo.ci@uni-muenster.de
44+
- name: deploy to ${{ env.GITHUB_REF_SLUG }}
45+
uses: peaceiris/actions-gh-pages@v3
46+
if: ${{ env.GITHUB_REF_SLUG != 'master' }}
47+
with:
48+
github_token: ${{ secrets.GITHUB_TOKEN }}
49+
publish_dir: gh-pages
50+
destination_dir: ${{ env.GITHUB_REF_SLUG }}
51+
user_name: 'openEO CI'
52+
user_email: openeo.ci@uni-muenster.de

.github/workflows/tests.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Test API Spec
2+
on: [push, pull_request]
3+
jobs:
4+
deploy:
5+
runs-on: ubuntu-latest
6+
strategy:
7+
matrix:
8+
node-version: [14.x]
9+
steps:
10+
- uses: actions/setup-node@v1
11+
- uses: actions/checkout@v2
12+
- name: Run tests
13+
run: |
14+
npm install
15+
npm test

.spectral.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ rules:
1717
contact-properties: true
1818
tag-description: true
1919
oas3-parameter-description: true
20+
oas3-unused-components-schema: false # Broken: https://github.com/stoplightio/spectral/issues/1271
2021
operation-summary-formatted:
2122
description: Operation `summary` should start with upper case and not end with a dot.
2223
recommended: true
@@ -33,5 +34,5 @@ rules:
3334
given: "$"
3435
then:
3536
function: pattern
36-
functionOptions: # this object be passed down as options to the custom function
37+
functionOptions:
3738
match: ^[a-z][a-z0-9\-]*$

.travis.yml

-60
This file was deleted.

CHANGELOG.md

+48-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased / Draft
88

9-
## 1.0.1 - 2020-12-07
9+
## [1.1.0] - 2021-06-15
10+
11+
### Added
12+
- `GET /processes` and `GET` / `PUT` for `/process_graphs/{process_graph_id}`: Allow specifying the return values processes receive from child processes. [#350](https://github.com/Open-EO/openeo-api/issues/350)
13+
- Recommendation that `POST /result` returns a `tar` file if the result consists of multiple files. [#349](https://github.com/Open-EO/openeo-api/issues/349)
14+
- `GET /credentials/oidc` can provide a set of default client ids for OpenID Connect. [#366](https://github.com/Open-EO/openeo-api/pull/366)
15+
- `experimental` and `deprecated` flags added for file formats, service types, udf runtimes, udf runtime versions, udf runtime libraries and all related parameters and schemas. [#354](https://github.com/Open-EO/openeo-api/issues/354)
16+
- `GET /jobs/{job_id}` and `GET /services/{service_id}`: `usage` property added for usage metrics. [#370](https://github.com/Open-EO/openeo-api/issues/370)
17+
- `GET /jobs/{job_id}/logs` and `GET /services/{service_id}/logs`:
18+
- `time` property added. [#330](https://github.com/Open-EO/openeo-api/issues/330)
19+
- `usage` property added to log entries. [#370](https://github.com/Open-EO/openeo-api/issues/370)
20+
- Added error `ResultLinkExpired`. [#379](https://github.com/Open-EO/openeo-api/issues/379)
21+
- `GET /me`: A default plan per user can be specified. [#375](https://github.com/Open-EO/openeo-api/issues/375)
22+
23+
### Changed
24+
25+
- API doesn't discourage usage of `multipleOf` in JSON Schemas any longer.
26+
- `GET /jobs/{job_id}/results` supports to return a STAC Collection. [#343](https://github.com/Open-EO/openeo-api/issues/343)
27+
- Updated STAC schemas to better support versions 1.x.x.
28+
- The first extent in a Collection is always the overall extent, followed by more specific extents. [#369](https://github.com/Open-EO/openeo-api/issues/369)
29+
30+
### Fixed
31+
32+
- Clarified how process exceptions should be used. [#352](https://github.com/Open-EO/openeo-api/issues/352)
33+
- Clarified that job results schould be stored as valid STAC catalogs. [#363](https://github.com/Open-EO/openeo-api/issues/363)
34+
- Clarified that job results require the property `datetime` and allow for additional properties. [#362](https://github.com/Open-EO/openeo-api/issues/362)
35+
- Clarified that billing plans, service names and file formats must be accepted case-insensitive. [#371](https://github.com/Open-EO/openeo-api/issues/371)
36+
- Clarified that the first provider listed at `GET /credentials/oidc` is the default provider for OpenID Connect.
37+
- Clarified that `GET /jobs/{job_id}/results` should always return valid signed URLs and the endpoint can be used to renew the signed URLs. [#379](https://github.com/Open-EO/openeo-api/issues/379)
38+
- Fixed casing of potential endpoints `GET /collections/{collection_id}/items` and `GET /collections/{collection_id}/items/{feature_id}`.
39+
- Clarified allowed characters in the `path` for uploaded user files.
40+
41+
## [1.0.1] - 2020-12-07
1042

1143
### Changed
1244
- `GET /collections` and `GET /collections/{collection_id}`: Units for STAC dimensions in `cube:dimensions` should be compliant to UDUNITS-2 units (singular) whenever available.
@@ -25,7 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2557
- Fixed JSON Schema links to point to draft-07 instead of draft/2019-09.
2658
- `GET /jobs/{job_id}/estimate`: Enforce in the response schema that "at least one of `costs`, `duration` or `size` MUST be provided."
2759

28-
## 1.0.0 - 2020-07-17
60+
## [1.0.0] - 2020-07-17
2961

3062
### Added
3163
- `GET /me`: Added optional `name` property to better separate an internal user id from a displayable user name. Adopted description of `user_id` accordingly.
@@ -85,7 +117,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
85117
- Clarified the expected behavior for process parameters, if a default value is given and the parameter is implicitly set to be required. [#303](https://github.com/Open-EO/openeo-api/issues/303)
86118
- Several clarifications and improvements for the documentation.
87119

88-
## 1.0.0-rc.2 - 2020-02-20
120+
## [1.0.0-rc.2] - 2020-02-20
89121

90122
### Added
91123
- `PUT /process_graphs/{process_graph_id}` to store and replace custom process-graphs. [#260](https://github.com/Open-EO/openeo-api/issues/260)
@@ -115,7 +147,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
115147
- Clarify that a copy of the STAC Item is recommended to be part of the assets in a batch job download.
116148
- Removed outdated error codes from `errors.json`.
117149

118-
## 1.0.0-rc.1 - 2020-01-31
150+
## [1.0.0-rc.1] - 2020-01-31
119151

120152
**Note:** The user and developer documentation has been moved to [openeo.org](https://openeo.org/documentation).
121153

@@ -334,3 +366,15 @@ Version for proof of concept. No changelog available.
334366

335367
## [0.0.1] - 2018-02-07
336368
Initial version.
369+
370+
371+
[Unreleased]: <https://github.com/Open-EO/openeo-api/compare/master...dev>
372+
[1.1.0]: <https://github.com/Open-EO/openeo-api/compare/1.0.1...1.1.0>
373+
[1.0.1]: <https://github.com/Open-EO/openeo-api/compare/1.0.0...1.0.1>
374+
[1.0.0]: <https://github.com/Open-EO/openeo-api/compare/0.4.2...1.0.0>
375+
[0.4.2]: <https://github.com/Open-EO/openeo-api/compare/0.4.1...0.4.2>
376+
[0.4.1]: <https://github.com/Open-EO/openeo-api/compare/0.4.0...0.4.1>
377+
[0.4.0]: <https://github.com/Open-EO/openeo-api/compare/0.3.0...0.4.0>
378+
[0.3.0]: <https://github.com/Open-EO/openeo-api/compare/0.0.2...0.3.0>
379+
[0.0.2]: <https://github.com/Open-EO/openeo-api/compare/0.0.1...0.0.2>
380+
[0.0.1]: <https://github.com/Open-EO/openeo-api/tree/0.0.1>

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ openEO develops an open API to connect R, Python and JavaScript clients to big E
66

77
## Versions / Branches
88

9-
The [master branch](https://github.com/Open-EO/openeo-api/tree/master) is the 'stable' version of the openEO API specification. It is currently version **1.0.1** of the specification. The [draft branch](https://github.com/Open-EO/openeo-api/tree/draft) is where active development takes place.
9+
The [master branch](https://github.com/Open-EO/openeo-api/tree/master) is the 'stable' version of the openEO API specification. It is currently version **1.1.0** of the specification. The [draft branch](https://github.com/Open-EO/openeo-api/tree/draft) is where active development takes place.
1010

1111
| Version / Branch | Status | Description |
1212
| --------------------------------------------------------- | ----------- | ----------- |
1313
| [draft](https://api.openeo.org/draft) | planned | *Unstable* - Next version. |
14-
| [**1.0.1**](https://api.openeo.org) | **current** | Clarifications, bugfixes and CORS improvements. [Changelog](CHANGELOG.md#101---2020-12-07). |
14+
| [**1.1.0**](https://api.openeo.org) | **current** | Clarifications, STAC updates, return value for child processes, more details for logs and jobs, default clients for OIDC. [Changelog](CHANGELOG.md#110---2021-06-15). |
15+
| [1.0.1](https://api.openeo.org/1.0.1) | legacy | Clarifications, bugfixes and CORS improvements. [Changelog](CHANGELOG.md#101---2020-12-07). |
1516
| [1.0.0](https://api.openeo.org/1.0.0) | legacy | First stable version of openEO. [Changelog](CHANGELOG.md#100---2020-07-17). |
1617
| [1.0.0-rc.2](https://api.openeo.org/1.0.0-rc.2) | legacy | Introduced user-defined processes. [Changelog](CHANGELOG.md#100-rc2---2020-02-20). |
1718
| [1.0.0-rc.1](https://api.openeo.org/1.0.0-rc.1) | legacy | Better UDF support, support for file import, support for processing logs, better alignment with STAC and upcoming OGC APIs. Removes WebSocket-based Subscription API. [Changelog](CHANGELOG.md#100-rc1---2020-01-31) |

errors.json

+8
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,14 @@
290290
"Batch Jobs"
291291
]
292292
},
293+
"ResultLinkExpired": {
294+
"description": "The signed URLs for batch job results have expired. Please send a request to `GET /jobs/{job_id}/results` to refresh the links.",
295+
"message": "The link to the batch job result has expired. Please request the results again.",
296+
"http": 410,
297+
"tags": [
298+
"Batch Jobs"
299+
]
300+
},
293301
"PaymentRequired": {
294302
"description": "The budget required to fulfil the request is insufficient.",
295303
"message": "The budget required to fulfil the request is not sufficient. A payment is required first.",

0 commit comments

Comments
 (0)