🚨🚨🐛 Source Notion: JSON Schema Updates (airbytehq#30587)

Co-authored-by: ChristoGrab <ChristoGrab@users.noreply.github.com>
ariesgun · Oct 23, 2023 · 1c48fc4 · 1c48fc4
1 parent a6cdccc
commit 1c48fc4
Show file tree

Hide file tree

Showing 14 changed files with 563 additions and 129 deletions.
diff --git a/airbyte-integrations/connectors/source-notion/Dockerfile b/airbyte-integrations/connectors/source-notion/Dockerfile
@@ -34,5 +34,5 @@ COPY source_notion ./source_notion
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=1.3.0
+LABEL io.airbyte.version=2.0.0
 LABEL io.airbyte.name=airbyte/source-notion
diff --git a/airbyte-integrations/connectors/source-notion/acceptance-test-config.yml b/airbyte-integrations/connectors/source-notion/acceptance-test-config.yml
@@ -17,12 +17,14 @@ acceptance_tests:
   discovery:
     tests:
       - config_path: "secrets/config.json"
+        backward_compatibility_tests_config:
+          disable_for_version: 1.3.0
   basic_read:
     tests:
       - config_path: "secrets/config.json"
         expect_records:
           path: "integration_tests/expected_records.jsonl"
-        fail_on_extra_columns: false
+        fail_on_extra_columns: true
   incremental:
     tests:
       - config_path: "secrets/config.json"

diff --git a/airbyte-integrations/connectors/source-notion/acceptance-test-docker.sh b/airbyte-integrations/connectors/source-notion/acceptance-test-docker.sh
diff --git a/airbyte-integrations/connectors/source-notion/metadata.yaml b/airbyte-integrations/connectors/source-notion/metadata.yaml
@@ -5,7 +5,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 6e00b415-b02e-4160-bf02-58176a0ae687
-  dockerImageTag: 1.3.0
+  dockerImageTag: 2.0.0
   dockerRepository: airbyte/source-notion
   githubIssueLabel: source-notion
   icon: notion.svg
@@ -17,6 +17,11 @@ data:
     oss:
       enabled: true
   releaseStage: generally_available
+  releases:
+    breakingChanges:
+      2.0.0:
+        message: "Version 2.0.0 introduces schema changes to multiple properties shared by the blocks, databases and pages streams. These changes were introduced to reflect updates to the Notion API. A full schema refresh and data reset are required to upgrade to this version."
+        upgradeDeadline: "2023-11-09"
   suggestedStreams:
     streams:
       - blocks

diff --git a/airbyte-integrations/connectors/source-notion/source_notion/schemas/blocks.json b/airbyte-integrations/connectors/source-notion/source_notion/schemas/blocks.json
@@ -13,10 +13,18 @@
       "type": "string"
     },
     "created_time": {
-      "type": "string"
+      "type": "string",
+      "format": "date-time"
+    },
+    "created_by": {
+      "$ref": "user.json"
+    },
+    "last_edited_by": {
+      "$ref": "user.json"
     },
     "last_edited_time": {
-      "type": "string"
+      "type": "string",
+      "format": "date-time"
     },
     "archived": {
       "type": "boolean"
@@ -60,36 +68,32 @@
         "video"
       ]
     },
