@elastic/ems-client 8.3.3 → 8.5.0

package/target/web/utils.js

@@ -1,13 +1,12 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import chroma from 'chroma-js';
 
+import chroma from 'chroma-js';
 /**
  * Resolves a target URL path relative to the host.
  * This is specifically useed by the Kibana proxy re-routing.
@@ -17,10 +16,8 @@ export function toAbsoluteUrl(host, path) {
   if (!host) {
     return path;
   }
-
   var hostEndWithSlash = host[host.length - 1] === '/';
   var pathStartsWithSlash = path[0] === '/';
-
   if (hostEndWithSlash === true && pathStartsWithSlash === true) {
     return host + path.slice(1);
   } else if (hostEndWithSlash !== pathStartsWithSlash) {
@@ -29,10 +26,16 @@ export function toAbsoluteUrl(host, path) {
     return host + '/' + path;
   }
 }
+
 /*
 Type with the possible ways to define a color in maplibre
 */
 
+/*
+A selection of the different maplibre-gl-js properties that refer to a color.
+Taken from maplibre https://github.com/maplibre/maplibre-gl-js/blob/main/src/style-spec/types.g.ts
+*/
+
 /*
 Function to transform a maplibre color definition by a given function.
 */
@@ -51,16 +54,16 @@ function transformColor(paintColor, func) {
     return newPaintColor;
   } else return paintColor;
 }
+
 /*
 This is the function used to generate the current EMS desaturated roadmap
 */
-
-
 export function desaturateColor(paintColor) {
   return transformColor(paintColor, function (color) {
     return chroma(color).desaturate(1.1).brighten(0.33);
   });
 }
+
 /*
 Blends an original maplibre color definition with a destination
 color. Accepts different blending modes and an additional `mix`
@@ -71,7 +74,6 @@ More details:
 https://gka.github.io/chroma.js/#chroma-blend
 https://gka.github.io/chroma.js/#chroma-mix
 */
-
 export function colorizeColor(sourceColor, destColor) {
   var operation = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'screen';
   var percentage = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0.5;

package/test/ems_client.test.ts

@@ -7,6 +7,7 @@
 
 import { getEMSClient } from './ems_client_util';
 import { FileLayer } from '../src/file_layer';
+import { LATEST_API_URL_PATH } from '../src/ems_client';
 
 it('should get api manifests', async () => {
   const { emsClient, getManifestMock } = getEMSClient({
@@ -466,3 +467,35 @@ it('should retrieve vectorstylesheet with all sources inlined) (proxy)', async (
   );
   expect(styleSheet!.sources!.openmaptiles!.type).toBe('vector');
 });
+
+it('should use LATEST_API_URL_PATH for date based versions (serverless)', async () => {
+  const version = '2023-01-01';
+  const { emsClient } = getEMSClient({
+    appVersion: version,
+    emsVersion: version,
+  });
+
+  const { services } = await emsClient.getMainManifest();
+
+  expect(services.length).toBeGreaterThan(0);
+
+  ['tms', 'file'].map((type) => {
+    const service = services.find((s) => s.type === type);
+    const manifestUrl = service?.manifest;
+
+    expect(manifestUrl).toBeDefined();
+    expect(manifestUrl?.match(LATEST_API_URL_PATH)).toBeTruthy();
+  });
+});
+
+it('should fail for non SemVer or Date based versions (serverless)', async () => {
+  const version = 'foo';
+  const t = () => {
+    getEMSClient({
+      appVersion: version,
+      emsVersion: version,
+    });
+  };
+
+  expect(t).toThrow(Error);
+});

package/.ci/jobs/defaults.yml

@@ -1,67 +0,0 @@
----
-##### GLOBAL METADATA
-
-- meta:
-    cluster: kibana-ci
-
-##### JOB DEFAULTS
-
-- job:
-    project-type: freestyle
-    logrotate:
-      daysToKeep: 30
-      numToKeep: 100
-    properties:
-      - github:
-          url: https://github.com/elastic/ems-client/
-      - inject:
-          properties-content: HOME=$JENKINS_HOME
-    concurrent: false
-    node: linux && !oraclelinux
-    scm:
-      - git:
-          name: origin
-          credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
-          reference-repo: /var/lib/jenkins/.git-references/ems-client.git
-          branches:
-            - ${ghprbActualCommit}
-          url: git@github.com:elastic/ems-client.git
-    wrappers:
-    - ansicolor
-    - timeout:
-        type: absolute
-        timeout: 180
-        fail: true
-    - timestamps
-    - workspace-cleanup
-    builders:
-      - shell: |-
-          #!/usr/local/bin/runbld
-          set -e
-          set +x
-
-          NODE_IMG="node:10"
-
-          docker pull $NODE_IMG
-          docker run --rm -i \
-              --env GIT_COMMITTER_NAME=test \
-              --env GIT_COMMITTER_EMAIL=test \
-              --env HOME=/tmp \
-              --user=$(id -u):$(id -g) \
-              --volume $PWD:/app \
-              --workdir /app \
-              $NODE_IMG \
-              bash -c 'npm config set spin false && /opt/yarn*/bin/yarn && yarn test && yarn run build'
-
-    publishers:
-      - email:
-          recipients: infra-root+build@elastic.co
-      - google-cloud-storage:
-          credentials-id: kibana-ci-gcs-plugin
-          uploads:
-            - classic:
-                file-pattern: integration/**/__diff_output__/**/*
-                storage-location: gs://kibana-ci-artifacts/jobs/$JOB_NAME/$BUILD_NUMBER
-                share-publicly: true
-                upload-for-failed-jobs: true
-                show-inline: true

package/.ci/jobs/elastic+ems-client+master.yml

@@ -1,18 +0,0 @@
----
-- job:
-    name: elastic+ems-client+master
-    display-name: 'elastic / ems-client # master'
-    description: Testing the ems-client master branch.
-    parameters:
-    - string:
-        name: branch_specifier
-        default: refs/heads/master
-        description: the Git branch specifier to build (<branchName>, <tagName>,
-          <commitId>, etc.)
-    scm:
-    - git:
-        branches:
-        - ${branch_specifier}
-    triggers:
-    - github
-    - timed: '@daily'

package/.ci/jobs/elastic+ems-client+pull-request.yml

@@ -1,19 +0,0 @@
----
-- job:
-    name: elastic+ems-client+pull-request
-    display-name: 'elastic / ems-client # pull-request'
-    description: Testing of ems-client pull requests
-    scm:
-    - git:
-        branches:
-        - ${ghprbActualCommit}
-        refspec: +refs/pull/*:refs/remotes/origin/pr/*
-    triggers:
-    - github-pull-request:
-        org-list:
-        - elastic
-        allow-whitelist-orgs-as-admins: true
-        github-hooks: true
-        cancel-builds-on-update: true
-        status-context: ems-client
-    publishers: []