Ensure version property is required when present in legacy telemetry

schemas/telemetry/anonymous/anonymous.4.schema.json

@@ -82,7 +82,8 @@
     }
   },
   "required": [
-    "payload"
+    "payload",
+    "version"
   ],
   "title": "anonymous",
   "type": "object"

schemas/telemetry/bhr/bhr.4.schema.json

@@ -1491,6 +1491,9 @@
       "type": "number"
     }
   },
+  "required": [
+    "version"
+  ],
   "title": "bhr",
   "type": "object"
 }

schemas/telemetry/normandy-login-study/normandy-login-study.4.schema.json

@@ -227,6 +227,9 @@
       "type": "number"
     }
   },
+  "required": [
+    "version"
+  ],
   "title": "normandy-login-study",
   "type": "object"
 }

schemas/telemetry/xfocsp-error-report/xfocsp-error-report.4.schema.json

@@ -123,6 +123,7 @@
     }
   },
   "required": [
+    "version",
     "payload"
   ],
   "title": "xfocsp-error-report",

scripts/assert-telemetry-version

@@ -36,6 +36,8 @@ def is_valid_telemetry_version(schema: Dict[str, Any]) -> (bool, Optional[str]):
         return False, f"invalid maximum version number"
     if not version["type"] in {"integer", "number"}:
         return False, f"version must be a number or integer"
+    if "version" in schema["properties"] and "version" not in schema.get("required", []):
+        return False, "version property must be required"
     return True, None
 
 

templates/telemetry/anonymous/anonymous.4.schema.json

@@ -25,6 +25,7 @@
     }
   },
   "required": [
-    "payload"
-    ]
+    "payload",
+    "version"
+  ]
 }

templates/telemetry/bhr/bhr.4.schema.json

@@ -80,5 +80,8 @@
         }
       }
     }
-  }
+  },
+  "required": [
+    "version"
+  ]
 }

templates/telemetry/normandy-login-study/normandy-login-study.4.schema.json

@@ -99,5 +99,8 @@
         }
       }
     }
-  }
+  },
+  "required": [
+    "version"
+  ]
 }

templates/telemetry/xfocsp-error-report/xfocsp-error-report.4.schema.json

@@ -63,6 +63,7 @@
     }
   },
   "required": [
+    "version",
     "payload"
   ]
 }