@elastic/ems-client 8.5.0 → 8.5.1

package/.buildkite/pipeline.yml

@@ -1,5 +1,7 @@
 agents:
-  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node18:0.1"
+  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node20:0.1"
+  cpu: "2"
+  memory: "2G"
 
 steps:
   - label: ":hammer_and_wrench: Test and build"

package/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# OpenAPI spec files
+/docs/openapi          @elastic/platform-docs

package/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

package/CHANGELOG.md

@@ -3,7 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [8.5.0] - TBD
+## [8.5.1] - 2023-11-09
+
+### Added
+- Add a new `getEmsVersion` method #204
+- Include OpenAPI specification #196 #197
+
+### Changed
+- Update release documentation #194
+- Update dependencies #198 #205
+- Update resources for Buildkite build # 199
+- Migration to Node 20 #208
+
+## [8.5.0] - 2023-08-23
 
 - Migration from Jenkins to Buildkite for automatic testing #145 #147
 - Detached the releases of EMS Client from the services consumed #185
@@ -28,7 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [8.3.1] - 2022-05-06
 
- - Added static methods to help translating basemap labels and blending colors to paint properties #105
+- Added static methods to help translating basemap labels and blending colors to paint properties #105
 - Add optional `format` argument to `getMinZoom` and `getMaxZoom` #90
 
 ## [8.3.0] - 2022-04-18

package/CONTRIBUTING.md

@@ -2,16 +2,15 @@
 
 ## Releasing
 
-Releases for @elastic/ems-client must match the corresponding minor version of Elastic Maps Service (EMS). Patch releases (e.g. v7.2.1) can be created for bug fixes.
+> ℹ️ Before 8.5.0, releases for @elastic/ems-client must match the corresponding minor version of Elastic Maps Service (EMS). Patch releases (e.g. v7.2.1) can be created for bug fixes. **8.5.0** is the first release decoupled of the rest of the Elastic Stack given the stability of the EMS services, and will only do new releases when necessary.
 
 > ℹ️ Elastic Maps Service may not have minor releases. For example, there are no v7.1 or v7.3 releases for EMS. So @elastic/ems-client may also skip minor releases.
 
 
 If you have access to make releases, the process is as follows:
 
-1. Be sure you have checked out the `master` branch and have pulled latest changes
-1. Update the version in `package.json` according to the corresponding minor version of Elastic Maps Service.
-1. If necessary, update the `DEFAULT_EMS_VERSION` constant in `ems_client.js`.
+1. Be sure you have checked out the `master` or released branch and have pulled latest changes
+1. Update the version in `package.json` accordingly.
 1. Update the CHANGELOG.md
 1. Commit changes with message "bump to x.y.z" where x.y.z is the version in package.json
 1. Tag the commit with `git tag vx.y.x`, for example `git tag v7.2.1`
@@ -19,7 +18,7 @@ If you have access to make releases, the process is as follows:
 1. Update the latest major branch on upstream with `git push upstream <major_branch>`
 1. Build the targets with `yarn build`
 1. Publish to npm with `npm publish --access public`
-
+1. If necessary, push the new branch upstream and create/archive Snyk targets
 
 ## Continuous Integration
 

package/docs/openapi/Makefile

@@ -0,0 +1,35 @@
+.DEFAULT_GOAL=help
+
+.PHONY: help
+help:  ## Show this help message
+	@awk 'BEGIN {FS = ":.*##"; printf "Usage: make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-20s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
+
+.PHONY: clean
+clean: ## remove generated spec files
+	find . -name "bundled.*" -delete
+
+.PHONY: validate
+validate: ## Validate the specs
+	@npx swagger-cli validate "ems_file_service/entrypoint.yaml"
+	@npx swagger-cli validate "ems_tile_service/entrypoint.yaml"
+
+.PHONY: dev-validate
+dev-validate: ## Listen for changes on specs and validate
+	ls ems_file_service/entrypoint.yaml  ems_tile_service/entrypoint.yaml \
+  | entr -c make validate
+
+.PHONY: bundle
+bundle:
+	for e in ems_file_service ems_tile_service; do \
+    for f in yaml json; do \
+      npx @redocly/cli bundle \
+        --output "$${e}/bundled.$${f}" \
+        --ext "$${f}" "$${e}/entrypoint.yaml";\
+    done; \
+  done;
+	$(MAKE) lint
+
+.PHONY: lint
+lint: ## lint bundled.json
+	@npx @redocly/cli lint ems_file_service/bundled.json
+	@npx @redocly/cli lint ems_tile_service/bundled.json

package/docs/openapi/README.md

