[7.x] [Telemetry] schema check throw on missing schema (elastic#75750) (

elastic#75767) * [Telemetry] schema check throw on missing schema (elastic#75750) * update schema for 7.x
gchaps · Aug 24, 2020 · de32e9f · de32e9f
1 parent 5122803
commit de32e9f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/packages/kbn-telemetry-tools/src/cli/run_telemetry_check.ts b/packages/kbn-telemetry-tools/src/cli/run_telemetry_check.ts
@@ -65,7 +65,8 @@ export function runTelemetryCheck() {
         },
         {
           title: 'Checking Matching collector.schema against stored json files',
-          task: (context) => new Listr(checkMatchingSchemasTask(context), { exitOnError: true }),
+          task: (context) =>
+            new Listr(checkMatchingSchemasTask(context, !fix), { exitOnError: true }),
         },
         {
           enabled: (_) => fix,

diff --git a/packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts b/packages/kbn-telemetry-tools/src/tools/tasks/check_matching_schemas_task.ts
@@ -22,7 +22,7 @@ import { TaskContext } from './task_context';
 import { checkMatchingMapping } from '../check_collector_integrity';
 import { readFileAsync } from '../utils';
 
-export function checkMatchingSchemasTask({ roots }: TaskContext) {
+export function checkMatchingSchemasTask({ roots }: TaskContext, throwOnDiff: boolean) {
   return roots.map((root) => ({
     task: async () => {
       const fullPath = path.resolve(process.cwd(), root.config.output);
@@ -31,8 +31,16 @@ export function checkMatchingSchemasTask({ roots }: TaskContext) {
 
       if (root.parsedCollections) {
         const differences = checkMatchingMapping(root.parsedCollections, esMapping);
-
         root.esMappingDiffs = Object.keys(differences);
+        if (root.esMappingDiffs.length && throwOnDiff) {
+          throw Error(
+            `The following changes must be persisted in ${fullPath} file. Use '--fix' to update.\n${JSON.stringify(
+              differences,
+              null,
+              2
+            )}`
+          );
+        }
       }
     },
     title: `Checking in ${root.config.root}`,

diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
@@ -48,6 +48,19 @@
         }
       }
     },
+    "csp": {
+      "properties": {
+        "strict": {
+          "type": "boolean"
+        },
+        "warnLegacyBrowsers": {
+          "type": "boolean"
+        },
+        "rulesChangedFromDefault": {
+          "type": "boolean"
+        }
+      }
+    },
     "telemetry": {
       "properties": {
         "opt_in_status": {