[19299] Deploy to staging

.env.sample

@@ -0,0 +1,9 @@
+# Default config
+TRUST_PROXY_HEADER=1
+DB_URL=postgresql://postgres:p0stgr3s@localhost:5433/logto
+ADMIN_PORT=3302
+PORT=3301
+
+# OGCIO Config
+MOCK_TOKEN_ENDPOINT=http://localhost:4005/logto/mock/token
+MOCK_KEYS_ENDPOINT=http://localhost:4005/logto/mock/keys

.github/CODEOWNERS

@@ -1,5 +1,10 @@
-/packages/schemas/tables @simeng-li @wangsijie @gao-sun
-/packages/core @simeng-li @wangsijie @gao-sun
-/packages/console @wangsijie @charIeszhao @gao-sun
-/packages/ui @simeng-li @charIeszhao
+/.github/ @gao-sun
 /.changeset @gao-sun
+/packages/schemas/tables/ @simeng-li @wangsijie @gao-sun
+/packages/core/ @simeng-li @wangsijie @gao-sun
+/packages/console/ @wangsijie @charIeszhao @xiaoyijun @gao-sun
+/packages/ui/ @simeng-li @charIeszhao
+connector*/ @darcyYe @gao-sun
+
+# The file below should be generated by the script, just in case someone accidentally edits it
+/packages/console/src/assets/docs/guides/index.ts @gao-sun

.github/workflows/alteration-compatibility-integration-test.yml

@@ -28,7 +28,7 @@ jobs:
         id: changes-detection
         run: |
           if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            BASE=$(git merge-base origin/${{github.base_ref}} HEAD)
+            BASE=$(git merge-base origin/${{ github.base_ref }} HEAD)
           else
             BASE=${{ github.event.before }}
           fi
@@ -37,24 +37,25 @@ jobs:
 
           if [ -n "$CHANGE_FILES" ]; then
             echo "$CHANGE_FILES"
-            echo "::set-output name=has-alteration-changes::true"
+            echo "has-alteration-changes=true" >> $GITHUB_OUTPUT
             echo "Alteration changes detected"
           else
-            echo "::set-output name=has-alteration-changes::false"
+            echo "has-alteration-changes=false" >> $GITHUB_OUTPUT
             echo "No alteration changes detected"
           fi
 
   package:
     needs: check-alteration-changes
     runs-on: ubuntu-latest
-    if: ${{needs.check-alteration-changes.outputs.has-alteration-changes == 'true'}}
+    if: ${{ needs.check-alteration-changes.outputs.has-alteration-changes == 'true' }}
     env:
       INTEGRATION_TEST: true
+      DEV_FEATURES_ENABLED: false
     steps:
-      - uses: logto-io/actions-package-logto-artifact@v2
+      - uses: logto-io/actions-package-logto-artifact@v3
         with:
           artifact-name: alteration-integration-test-${{ github.sha }}
-          branch: ${{github.base_ref}}
+          branch: ${{ github.base_ref }}
           pnpm-version: 9
 
   run-logto:
@@ -66,13 +67,27 @@ jobs:
     runs-on: ubuntu-latest
     env:
       INTEGRATION_TEST: true
+      DEV_FEATURES_ENABLED: false
       DB_URL: postgres://postgres:postgres@localhost:5432/postgres
 
     steps:
-      - uses: logto-io/actions-run-logto-integration-tests@v3
+      - uses: logto-io/actions-run-logto-integration-tests@v4
         with:
-          branch: ${{github.base_ref}}
+          branch: ${{ github.base_ref }}
           logto-artifact: alteration-integration-test-${{ github.sha }}
           test-target: ${{ matrix.target }}
-          db-alteration-target: ${{github.head_ref}}
+          db-alteration-target: ${{ github.head_ref }}
           pnpm-version: 9
+
+  # Automatically rerun the workflow since the integration tests are moody
+  # From this genius: https://github.com/orgs/community/discussions/67654#discussioncomment-8038649
+  rerun-on-failure:
+    needs: run-logto
+    if: failure() && fromJSON(github.run_attempt) < 3
+    runs-on: ubuntu-latest
+    steps:
+      - env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: gh workflow run rerun.yml -F run_id=${{ github.run_id }}

.github/workflows/changesets.yml

@@ -18,7 +18,7 @@ jobs:
           token: ${{ secrets.BOT_PAT }}
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 

.github/workflows/commitlint.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 

.github/workflows/integration-test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - "push-action/**"
   pull_request:
 
 concurrency:
@@ -13,30 +12,51 @@ concurrency:
 
 jobs:
   package:
+    strategy:
+      matrix:
+        # Run the integration tests with and without dev features enabled
+        dev-features-enabled: [true, false]
     runs-on: ubuntu-latest
     env:
       INTEGRATION_TEST: true
+      DEV_FEATURES_ENABLED: ${{ matrix.dev-features-enabled }}
 
     steps:
-      - uses: logto-io/actions-package-logto-artifact@v2
+      - uses: logto-io/actions-package-logto-artifact@v3
         with:
-          artifact-name: integration-test-${{ github.sha }}
+          artifact-name: integration-test-${{ github.sha }}-dev-features-${{ matrix.dev-features-enabled }}
           pnpm-version: 9
 
   run-logto:
     strategy:
       fail-fast: false
       matrix:
         target: [api, experience, console]
+        # Run the integration tests with and without dev features enabled
+        dev-features-enabled: [true, false]
     needs: package
     runs-on: ubuntu-latest
     env:
       INTEGRATION_TEST: true
