From 54e1f79e270c4d2113fdeb88a23247ad5e832d07 Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Thu, 13 Jun 2024 12:16:54 +0700 Subject: [PATCH] UBERF-6515 Remove TRANSACTOR_URL from front configuration (#5800) Signed-off-by: Alexander Onnikov --- dev/docker-compose.yaml | 1 - pods/front/package.json | 2 +- pods/front/run.sh | 1 - server/front/readme.md | 1 - server/front/run.sh | 1 - server/front/src/index.ts | 1 - server/front/src/starter.ts | 7 ------- tests/docker-compose.yaml | 1 - 8 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index c2f6254e2d..7e9aed0735 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -80,7 +80,6 @@ services: - GMAIL_URL=http://localhost:8088 - TELEGRAM_URL=http://localhost:8086 - UPLOAD_URL=/files - - TRANSACTOR_URL=ws://localhost:3333 - ELASTIC_URL=http://elastic:9200 - COLLABORATOR_URL=ws://localhost:3078 - COLLABORATOR_API_URL=http://localhost:3078 diff --git a/pods/front/package.json b/pods/front/package.json index 705f796f9b..d328ce724d 100644 --- a/pods/front/package.json +++ b/pods/front/package.json @@ -21,7 +21,7 @@ "docker:push": "../../common/scripts/docker_tag.sh hardcoreeng/front", "docker:tbuild": "docker build -t hardcoreeng/front . --platform=linux/amd64 && ../../common/scripts/docker_tag_push.sh hardcoreeng/front", "format": "format src", - "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost TRANSACTOR_URL=ws://localhost:3333 SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files ELASTIC_URL=http://localhost:9200 MODEL_VERSION=$(node ../../common/scripts/show_version.js) PUBLIC_DIR='.' ts-node ./src/__start.ts", + "run-local": "cross-env MINIO_ACCESS_KEY=minioadmin MINIO_SECRET_KEY=minioadmin MINIO_ENDPOINT=localhost SERVER_SECRET='secret' ACCOUNTS_URL=http://localhost:3000 UPLOAD_URL=/files ELASTIC_URL=http://localhost:9200 MODEL_VERSION=$(node ../../common/scripts/show_version.js) PUBLIC_DIR='.' ts-node ./src/__start.ts", "test": "jest --passWithNoTests --silent --forceExit", "_phase:build": "compile transpile src", "_phase:test": "jest --passWithNoTests --silent --forceExit", diff --git a/pods/front/run.sh b/pods/front/run.sh index faf33964f6..2db411eff4 100755 --- a/pods/front/run.sh +++ b/pods/front/run.sh @@ -2,7 +2,6 @@ export ACCOUNTS_URL=http://localhost:3333 export UPLOAD_URL=http://localhost:3333/files -export TRANSACTOR_URL=ws://localhost:3333 export ELASTIC_URL=http://elastic:9200 export COLLABORATOR_URL=ws://localhost:3078 export COLLABORATOR_API_URL=http://localhost:3078 diff --git a/server/front/readme.md b/server/front/readme.md index 660304b37b..f8bba096ee 100644 --- a/server/front/readme.md +++ b/server/front/readme.md @@ -5,7 +5,6 @@ Front service is suited to deliver application bundles and resource assets, it a ## Configuration * SERVER_PORT: Specifies the port number on which the server will listen. -* TRANSACTOR_URL: Specifies the URL of the transactor. * MONGO_URL: Specifies the URL of the MongoDB database. * ELASTIC_URL: Specifies the URL of the Elasticsearch service. * ACCOUNTS_URL: Specifies the URL of the accounts service. diff --git a/server/front/run.sh b/server/front/run.sh index 8a72584726..69a10dc590 100755 --- a/server/front/run.sh +++ b/server/front/run.sh @@ -2,7 +2,6 @@ export ACCOUNTS_URL=http://localhost:3333 export UPLOAD_URL=http://localhost:3333/files -export TRANSACTOR_URL=ws://localhost:3333 export ELASTIC_URL=http://elastic:9200 export MINIO_ENDPOINT=minio export MINIO_ACCESS_KEY=minioadmin diff --git a/server/front/src/index.ts b/server/front/src/index.ts index 521bdc878f..0f06e84096 100644 --- a/server/front/src/index.ts +++ b/server/front/src/index.ts @@ -221,7 +221,6 @@ async function getFile ( export function start ( ctx: MeasureContext, config: { - transactorEndpoint: string elasticUrl: string storageAdapter: StorageAdapter accountsUrl: string diff --git a/server/front/src/starter.ts b/server/front/src/starter.ts index 3341dd165a..fcf48cc0d0 100644 --- a/server/front/src/starter.ts +++ b/server/front/src/starter.ts @@ -24,12 +24,6 @@ import { start } from '.' export function startFront (ctx: MeasureContext, extraConfig?: Record): void { const SERVER_PORT = parseInt(process.env.SERVER_PORT ?? '8080') - const transactorEndpoint = process.env.TRANSACTOR_URL - if (transactorEndpoint === undefined) { - console.error('please provide transactor url') - process.exit(1) - } - const url = process.env.MONGO_URL if (url === undefined) { console.error('please provide mongodb url') @@ -117,7 +111,6 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record