Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

fix(tests): move away from minio to garage

Mohamed Bassem6a63c11c2677
diff --git a/docker/garage/garage.toml b/docker/garage/garage.toml
new file mode 100644
index 00000000..2f94de72
--- /dev/null
+++ b/docker/garage/garage.toml
@@ -0,0 +1,13 @@
+# Single-node storage for E2E tests and benchmarks only.
+metadata_dir = "/data/meta"
+data_dir = "/data/blocks"
+db_engine = "sqlite"
+replication_factor = 1
+
+rpc_bind_addr = "[::]:3901"
+rpc_public_addr = "127.0.0.1:3901"
+rpc_secret = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+
+[s3_api]
+s3_region = "us-east-1"
+api_bind_addr = "[::]:3900"
diff --git a/packages/benchmarks/docker-compose.yml b/packages/benchmarks/docker-compose.yml
index 6a47ceba..e1ad8231 100644
--- a/packages/benchmarks/docker-compose.yml
+++ b/packages/benchmarks/docker-compose.yml
@@ -37,18 +37,25 @@ services:
restart: unless-stopped
volumes:
- ./setup/html:/usr/share/nginx/html
- minio:
- image: minio/minio:latest
+ garage:
+ image: dxflrs/garage:v2.3.0
restart: unless-stopped
ports:
- - "9000:9000"
- - "9001:9001"
+ - "9000:3900"
environment:
- MINIO_ROOT_USER: minioadmin
- MINIO_ROOT_PASSWORD: minioadmin
- command: server /data --console-address ":9001"
+ # Fixed credentials for local tests only.
+ GARAGE_DEFAULT_ACCESS_KEY: GK0123456789abcdef0123456789abcdef
+ GARAGE_DEFAULT_SECRET_KEY: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+ GARAGE_DEFAULT_BUCKET: karakeep-test
+ command: /garage server --single-node --default-bucket
volumes:
- - minio_data:/data
+ - ../../docker/garage/garage.toml:/etc/garage.toml:ro
+ - garage_data:/data
+ healthcheck:
+ test: ["CMD", "/garage", "bucket", "info", "karakeep-test"]
+ interval: 1s
+ timeout: 5s
+ retries: 30
volumes:
- minio_data:
+ garage_data:
diff --git a/packages/benchmarks/src/startContainers.ts b/packages/benchmarks/src/startContainers.ts
index ed4e0250..6a6e10a5 100644
--- a/packages/benchmarks/src/startContainers.ts
+++ b/packages/benchmarks/src/startContainers.ts
@@ -38,7 +38,7 @@ async function captureDockerLogs(composeDir: string): Promise<void> {
// ignore
}
- const services = ["web", "meilisearch", "chrome", "nginx", "minio"];
+ const services = ["web", "meilisearch", "chrome", "nginx", "garage"];
for (const service of services) {
try {
execSync(
@@ -69,7 +69,7 @@ export async function startContainers(): Promise<RunningContainers> {
const buildArg = skipBuild ? "" : "--build";
logStep(`Starting docker compose on port ${port}`);
- execSync(`docker compose up ${buildArg} -d`, {
+ execSync(`docker compose up ${buildArg} -d --wait --wait-timeout 60`, {
cwd: composeDir,
stdio: "inherit",
env: { ...process.env, KARAKEEP_PORT: String(port) },
diff --git a/packages/e2e_tests/docker-compose.yml b/packages/e2e_tests/docker-compose.yml
index 2c57bb15..dc95a462 100644
--- a/packages/e2e_tests/docker-compose.yml
+++ b/packages/e2e_tests/docker-compose.yml
@@ -52,18 +52,25 @@ services:
volumes:
- ./setup/html:/usr/share/nginx/html
- ./setup/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
- minio:
- image: minio/minio:latest
+ garage:
+ image: dxflrs/garage:v2.3.0
restart: unless-stopped
ports:
- - "9000:9000"
- - "9001:9001"
+ - "9000:3900"
environment:
- MINIO_ROOT_USER: minioadmin
- MINIO_ROOT_PASSWORD: minioadmin
- command: server /data --console-address ":9001"
+ # Fixed credentials for local tests only.
+ GARAGE_DEFAULT_ACCESS_KEY: GK0123456789abcdef0123456789abcdef
+ GARAGE_DEFAULT_SECRET_KEY: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+ GARAGE_DEFAULT_BUCKET: karakeep-test
+ command: /garage server --single-node --default-bucket
volumes:
- - minio_data:/data
+ - ../../docker/garage/garage.toml:/etc/garage.toml:ro
+ - garage_data:/data
+ healthcheck:
+ test: ["CMD", "/garage", "bucket", "info", "karakeep-test"]
+ interval: 1s
+ timeout: 5s
+ retries: 30
aimock:
image: ghcr.io/copilotkit/aimock:latest
restart: unless-stopped
@@ -88,4 +95,4 @@ services:
retries: 20
volumes:
- minio_data:
+ garage_data:
diff --git a/packages/e2e_tests/setup/startContainers.ts b/packages/e2e_tests/setup/startContainers.ts
index 9d585b09..4005c4ca 100644
--- a/packages/e2e_tests/setup/startContainers.ts
+++ b/packages/e2e_tests/setup/startContainers.ts
@@ -54,7 +54,7 @@ export default async function ({ provide }: GlobalSetupContext) {
console.log(
`Starting docker compose on ports karakeep=${karakeepPort} aimock=${aimockPort} meili=${meiliPort}...`,
);
- execSync(`docker compose up ${buildArg} -d`, {
+ execSync(`docker compose up ${buildArg} -d --wait --wait-timeout 60`, {
cwd: __dirname,
stdio: "inherit",
env: {
@@ -93,7 +93,7 @@ export default async function ({ provide }: GlobalSetupContext) {
"meilisearch",
"chrome",
"nginx",
- "minio",
+ "garage",
"aimock",
];
for (const service of services) {
diff --git a/packages/e2e_tests/tests/assetdb/assetdb-utils.ts b/packages/e2e_tests/tests/assetdb/assetdb-utils.ts
index 74f16a87..6d55a5bc 100644
--- a/packages/e2e_tests/tests/assetdb/assetdb-utils.ts
+++ b/packages/e2e_tests/tests/assetdb/assetdb-utils.ts
@@ -131,10 +131,11 @@ export function createLocalFileSystemStore(
export function createS3Store(bucketName: string): S3AssetStore {
const s3Client = new S3Client({
region: "us-east-1",
- endpoint: "http://localhost:9000", // MinIO endpoint for testing
+ endpoint: "http://localhost:9000", // Garage endpoint for testing
credentials: {
- accessKeyId: "minioadmin",
- secretAccessKey: "minioadmin",
+ accessKeyId: "GK0123456789abcdef0123456789abcdef",
+ secretAccessKey:
+ "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
},
forcePathStyle: true,
});
@@ -147,8 +148,9 @@ export async function createTestBucket(bucketName: string): Promise<S3Client> {
region: "us-east-1",
endpoint: "http://localhost:9000",
credentials: {
- accessKeyId: "minioadmin",
- secretAccessKey: "minioadmin",
+ accessKeyId: "GK0123456789abcdef0123456789abcdef",
+ secretAccessKey:
+ "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
},
forcePathStyle: true,
});
diff --git a/packages/e2e_tests/tests/assetdb/s3-store.test.ts b/packages/e2e_tests/tests/assetdb/s3-store.test.ts
index 32998db8..09a1ee6d 100644
--- a/packages/e2e_tests/tests/assetdb/s3-store.test.ts
+++ b/packages/e2e_tests/tests/assetdb/s3-store.test.ts
@@ -136,7 +136,7 @@ describe("S3AssetStore - S3-Specific Behaviors", () => {
});
describe("S3 Eventual Consistency", () => {
- it("should handle immediate read after write (MinIO strong consistency)", async () => {
+ it("should handle immediate read after write", async () => {
const testData = createTestAssetData();
await store.saveAsset({
@@ -146,7 +146,7 @@ describe("S3AssetStore - S3-Specific Behaviors", () => {
metadata: testData.metadata,
});
- // Immediately try to read - should work with MinIO's strong consistency
+ // A completed write should be immediately readable.
const { asset, metadata } = await store.readAsset({
userId: testData.userId,
assetId: testData.assetId,