Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding service information for the STAC catalog #373

Merged
merged 14 commits into from
Oct 2, 2023
Merged

Adding service information for the STAC catalog #373

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4c7652d
Adding service information for the STAC catalog
dchandan Aug 18, 2023
1a16b4b
Fixing json
dchandan Aug 18, 2023
85e3c60
Fixing json, attempt 2
dchandan Aug 18, 2023
04a1b44
JSON decode issues should be fixed now
dchandan Aug 18, 2023
e0fd388
Merge branch 'master'
dchandan Sep 11, 2023
d21cdd2
PR related changes
dchandan Sep 11, 2023
d774117
changing service-doc to a pinned version
dchandan Sep 14, 2023
2c16707
Merge branch 'master' into add-stac-service
mishaschwartz Sep 27, 2023
ad5b39e
update gitignore and put all info in single file
mishaschwartz Sep 27, 2023
92906a2
update tests
mishaschwartz Sep 27, 2023
75eae10
Merge branch 'master' into add-stac-service
mishaschwartz Oct 2, 2023
809aa2d
add alternate rel to stac and stac-browser
mishaschwartz Oct 2, 2023
bfc6e79
Merge branch 'master' into add-stac-service
dchandan Oct 2, 2023
58677d3
Bump version: 1.33.4 → 1.33.5
dchandan Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
## CHANGES

- Adding a description for the STAC service that will be served at the `/services` endpoint
dchandan marked this conversation as resolved.
Show resolved Hide resolved

[1.33.2](https://github.com/bird-house/birdhouse-deploy/tree/1.33.2) (2023-09-27)
------------------------------------------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions birdhouse/components/stac/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
config/magpie/config.yml
config/proxy/conf.extra-service.d/stac.conf
config/canarie-api/canarie_api_monitoring.py
service-config.json
44 changes: 44 additions & 0 deletions birdhouse/components/stac/service-config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
"name": "stac",
"keywords": [
"catalog"
],
"description": "Searchable spatiotemporal metadata describing climate and Earth observation datasets.",
"links": [
{
"rel": "service",
"type": "application/json",
"href": "https://${PAVICS_FQDN_PUBLIC}/stac/"
},
{
"rel": "service-doc",
"type": "text/html",
"href": "https://github.com/radiantearth/stac-api-spec/tree/v1.0.0"
},
{
"rel": "service-desc",
"type": "application/yaml",
"href": "https://raw.githubusercontent.com/radiantearth/stac-api-spec/main/core/openapi.yaml"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better actually to refer to a pinned version (release/tag).
https://github.com/radiantearth/stac-api-spec/tree/v1.0.0 should be good.
We should probably make this a configurable env-var with the corresponding app tag for the docker image.
Right now, crim-ca/stac-app:main is used as well:
https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/components/stac/docker-compose-extra.yml#L13

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree about the pinned version. I didn't quite understand your second comment..

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fmigneault can this be addressed in a different PR? It's a good point but probably should be addressed later when we actually start using a version other than crim-ca/stac-app:main

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I agree to move it to another PR while addressing the reference image.

}
]
}, {
"$schema": "https://raw.githubusercontent.com/DACCS-Climate/Marble-node-registry/main/node_registry.schema.json#service",
"name": "stac-browser",
"keywords": [
"catalog"
],
"description": "A web interface to browse the STAC catalogs.",
"links": [
{
"rel": "service",
"type": "text/html",
"href": "https://${PAVICS_FQDN_PUBLIC}/stac-browser/"
},
{
"rel": "service-doc",
"type": "text/html",
"href": "https://github.com/radiantearth/stac-browser"
}
]
}
Loading