Merge branch 'main' into feat/allow_override_user

Author: odelcroi

.config/nextest.toml

@@ -1,14 +1,2 @@
-[test-groups]
-database = { max-threads = 1 }
-
 [profile.default]
 retries = 1
-
-# sqlx has a problem with nextest, as it uses a process-local semaphore to have
-# tests use different databases. This doesn't work with nextest, as it has a
-# process-per-test model, which is why we need to make sure only one test uses
-# the database at a time.
-# See https://github.com/launchbadge/sqlx/pull/3334
-[[profile.default.overrides]]
-filter = 'package(mas-handlers) or package(mas-storage-pg)'
-test-group = 'database'

.dockerignore

@@ -3,7 +3,6 @@ crates/*/target
 crates/*/node_modules
 frontend/node_modules
 frontend/dist
-tools/syn2mas/**
 docs/
 .devcontainer/
 .github/

.github/dependabot.yml

@@ -106,20 +106,3 @@ updates:
       browser-logos:
         patterns:
           - "@browser-logos/*"
-
-  - package-ecosystem: "npm"
-    directory: "/tools/syn2mas/"
-    labels:
-      - "A-Dependencies"
-      - "Z-Deps-Syn2Mas"
-    schedule:
-      interval: "weekly"
-    ignore:
-      # Ignore @types/node until we can upgrade to Node 20
-      - dependency-name: "@types/node"
-        update-types: ["version-update:semver-major"]
-    groups:
-      production:
-        dependency-type: "production"
-      development:
-        dependency-type: "development"

.github/scripts/commit-and-tag.cjs

@@ -13,12 +13,7 @@ module.exports = async ({ github, context }) => {
   const parent = context.sha;
   if (!version) throw new Error("VERSION is not defined");
 
-  const files = [
-    "Cargo.toml",
-    "Cargo.lock",
-    "tools/syn2mas/package.json",
-    "tools/syn2mas/package-lock.json",
-  ];
+  const files = ["Cargo.toml", "Cargo.lock"];
 
   /** @type {{path: string, mode: "100644", type: "blob", sha: string}[]} */
   const tree = [];

.github/workflows/build.yaml

@@ -23,7 +23,6 @@ env:
   SCCACHE_GHA_ENABLED: "true"
   RUSTC_WRAPPER: "sccache"
   IMAGE: ghcr.io/element-hq/matrix-authentication-service
-  IMAGE_SYN2MAS: ghcr.io/element-hq/matrix-authentication-service/syn2mas
   BUILDCACHE: ghcr.io/element-hq/matrix-authentication-service/buildcache
   DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
 
@@ -253,24 +252,8 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
 
-      - name: Docker meta (syn2mas)
-        id: meta-syn2mas
-        uses: docker/[email protected]
-        with:
-          images: "${{ env.IMAGE_SYN2MAS }}"
-          bake-target: docker-metadata-action-syn2mas
-          flavor: |
-            latest=auto
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
       - name: Setup Cosign
-        uses: sigstore/[email protected].1
+        uses: sigstore/[email protected].2
 
       - name: Set up Docker Buildx
         uses: docker/[email protected]
@@ -288,13 +271,12 @@ jobs:
 
       - name: Build and push
         id: bake
-        uses: docker/bake-action@v6.5.0
+        uses: docker/bake-action@v6.6.0
         with:
           files: |
             ./docker-bake.hcl
             cwd://${{ steps.meta.outputs.bake-file }}
             cwd://${{ steps.meta-debug.outputs.bake-file }}
-            cwd://${{ steps.meta-syn2mas.outputs.bake-file }}
           set: |
             base.output=type=image,push=true
             base.cache-from=type=registry,ref=${{ env.BUILDCACHE }}:buildcache
@@ -318,43 +300,11 @@ jobs:
         env:
           REGULAR_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).regular.digest }}
           DEBUG_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).debug.digest }}
-          SYN2MAS_DIGEST: ${{ steps.output.outputs.metadata && fromJSON(steps.output.outputs.metadata).syn2mas.digest }}
 
         run: |-
           cosign sign --yes \
             "$IMAGE@$REGULAR_DIGEST" \
             "$IMAGE@$DEBUG_DIGEST" \
