uberf-12323: fix tests

Signed-off-by: Alexey Zinoviev <[email protected]>

Author: lexiv0re

dev/docker-compose.min.yaml

@@ -143,6 +143,7 @@ services:
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - MODEL_ENABLED=*
       - ACCOUNTS_URL=http://huly.local:3000
+      - ACCOUNTS_DB_URL=${DB_CR_URL}
       - BRANDING_PATH=/var/cfg/branding.json
       - BACKUP_STORAGE=${BACKUP_STORAGE_CONFIG}
       - BACKUP_BUCKET=${BACKUP_BUCKET_NAME}

dev/docker-compose.yaml

@@ -195,6 +195,7 @@ services:
       - STATS_URL=http://huly.local:4900
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - ACCOUNTS_URL=http://huly.local:3000
+      - ACCOUNTS_DB_URL=${DB_CR_URL}
       - BRANDING_PATH=/var/cfg/branding.json
       - BACKUP_STORAGE=${BACKUP_STORAGE_CONFIG}
       - BACKUP_BUCKET=${BACKUP_BUCKET_NAME}

qms-tests/docker-compose.yaml

@@ -122,6 +122,7 @@ services:
       - TRANSACTOR_URL=ws://transactor:3334;ws://huly.local:3334
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - ACCOUNTS_URL=http://account:3003
+      - ACCOUNTS_DB_URL=${DB_PG_URL}
       - BRANDING_PATH=/var/cfg/branding.json
     restart: unless-stopped
   front:

server/backup-service/src/config.ts

