feat: Make most fields in big query diagnostic schema as optional #404 (

#420) * start using new schema for diagnostic data Co-authored-by: Pritam Ghanghas <pghanghas@nebra.com>
NebraLtd · Aug 1, 2022 · e43a92a · e43a92a
1 parent 56a2c3d
commit e43a92a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/bigquery/diag_schema.json b/bigquery/diag_schema.json
@@ -20,37 +20,37 @@
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "BN",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "ID",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "BA",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "FR",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "FW",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "VA",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "serial_number",
     "type": "STRING"
   },
@@ -65,17 +65,17 @@
     "type": "BOOLEAN"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "PK",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "OK",
     "type": "STRING"
   },
   {
-    "mode": "REQUIRED",
+    "mode": "NULLABLE",
     "name": "AN",
     "type": "STRING"
   },

diff --git a/hw_diag/diagnostics/bigquery_data_model.py b/hw_diag/diagnostics/bigquery_data_model.py
@@ -8,18 +8,18 @@ class DiagnosticDataModel(BaseModel):
     last_updated: str
     E0: Optional[str]
     W0: Optional[str]
-    BN: str
-    ID: str
-    BA: str
-    FR: str
-    FW: str
-    VA: str
-    serial_number: str
+    BN: Optional[str]
+    ID: Optional[str]
+    BA: Optional[str]
+    FR: Optional[str]
+    FW: Optional[str]
+    VA: Optional[str]
+    serial_number: Optional[str]
     ECC: Optional[bool]
     LOR: Optional[bool]
-    PK: str
-    OK: str
-    AN: str
+    PK: Optional[str]
+    OK: Optional[str]
+    AN: Optional[str]
     MC: Optional[bool]
     MD: Optional[bool]
     MH: Optional[int]

diff --git a/hw_diag/tests/test_gcs_shipper.py b/hw_diag/tests/test_gcs_shipper.py
@@ -48,7 +48,7 @@ def test_diagnostics_missing_required_field(self, mock_requests):
         mock_requests.post = MagicMock()
         mock_requests.post.return_value = OKResponse()
         diag_data = valid_diagnostic_data().copy()
-        diag_data.pop('serial_number')
+        diag_data.pop('last_updated')
         retval = upload_diagnostics(diag_data, True)
         self.assertFalse(retval)