Skip to content

ci: run Test JS integration tests against a pinned postgres-eql container #477

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.

Sign up for GitHub

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

Merged
coderdan merged 2 commits into from
May 21, 2026
+56 −37
Merged

ci: run Test JS integration tests against a pinned postgres-eql container #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37e670a
ci: run Test JS integration tests against a pinned postgres-eql conta…
coderdan May 21, 2026
4787430
test(protect): skip = equality tests calibrated to an unreleased EQL …
coderdan May 21, 2026
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
29 changes: 22 additions & 7 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,25 @@ jobs:
name: Run Tests
runs-on: blacksmith-4vcpu-ubuntu-2404

# Postgres + EQL for the integration tests. Official EQL image —
# PostgreSQL 17 with EQL pre-installed via /docker-entrypoint-initdb.d.
# Pinned to eql-2.2.1 to match the EQL payload format the code emits
# (protect-ffi 0.21.x); bump in lockstep with the protect-ffi upgrade.
services:
postgres:
image: ghcr.io/cipherstash/postgres-eql:17-2.2.1
Copy link
Copy Markdown
Contributor

@freshtonic freshtonic May 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent

env:
POSTGRES_USER: cipherstash
POSTGRES_PASSWORD: password
POSTGRES_DB: cipherstash
ports:
- 5432:5432
options: >-
--health-cmd "pg_isready -U cipherstash -d cipherstash"
--health-interval 2s
--health-timeout 5s
--health-retries 20

steps:
- name: Checkout Repo
uses: actions/checkout@v6
Expand Down Expand Up @@ -50,9 +69,7 @@ jobs:
echo "CS_CLIENT_ID=${{ secrets.CS_CLIENT_ID }}" >> ./packages/protect/.env
echo "CS_CLIENT_KEY=${{ secrets.CS_CLIENT_KEY }}" >> ./packages/protect/.env
echo "CS_CLIENT_ACCESS_KEY=${{ secrets.CS_CLIENT_ACCESS_KEY }}" >> ./packages/protect/.env
echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> ./packages/protect/.env
echo "SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" >> ./packages/protect/.env
echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> ./packages/protect/.env
echo "DATABASE_URL=postgres://cipherstash:password@localhost:5432/cipherstash" >> ./packages/protect/.env

- name: Create .env file in ./packages/stack/
run: |
Expand All @@ -61,9 +78,7 @@ jobs:
echo "CS_CLIENT_ID=${{ secrets.CS_CLIENT_ID }}" >> ./packages/stack/.env
echo "CS_CLIENT_KEY=${{ secrets.CS_CLIENT_KEY }}" >> ./packages/stack/.env
echo "CS_CLIENT_ACCESS_KEY=${{ secrets.CS_CLIENT_ACCESS_KEY }}" >> ./packages/stack/.env
echo "SUPABASE_URL=${{ secrets.SUPABASE_URL }}" >> ./packages/stack/.env
echo "SUPABASE_ANON_KEY=${{ secrets.SUPABASE_ANON_KEY }}" >> ./packages/stack/.env
echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> ./packages/stack/.env
echo "DATABASE_URL=postgres://cipherstash:password@localhost:5432/cipherstash" >> ./packages/stack/.env

- name: Create .env file in ./packages/protect-dynamodb/
run: |
Expand All @@ -80,7 +95,7 @@ jobs:
echo "CS_CLIENT_ID=${{ secrets.CS_CLIENT_ID }}" >> ./packages/drizzle/.env
echo "CS_CLIENT_KEY=${{ secrets.CS_CLIENT_KEY }}" >> ./packages/drizzle/.env
echo "CS_CLIENT_ACCESS_KEY=${{ secrets.CS_CLIENT_ACCESS_KEY }}" >> ./packages/drizzle/.env
echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> ./packages/drizzle/.env
echo "DATABASE_URL=postgres://cipherstash:password@localhost:5432/cipherstash" >> ./packages/drizzle/.env

# Run TurboRepo tests
- name: Run tests
Expand Down
10 changes: 8 additions & 2 deletions packages/protect/__tests__/searchable-json-pg.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2187,8 +2187,14 @@ describe('searchableJson postgres integration', () => {
})

// ─── WHERE comparison: = equality ──────────────────────────────────

