Skip to content

Commit 99e7b73

Browse files
committed
Revert "support signed links to auxiliary files in batch job result STAC items"
This reverts commit 1109ec4. This added top-level (Collection) links to item-level links implicitly so not right conceptually. Support dedicated derived_from document only for "STAC 1.1 items" (implemented in #411). Open-EO/openeo-geopyspark-driver#1278
1 parent 8be1259 commit 99e7b73

File tree

4 files changed

+2
-25
lines changed

4 files changed

+2
-25
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ and start a new "In Progress" section above it.
2626
- `DiskWorkspace`: support unified asset keys ([Open-EO/openeo-geopyspark-driver#1111](https://github.com/Open-EO/openeo-geopyspark-driver/issues/1111))
2727
- Support persisting results metadata URI in job registry ([Open-EO/openeo-geopyspark-driver#1255](https://github.com/Open-EO/openeo-geopyspark-driver/issues/1255))
2828
- More fine-grained `convert_node` cache control ([Open-EO/openeo-geopyspark-driver#1331](https://github.com/Open-EO/openeo-geopyspark-driver/issues/1331)/[#422](https://github.com/Open-EO/openeo-python-driver/pull/422))
29-
- Support signed links to auxiliary files in batch job result STAC items ([Open-EO/openeo-geopyspark-driver#1278](https://github.com/Open-EO/openeo-geopyspark-driver/issues/1278))
3029

3130

3231
## 0.134.0

openeo_driver/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.135.0a8"
1+
__version__ = "0.135.0a7"

openeo_driver/views.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,13 +1382,6 @@ def _get_job_result_item(job_id, item_id, user_id):
13821382

13831383
job_info = backend_implementation.batch_jobs.get_job_info(job_id, user_id)
13841384

1385-
exposable_links = [link for link in (job_info.links or []) if link.get("_expose_internal", False)]
1386-
for link in exposable_links:
1387-
link.pop("_expose_internal")
1388-
link["href"] = backend_implementation.config.asset_url.build_url( # TODO: not an asset
1389-
asset_metadata={}, asset_name=pathlib.Path(link["href"]).name, job_id=job_id, user_id=user_id # TODO: assumes href is an absolute file path; prepare for S3 URI and put it in asset_metadata's href?
1390-
)
1391-
13921385
geometry = asset_metadata.get("geometry", job_info.geometry)
13931386
bbox = asset_metadata.get("bbox", job_info.bbox)
13941387

@@ -1445,8 +1438,7 @@ def _get_job_result_item(job_id, item_id, user_id):
14451438
"href": url_for(".list_job_results", job_id=job_id, _external=True), # SHOULD be absolute
14461439
"type": "application/json",
14471440
},
1448-
]
1449-
+ exposable_links,
1441+
],
14501442
"assets": {asset_filename: _asset_object(job_id, user_id, asset_filename, asset_metadata, job_info)},
14511443
"collection": job_id,
14521444
}

tests/test_views.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,14 +1336,6 @@ def _fresh_job_registry(next_job_id="job-1234", output_root: Optional[Path] = No
13361336
end_datetime=datetime(1981, 4, 24, 3, 0, 0),
13371337
instruments=["MSI"],
13381338
epsg=4326,
1339-
links=[
1340-
{
1341-
"rel": "custom",
1342-
"href": "53c71345-09b4-46b4-b6b0-03fd6fe1f199_input_items.json",
1343-
"type": "application/json",
1344-
"_expose_internal": True,
1345-
}
1346-
],
13471339
plan="some_plan",
13481340
costs=1.23,
13491341
budget=4.56,
@@ -3120,12 +3112,6 @@ def test_get_job_result_item(self, flask_app, api110, backend_config_overrides):
31203112
"href": "http://oeo.net/openeo/1.1.0/jobs/53c71345-09b4-46b4-b6b0-03fd6fe1f199/results",
31213113
"type": "application/json",
31223114
},
3123-
{
3124-
"rel": "custom",
3125-
# TODO: what does the URL look like? Currently /aux instead of /assets; should /items be in there?
3126-
"href": "http://oeo.net/openeo/1.1.0/jobs/53c71345-09b4-46b4-b6b0-03fd6fe1f199/results/aux/TXIuVGVzdA==/e8ad3022a08bbc5c123597c1f948f6d4/53c71345-09b4-46b4-b6b0-03fd6fe1f199_input_items.json?expires=2234",
3127-
"type": "application/json",
3128-
},
31293115
],
31303116
"assets": {
31313117
"output.tiff": {

0 commit comments

Comments
 (0)