From 23735954349b9c7401ed0dea0c39e694d17292da Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Fri, 25 Oct 2024 22:53:06 +0300 Subject: [PATCH 1/8] update rock to v1.1.0 --- airbyte_ui_rock/rockcraft.yaml | 2 +- src/charm.py | 1 + src/literals.py | 2 +- tests/unit/test_charm.py | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/airbyte_ui_rock/rockcraft.yaml b/airbyte_ui_rock/rockcraft.yaml index e4d0078..f659130 100644 --- a/airbyte_ui_rock/rockcraft.yaml +++ b/airbyte_ui_rock/rockcraft.yaml @@ -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.1.0 build-packages: - jq - curl diff --git a/src/charm.py b/src/charm.py index be31333..c772ad2 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}", diff --git a/src/literals.py b/src/literals.py index 28d68bc..e815d9d 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.1.0" AIRBYTE_SERVER_RELATION = "airbyte-server" diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 180a102..4944ded 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -134,6 +134,7 @@ def test_ready(self): "startup": "enabled", "override": "replace", "environment": { + "AIRBYTE_VERSION": "1.1.0", "API_URL": "/api/v1/", "AIRBYTE_EDITION": "community", "AIRBYTE_SERVER_HOST": "airbyte-k8s:8001", From 31b366922a8561e949b1c87790377f2abd5e657c Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Sun, 27 Oct 2024 22:48:17 +0100 Subject: [PATCH 2/8] update patch and startup command --- airbyte_ui_rock/patches/vite-config-http.patch | 4 ++-- src/charm.py | 2 +- tests/unit/test_charm.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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/src/charm.py b/src/charm.py index c772ad2..397370f 100755 --- a/src/charm.py +++ b/src/charm.py @@ -209,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/tests/unit/test_charm.py b/tests/unit/test_charm.py index 4944ded..30e65a0 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -130,7 +130,7 @@ 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": { From 8fd3b7fcb5432d03460527346761b4fc6716178d Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Sun, 27 Oct 2024 23:14:18 +0100 Subject: [PATCH 3/8] update rock build --- airbyte_ui_rock/rockcraft.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/airbyte_ui_rock/rockcraft.yaml b/airbyte_ui_rock/rockcraft.yaml index f659130..a01914e 100644 --- a/airbyte_ui_rock/rockcraft.yaml +++ b/airbyte_ui_rock/rockcraft.yaml @@ -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 From 642014bf25b29389d580bcee2591044ea7a23614 Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Thu, 21 Nov 2024 14:08:19 +0300 Subject: [PATCH 4/8] update rock to v1.2.0 --- airbyte_ui_rock/rockcraft.yaml | 2 +- src/literals.py | 2 +- tests/unit/test_charm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte_ui_rock/rockcraft.yaml b/airbyte_ui_rock/rockcraft.yaml index a01914e..0a5810e 100644 --- a/airbyte_ui_rock/rockcraft.yaml +++ b/airbyte_ui_rock/rockcraft.yaml @@ -35,7 +35,7 @@ parts: plugin: dump source: https://github.com/airbytehq/airbyte-platform.git # yamllint disable-line source-type: git - source-tag: v1.1.0 + source-tag: v1.2.0 build-packages: - jq - curl diff --git a/src/literals.py b/src/literals.py index e815d9d..ff780c9 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 = "1.1.0" +AIRBYTE_VERSION = "1.2.0" AIRBYTE_SERVER_RELATION = "airbyte-server" diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 30e65a0..944415c 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -134,7 +134,7 @@ def test_ready(self): "startup": "enabled", "override": "replace", "environment": { - "AIRBYTE_VERSION": "1.1.0", + "AIRBYTE_VERSION": "1.2.0", "API_URL": "/api/v1/", "AIRBYTE_EDITION": "community", "AIRBYTE_SERVER_HOST": "airbyte-k8s:8001", From af435aaced1c0b9b67404d9edf117fe2d9ce2100 Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Thu, 21 Nov 2024 14:25:40 +0300 Subject: [PATCH 5/8] update juju lib version --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 5495e8f5fe0cb4cf9665e4f9049d8c766d0f7d44 Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Thu, 21 Nov 2024 15:11:53 +0300 Subject: [PATCH 6/8] fix command --- src/charm.py | 2 +- tests/unit/test_charm.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/charm.py b/src/charm.py index 397370f..c9e56d3 100755 --- a/src/charm.py +++ b/src/charm.py @@ -209,7 +209,7 @@ def _update(self, event): "services": { self.name: { "summary": self.name, - "command": "/usr/bin/pnpm -C airbyte-webapp start --oss-k8s", + "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/tests/unit/test_charm.py b/tests/unit/test_charm.py index 944415c..c773a54 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -130,7 +130,7 @@ def test_ready(self): "services": { APP_NAME: { "summary": APP_NAME, - "command": "/usr/bin/pnpm -C airbyte-webapp start --oss-k8s", + "command": "/usr/bin/pnpm -C airbyte-webapp start oss-k8s", "startup": "enabled", "override": "replace", "environment": { From e8c736a5400bbd897f771161aee7f981c5023641 Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Mon, 6 Jan 2025 19:32:11 +0300 Subject: [PATCH 7/8] update rock to v1.3.0 --- airbyte_ui_rock/rockcraft.yaml | 2 +- src/literals.py | 2 +- tests/unit/test_charm.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte_ui_rock/rockcraft.yaml b/airbyte_ui_rock/rockcraft.yaml index 0a5810e..5c00be5 100644 --- a/airbyte_ui_rock/rockcraft.yaml +++ b/airbyte_ui_rock/rockcraft.yaml @@ -35,7 +35,7 @@ parts: plugin: dump source: https://github.com/airbytehq/airbyte-platform.git # yamllint disable-line source-type: git - source-tag: v1.2.0 + source-tag: v1.3.0 build-packages: - jq - curl diff --git a/src/literals.py b/src/literals.py index ff780c9..604908c 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 = "1.2.0" +AIRBYTE_VERSION = "1.3.0" AIRBYTE_SERVER_RELATION = "airbyte-server" diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index c773a54..0fcfd6e 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -134,7 +134,7 @@ def test_ready(self): "startup": "enabled", "override": "replace", "environment": { - "AIRBYTE_VERSION": "1.2.0", + "AIRBYTE_VERSION": "1.3.0", "API_URL": "/api/v1/", "AIRBYTE_EDITION": "community", "AIRBYTE_SERVER_HOST": "airbyte-k8s:8001", From 763686834d88d3dad5654b05e895bbc0010ebc9d Mon Sep 17 00:00:00 2001 From: Ali Kelkawi Date: Mon, 13 Jan 2025 18:34:26 +0300 Subject: [PATCH 8/8] pin postgresql revision in itest --- tests/integration/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), )