diff --git a/CHANGELOG.md b/CHANGELOG.md index ac02b4da..d4b375c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Upgraded stac-fastapi and pgstac versions to bring support for CQL2-JSON filter support [#20](https://github.com/microsoft/planetary-computer-apis/pull/20) - Organized and updated documentation markdown docs [#11](https://github.com/microsoft/planetary-computer-apis/pull/11) +- Allow SAS URL variable to be passed to PC SDK in tiler service [#33](https://github.com/microsoft/planetary-computer-apis/pull/33) ### Added - Errors are logged using exceptions and including request metadata [#14](https://github.com/microsoft/planetary-computer-apis/pull/14) ### Fixed - Updated search limit constraints to avoid 500s [#15](https://github.com/microsoft/planetary-computer-apis/pull/15) +- Fixed STAC `describedby` and `preview` links [#33](https://github.com/microsoft/planetary-computer-apis/pull/33) diff --git a/deployment/helm/deploy-values.template.yaml b/deployment/helm/deploy-values.template.yaml index 6e22f82e..ac50ba70 100644 --- a/deployment/helm/deploy-values.template.yaml +++ b/deployment/helm/deploy-values.template.yaml @@ -49,6 +49,7 @@ tiler: stac_api_url: http://planetary-computer-stac.pc.svc.cluster.local stac_api_href: https://{{ tf.dns_label }}.westeurope.cloudapp.azure.com/stac/ + pc_sdk_sas_url: https://{{ tf.dns_label }}.westeurope.cloudapp.azure.com/sas/ metrics: instrumentationKey: "{{ tf.instrumentation_key }}" diff --git a/deployment/helm/published/planetary-computer-tiler/templates/deployment.yaml b/deployment/helm/published/planetary-computer-tiler/templates/deployment.yaml index bf6d003b..eabe1587 100644 --- a/deployment/helm/published/planetary-computer-tiler/templates/deployment.yaml +++ b/deployment/helm/published/planetary-computer-tiler/templates/deployment.yaml @@ -77,6 +77,8 @@ spec: value: "{{ .Values.tiler.stac_api_url}}" - name: STAC_API_HREF value: "{{ .Values.tiler.stac_api_href}}" + - name: PC_SDK_SAS_URL + value: "{{ .Values.tiler.pc_sdk_sas_url}}" - name: APP_INSIGHTS_INSTRUMENTATION_KEY value: "{{ .Values.metrics.instrumentationKey }}" diff --git a/deployment/helm/published/planetary-computer-tiler/values.yaml b/deployment/helm/published/planetary-computer-tiler/values.yaml index 7f3131ae..a61c7ff1 100644 --- a/deployment/helm/published/planetary-computer-tiler/values.yaml +++ b/deployment/helm/published/planetary-computer-tiler/values.yaml @@ -35,6 +35,7 @@ tiler: stac_api_url: "" stac_api_href: "" + pc_sdk_sas_url: "" host: "0.0.0.0" port: "80" diff --git a/docker-compose.yml b/docker-compose.yml index 43920943..2331c236 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: - FF_VRT="yes" - STAC_API_URL=http://stac:8081 - STAC_API_HREF=http://localhost:8080/stac/ - - PC_SDK_SAS_URL=https://planetarycomputer.microsoft.com/api/sas/v1/token + - PC_SDK_SAS_URL=https://planetarycomputer-staging.microsoft.com/api/sas/v1/token # titiler.pgstac - POSTGRES_USER=username diff --git a/pcstac/pcstac/client.py b/pcstac/pcstac/client.py index 34ec486a..60c0e0c2 100644 --- a/pcstac/pcstac/client.py +++ b/pcstac/pcstac/client.py @@ -54,7 +54,7 @@ def inject_collection_links(self, collection: Collection) -> Collection: { "rel": "describedby", "href": urljoin( - "https://planetarycomputer.microsoft.com/dataset", + "https://planetarycomputer.microsoft.com/dataset/", collection["id"], ), "title": "Human readable dataset overview and reference", @@ -113,14 +113,6 @@ async def get_collection( Returns: Collection. """ - logger.info( - "Single collection requested", - extra={ - "custom_dimensions": { - "container": collection_id, - } - }, - ) try: render_config = COLLECTION_RENDER_CONFIG.get(collection_id) diff --git a/pctiler/pctiler/endpoints/item.py b/pctiler/pctiler/endpoints/item.py index edd4cb52..a6b382f3 100644 --- a/pctiler/pctiler/endpoints/item.py +++ b/pctiler/pctiler/endpoints/item.py @@ -54,7 +54,7 @@ def map( tilejson_params = get_param_str( { "collection": collection, - "items": item, + "item": item, "assets": ",".join(render_config.assets), } )