Sync cdk manifest between webapp and connector builder server (#22422)

* do not rely on local cdk anymore * cache versioned schemas * fix used version * centralize used CDK version * fix dpath
airbytehq · Feb 7, 2023 · c955e61 · c955e61
1 parent 53098fe
commit c955e61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -85,6 +85,8 @@ jobs:
               - 'airbyte-db/**'
             frontend:
               - 'airbyte-api/src/main/openapi/config.yaml'
+              - 'airbyte-connector-builder-server/CDK_VERSION'
+              - 'airbyte-connector-builder-server/src/main/openapi/openapi.yaml'
               - 'airbyte-webapp/**'
               - 'airbyte-webapp-e2e-tests/**'
 

diff --git a/airbyte-connector-builder-server/CDK_VERSION b/airbyte-connector-builder-server/CDK_VERSION
@@ -0,0 +1 @@
+0.25.0
diff --git a/airbyte-connector-builder-server/setup.py b/airbyte-connector-builder-server/setup.py
@@ -12,6 +12,8 @@
 # The text of the README file
 README = (HERE / "README.md").read_text()
 
+CDK_VERSION = (HERE / "CDK_VERSION").read_text()
+
 setup(
     name="connector-builder-server",
     version="0.40.32",
@@ -41,7 +43,7 @@
     },
     packages=find_packages(exclude=("unit_tests", "integration_tests", "docs")),
     package_data={},
-    install_requires=["airbyte-cdk==0.25", "fastapi", "uvicorn"],
+    install_requires=[f"airbyte-cdk=={CDK_VERSION}", "fastapi", "uvicorn"],
     python_requires=">=3.9.11",
     extras_require={
         "tests": [

diff --git a/airbyte-webapp/scripts/load-declarative-schema.sh b/airbyte-webapp/scripts/load-declarative-schema.sh
@@ -4,8 +4,7 @@
 set -e
 mkdir -p build
 
-# Make sure this is aligned with the CDK version of the connector builder server
-DEFAULT_CDK_VERSION="0.25.0"
+DEFAULT_CDK_VERSION=`cat ../airbyte-connector-builder-server/CDK_VERSION`
 
 if [ -z "$CDK_VERSION" ]
 then