@@ -0,0 +1,41 @@
+# OpenAPI (Experimental)
+
+Spec files for Elastic Map Service manifests can be used for online tools like those found at https://openapi.tools/. 
+
+* **EMS Tile Service** as [JSON](https://raw.githubusercontent.com/elastic/ems-client/master/docs/openapi/ems_tile_service/bundled.json) or [YAML](https://raw.githubusercontent.com/elastic/ems-client/master/docs/openapi/ems_tile_service/bundled.yaml)
+* **EMS File Service** as [JSON](https://raw.githubusercontent.com/elastic/ems-client/master/docs/openapi/ems_file_service/bundled.json) or [YAML](https://raw.githubusercontent.com/elastic/ems-client/master/docs/openapi/ems_file_service/bundled.yaml)
+
+
+A guide about the openApi specification can be found at [https://swagger.io/docs/specification/about/](https://swagger.io/docs/specification/about/).
+
+## Tools
+
+You can use the `Makefile` script with the `validate`, `bundle`, and `clean` targets.
+
+Alternatively, you can run this validate the docs before bundling them with the following command in the `docs/openapi/` folder:
+
+  ```bash
+for e in ems_file_service ems_tile_service; do
+  npx swagger-cli validate "${e}/entrypoint.yaml"; 
+done
+  ```
+
+Then you can generate the `bundled` files by running the following commands:
+
+  ```bash
+for e in ems_file_service ems_tile_service; do
+  for f in yaml json; do
+    npx @redocly/cli bundle \
+      --output "${e}/bundled.${f}" \
+      --ext "${f}" "${e}/entrypoint.yaml"
+  done
+done
+  ```
+
+You can run additional linting with the following command:
+
+```bash
+for e in ems_file_service ems_tile_service; do
+  npx @redocly/cli lint "${e}/bundled.json"; 
+done
+```

package/docs/openapi/components/attribution.yaml

@@ -0,0 +1,19 @@
+type: array
+description: The attribution of this data
+minItems: 1
+items:
+  type: object
+  properties:
+    label:
+      type: object
+      properties:
+        en:
+          type: string
+          description: English attribution label
+    url:
+      type: object
+      properties:
+        en:
+          type: string
+          description: Attribution details URL
+          format: URL

package/docs/openapi/components/examples/file_service_200.json

@@ -0,0 +1 @@
+{ "version": "2023-10-31", "layers": [ { "layer_id": "world_countries", "created_at": "2020-10-28T16:16:08.720286", "attribution": [ { "label": { "en": "Made with NaturalEarth" }, "url": { "en": "http://www.naturalearthdata.com/about/terms-of-use" } }, { "label": { "en": "OpenStreetMap contributors" }, "url": { "en": "https://www.openstreetmap.org/copyright" } }, { "label": { "en": "Elastic Maps Service" }, "url": { "en": "https://www.elastic.co/elastic-maps-service" } } ], "formats": [ { "type": "topojson", "url": "/files/world_countries_v7.topo.json", "legacy_default": true, "meta": { "feature_collection_path": "data" } }, { "type": "geojson", "url": "/files/world_countries_v7.geo.json", "legacy_default": false } ], "fields": [ { "type": "id", "id": "iso2", "label": { "en": "ISO 3166-1 alpha-2 code", "af": "landkode (ISO 3166-1 alpha-2)", "ar": "أيزو 3166-1 حرفي-2" }, "regex": "^[A-Z]{2}$", "alias": ["(geo\\.){0,}country_iso_code$", "(country|countries)"], "values": ["AD", "AE", "ZW"] }, { "type": "id", "id": "iso3", "label": { "en": "ISO 3166-1 alpha-3 code", "af": "landkode (ISO 3166-1 alpha-3)", "ar": "أيزو 3166-1 حرفي-3" }, "regex": "^[A-Z]{3}$", "values": ["AND", "ARE", "ZWE"] }, { "type": "id", "id": "iso_numeric", "label": { "en": "ISO 3166-1 numeric code", "af": "landkode (ISO 3166-1 numeries)", "ar": "رمز إيزو الرقمي 3166-1" } }, { "type": "property", "id": "name", "label": { "en": "name", "am": "ስም" }, "alias": ["(country|countries)"] } ], "legacy_ids": ["World Countries"], "layer_name": { "en": "World Countries", "zh-tw": "國家" } }, { "layer_id": "administrative_regions_lvl2", "created_at": "2020-07-06T22:19:49.290894", "attribution": [ { "label": { "en": "Made with NaturalEarth" }, "url": { "en": "http://www.naturalearthdata.com/about/terms-of-use" } }, { "label": { "en": "OpenStreetMap contributors" }, "url": { "en": "https://www.openstreetmap.org/copyright" } }, { "label": { "en": "Elastic Maps Service" }, "url": { "en": "https://www.elastic.co/elastic-maps-service" } } ], "formats": [ { "type": "topojson", "url": "/files/admin_regions_lvl2_v2.topo.json", "legacy_default": true, "meta": { "feature_collection_path": "data" } }, { "type": "geojson", "url": "/files/admin_regions_lvl2_v2.geo.json", "legacy_default": false } ], "fields": [ { "type": "id", "id": "region_iso_code", "label": { "en": "Region ISO code" }, "regex": "^[A-Z]{2}-[A-Z0-9]{1,3}~?$", "alias": ["(geo\\.){0,}region_iso_code"], "values": ["AD-02", "AD-03", "AD-04"] }, { "type": "property", "id": "region_name", "label": { "en": "Region name" } }, { "type": "property", "id": "country_iso2_code", "label": { "en": "Country ISO2 code" } }, { "type": "property", "id": "country_iso3_code", "label": { "en": "Country ISO3 code" } }, { "type": "property", "id": "country_name", "label": { "en": "Country name" } } ], "legacy_ids": ["Administrative regions"], "layer_name": { "en": "Administrative regions", "zh-sg": "行政领土实体", "zh-tw": "行政領土實體" } }, { "layer_id": "albania_counties", "created_at": "2019-08-06T22:16:16.377Z", "attribution": [ { "label": { "en": "OpenStreetMap contributors" }, "url": { "en": "https://www.openstreetmap.org/copyright" } }, { "label": { "en": "Elastic Maps Service" }, "url": { "en": "https://www.elastic.co/elastic-maps-service" } } ], "formats": [ { "type": "geojson", "url": "/files/albania_counties_v1.geo.json", "legacy_default": true } ], "fields": [ { "type": "id", "id": "iso_3166_2", "label": { "en": "ISO 3166-2 code", "af": "ISO 3166-2", "ar": "أيزو 3166-2" }, "values": ["AL-05", "AL-01", "AL-12"] }, { "type": "property", "id": "label_en", "label": { "en": "name (en)", "am": "ስም (en)", "ar": "الاسم (en)" } }, { "type": "property", "id": "label_sq", "label": { "en": "name (sq)", "am": "ስም (sq)", "ar": "الاسم (sq)" } } ], "legacy_ids": ["Albania Counties"], "layer_name": { "en": "Albania Counties", "zh-sg": "阿尔巴尼亚行政区划", "zh-tw": "阿爾巴尼亞行政區劃" } } ] }

package/docs/openapi/components/examples/file_service_404.xml

@@ -0,0 +1 @@
+<?xml version='1.0' encoding='UTF-8'?><Error><Code>NoSuchKey</Code><Message>The specified key does not exist.</Message></Error>

package/docs/openapi/components/examples/tile_service_200.json

@@ -0,0 +1 @@
+{"version": "2023-10-31", "services": [{"id": "road_map", "name": {"en": "Classic"}, "attribution": [{"label": {"en": "OpenStreetMap contributors"}, "url": {"en": "https://www.openstreetmap.org/copyright"}}, {"label": {"en": "OpenMapTiles"}, "url": {"en": "https://openmaptiles.org"}}, {"label": {"en": "Elastic Maps Service"}, "url": {"en": "https://www.elastic.co/elastic-maps-service"}}], "formats": [{"locale": "en", "format": "vector", "url": "/2023-10-31/styles/osm-bright/style.json"}, {"locale": "en", "format": "raster", "url": "/2023-10-31/styles/osm-bright.json"}]}, {"id": "road_map_desaturated", "name": {"en": "Light"}, "attribution": [{"label": {"en": "OpenStreetMap contributors"}, "url": {"en": "https://www.openstreetmap.org/copyright"}}, {"label": {"en": "OpenMapTiles"}, "url": {"en": "https://openmaptiles.org"}}, {"label": {"en": "Elastic Maps Service"}, "url": {"en": "https://www.elastic.co/elastic-maps-service"}}], "formats": [{"locale": "en", "format": "vector", "url": "/2023-10-31/styles/osm-bright-desaturated/style.json"}, {"locale": "en", "format": "raster", "url": "/2023-10-31/styles/osm-bright-desaturated.json"}]}, {"id": "dark_map", "name": {"en": "Dark"}, "attribution": [{"label": {"en": "OpenStreetMap contributors"}, "url": {"en": "https://www.openstreetmap.org/copyright"}}, {"label": {"en": "OpenMapTiles"}, "url": {"en": "https://openmaptiles.org"}}, {"label": {"en": "Elastic Maps Service"}, "url": {"en": "https://www.elastic.co/elastic-maps-service"}}], "formats": [{"locale": "en", "format": "vector", "url": "/2023-10-31/styles/dark-matter/style.json"}, {"locale": "en", "format": "raster", "url": "/2023-10-31/styles/dark-matter.json"}]}]}

package/docs/openapi/components/examples/tile_service_404.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Error</title>
+</head>
+<body>
+<pre>Cannot GET /snthstn</pre>
+</body>
+</html>