Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(infra): stop a bundled container its datastore no longer uses
Yudhi Armyndharis24b8aeae7326
diff --git a/src/modules/infra/infra-config.controller.spec.ts b/src/modules/infra/infra-config.controller.spec.tsindex 39f4d3e18..e16eb2f00 100644--- a/src/modules/infra/infra-config.controller.spec.ts+++ b/src/modules/infra/infra-config.controller.spec.ts@@ -2660,7 +2660,7 @@ describe('InfraConfigController.requestRestart constrains teardown to managed pr});describe('a service the environment pins the app to', () => {- const KEYS = ['DATABASE_HOST', 'REDIS_HOST', 'S3_ENDPOINT'];+ const KEYS = ['DATABASE_HOST', 'REDIS_HOST', 'S3_ENDPOINT', 'DATABASE_TYPE', 'REDIS_ENABLED', 'STORAGE_TYPE'];let savedEnv: Array<[string, string | undefined]>;beforeEach(() => {@@ -2680,6 +2680,9 @@ describe('InfraConfigController.requestRestart constrains teardown to managed prprocess.env.DATABASE_HOST = 'postgres';process.env.REDIS_HOST = 'redis';process.env.S3_ENDPOINT = 'http://minio:9000';+ process.env.DATABASE_TYPE = 'postgres';+ process.env.REDIS_ENABLED = 'true';+ process.env.STORAGE_TYPE = 's3';recordPinnedEnvKeys(process.env);const stopManagedService = jest.fn().mockResolvedValue(true);const controller = buildController({diff --git a/src/modules/infra/infra-config.controller.ts b/src/modules/infra/infra-config.controller.tsindex 1826bfd49..904d5c23f 100644--- a/src/modules/infra/infra-config.controller.ts+++ b/src/modules/infra/infra-config.controller.ts@@ -21,6 +21,7 @@ import {BUNDLED_SERVICE_ENV,DockerService,MANAGED_DOCKER_PROFILES,+ datastoreInUse,hostPinnedElsewhere,namesBundledContainer,} from '../docker';@@ -486,7 +487,9 @@ export class InfraConfigController {const bundled = BUNDLED_SERVICE_ENV[profile];if (!bundled) return false;const [key] = bundled;- return namesBundledContainer(profile, isEnvPinned(key) ? process.env[key] : (saved ??= readGeneratedEnv())[key]);+ const bootValue = this.bootValueReader((saved ??= readGeneratedEnv()));+ // A host that still names the container keeps it only while the next boot uses that datastore.+ return datastoreInUse(profile, bootValue) && namesBundledContainer(profile, bootValue(key));};const requestedRemoval = body?.profilesToRemove || [];const keptRunning = requestedRemoval.filter(dialsBundled);diff --git a/src/modules/infra/infra-config.persistence.spec.ts b/src/modules/infra/infra-config.persistence.spec.tsindex c172a142b..248d26b64 100644--- a/src/modules/infra/infra-config.persistence.spec.ts+++ b/src/modules/infra/infra-config.persistence.spec.ts@@ -4,6 +4,7 @@ import * as path from 'path';import { BadRequestException, ValidationPipe } from '@nestjs/common';import { GLOBAL_VALIDATION_OPTIONS } from '../../config/app-validation';import { recordOsEnvKeys, recordPinnedEnvKeys } from '../../config/env-precedence';+import { RestartDto } from './dto/restart.dto';import { SaveConfigDto } from './dto/save-config.dto';import { InfraConfigController } from './infra-config.controller';@@ -179,3 +180,77 @@ it('accepts a valid partial PostgreSQL change and preserves an absent pool valueexpect((await save({ database: { poolSize: 18 } })).saved).toBe(true);expect(dotenv.parse(actualFs.readFileSync(file)).DATABASE_POOL_SIZE).toBe('18');});++const disabledServices: Array<{+ profile: string;+ stored: Record<string, string>;+ pins: Record<string, string>;+ body: SaveConfigDto;+}> = [+ {+ profile: 'postgres',+ stored: { ...database, POSTGRES_BUILTIN: 'true', DATABASE_HOST: 'postgres' },+ pins: { DATABASE_HOST: 'postgres' },+ body: { database: { type: 'sqlite' } },+ },+ {+ profile: 'minio',+ stored: {+ STORAGE_TYPE: 's3',+ MINIO_BUILTIN: 'true',+ S3_ENDPOINT: 'http://minio:9000',+ S3_ACCESS_KEY_ID: 'minioadmin',+ S3_SECRET_ACCESS_KEY: 'minioadmin',+ },+ pins: { S3_ENDPOINT: 'http://minio:9000' },+ body: { storage: { type: 'local' } },+ },+ {+ profile: 'redis',+ stored: {+ REDIS_ENABLED: 'true',+ REDIS_BUILTIN: 'true',+ REDIS_HOST: 'redis',+ QUEUE_ENABLED: 'false',+ CACHE_ENABLED: 'false',+ },+ pins: { REDIS_HOST: 'redis' },+ body: { redis: { enabled: false, builtIn: true } },+ },+];+for (const example of disabledServices) {+ it(`stops unused ${example.profile} despite its bundled host pin`, async () => {+ seed(example.stored);+ Object.assign(process.env, example.pins);+ recordPinnedEnvKeys(example.pins);+ expect((await save(example.body)).saved).toBe(true);+ const { controller, stop } = build();+ const input = await admitted({ profilesToRemove: [example.profile] }, RestartDto);+ expect((await controller.requestRestart(input)).profilesToRemove).toEqual([example.profile]);+ expect(stop).toHaveBeenCalledWith(example.profile);+ });+}++it.each(['QUEUE_ENABLED', 'CACHE_ENABLED'])('keeps Redis for its active %s consumer', async consumer => {+ seed({ REDIS_HOST: 'redis', REDIS_ENABLED: 'false', [consumer]: 'true' });+ process.env.REDIS_HOST = 'redis';+ recordPinnedEnvKeys({ REDIS_HOST: 'redis' });+ const { controller, stop } = build();+ expect((await controller.requestRestart({ profilesToRemove: ['redis'] })).profilesToRemove).toEqual([]);+ expect(stop).not.toHaveBeenCalled();+});++it('writes the same unused-profile stop to the signal-file fallback', async () => {+ process.env.DATABASE_HOST = 'OpenWA-POSTGRES.';+ recordPinnedEnvKeys({ DATABASE_HOST: process.env.DATABASE_HOST });+ const { controller, stop } = build(false);+ expect((await controller.requestRestart({ profilesToRemove: ['postgres'] })).profilesToRemove).toEqual(['postgres']);+ expect(+ (+ JSON.parse(actualFs.readFileSync(path.join(directory, 'data', '.orchestration-request.json'), 'utf8')) as {+ profilesToRemove: string[];+ }+ ).profilesToRemove,+ ).toEqual(['postgres']);+ expect(stop).not.toHaveBeenCalled();+});