Skip to content

fix: feature enablement in admin api #853

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
fenos merged 2 commits into from
Feb 19, 2026
Merged

fix: feature enablement in admin api #853

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
f41b4d6
fix: feature enablement in admin api
ferhatelmas Feb 9, 2026
860b84a
chore: address feedback
ferhatelmas Feb 18, 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
20 changes: 8 additions & 12 deletions src/http/routes/admin/tenants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export default async function routes(fastify: FastifyInstance) {
anonKey: decrypt(anon_key),
databaseUrl: decrypt(database_url),
databasePoolUrl:
typeof database_pool_url === null
database_pool_url === null
? null
: database_pool_url
? decrypt(database_pool_url)
Expand Down Expand Up @@ -490,18 +490,14 @@ export default async function routes(fastify: FastifyInstance) {
tenantInfo.tracing_mode = tracingMode
}

if (typeof features?.icebergCatalog?.enabled) {
tenantInfo.feature_iceberg_catalog = features?.icebergCatalog?.enabled
tenantInfo.feature_iceberg_catalog_max_namespaces = features?.icebergCatalog?.maxNamespaces
tenantInfo.feature_iceberg_catalog_max_tables = features?.icebergCatalog?.maxTables
tenantInfo.feature_iceberg_catalog_max_catalogs = features?.icebergCatalog?.maxCatalogs
}
tenantInfo.feature_iceberg_catalog = features?.icebergCatalog?.enabled
tenantInfo.feature_iceberg_catalog_max_namespaces = features?.icebergCatalog?.maxNamespaces
tenantInfo.feature_iceberg_catalog_max_tables = features?.icebergCatalog?.maxTables
tenantInfo.feature_iceberg_catalog_max_catalogs = features?.icebergCatalog?.maxCatalogs

if (typeof features?.vectorBuckets?.enabled) {
tenantInfo.feature_vector_buckets = features?.vectorBuckets?.enabled
tenantInfo.feature_vector_buckets_max_buckets = features?.vectorBuckets?.maxBuckets
tenantInfo.feature_vector_buckets_max_indexes = features?.vectorBuckets?.maxIndexes
}
tenantInfo.feature_vector_buckets = features?.vectorBuckets?.enabled
tenantInfo.feature_vector_buckets_max_buckets = features?.vectorBuckets?.maxBuckets
tenantInfo.feature_vector_buckets_max_indexes = features?.vectorBuckets?.maxIndexes

await multitenantKnex.transaction(async (trx) => {
await trx('tenants').insert(tenantInfo).onConflict('id').merge()
Expand Down
95 changes: 95 additions & 0 deletions src/test/tenant.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,101 @@ describe('Tenant configs', () => {
expect(getResponseJSON).toEqual({ ...payload, fileSizeLimit: 2 })
})

test('Update tenant databasePoolUrl to null', async () => {
await adminApp.inject({
method: 'POST',
url: `/tenants/abc`,
payload,
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})

const patchResponse = await adminApp.inject({
method: 'PATCH',
url: `/tenants/abc`,
payload: { databasePoolUrl: null },
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})
expect(patchResponse.statusCode).toBe(204)

const getResponse = await adminApp.inject({
method: 'GET',
url: `/tenants/abc`,
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})
expect(getResponse.statusCode).toBe(200)

const getResponseJSON = JSON.parse(getResponse.body)
expect(getResponseJSON).toEqual({ ...payload, databasePoolUrl: null })
expect(getResponseJSON.databasePoolUrl).toBeNull()
})

test('Upsert tenant config updates iceberg/vector limits when enabled is omitted', async () => {
await adminApp.inject({
method: 'POST',
url: `/tenants/abc`,
payload,
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})

const updatedValue = 999

const putPayloadWithoutFeatureEnabled = {
...payload,
features: {
...payload.features,
icebergCatalog: {
maxCatalogs: updatedValue,
maxNamespaces: updatedValue,
maxTables: updatedValue,
},
vectorBuckets: {
maxBuckets: updatedValue,
maxIndexes: updatedValue,
},
},
}

const putResponse = await adminApp.inject({
method: 'PUT',
url: `/tenants/abc`,
payload: putPayloadWithoutFeatureEnabled,
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})
expect(putResponse.statusCode).toBe(204)

const getResponse = await adminApp.inject({
method: 'GET',
url: `/tenants/abc`,
headers: {
apikey: process.env.ADMIN_API_KEYS,
},
})
expect(getResponse.statusCode).toBe(200)

const getResponseJSON = JSON.parse(getResponse.body)
expect(getResponseJSON.features.icebergCatalog).toEqual({
enabled: payload.features.icebergCatalog.enabled,
maxCatalogs: updatedValue,
maxNamespaces: updatedValue,
maxTables: updatedValue,
})
expect(getResponseJSON.features.vectorBuckets).toEqual({
enabled: payload.features.vectorBuckets.enabled,
maxBuckets: updatedValue,
maxIndexes: updatedValue,
})
})

test('Upsert tenant config', async () => {
const firstPutResponse = await adminApp.inject({
method: 'PUT',
Expand Down
Loading