From eac2aa8be877c0c069cba9252bb6f7c217574b55 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Fri, 31 Jul 2020 17:50:38 -0400
Subject: [PATCH] Tweak injected metadata (#73990)

Removes unnecessary fields from injected metadata for clients.
---
 .../rendering_service.test.ts.snap            | 270 +++---------------
 .../rendering/rendering_service.test.ts       |  11 +-
 .../server/rendering/rendering_service.tsx    |   5 +-
 src/core/server/rendering/types.ts            |   7 +-
 4 files changed, 55 insertions(+), 238 deletions(-)

diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
index 3b11313367d9c..a3401e2ad3c11 100644
--- a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
+++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
@@ -9,37 +9,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -81,37 +62,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -153,37 +115,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -229,37 +172,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/translations/en.json",
@@ -301,37 +225,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -373,37 +278,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -445,37 +331,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/translations/en.json",
@@ -517,37 +384,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -591,37 +439,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
@@ -663,37 +492,18 @@ Object {
     "warnLegacyBrowsers": true,
   },
   "env": Object {
-    "binDir": Any<String>,
-    "cliArgs": Object {
-      "basePath": false,
-      "dev": true,
-      "open": false,
-      "optimize": false,
-      "oss": false,
-      "quiet": false,
-      "repl": false,
-      "runExamples": false,
-      "silent": false,
-      "watch": false,
-    },
-    "configDir": Any<String>,
-    "configs": Array [],
-    "homeDir": Any<String>,
-    "isDevClusterMaster": false,
-    "logDir": Any<String>,
     "mode": Object {
-      "dev": true,
-      "name": "development",
-      "prod": false,
+      "dev": Any<Boolean>,
+      "name": Any<String>,
+      "prod": Any<Boolean>,
     },
     "packageInfo": Object {
       "branch": Any<String>,
       "buildNum": Any<Number>,
       "buildSha": Any<String>,
-      "dist": false,
+      "dist": Any<Boolean>,
       "version": Any<String>,
     },
-    "pluginSearchPaths": Any<Array>,
   },
   "i18n": Object {
     "translationsUrl": "/mock-server-basepath/translations/en.json",
diff --git a/src/core/server/rendering/rendering_service.test.ts b/src/core/server/rendering/rendering_service.test.ts
index d1c527aca4dba..7caf4af850c10 100644
--- a/src/core/server/rendering/rendering_service.test.ts
+++ b/src/core/server/rendering/rendering_service.test.ts
@@ -30,17 +30,18 @@ const INJECTED_METADATA = {
   branch: expect.any(String),
   buildNumber: expect.any(Number),
   env: {
-    binDir: expect.any(String),
-    configDir: expect.any(String),
-    homeDir: expect.any(String),
-    logDir: expect.any(String),
+    mode: {
+      name: expect.any(String),
+      dev: expect.any(Boolean),
+      prod: expect.any(Boolean),
+    },
     packageInfo: {
       branch: expect.any(String),
       buildNum: expect.any(Number),
       buildSha: expect.any(String),
+      dist: expect.any(Boolean),
       version: expect.any(String),
     },
-    pluginSearchPaths: expect.any(Array),
   },
   legacyMetadata: {
     branch: expect.any(String),
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
index a02d85d22b2cb..6218b23ae3878 100644
--- a/src/core/server/rendering/rendering_service.tsx
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -54,7 +54,10 @@ export class RenderingService implements CoreService<InternalRenderingServiceSet
         if (!this.legacyInternals) {
           throw new Error('Cannot render before "start"');
         }
-        const { env } = this.coreContext;
+        const env = {
+          mode: this.coreContext.env.mode,
+          packageInfo: this.coreContext.env.packageInfo,
+        };
         const basePath = http.basePath.get(request);
         const serverBasePath = http.basePath.serverBasePath;
         const settings = {
diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts
index 2a3be93055006..18708e17fa10a 100644
--- a/src/core/server/rendering/types.ts
+++ b/src/core/server/rendering/types.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { Env } from '../config';
+import { EnvironmentMode, PackageInfo } from '../config';
 import { ICspConfig } from '../csp';
 import { InternalHttpServiceSetup, KibanaRequest, LegacyRequest } from '../http';
 import { LegacyNavLink, LegacyServiceDiscoverPlugins } from '../legacy';
@@ -40,7 +40,10 @@ export interface RenderingMetadata {
     branch: string;
     basePath: string;
     serverBasePath: string;
-    env: Env;
+    env: {
+      mode: EnvironmentMode;
+      packageInfo: PackageInfo;
+    };
     legacyMode: boolean;
     i18n: {
       translationsUrl: string;