-            "$IMAGE_SYN2MAS@$SYN2MAS_DIGEST"
-
-  syn2mas:
-    name: Release syn2mas on NPM
-    runs-on: ubuntu-24.04
-    if: github.event_name != 'pull_request'
-
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-      - name: Checkout the code
-        uses: actions/[email protected]
-
-      - name: Install Node
-        uses: actions/[email protected]
-        with:
-          node-version-file: ./tools/syn2mas/.nvmrc
-
-      - name: Install Node dependencies
-        working-directory: ./tools/syn2mas
-        run: npm ci
-
-      - name: Publish
-        uses: JS-DevTools/npm-publish@v3
-        with:
-          package: ./tools/syn2mas
-          token: ${{ secrets.NPM_TOKEN }}
-          provenance: true
-          dry-run: ${{ !startsWith(github.ref, 'refs/tags/') }}
 
   release:
     name: Release
@@ -363,7 +313,6 @@ jobs:
     needs:
       - assemble-archives
       - build-image
-      - syn2mas
     steps:
       - name: Download the artifacts from the previous job
         uses: actions/download-artifact@v4
@@ -403,18 +352,6 @@ jobs:
                 ') }}
                 ```
 
-            `syn2mas` migration tool:
-
-              - Digest:
-                ```
-                ${{ env.IMAGE_SYN2MAS }}@${{ fromJSON(needs.build-image.outputs.metadata).syn2mas.digest }}
-                ```
-              - Tags:
-                ```
-                ${{ join(fromJSON(needs.build-image.outputs.metadata).syn2mas.tags, '
-                ') }}
-                ```
-
           files: |
             artifacts/mas-cli-aarch64-linux.tar.gz
             artifacts/mas-cli-x86_64-linux.tar.gz

.github/workflows/ci.yaml

@@ -58,7 +58,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22
 
@@ -82,7 +82,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22
 
@@ -106,7 +106,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 20
 
@@ -311,34 +311,6 @@ jobs:
             --archive-file nextest-archive.tar.zst \
             --partition count:${{ matrix.partition }}/3
 
-  syn2mas:
-    name: Check syn2mas
-    runs-on: ubuntu-24.04
-
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout the code
-        uses: actions/[email protected]
-
-      - name: Install Node
-        uses: actions/[email protected]
-        with:
-          node-version-file: ./tools/syn2mas/.nvmrc
-
-      - name: Install Node dependencies
-        working-directory: ./tools/syn2mas
-        run: npm ci
-
-      - name: Lint
-        working-directory: ./tools/syn2mas
-        run: npm run lint
-
-      - name: Build
-        working-directory: ./tools/syn2mas
-        run: npm run build
-
   tests-done:
     name: Tests done
     if: ${{ always() }}
@@ -352,7 +324,6 @@ jobs:
       - clippy
       - check-schema
       - test
-      - syn2mas
     runs-on: ubuntu-24.04
 
     steps:

.github/workflows/coverage.yaml

@@ -33,7 +33,7 @@ jobs:
         run: make coverage
 
       - name: Upload to codecov.io
-        uses: codecov/[email protected].0
+        uses: codecov/[email protected].2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: policies/coverage.json
@@ -60,7 +60,7 @@ jobs:
         run: npm run coverage
 
       - name: Upload to codecov.io
-        uses: codecov/[email protected].0
+        uses: codecov/[email protected].2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: frontend/coverage/
@@ -127,7 +127,7 @@ jobs:
           grcov . --binary-path ./target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/tests.lcov
 
       - name: Upload to codecov.io
-        uses: codecov/[email protected].0
+        uses: codecov/[email protected].2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: target/coverage/*.lcov

.github/workflows/docs.yaml

@@ -34,7 +34,7 @@ jobs:
           tool: mdbook
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22
 

.github/workflows/release-branch.yaml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22
 

.github/workflows/tag.yaml

@@ -40,10 +40,6 @@ jobs:
       - name: Run `cargo metadata` to make sure the lockfile is up to date
         run: cargo metadata --format-version 1
 
-      - name: Set the tools/syn2mas version
-        working-directory: tools/syn2mas
-        run: npm version "${{ inputs.version }}" --no-git-tag-version
-
       - name: Commit and tag using the GitHub API
         uses: actions/[email protected]
         id: commit

.github/workflows/translations-download.yaml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22
 

.github/workflows/translations-upload.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: Install Node
-        uses: actions/setup-node@v4.3.0
+        uses: actions/setup-node@v4.4.0
         with:
           node-version: 22