From 1d84ae61e2fd91501b59b363758b28eea86d1b50 Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Wed, 4 Oct 2023 15:06:06 +0200 Subject: [PATCH 1/6] Use LTC v1.17.0 --- .env.demo | 2 +- .env.dev | 2 +- .env.test | 2 +- CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.demo b/.env.demo index b31e13f81..024677e44 100644 --- a/.env.demo +++ b/.env.demo @@ -64,7 +64,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://localhost/client/ -LAYMAN_CLIENT_VERSION=2e7447d701c6246cd7f624510146ad6c32a9b426 +LAYMAN_CLIENT_VERSION=v1.17.0 # extra hosts to be added to /etc/hosts EXTRA_HOST1=1.2.3.4:1.2.3.4 diff --git a/.env.dev b/.env.dev index 0910fb774..9fcf08d84 100644 --- a/.env.dev +++ b/.env.dev @@ -64,7 +64,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://localhost:3000/client/ -LAYMAN_CLIENT_VERSION=2e7447d701c6246cd7f624510146ad6c32a9b426 +LAYMAN_CLIENT_VERSION=v1.17.0 ############################################################################## diff --git a/.env.test b/.env.test index 248eecbfc..ba8040104 100644 --- a/.env.test +++ b/.env.test @@ -64,7 +64,7 @@ LAYMAN_CLIENT_URL=http://layman_client_test:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://layman_test_run_1:8000/client/ -LAYMAN_CLIENT_VERSION=2e7447d701c6246cd7f624510146ad6c32a9b426 +LAYMAN_CLIENT_VERSION=v1.17.0 ############################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index ab7d895e2..b731cbe73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Upgrade requirements - Change environment variable [LAYMAN_CLIENT_VERSION](doc/env-settings.md#LAYMAN_CLIENT_VERSION): ``` - LAYMAN_CLIENT_VERSION=2e7447d701c6246cd7f624510146ad6c32a9b426 + LAYMAN_CLIENT_VERSION=v1.17.0 ``` - Stop using environment variable `LAYMAN_GS_PROXY_BASE_URL`, it has no effect to Layman anymore. - GeoServer's [Proxy Base URL](https://docs.geoserver.org/2.21.x/en/user/configuration/globalsettings.html) is now automatically set by Layman on each start. Value is automatically derived from environment variables [`LAYMAN_CLIENT_PUBLIC_URL`](doc/env-settings.md#layman_client_public_url) (protocol) and [`LAYMAN_PROXY_SERVER_NAME`](doc/env-settings.md#layman_proxy_server_name) (domain and port). URL path is always `/geoserver/`. From d6347be7bc4f05806a48be28f217b7632765c3a1 Mon Sep 17 00:00:00 2001 From: index-git Date: Wed, 4 Oct 2023 15:46:10 +0200 Subject: [PATCH 2/6] Fix link url --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b731cbe73..91576602f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ - requests to [WMS](doc/endpoints.md#web-map-service) and [WFS](doc/endpoints.md#web-feature-service) endpoints - [#868](https://github.com/LayerManager/layman/issues/868) Responses to [GET Workspace Layer Metadata Comparison](doc/rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](doc/rest.md#get-workspace-map-metadata-comparison) do not respect [HTTP X-Forwarded headers](doc/client-proxy.md#x-forwarded-http-headers) of the request intentionally, in order to keep URLs in canonical form. - [#868](https://github.com/LayerManager/layman/issues/868) Relations between map and [internal layers](doc/models.md#internal-map-layer) are updated in `map_layer` table when calling [POST Workspace Maps](doc/rest.md#post-workspace-maps), [PATCH Workspace Map](doc/rest.md#patch-workspace-map), [DELETE Workspace Map](doc/rest.md#delete-workspace-map), and [DELETE Workspace Maps](doc/rest.md#delete-workspace-maps). -- [#901](https://github.com/LayerManager/layman/issues/868) Endpoints [POST](doc/rest.md#post-workspace-maps) and [PATCH](doc/rest.md#patch-workspace-map) accept map compositions in version `3.x.x`. +- [#901](https://github.com/LayerManager/layman/issues/901) Endpoints [POST](doc/rest.md#post-workspace-maps) and [PATCH](doc/rest.md#patch-workspace-map) accept map compositions in version `3.x.x`. - [#927](https://github.com/LayerManager/layman/issues/927) Send styles to GeoServer with [`raw`](https://docs.geoserver.org/2.21.x/en/user/rest/api/styles.html#raw) param set to `True`. - [#880](https://github.com/LayerManager/layman/issues/880) Use Docker Compose v2 (`docker compose`) in Makefile without `compatibility` flag and remove `Makefile_docker-compose_v1` file. Docker containers are named according to Docker Compose v2 and may have different name after upgrade. - [#765](https://github.com/LayerManager/layman/issues/765) Stop saving OAuth2 claims in filesystem, use prime DB schema only. From 0ea5216ce068d0d841ccddda8043221f0be6ef23 Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Thu, 5 Oct 2023 13:56:05 +0200 Subject: [PATCH 3/6] Revise CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91576602f..72df6fe27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ - [#868](https://github.com/LayerManager/layman/issues/868) Responses to [GET Workspace Layer Metadata Comparison](doc/rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](doc/rest.md#get-workspace-map-metadata-comparison) do not respect [HTTP X-Forwarded headers](doc/client-proxy.md#x-forwarded-http-headers) of the request intentionally, in order to keep URLs in canonical form. - [#868](https://github.com/LayerManager/layman/issues/868) Relations between map and [internal layers](doc/models.md#internal-map-layer) are updated in `map_layer` table when calling [POST Workspace Maps](doc/rest.md#post-workspace-maps), [PATCH Workspace Map](doc/rest.md#patch-workspace-map), [DELETE Workspace Map](doc/rest.md#delete-workspace-map), and [DELETE Workspace Maps](doc/rest.md#delete-workspace-maps). - [#901](https://github.com/LayerManager/layman/issues/901) Endpoints [POST](doc/rest.md#post-workspace-maps) and [PATCH](doc/rest.md#patch-workspace-map) accept map compositions in version `3.x.x`. -- [#927](https://github.com/LayerManager/layman/issues/927) Send styles to GeoServer with [`raw`](https://docs.geoserver.org/2.21.x/en/user/rest/api/styles.html#raw) param set to `True`. +- [#927](https://github.com/LayerManager/layman/issues/927) SLD styles are internally published to GeoServer with [`raw`](https://docs.geoserver.org/2.21.x/en/user/rest/api/styles.html#raw) parameter set to `True`. - [#880](https://github.com/LayerManager/layman/issues/880) Use Docker Compose v2 (`docker compose`) in Makefile without `compatibility` flag and remove `Makefile_docker-compose_v1` file. Docker containers are named according to Docker Compose v2 and may have different name after upgrade. - [#765](https://github.com/LayerManager/layman/issues/765) Stop saving OAuth2 claims in filesystem, use prime DB schema only. - [#893](https://github.com/LayerManager/layman/issues/893) It is possible to specify logging level by new environment variable [LAYMAN_LOGLEVEL](doc/env-settings.md#LAYMAN_LOGLEVEL). Default level is `INFO`. From f32d4c53682498c49b4b661840edb95bfa4dd56b Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Thu, 5 Oct 2023 14:03:39 +0200 Subject: [PATCH 4/6] Explain why X-Forwarded headers do not affect GET Metadata Comparison responses --- doc/client-proxy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/client-proxy.md b/doc/client-proxy.md index 17584fbff..d6a74d831 100644 --- a/doc/client-proxy.md +++ b/doc/client-proxy.md @@ -110,4 +110,4 @@ Currently, value of X-Forwarded headers affects following URLs: * [WFS endpoints](endpoints.md#web-feature-service) * all operations URLs -Values of X-Forwarded headers does not affect response values of [GET Workspace Layer Metadata Comparison](rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison). +Values of X-Forwarded headers does not affect responses of [GET Workspace Layer Metadata Comparison](rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison) intentionally, in order to keep URLs in canonical form. \ No newline at end of file From 78f9f959240aee9aead30d9cfbcc8f783158b89b Mon Sep 17 00:00:00 2001 From: index-git Date: Thu, 5 Oct 2023 14:13:22 +0200 Subject: [PATCH 5/6] Join REST endpoint documentation in client-proxy.md --- doc/client-proxy.md | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/doc/client-proxy.md b/doc/client-proxy.md index d6a74d831..6ecb85f78 100644 --- a/doc/client-proxy.md +++ b/doc/client-proxy.md @@ -49,24 +49,18 @@ then response will change to ``` Currently, value of X-Forwarded headers affects following URLs: -* [GET Publications](rest.md#get-publications) +* [GET Publications](rest.md#get-publications), [GET Layers](rest.md#get-layers), [GET Maps](rest.md#get-maps), [GET Workspace Layers](rest.md#get-workspace-layers) and [GET Workspace Maps](rest.md#get-workspace-maps) * `url` key -* [GET Layers](rest.md#get-layers) +* [POST Workspace Layers](rest.md#post-workspace-layers) and [POST Workspace Maps](rest.md#post-workspace-maps) * `url` key -* [GET Workspace Layers](rest.md#get-workspace-layers) - * `url` key -* [GET Maps](rest.md#get-maps) - * `url` key -* [GET Workspace Maps](rest.md#get-workspace-maps) - * `url` key -* [GET Workspace Layer](rest.md#get-workspace-layer) +* [GET Workspace Layer](rest.md#get-workspace-layer) and [PATCH Workspace Layer](rest.md#patch-workspace-layer) * `url` key * `wms`.`url` key * `wfs`.`url` key * `style`.`url` key * `thumbnail`.`url` key * `metadata`.`comparison_url` key -* [GET Workspace Map](rest.md#get-workspace-map) +* [GET Workspace Map](rest.md#get-workspace-map) and [PATCH Workspace Map](rest.md#patch-workspace-map) * `url` key * `file`.`url` key * `thumbnail`.`url` key @@ -78,30 +72,8 @@ Currently, value of X-Forwarded headers affects following URLs: * each `legends` key if its HTTP protocol and netloc corresponds with `url` or `protocol`.`url` * `style` key if its HTTP protocol and netloc corresponds with `url` or `protocol`.`url` * NOTE: If client proxy protocol, host, or URL path prefix was used in URLs in uploaded file, then such values are also replaced with values according to X-Forwarded header values. Default values are used for requests without X-Forwarded headers (protocol is the one from [LAYMAN_CLIENT_PUBLIC_URL](env-settings.md#layman_client_public_url), host is [LAYMAN_PROXY_SERVER_NAME](env-settings.md#layman_proxy_server_name), and path prefix is empty string). -* [POST Workspace Layers](rest.md#post-workspace-layers) - * `url` key -* [DELETE Workspace Layer](rest.md#delete-workspace-layer) - * `url` key -* [DELETE Workspace Layers](rest.md#delete-workspace-layers) - * `url` key -* [DELETE Workspace Map](rest.md#delete-workspace-map) - * `url` key -* [DELETE Workspace Maps](rest.md#delete-workspace-maps) - * `url` key -* [POST Workspace Maps](rest.md#post-workspace-maps) - * `url` key -* [PATCH Workspace Layer](rest.md#patch-workspace-layer) +* [DELETE Workspace Layers](rest.md#delete-workspace-layers), [DELETE Workspace Maps](rest.md#delete-workspace-maps), [DELETE Workspace Layer](rest.md#delete-workspace-layer) and [DELETE Workspace Map](rest.md#delete-workspace-map) * `url` key - * `wms`.`url` key - * `wfs`.`url` key - * `style`.`url` key - * `thumbnail`.`url` key - * `metadata`.`comparison_url` key -* [PATCH Workspace Map](rest.md#patch-workspace-map) - * `url` key - * `file`.`url` key - * `thumbnail`.`url` key - * `metadata`.`comparison_url` key * [OGC endpoints](endpoints.md) * Headers `X-Forwarded-For`, `X-Forwarded-Path`, `Forwarded` and `Host` are ignored * [WMS endpoints](endpoints.md#web-map-service) @@ -110,4 +82,4 @@ Currently, value of X-Forwarded headers affects following URLs: * [WFS endpoints](endpoints.md#web-feature-service) * all operations URLs -Values of X-Forwarded headers does not affect responses of [GET Workspace Layer Metadata Comparison](rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison) intentionally, in order to keep URLs in canonical form. \ No newline at end of file +Values of X-Forwarded headers does not affect responses of [GET Workspace Layer Metadata Comparison](rest.md#get-workspace-layer-metadata-comparison) and [GET Workspace Map Metadata Comparison](rest.md#get-workspace-map-metadata-comparison) intentionally, in order to keep URLs in canonical form. From 381c4be0a6b5fc400a98bda3380de3f99a65a9e5 Mon Sep 17 00:00:00 2001 From: index-git Date: Thu, 5 Oct 2023 14:18:14 +0200 Subject: [PATCH 6/6] Release 1.22.0 --- CHANGELOG.md | 2 +- version.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72df6fe27..2a5015018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## v1.22.0 - {release-date} + 2023-10-05 ### Upgrade requirements - Change environment variable [LAYMAN_CLIENT_VERSION](doc/env-settings.md#LAYMAN_CLIENT_VERSION): ``` diff --git a/version.txt b/version.txt index 7b11c54a8..ae17555ca 100644 --- a/version.txt +++ b/version.txt @@ -1,2 +1,2 @@ -v1.22.0-dev -2023-07-06T15:00:01Z +v1.22.0 +2023-10-05T14:00:00Z