describe('WHERE comparison: = equality', () => {
//
// SKIPPED: these 4 tests are calibrated to STE-vec entry `=` behaviour
// and error wording from an unreleased EQL build — they do not pass
// against any published EQL release (verified across 2.1.x–2.3.x). The
// CI Postgres is now pinned to a published image (eql-2.2.1), so they
// fail. Re-enable and re-calibrate as part of the EQL 2.3 upgrade
// (protect-ffi 0.22.0 — PR #473).
describe.skip('WHERE comparison: = equality', () => {
it('jsonb_path_query_first = self-comparison (Extended)', async () => {
const plaintext = { role: 'eq-jpqf', marker: 'eq-jpqf-marker' }
const { id } = await insertRow(plaintext)
Expand Down
27 changes: 13 additions & 14 deletions packages/protect/__tests__/supabase.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,20 @@ import {

import { createClient } from '@supabase/supabase-js'

if (!process.env.SUPABASE_URL) {
throw new Error('Missing env.SUPABASE_URL')
}
if (!process.env.SUPABASE_ANON_KEY) {
throw new Error('Missing env.SUPABASE_ANON_KEY')
}
if (!process.env.DATABASE_URL) {
throw new Error('Missing env.DATABASE_URL — needed for fixture setup DDL')
}

const supabase = createClient(
process.env.SUPABASE_URL,
process.env.SUPABASE_ANON_KEY,
// supabase.test.ts needs a live Supabase project, so the suite is skipped
// when the Supabase environment is not configured (e.g. in CI, pending a
// containerised Supabase setup). It runs locally when SUPABASE_URL,
// SUPABASE_ANON_KEY, and DATABASE_URL are all set.
const SUPABASE_ENABLED = Boolean(
process.env.SUPABASE_URL &&
process.env.SUPABASE_ANON_KEY &&
process.env.DATABASE_URL,
)

const supabase = SUPABASE_ENABLED
? createClient(process.env.SUPABASE_URL!, process.env.SUPABASE_ANON_KEY!)
: (undefined as unknown as ReturnType<typeof createClient>)

const table = csTable('protect-ci', {
encrypted: csColumn('encrypted').freeTextSearch().equality(),
age: csColumn('age').dataType('number').equality(),
Expand Down Expand Up @@ -103,7 +102,7 @@ afterAll(async () => {
}
})

describe('supabase', () => {
describe.skipIf(!SUPABASE_ENABLED)('supabase', () => {
it('should insert and select encrypted data', async () => {
const protectClient = await protect({ schemas: [table] })

Expand Down
27 changes: 13 additions & 14 deletions packages/stack/__tests__/supabase.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createClient } from '@supabase/supabase-js'

if (!process.env.SUPABASE_URL) {
throw new Error('Missing env.SUPABASE_URL')
}
if (!process.env.SUPABASE_ANON_KEY) {
throw new Error('Missing env.SUPABASE_ANON_KEY')
}
if (!process.env.DATABASE_URL) {
throw new Error('Missing env.DATABASE_URL — needed for fixture setup DDL')
}

const supabase = createClient(
process.env.SUPABASE_URL,
process.env.SUPABASE_ANON_KEY,
// supabase.test.ts needs a live Supabase project, so the suite is skipped
// when the Supabase environment is not configured (e.g. in CI, pending a
// containerised Supabase setup). It runs locally when SUPABASE_URL,
// SUPABASE_ANON_KEY, and DATABASE_URL are all set.
const SUPABASE_ENABLED = Boolean(
process.env.SUPABASE_URL &&
process.env.SUPABASE_ANON_KEY &&
process.env.DATABASE_URL,
)

const supabase = SUPABASE_ENABLED
? createClient(process.env.SUPABASE_URL!, process.env.SUPABASE_ANON_KEY!)
: (undefined as unknown as ReturnType<typeof createClient>)

const table = encryptedTable('protect-ci', {
encrypted: encryptedColumn('encrypted').freeTextSearch().equality(),
age: encryptedColumn('age').dataType('number').equality(),
Expand Down Expand Up @@ -104,7 +103,7 @@ afterAll(async () => {
}
}, 30000)

describe('supabase (encryptedSupabase wrapper)', () => {
describe.skipIf(!SUPABASE_ENABLED)('supabase (encryptedSupabase wrapper)', () => {
it('should insert and select encrypted data', async () => {
const protectClient = await Encryption({ schemas: [table] })
const eSupabase = encryptedSupabase({
Expand Down
Loading