Skip to content

Commit cc3d78f

Browse files
committed
fix: pin EQL install scripts to eql-2.2.1
Stack installed the EQL SQL bundle from an unpinned releases/latest URL. EQL's Latest GitHub release moved to the 2.3 line, so CI (and the CLI installer / Drizzle generator) started pulling EQL 2.3 while the code emits EQL 2.2 payloads (protect-ffi 0.21.4) — breaking STE-vec containment queries. Pin local/Dockerfile, the CLI installer, and the Drizzle migration generator to eql-2.2.1. The move to 2.3 happens with the protect-ffi 0.22.0 upgrade.
1 parent 8daf4e3 commit cc3d78f

3 files changed

Lines changed: 13 additions & 5 deletions

File tree

local/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ FROM postgres:latest
22

33
RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && rm -rf /var/lib/apt/lists/*
44

5-
# Download latest EQL install script
6-
RUN curl -sLo /tmp/cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql
5+
# EQL install script, pinned to match the EQL payload format the code emits
6+
# (protect-ffi 0.21.x -> EQL 2.2). Bump in lockstep with protect-ffi.
7+
ARG EQL_VERSION=eql-2.2.1
8+
RUN curl -sLo /tmp/cipherstash-encrypt.sql https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt.sql
79

810
# Copy the custom entrypoint script and SQL files
911
COPY postgres-entrypoint.sh /usr/local/bin/postgres-entrypoint.sh

packages/cli/src/installer/index.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import { existsSync, readFileSync } from 'node:fs'
22
import { dirname, join, resolve } from 'node:path'
33
import pg from 'pg'
44

5+
// EQL release, pinned to match the EQL payload format this package emits.
6+
// Bump in lockstep with @cipherstash/protect-ffi.
7+
const EQL_VERSION = 'eql-2.2.1'
58
const EQL_INSTALL_URL =
6-
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql'
9+
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt.sql`
710
const EQL_INSTALL_NO_OPERATOR_FAMILY_URL =
8-
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt-supabase.sql'
11+
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt-supabase.sql`
912
const EQL_SCHEMA_NAME = 'eql_v2'
1013

1114
/**

packages/drizzle/src/bin/generate-eql-migration.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ import { readdir } from 'node:fs/promises'
44
import { join, resolve } from 'node:path'
55
import { detectRunner } from './runner.js'
66

7+
// EQL release, pinned to match the EQL payload format this package emits.
8+
// Bump in lockstep with @cipherstash/protect-ffi.
9+
const EQL_VERSION = 'eql-2.2.1'
710
const EQL_INSTALL_URL =
8-
'https://github.com/cipherstash/encrypt-query-language/releases/latest/download/cipherstash-encrypt.sql'
11+
`https://github.com/cipherstash/encrypt-query-language/releases/download/${EQL_VERSION}/cipherstash-encrypt.sql`
912

1013
type CliArgs = {
1114
migrationName: string

0 commit comments

Comments
 (0)