+      DEV_FEATURES_ENABLED: ${{ matrix.dev-features-enabled }}
       DB_URL: postgres://postgres:postgres@localhost:5432/postgres
 
     steps:
-      - uses: logto-io/actions-run-logto-integration-tests@v3
+      - uses: logto-io/actions-run-logto-integration-tests@v4
         with:
-          logto-artifact: integration-test-${{ github.sha }}
+          logto-artifact: integration-test-${{ github.sha }}-dev-features-${{ env.DEV_FEATURES_ENABLED }}
           test-target: ${{ matrix.target }}
           pnpm-version: 9
+
+  # Automatically rerun the workflow since the integration tests are moody
+  # From this genius: https://github.com/orgs/community/discussions/67654#discussioncomment-8038649
+  rerun-on-failure:
+    needs: run-logto
+    if: failure() && fromJSON(github.run_attempt) < 3
+    runs-on: ubuntu-latest
+    steps:
+      - env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: gh workflow run rerun.yml -r ${{ github.head_ref || github.ref_name }} -F run_id=${{ github.run_id }}

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 
@@ -89,7 +89,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           build-args: | # Test cloud build
@@ -120,7 +120,7 @@ jobs:
         run: cp ./fresh/pnpm-lock.yaml ./
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
           run-install: false
@@ -136,7 +136,7 @@ jobs:
       # ** End **
 
       - name: Setup Postgres
-        uses: ikalnytskyi/action-setup-postgres@v5
+        uses: ikalnytskyi/action-setup-postgres@v6
 
       # ** Setup up-to-date databases and compare (test `up`) **
       - name: Setup fresh database

.github/workflows/master-codecov-report.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 

.github/workflows/release.yml

@@ -105,7 +105,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           context: .
@@ -129,7 +129,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 
@@ -161,7 +161,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 

.github/workflows/rerun.yml

@@ -0,0 +1,20 @@
+# From this genius: https://github.com/orgs/community/discussions/67654#discussioncomment-8038649
+name: Rerun workflow
+
+on:
+  workflow_dispatch:
+    inputs:
+      run_id:
+        required: true
+jobs:
+  rerun:
+    runs-on: ubuntu-latest
+    steps:
+      - name: rerun ${{ inputs.run_id }}
+        env:
+          GH_REPO: ${{ github.repository }}
+          GH_TOKEN: ${{ github.token }}
+          GH_DEBUG: api
+        run: |
+          gh run watch ${{ inputs.run_id }} > /dev/null 2>&1
+          gh run rerun ${{ inputs.run_id }} --failed

.github/workflows/upload-annotations.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node and pnpm
-        uses: silverhand-io/actions-node-pnpm-run-steps@v4
+        uses: silverhand-io/actions-node-pnpm-run-steps@v5
         with:
           pnpm-version: 9
 

.scripts/compare-database.js

@@ -99,21 +99,46 @@ const queryDatabaseManifest = async (database) => {
   `);
 
   // This function removes the last segment of grantee since Logto will use 'logto_tenant_fresh/alteration' for the role name.
-  const normalizeGrantee = ({ grantee, ...rest }) => {
-    if (grantee.startsWith('logto_tenant_')) {
-      return { ...rest, grantee: 'logto_tenant' };
+  const normalizeRoleName = (roleName) => {
+    if (roleName.startsWith('logto_tenant_')) {
+      return 'logto_tenant';
     }
 
-    return { grantee, ...rest };
+    // Removes the last segment of region grantee since Logto will use 'logto_region_xxx' for the role name for different regions.
+    if (roleName.startsWith('logto_region_')) {
+      return 'logto_region';
+    }
+
+    return roleName;
   };
 
+  const normalizeGrantee = ({ grantee, ...rest }) => ({
+    ...rest,
+    grantee: normalizeRoleName(grantee),
+  });
+
   // Ditto.
   const normalizeRoles = ({ roles: raw, ...rest }) => {
-    const roles = raw.slice(1, -1).split(',').map((name) => name.startsWith('logto_tenant_') ? 'logto_tenant' : name);
+    const roles = raw
+      .slice(1, -1)
+      .split(',')
+      .map((name) => normalizeRoleName(name));
 
     return { roles, ...rest };
   };
 
+  const normalizePolicyname = ({ policyname, ...rest }) => {
+    const prefix = 'allow_';
+    const suffix = '_access';
+    if (policyname && policyname.startsWith(prefix) && policyname.endsWith(suffix)) {
+      // This is a naming convention in Logto cloud, it is formatted as `allow_{role_name}_access`, we need to normalize the role name part for the convenience of comparing DB updates.
+      // Ref: https://github.com/logto-io/cloud/pull/738
+      return { policyname: `${prefix}${normalizeRoleName(policyname.slice(prefix.length, -suffix.length))}${suffix}`, ...rest };
+    }
+
+    return { policyname, ...rest };
+  };
+
   // Omit generated ids and values
   return {
     tables: omitArray(tables, 'table_catalog'),
@@ -144,7 +169,7 @@ const queryDatabaseManifest = async (database) => {
     indexes,
     funcs,
     triggers: omitArray(triggers, 'trigger_catalog', 'event_object_catalog'),
-    policies: policies.map(normalizeRoles),
+    policies: policies.map(normalizeRoles).map(normalizePolicyname),
     columnGrants: omitArray(columnGrants, 'table_catalog').map(normalizeGrantee),
     tableGrants: omitArray(tableGrants, 'table_catalog').map(normalizeGrantee),
   };

.vscode/settings.json

@@ -54,6 +54,7 @@
     "timestamptz",
     "topbar",
     "upsell",
-    "withtyped"
+    "withtyped",
+    "backchannel"
   ]
 }