-    "paragraph": { "$ref": "text_element.json" },
-    "quote": { "$ref": "text_element.json" },
-    "bulleted_list_item": { "$ref": "text_element.json" },
-    "numbered_list_item": { "$ref": "text_element.json" },
-    "toggle": { "$ref": "text_element.json" },
-    "heading_1": { "$ref": "heading.json" },
-    "heading_2": { "$ref": "heading.json" },
-    "heading_3": { "$ref": "heading.json" },
-    "callout": {
+    "bookmark": {
       "type": "object",
       "properties": {
-        "color": { "type": "string" },
-        "text": { "type": "array", "items": { "$ref": "rich_text.json" } },
-        "icon": { "$ref": "icon.json" },
-        "children": { "type": "array", "items": { "type": "object" } }
+        "url": { "type": "string" },
+        "caption": { "type": "array", "items": { "$ref": "rich_text.json" } }
       }
     },
-    "to_do": {
+    "breadcrumb": {
+      "type": "object"
+    },
+    "bulleted_list_item": { "$ref": "text_element.json" },
+    "callout": {
       "type": "object",
       "properties": {
-        "text": { "type": "array", "items": { "$ref": "rich_text.json" } },
-        "checked": { "type": ["null", "boolean"] },
-        "children": { "type": "array", "items": { "type": "object" } }
+        "color": { "type": "string" },
+        "rich_text": { "type": "array", "items": { "$ref": "rich_text.json" } },
+        "icon": { "$ref": "icon.json" }
       }
     },
+    "child_page": { "$ref": "child.json" },
+    "child_database": { "$ref": "child.json" },
     "code": {
       "type": "object",
       "properties": {
-        "color": { "type": "string" },
-        "text": { "type": "array", "items": { "$ref": "rich_text.json" } },
+        "caption": { "type": "array", "items": { "$ref": "rich_text.json" } },
+        "rich_text": { "type": "array", "items": { "$ref": "rich_text.json" } },
         "language": {
           "enum": [
             "abap",
@@ -168,30 +172,88 @@
         }
       }
     },
-    "child_page": { "$ref": "child.json" },
-    "child_database": { "$ref": "child.json" },
+    "column": {
+      "type": "object"
+    },
+    "column_list": {
+      "type": "object"
+    },
+    "divider": {
+      "type": "object"
+    },
     "embed": {
       "type": "object",
       "properties": {
         "url": { "type": "string" }
       }
     },
-    "image": { "$ref": "file.json" },
-    "video": { "$ref": "file.json" },
+    "equation": {
+      "type": "object",
+      "properties": {
+        "expression": { "type": "string" }
+      }
+    },
     "file": { "$ref": "file.json" },
+    "heading_1": { "$ref": "heading.json" },
+    "heading_2": { "$ref": "heading.json" },
+    "heading_3": { "$ref": "heading.json" },
+    "image": { "$ref": "file.json" },
+    "link_preview": {
+      "type": "object",
+      "properties": {
+        "url": { "type": "string" }
+      }
+    },
+    "link_to_page": {
+      "type": "object",
+      "properties": {
+        "page_id": { "type": "string" },
+        "type": { "type": "string" }
+      }
+    },
+    "numbered_list_item": { "$ref": "text_element.json" },
+    "paragraph": { "$ref": "text_element.json" },
     "pdf": { "$ref": "file.json" },
-    "bookmark": {
+    "quote": { "$ref": "text_element.json" },
+    "table": {
       "type": "object",
       "properties": {
-        "url": { "type": "string" },
-        "caption": { "type": "array", "items": { "$ref": "rich_text.json" } }
+        "table_width": { "type": "integer" },
+        "has_column_header": { "type": "boolean" },
+        "has_row_header": { "type": "boolean" }
       }
     },
-    "equation": {
+    "table_of_contents": {
       "type": "object",
       "properties": {
-        "expression": { "type": "string" }
+        "color": { "type": "string" }
+      }
+    },
+    "table_row": {
+      "type": "object",
+      "properties": {
+        "cells": { "type": "array", "items": { "$ref": "rich_text.json" } }
+      }
+    },
+    "template": {
+      "type": "object",
+      "properties": {
+        "rich_text": { "type": "array", "items": { "$ref": "rich_text.json" } }
+      }
+    },
+    "to_do": {
+      "type": "object",
+      "properties": {
+        "rich_text": { "type": "array", "items": { "$ref": "rich_text.json" } },
+        "checked": { "type": ["null", "boolean"] },
+        "color": { "type": "string" },
+        "children": { "type": "array", "items": { "type": "object" } }
       }
+    },
+    "toggle": { "$ref": "text_element.json" },
+    "video": { "$ref": "file.json" },
+    "unsupported": {
+      "type": "object"
     }
   }
 }