Update the ems-client dependency to 7.7.0 (#59936) (#60431)

* Update the ems-client dependency This PR adds the `appName` and `appVersion` parameters used by ems-client. The `appVersion` parameter replaces the now deprecated `kbnVersion` parameter in ems-client. * Review feedback * Fix borked merge Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Mar 17, 2020 · 9fcfa40 · 9fcfa40
1 parent 8b36bb8
commit 9fcfa40
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
     "@babel/register": "^7.7.0",
     "@elastic/charts": "^17.1.1",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "7.6.0",
+    "@elastic/ems-client": "7.7.0",
     "@elastic/eui": "20.0.2",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",

diff --git a/src/legacy/ui/public/vis/map/service_settings.js b/src/legacy/ui/public/vis/map/service_settings.js
@@ -47,7 +47,8 @@ uiModules
         this._showZoomMessage = true;
         this._emsClient = new EMSClient({
           language: i18n.getLocale(),
-          kbnVersion: kbnVersion,
+          appVersion: kbnVersion,
+          appName: 'kibana',
           fileApiUrl: mapConfig.emsFileApiUrl,
           tileApiUrl: mapConfig.emsTileApiUrl,
           htmlSanitizer: $sanitize,

diff --git a/x-pack/legacy/plugins/maps/public/meta.js b/x-pack/legacy/plugins/maps/public/meta.js
@@ -9,6 +9,7 @@ import {
   EMS_FILES_CATALOGUE_PATH,
   EMS_TILES_CATALOGUE_PATH,
   EMS_GLYPHS_PATH,
+  EMS_APP_NAME,
 } from '../common/constants';
 import chrome from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
@@ -56,7 +57,8 @@ export function getEMSClient() {
 
       emsClient = new EMSClient({
         language: i18n.getLocale(),
-        kbnVersion: chrome.getInjected('kbnPkgVersion'),
+        appVersion: chrome.getInjected('kbnPkgVersion'),
+        appName: EMS_APP_NAME,
         tileApiUrl,
         fileApiUrl,
         landingPageUrl: chrome.getInjected('emsLandingPageUrl'),

diff --git a/x-pack/legacy/plugins/maps/server/routes.js b/x-pack/legacy/plugins/maps/server/routes.js
@@ -5,6 +5,7 @@
  */
 
 import {
+  EMS_APP_NAME,
   EMS_CATALOGUE_PATH,
   EMS_FILES_API_PATH,
   EMS_FILES_CATALOGUE_PATH,
@@ -38,7 +39,8 @@ export function initRoutes(server, licenseUid) {
   if (mapConfig.includeElasticMapsService) {
     emsClient = new EMSClient({
       language: i18n.getLocale(),
-      kbnVersion: serverConfig.get('pkg.version'),
+      appVersion: serverConfig.get('pkg.version'),
+      appName: EMS_APP_NAME,
       fileApiUrl: mapConfig.emsFileApiUrl,
       tileApiUrl: mapConfig.emsTileApiUrl,
       landingPageUrl: mapConfig.emsLandingPageUrl,

diff --git a/x-pack/package.json b/x-pack/package.json
@@ -179,7 +179,7 @@
     "@babel/register": "^7.7.0",
     "@babel/runtime": "^7.5.5",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "7.6.0",
+    "@elastic/ems-client": "7.7.0",
     "@elastic/eui": "20.0.2",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.1.0",

diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
@@ -10,6 +10,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
+export const EMS_APP_NAME = 'kibana';
 export const EMS_CATALOGUE_PATH = 'ems/catalogue';
 
 export const EMS_FILES_CATALOGUE_PATH = 'ems/files';

diff --git a/yarn.lock b/yarn.lock
@@ -2587,10 +2587,10 @@
     once "^1.4.0"
     pump "^3.0.0"
 
-"@elastic/ems-client@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.6.0.tgz#ca548aba1a1f5170a1892de129b537b5248c74be"
-  integrity sha512-oBtLH24qIgTaMhlSske49FTd35Y0nv+PlZCZaHkBhOH+ScsTDL3LO2lbIcSmcYQod43Ly34v/xwJvFCTxojVEQ==
+"@elastic/ems-client@7.7.0":
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-7.7.0.tgz#7d36d716dd941f060b9fcdae94f186a9aecc5cc2"
+  integrity sha512-JatsSyLik/8MTEOEimzEZ3NYjvGL1YzjbGujuSCgaXhPRqzu/wvMLEL8dlVpmYFZ7ALbGNsVdho4Hr8tngsIMw==
   dependencies:
     lodash "^4.17.15"
     node-fetch "^1.7.3"