From 9141f5a90985159e68e71058b6b43c3244db320f Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Sat, 11 Oct 2025 14:14:25 -0700 Subject: [PATCH] fix: use TEXEAR_HOME and default to current folder to find config --- .../texera/service/ComputingUnitManagingService.scala | 8 ++++++-- .../src/main/scala/org/apache/amber/util/PathUtils.scala | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala index c7aeb67d7b..4639789fb1 100644 --- a/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala +++ b/computing-unit-managing-service/src/main/scala/org/apache/texera/service/ComputingUnitManagingService.scala @@ -24,7 +24,6 @@ import io.dropwizard.auth.AuthDynamicFeature import io.dropwizard.core.Application import io.dropwizard.core.setup.{Bootstrap, Environment} import org.apache.amber.config.StorageConfig -import org.apache.amber.util.PathUtils.workflowComputingUnitManagingServicePath import org.apache.texera.auth.{JwtAuthFilter, SessionUser} import org.apache.texera.dao.SqlServer import org.apache.texera.service.resource.{ @@ -33,6 +32,8 @@ import org.apache.texera.service.resource.{ HealthCheckResource } +import java.nio.file.Path + class ComputingUnitManagingService extends Application[ComputingUnitManagingServiceConfiguration] { override def initialize( @@ -68,8 +69,11 @@ class ComputingUnitManagingService extends Application[ComputingUnitManagingServ } object ComputingUnitManagingService { + def main(args: Array[String]): Unit = { - val configFilePath = workflowComputingUnitManagingServicePath + val configFilePath = Path + .of(sys.env.getOrElse("TEXERA_HOME", ".")) + .resolve("computing-unit-managing-service") .resolve("src") .resolve("main") .resolve("resources") diff --git a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala index 255ae8f657..6fb12c990d 100644 --- a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala +++ b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala @@ -58,9 +58,6 @@ object PathUtils { lazy val fileServicePath: Path = corePath.resolve("file-service") - lazy val workflowComputingUnitManagingServicePath: Path = - corePath.resolve("computing-unit-managing-service") - lazy val configServicePath: Path = corePath.resolve("config-service") lazy val accessControlServicePath: Path = corePath.resolve("access-control-service")