Merge branch 'master' into fix/typegen-composite-types-not-nullable

Author: soedirgo

.github/workflows/ci.yml

@@ -7,16 +7,22 @@ on:
       - master
   workflow_dispatch:
 
+# Cancel old builds on new commit for same workflow + branch/PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version-file: '.nvmrc'
+
 
       - run: |
           npm clean-install
@@ -25,25 +31,36 @@ jobs:
 
   prettier-check:
     name: Prettier check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actionsx/prettier@v2
+      - name: Setup node
+        uses: actions/setup-node@v4
         with:
-          args: --check "{src,test}/**/*.ts"
-  
+          node-version-file: '.nvmrc'
+
+      # Installing all dependencies takes up to three minutes, hacking around to only installing prettier+deps
+      - name: Download dependencies
+        run: |
+          rm package.json
+          rm package-lock.json
+          npm i prettier@3 [email protected]
+      - name: Run prettier
+        run: |-
+          npx prettier -c '{src,test}/**/*.ts'
+
   docker:
     name: Build with docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout Repo
 
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         name: Set up Docker Buildx
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
           push: false
           tags: pg-meta:test

.github/workflows/docs.yml

@@ -6,16 +6,22 @@ on:
       - master
   workflow_dispatch:
 
+
+# Cancel old builds on new commit for same workflow + branch/PR
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docs:
     name: Publish docs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version-file: '.nvmrc'
 
       - run: |
           npm clean-install

.github/workflows/mirror.yml

@@ -16,19 +16,19 @@ jobs:
       packages: write
     steps:
       - name: configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
           aws-region: us-east-1
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: public.ecr.aws
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: akhilerm/tag-push-action@v2.1.0
+      - uses: akhilerm/tag-push-action@v2.2.0
         with:
           src: docker.io/supabase/postgres-meta:${{ inputs.version }}
           dst: |

.github/workflows/publish-deps.yml

@@ -5,22 +5,22 @@ on:
 
 jobs:
   publish:
-    # Must match glibc verison in node:18
+    # Must match glibc verison in node:20
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'pyramation/libpg-query-node'
-          ref: 'v13'
+          ref: 'v15'
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
 
       - run: npm i
       - run: npm run binary:build
 
-      - uses: aws-actions/configure-aws-credentials@v2
+      - uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
           aws-region: us-east-1

.github/workflows/release.yml

@@ -9,58 +9,29 @@ on:
 jobs:
   semantic-release:
     name: Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       new-release-published: ${{ steps.semantic-release.outputs.new_release_published }}
       new-release-version: ${{ steps.semantic-release.outputs.new_release_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
 
       - run: |
           npm clean-install
           npm run build
 
       - id: semantic-release
-        uses: cycjimmy/semantic-release-action@v3
+        uses: cycjimmy/semantic-release-action@v4
         with:
-          semantic_version: 18
+          semantic_version: 21
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-  upload:
-    name: Upload assets to GitHub Releases
-    needs:
-      - semantic-release
-    if: needs.semantic-release.outputs.new-release-published == 'true'
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-
-      - name: Prepare release
-        run: |
-          npm clean-install
-          npm run pkg
-          mv bin/postgres-meta-linux postgres-meta
-          tar -czvf postgres-meta-${{ needs.semantic-release.outputs.new-release-version }}-x86_64-linux-gnu.tar.gz postgres-meta
-          mv bin/postgres-meta-macos postgres-meta
-          tar -czvf postgres-meta-${{ needs.semantic-release.outputs.new-release-version }}-x86_64-apple-darwin.tar.gz postgres-meta
-          mv bin/postgres-meta-win.exe postgres-meta.exe
-          tar -czvf postgres-meta-${{ needs.semantic-release.outputs.new-release-version }}-x86_64-pc-windows.tar.gz postgres-meta.exe
-
-      - uses: softprops/action-gh-release@v1
-        with:
-          tag_name: v${{ needs.semantic-release.outputs.new-release-version }}
-          files: postgres-meta-*.tar.gz
-
   docker-hub:
     name: Release on Docker Hub
     needs:
@@ -73,7 +44,7 @@ jobs:
       packages: write
     steps:
       - id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             supabase/postgres-meta
@@ -82,36 +53,36 @@ jobs:
           tags: |
             type=raw,value=v${{ needs.semantic-release.outputs.new-release-version }}
 
-      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-qemu-action@v3
         with:
           platforms: amd64,arm64
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           role-to-assume: ${{ secrets.PROD_AWS_ROLE }}
           aws-region: us-east-1
 
       - name: Login to ECR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: public.ecr.aws
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v5
         with:
           push: true
           platforms: linux/amd64,linux/arm64

.nvmrc

@@ -0,0 +1 @@
+v20

.pkg.config.json

@@ -0,0 +1,14 @@
+# Contributing
+
+### Install deps
+
+- docker
+- `npm install`
+
+### Start services
+
+1. Run `docker compose up` in `/test/db`
+2. Run the tests: `npm run test:run`
+3. Make changes in code (`/src`) and tests (`/test/lib` and `/test/server`)
+4. Run the tests again: `npm run test:run`
+5. Commit + PR

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-FROM node:18 as build
+FROM node:20 as build
 WORKDIR /usr/src/app
 # Do `npm ci` separately so we can cache `node_modules`
 # https://nodejs.org/en/docs/guides/nodejs-docker-webapp/
@@ -7,13 +7,17 @@ RUN npm clean-install
 COPY . .
 RUN npm run build && npm prune --omit=dev
 
-FROM node:18-slim
+FROM node:20-slim
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
 WORKDIR /usr/src/app
 COPY --from=build /usr/src/app/node_modules node_modules
 COPY --from=build /usr/src/app/dist dist
 COPY package.json ./
 ENV PG_META_PORT=8080
-CMD ["npm", "run", "start"]
+# `npm run start` does not forward signals to child process
+CMD ["node", "dist/server/server.js"]
 EXPOSE 8080
 # --start-period defaults to 0s, but can't be set to 0s (to be explicit) by now
-HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD node -e "require('http').get('http://localhost:8080/health', (r) => {if (r.statusCode !== 200) throw new Error(r.statusCode)})"
+HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD node -e "fetch('http://localhost:8080/health').then((r) => {if (r.status !== 200) throw new Error(r.status)})"

Dockerfile

@@ -98,7 +98,7 @@ None. Please don't use this as a standalone server. This should be used behind a
 
 To start developing, run `npm run dev`. It will set up the database with Docker for you. The server will restart on file change.
 
-If you are fixing a bug, you should create a new test case. To test your changes, add the `-u/--updateSnapshot` flag to `jest` on the `test:run` script, run `npm run test`, and then review the git diff of the snapshots. Depending on your change, you may see `id` fields being changed - this is expected and you are free to commit it, as long as it passes the CI. Don't forget to remove the `-u/--updateSnapshot` flag when committing.
+If you are fixing a bug, you should create a new test case. To test your changes, add the `-u` flag to `vitest` on the `test:run` script, run `npm run test`, and then review the git diff of the snapshots. Depending on your change, you may see `id` fields being changed - this is expected and you are free to commit it, as long as it passes the CI. Don't forget to remove the `-u` flag when committing.
 
 To make changes to the TypeScript type generation, run `npm run gen:types:typescript` while you have `npm run dev` running.
 To use your own database connection string instead of the provided test database, run: