diff --git a/airbyte_ui_rock/patches/vite-config-http.patch b/airbyte_ui_rock/patches/vite-config-http.patch index 82e97ed..d4f0e67 100644 --- a/airbyte_ui_rock/patches/vite-config-http.patch +++ b/airbyte_ui_rock/patches/vite-config-http.patch @@ -2,10 +2,10 @@ # See LICENSE file for licensing details. diff --git a/airbyte-webapp/vite.config.mts b/airbyte-webapp/vite.config.mts -index 4cf29fa0de..6359ab2a55 100644 +index a5ac6fa87d..962717506e 100644 --- a/airbyte-webapp/vite.config.mts +++ b/airbyte-webapp/vite.config.mts -@@ -118,6 +118,7 @@ export default defineConfig(() => { +@@ -127,6 +127,7 @@ export default defineConfig(() => { }, }, server: { diff --git a/airbyte_ui_rock/rockcraft.yaml b/airbyte_ui_rock/rockcraft.yaml index e4d0078..aea0393 100644 --- a/airbyte_ui_rock/rockcraft.yaml +++ b/airbyte_ui_rock/rockcraft.yaml @@ -4,7 +4,7 @@ name: airbyte-ui summary: Airbyte UI rock description: Airbyte UI OCI image for the Airbyte UI charm -version: "1.0" +version: "1.4.0" base: ubuntu@22.04 license: Apache-2.0 platforms: @@ -35,7 +35,7 @@ parts: plugin: dump source: https://github.com/airbytehq/airbyte-platform.git # yamllint disable-line source-type: git - source-tag: v0.63.8 + source-tag: v1.4.0 build-packages: - jq - curl @@ -61,6 +61,8 @@ parts: # Copy build directory files to app cp -r . ${CRAFT_PART_INSTALL}/airbyte-webapp cp -r ../airbyte-connector-builder-resources/ ${CRAFT_PART_INSTALL}/airbyte-connector-builder-resources + cp -r ../airbyte-commons-auth/ ${CRAFT_PART_INSTALL}/airbyte-commons-auth + cp -r ../airbyte-api/ ${CRAFT_PART_INSTALL}/airbyte-api cp -r /root/.nvm/versions/node/v20.11.0/bin/node ${CRAFT_PART_INSTALL}/node cp -r /root/.nvm/versions/node/v20.11.0/bin/pnpm ${CRAFT_PART_INSTALL}/pnpm cp -r /root/.nvm/versions/node/v20.11.0/lib ${CRAFT_PART_INSTALL}/ @@ -70,6 +72,8 @@ parts: stage: - airbyte-webapp - airbyte-connector-builder-resources + - airbyte-commons-auth + - airbyte-api - bin/node - bin/pnpm - lib diff --git a/src/charm.py b/src/charm.py index be31333..c9e56d3 100755 --- a/src/charm.py +++ b/src/charm.py @@ -187,6 +187,7 @@ def _update(self, event): server_svc = self._state.airbyte_server["name"] context = { + "AIRBYTE_VERSION": AIRBYTE_VERSION, "API_URL": "/api/v1/", "AIRBYTE_EDITION": "community", "AIRBYTE_SERVER_HOST": f"{server_svc}:{INTERNAL_API_PORT}", @@ -208,7 +209,7 @@ def _update(self, event): "services": { self.name: { "summary": self.name, - "command": "/usr/bin/pnpm -C airbyte-webapp start", + "command": "/usr/bin/pnpm -C airbyte-webapp start oss-k8s", "startup": "enabled", "override": "replace", # Including config values here so that a change in the diff --git a/src/literals.py b/src/literals.py index 28d68bc..ba0ffe7 100644 --- a/src/literals.py +++ b/src/literals.py @@ -6,5 +6,5 @@ WEB_UI_PORT = 8080 INTERNAL_API_PORT = 8001 CONNECTOR_BUILDER_API_PORT = 80 -AIRBYTE_VERSION = "0.60.0" +AIRBYTE_VERSION = "1.4.0" AIRBYTE_SERVER_RELATION = "airbyte-server" diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 07d9756..402511d 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -57,7 +57,7 @@ async def deploy(ops_test: OpsTest, charm: str, charm_image: str): config={"num-history-shards": 1}, ), ops_test.model.deploy(APP_NAME_TEMPORAL_ADMIN, channel="edge"), - ops_test.model.deploy("postgresql-k8s", channel="14/stable", trust=True), + ops_test.model.deploy("postgresql-k8s", channel="14/stable", trust=True, revision=381), ops_test.model.deploy("minio", channel="edge"), ops_test.model.deploy("nginx-ingress-integrator", channel="edge", revision=103, trust=True), ) diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 180a102..15f1fd8 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -15,6 +15,7 @@ from ops.testing import Harness from charm import AirbyteUIK8sOperatorCharm +from literals import AIRBYTE_VERSION from src.charm import CONNECTOR_BUILDER_API_PORT, INTERNAL_API_PORT, WEB_UI_PORT APP_NAME = "airbyte-webapp" @@ -130,10 +131,11 @@ def test_ready(self): "services": { APP_NAME: { "summary": APP_NAME, - "command": "/usr/bin/pnpm -C airbyte-webapp start", + "command": "/usr/bin/pnpm -C airbyte-webapp start oss-k8s", "startup": "enabled", "override": "replace", "environment": { + "AIRBYTE_VERSION": AIRBYTE_VERSION, "API_URL": "/api/v1/", "AIRBYTE_EDITION": "community", "AIRBYTE_SERVER_HOST": "airbyte-k8s:8001", diff --git a/tox.ini b/tox.ini index b806486..b542cec 100644 --- a/tox.ini +++ b/tox.ini @@ -100,7 +100,7 @@ commands = description = Run integration tests deps = ipdb==0.13.9 - juju==3.5.2.0 + juju==3.5.2.1 pytest==7.1.3 pytest-operator==0.35.0 temporalio==1.1.0