From 3a0bb6c5f191e060f370259df5b37dff3ae41b03 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 18:01:41 +0000 Subject: [PATCH 01/12] chore(deps): update dependency element-hq/matrix-authentication-service to v1.3.0 --- synapse_rock/rockcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse_rock/rockcraft.yaml b/synapse_rock/rockcraft.yaml index 867edc4d0..007105fe7 100644 --- a/synapse_rock/rockcraft.yaml +++ b/synapse_rock/rockcraft.yaml @@ -13,7 +13,7 @@ platforms: environment: &mas-source source: https://github.com/element-hq/matrix-authentication-service source-type: git - source-tag: v1.2.0 + source-tag: v1.3.0 parts: scripts: plugin: dump From e4d2c0591448b345f18d2924a2e1ebe2742eaf24 Mon Sep 17 00:00:00 2001 From: Amanda Hager Lopes de Andrade Katz Date: Wed, 24 Sep 2025 15:29:56 -0300 Subject: [PATCH 02/12] Bump node version --- synapse_rock/rockcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse_rock/rockcraft.yaml b/synapse_rock/rockcraft.yaml index 007105fe7..b46811aca 100644 --- a/synapse_rock/rockcraft.yaml +++ b/synapse_rock/rockcraft.yaml @@ -204,7 +204,7 @@ parts: <<: *mas-source source-subdir: frontend build-environment: - - NODE_URI: "https://nodejs.org/dist/v20.18.1/node-v20.18.1-linux-x64.tar.gz" + - NODE_URI: "https://nodejs.org/dist/v22.19.0/node-v22.19.0-linux-x64.tar.gz" override-build: | curl -Ls $NODE_URI | tar xzf - -C /usr/ --skip-old-files --no-same-owner --strip-components=1 (cd $CRAFT_PART_BUILD/frontend; npm ci; npm run build) From fc9065b0ecbe8576590cd3c7e3de5467b8d2e635 Mon Sep 17 00:00:00 2001 From: "Amanda H. L. de Andrade Katz" Date: Tue, 7 Oct 2025 14:12:58 -0300 Subject: [PATCH 03/12] Update rockcraft.yaml --- synapse_rock/rockcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse_rock/rockcraft.yaml b/synapse_rock/rockcraft.yaml index 62cc9ef0f..9710639e9 100644 --- a/synapse_rock/rockcraft.yaml +++ b/synapse_rock/rockcraft.yaml @@ -210,6 +210,7 @@ parts: (cd $CRAFT_PART_BUILD/frontend; npm ci; npm run build) mkdir -p $CRAFT_PART_INSTALL/mas/share/assets cp frontend/dist/manifest.json $CRAFT_PART_INSTALL/mas/share/manifest.json + rm -f frontend/dist/index.html* frontend/dist/manifest.json* cp -r frontend/dist/* $CRAFT_PART_INSTALL/mas/share/assets stage: - mas/share/* From c517265587c6feb80d3020a4c25be9f2153fe7f3 Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Wed, 15 Oct 2025 15:30:34 -0400 Subject: [PATCH 04/12] Debug --- src/state/mas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/state/mas.py b/src/state/mas.py index b37d621e0..80aac1885 100644 --- a/src/state/mas.py +++ b/src/state/mas.py @@ -222,4 +222,4 @@ def validate_datasource(datasource: DatasourcePostgreSQL) -> None: datasource.get("port"), ] ): - raise MASDatasourceInvalidError("Missing values in postgresql datasource.") + raise MASDatasourceInvalidError(f"Missing values in postgresql datasource: {datasource}") From f072339289d75f9cd889e5fe8e928cb84f28ed3f Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Wed, 15 Oct 2025 16:19:49 -0400 Subject: [PATCH 05/12] Do not raise on error --- tests/integration/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index b484510de..1b23a3929 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -134,6 +134,7 @@ async def synapse_app_fixture( apps=[synapse_app_name, postgresql_app.name], status=ACTIVE_STATUS_NAME, idle_period=5, + raise_on_error=False, ) await model.relate(f"{synapse_app_name}:database", f"{postgresql_app.name}") await model.wait_for_idle( From d92b24c09f9118c0663ed5caf26ce5a75eb620ee Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Wed, 15 Oct 2025 17:02:32 -0400 Subject: [PATCH 06/12] Invert relations --- tests/integration/conftest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 1b23a3929..6d791db1c 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -129,18 +129,18 @@ async def synapse_app_fixture( await app.set_config({"public_baseurl": f"http://{synapse_ip}:8080"}) async with ops_test.fast_forward(): - await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}") + await model.relate(f"{synapse_app_name}:database", f"{postgresql_app.name}") await model.wait_for_idle( apps=[synapse_app_name, postgresql_app.name], status=ACTIVE_STATUS_NAME, idle_period=5, - raise_on_error=False, ) - await model.relate(f"{synapse_app_name}:database", f"{postgresql_app.name}") + await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}") await model.wait_for_idle( apps=[synapse_app_name, postgresql_app.name], status=ACTIVE_STATUS_NAME, idle_period=5, + raise_on_error=False, ) return app From b4ecdd8632aa2034772ba88a3f6ab9c22ed193aa Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Wed, 15 Oct 2025 18:16:29 -0400 Subject: [PATCH 07/12] Fix relation name --- 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 6d791db1c..5d37146ed 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -135,7 +135,7 @@ async def synapse_app_fixture( status=ACTIVE_STATUS_NAME, idle_period=5, ) - await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}") + await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}:database") await model.wait_for_idle( apps=[synapse_app_name, postgresql_app.name], status=ACTIVE_STATUS_NAME, From fd2982d8ef91138fe8f56997ce6b9a6340a10404 Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Wed, 15 Oct 2025 18:51:15 -0400 Subject: [PATCH 08/12] Fix --- tests/integration/conftest.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 5d37146ed..2eeb2eb82 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -130,11 +130,6 @@ async def synapse_app_fixture( async with ops_test.fast_forward(): await model.relate(f"{synapse_app_name}:database", f"{postgresql_app.name}") - await model.wait_for_idle( - apps=[synapse_app_name, postgresql_app.name], - status=ACTIVE_STATUS_NAME, - idle_period=5, - ) await model.relate(f"{synapse_app_name}:mas-database", f"{postgresql_app.name}:database") await model.wait_for_idle( apps=[synapse_app_name, postgresql_app.name], From d245067e3393414ff3218152158e55eab897e467 Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Thu, 16 Oct 2025 16:17:22 -0400 Subject: [PATCH 09/12] Update mas source tag --- synapse_rock/rockcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse_rock/rockcraft.yaml b/synapse_rock/rockcraft.yaml index 703890dfd..55cb2ac40 100644 --- a/synapse_rock/rockcraft.yaml +++ b/synapse_rock/rockcraft.yaml @@ -13,7 +13,7 @@ platforms: environment: &mas-source source: https://github.com/element-hq/matrix-authentication-service source-type: git - source-tag: v1.3.0 + source-tag: v1.4.1 parts: scripts: plugin: dump From 98b8bacec3a5ceb4cded8e14878e567e16ae48cd Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Thu, 16 Oct 2025 18:10:53 -0400 Subject: [PATCH 10/12] Run CI From 07f355ae467fffeb4dd6fc18bcf3170bf394bc66 Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Fri, 17 Oct 2025 14:40:33 -0400 Subject: [PATCH 11/12] Run CI From 066f882989b1b5e31e0f0d86268d3a5345770e5d Mon Sep 17 00:00:00 2001 From: Niels Robin-Aubertin Date: Fri, 17 Oct 2025 15:36:14 -0400 Subject: [PATCH 12/12] Remove debug --- src/state/mas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/state/mas.py b/src/state/mas.py index 80aac1885..b37d621e0 100644 --- a/src/state/mas.py +++ b/src/state/mas.py @@ -222,4 +222,4 @@ def validate_datasource(datasource: DatasourcePostgreSQL) -> None: datasource.get("port"), ] ): - raise MASDatasourceInvalidError(f"Missing values in postgresql datasource: {datasource}") + raise MASDatasourceInvalidError("Missing values in postgresql datasource.")