@@ -17,7 +17,8 @@ import { type BackupConfig } from '@hcengineering/server-backup'
 
 interface Config extends Omit<BackupConfig, 'Token'> {
   AccountsURL: string
-  AccountsNS: string
+  AccountsDbURL: string
+  AccountsDbNS: string
   ServiceID: string
   Secret: string
 
@@ -37,7 +38,8 @@ interface Config extends Omit<BackupConfig, 'Token'> {
 
 const envMap: { [key in keyof Config]: string } = {
   AccountsURL: 'ACCOUNTS_URL',
-  AccountsNS: 'ACCOUNTS_NS',
+  AccountsDbURL: 'ACCOUNTS_DB_URL',
+  AccountsDbNS: 'ACCOUNTS_NS',
   ServiceID: 'SERVICE_ID',
   Secret: 'SECRET',
   BucketName: 'BUCKET_NAME',
@@ -55,6 +57,7 @@ const envMap: { [key in keyof Config]: string } = {
 
 const required: Array<keyof Config> = [
   'AccountsURL',
+  'AccountsDbURL',
   'Secret',
   'ServiceID',
   'BucketName',
@@ -66,7 +69,8 @@ const required: Array<keyof Config> = [
 export const config: () => Config = () => {
   const params: Partial<Config> = {
     AccountsURL: process.env[envMap.AccountsURL],
-    AccountsNS: process.env[envMap.AccountsNS],
+    AccountsDbURL: process.env[envMap.AccountsDbURL],
+    AccountsDbNS: process.env[envMap.AccountsDbNS],
     Secret: process.env[envMap.Secret],
     BucketName: process.env[envMap.BucketName] ?? 'backups',
     ServiceID: process.env[envMap.ServiceID] ?? 'backup-service',

server/backup/src/service.ts

@@ -44,7 +44,8 @@ import { restore } from './restore'
 
 export interface BackupConfig {
   AccountsURL: string
-  AccountsNS?: string
+  AccountsDbURL: string
+  AccountsDbNS?: string
   Token: string
 
   Interval: number // Timeout in seconds
@@ -322,13 +323,13 @@ class BackupWorker {
       if (pipeline === undefined) {
         throw new Error('Pipeline is undefined, cannot proceed with backup')
       }
-      const [accountDB, closeAccountDB] = await getAccountDB(this.config.AccountsURL, this.config.AccountsNS)
+      const [accountDB, closeAccountDB] = await getAccountDB(this.config.AccountsDbURL, this.config.AccountsDbNS)
       const result = await ctx.with(
         'backup',
         {},
-        (ctx) => {
+        async (ctx) => {
           try {
-            return backup(ctx, pipeline as Pipeline, wsIds, storage, accountDB, {
+            return await backup(ctx, pipeline as Pipeline, wsIds, storage, accountDB, {
               skipDomains: this.skipDomains,
               force: true,
               timeout: this.config.Timeout * 1000,

server/workspace-service/src/index.ts

@@ -95,6 +95,12 @@ export function serveWorkspaceAccount (
   }
   setMetadata(serverClientPlugin.metadata.Endpoint, accountUri)
 
+  const accountDbUrl = process.env.ACCOUNTS_DB_URL
+  if (accountDbUrl === undefined) {
+    console.log('Please provide account db url')
+    process.exit(1)
+  }
+
   const serverSecret = process.env.SERVER_SECRET
   if (serverSecret === undefined) {
     console.log('Please provide server secret')
@@ -135,7 +141,8 @@ export function serveWorkspaceAccount (
     wsOperation,
     brandings,
     fulltextUrl,
-    accountUri
+    accountUri,
+    accountDbUrl
   )
 
   void worker

server/workspace-service/src/service.ts

@@ -119,7 +119,8 @@ export class WorkspaceWorker {
     readonly operation: WorkspaceOperation,
     readonly brandings: BrandingMap,
     readonly fulltextUrl: string | undefined,
-    readonly accountsUrl: string
+    readonly accountsUrl: string,
+    readonly accountsDbUrl: string
   ) {}
 
   hasAvailableThread (): boolean {
@@ -605,12 +606,13 @@ export class WorkspaceWorker {
         workspace,
         opt.backup.backupStorage,
         {
+          AccountsURL: this.accountsUrl,
+          AccountsDbURL: this.accountsDbUrl,
           Token: token,
           BucketName: opt.backup.bucketName,
           CoolDown: 0,
           Timeout: 0,
           SkipWorkspaces: '',
-          AccountsURL: '',
           Interval: 0,
           Parallel: 1,
           KeepSnapshots: 7 * 12

tests/docker-compose.override.yaml

@@ -9,6 +9,7 @@ services:
   workspace:
     environment:
       - DB_URL=${DB_PG_URL}
+      - ACCOUNTS_DB_URL=${DB_PG_URL}
   fulltext:
     environment:
       - DB_URL=${DB_PG_URL}

tests/docker-compose.yaml

@@ -151,6 +151,7 @@ services:
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - REGION=
       - ACCOUNTS_URL=http://account:3003
+      - ACCOUNTS_DB_URL=${MONGO_URL}
       - BRANDING_PATH=/var/cfg/branding.json
       - STATS_URL=http://stats:4901
     restart: unless-stopped

ws-tests/docker-compose.yaml

@@ -178,6 +178,7 @@ services:
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - REGION=
       - ACCOUNTS_URL=http://huly.local:3003
+      - ACCOUNTS_DB_URL=${DB_EU_URL}
       - BRANDING_PATH=/var/cfg/branding.json
       - BACKUP_STORAGE=${BACKUP_STORAGE_CONFIG}
       - BACKUP_BUCKET=${BACKUP_BUCKET_NAME}
@@ -202,6 +203,7 @@ services:
       - STATS_URL=http://huly.local:4901
       - STORAGE_CONFIG=${STORAGE_CONFIG}
       - ACCOUNTS_URL=http://huly.local:3003
+      - ACCOUNTS_DB_URL=${DB_EU_URL}
       - BRANDING_PATH=/var/cfg/branding.json
       - BACKUP_STORAGE=${BACKUP_STORAGE_CONFIG}
       - BACKUP_BUCKET=${BACKUP_BUCKET_NAME}