Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rock to v1.2.0 #14

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airbyte_ui_rock/patches/vite-config-http.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
6 changes: 5 additions & 1 deletion airbyte_ui_rock/rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0
build-packages:
- jq
- curl
Expand All @@ -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}/
Expand All @@ -70,6 +72,8 @@ parts:
stage:
- airbyte-webapp
- airbyte-connector-builder-resources
- airbyte-commons-auth
- airbyte-api
- bin/node
- bin/pnpm
- lib
3 changes: 2 additions & 1 deletion src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/literals.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0"
AIRBYTE_SERVER_RELATION = "airbyte-server"
2 changes: 1 addition & 1 deletion tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,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": "1.3.0",
"API_URL": "/api/v1/",
"AIRBYTE_EDITION": "community",
"AIRBYTE_SERVER_HOST": "airbyte-k8s:8001",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading