diff --git a/.docker/selfhost/schema.json b/.docker/selfhost/schema.json index b1e6e3d692..a78e7aa036 100644 --- a/.docker/selfhost/schema.json +++ b/.docker/selfhost/schema.json @@ -886,8 +886,8 @@ "properties": { "enabled": { "type": "boolean", - "description": "Enable indexer plugin\n@default true\n@environment `AFFINE_INDEXER_ENABLED`", - "default": true + "description": "Enable indexer plugin\n@default false\n@environment `AFFINE_INDEXER_ENABLED`", + "default": false }, "provider.type": { "type": "string", diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 32b0c82250..16f0cfdf21 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -20,6 +20,7 @@ env: COVERAGE: true MACOSX_DEPLOYMENT_TARGET: '10.13' DEPLOYMENT_TYPE: affine + AFFINE_INDEXER_ENABLED: true concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/packages/backend/server/.env.example b/packages/backend/server/.env.example index 9c740f0492..2d8a2362b7 100644 --- a/packages/backend/server/.env.example +++ b/packages/backend/server/.env.example @@ -9,4 +9,6 @@ # MAILER_SENDER="noreply@toeverything.info" # MAILER_USER="noreply@toeverything.info" # MAILER_PASSWORD="affine" -# MAILER_SECURE=false \ No newline at end of file +# MAILER_SECURE=false + +# AFFINE_INDEXER_ENABLED=true diff --git a/packages/backend/server/src/plugins/indexer/__tests__/event.spec.ts b/packages/backend/server/src/plugins/indexer/__tests__/event.spec.ts index 7e40da45c2..4ca0353232 100644 --- a/packages/backend/server/src/plugins/indexer/__tests__/event.spec.ts +++ b/packages/backend/server/src/plugins/indexer/__tests__/event.spec.ts @@ -3,11 +3,19 @@ import Sinon from 'sinon'; import { createModule } from '../../../__tests__/create-module'; import { Config } from '../../../base'; +import { ConfigModule } from '../../../base/config'; import { IndexerModule } from '..'; import { IndexerEvent } from '../event'; const module = await createModule({ - imports: [IndexerModule], + imports: [ + IndexerModule, + ConfigModule.override({ + indexer: { + enabled: true, + }, + }), + ], }); const indexerEvent = module.get(IndexerEvent); const config = module.get(Config); diff --git a/packages/backend/server/src/plugins/indexer/__tests__/job.spec.ts b/packages/backend/server/src/plugins/indexer/__tests__/job.spec.ts index 1f8e17e634..8977879711 100644 --- a/packages/backend/server/src/plugins/indexer/__tests__/job.spec.ts +++ b/packages/backend/server/src/plugins/indexer/__tests__/job.spec.ts @@ -7,6 +7,7 @@ import Sinon from 'sinon'; import { createModule } from '../../../__tests__/create-module'; import { Mockers } from '../../../__tests__/mocks'; import { JOB_SIGNAL } from '../../../base'; +import { ConfigModule } from '../../../base/config'; import { ServerConfigModule } from '../../../core/config'; import { Models } from '../../../models'; import { IndexerModule, IndexerService } from '..'; @@ -15,7 +16,15 @@ import { IndexerJob } from '../job'; import { ManticoresearchProvider } from '../providers'; const module = await createModule({ - imports: [IndexerModule, ServerConfigModule], + imports: [ + IndexerModule, + ServerConfigModule, + ConfigModule.override({ + indexer: { + enabled: true, + }, + }), + ], providers: [IndexerService], }); const indexerService = module.get(IndexerService); diff --git a/packages/backend/server/src/plugins/indexer/__tests__/providers/elasticsearch.spec.ts b/packages/backend/server/src/plugins/indexer/__tests__/providers/elasticsearch.spec.ts index 6f73dfc6ab..0af7ce0fad 100644 --- a/packages/backend/server/src/plugins/indexer/__tests__/providers/elasticsearch.spec.ts +++ b/packages/backend/server/src/plugins/indexer/__tests__/providers/elasticsearch.spec.ts @@ -33,6 +33,7 @@ _test.before(async () => { IndexerModule, ConfigModule.override({ indexer: { + enabled: true, provider: { type: SearchProviderType.Elasticsearch, endpoint: 'http://localhost:9200', diff --git a/packages/backend/server/src/plugins/indexer/__tests__/providers/manticoresearch.spec.ts b/packages/backend/server/src/plugins/indexer/__tests__/providers/manticoresearch.spec.ts index 75b3f1f690..0706a8b1e5 100644 --- a/packages/backend/server/src/plugins/indexer/__tests__/providers/manticoresearch.spec.ts +++ b/packages/backend/server/src/plugins/indexer/__tests__/providers/manticoresearch.spec.ts @@ -18,6 +18,7 @@ const module = await createModule({ IndexerModule, ConfigModule.override({ indexer: { + enabled: true, provider: { type: SearchProviderType.Manticoresearch, endpoint: 'http://localhost:9308', diff --git a/packages/backend/server/src/plugins/indexer/__tests__/service.spec.ts b/packages/backend/server/src/plugins/indexer/__tests__/service.spec.ts index 0ec43fb7eb..b3b1ec2dcf 100644 --- a/packages/backend/server/src/plugins/indexer/__tests__/service.spec.ts +++ b/packages/backend/server/src/plugins/indexer/__tests__/service.spec.ts @@ -6,6 +6,7 @@ import { omit, pick } from 'lodash-es'; import { createModule } from '../../../__tests__/create-module'; import { Mockers } from '../../../__tests__/mocks'; +import { ConfigModule } from '../../../base/config'; import { ServerConfigModule } from '../../../core/config'; import { IndexerModule, IndexerService } from '..'; import { SearchProviderFactory } from '../factory'; @@ -20,7 +21,15 @@ import { } from '../types'; const module = await createModule({ - imports: [IndexerModule, ServerConfigModule], + imports: [ + IndexerModule, + ServerConfigModule, + ConfigModule.override({ + indexer: { + enabled: true, + }, + }), + ], providers: [IndexerService], }); const indexerService = module.get(IndexerService); diff --git a/packages/backend/server/src/plugins/indexer/config.ts b/packages/backend/server/src/plugins/indexer/config.ts index ff06e84c31..b50b011f4f 100644 --- a/packages/backend/server/src/plugins/indexer/config.ts +++ b/packages/backend/server/src/plugins/indexer/config.ts @@ -30,7 +30,7 @@ declare global { defineModuleConfig('indexer', { enabled: { desc: 'Enable indexer plugin', - default: true, + default: false, env: ['AFFINE_INDEXER_ENABLED', 'boolean'], }, 'provider.type': {