This is an automated email from the ASF dual-hosted git repository.
yiconghuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 046299a621 chore: relocate config-service (#3874)
046299a621 is described below
commit 046299a621db51ab3b6aaa5b3e057e008d514f60
Author: Yicong Huang <[email protected]>
AuthorDate: Sun Oct 12 10:29:03 2025 -0700
chore: relocate config-service (#3874)
According to the reorganization plan #3846. This PR moves
`core/config-service` out to root.
resolves #3857
---------
Signed-off-by: Yicong Huang <[email protected]>
---
build.sbt | 2 +-
{core/config-service => config-service}/build.sbt | 0
.../src/main/resources/config-service-web-config.yaml | 0
.../src/main/scala/org/apache/texera/service/ConfigService.scala | 7 +++++--
.../org/apache/texera/service/ConfigServiceConfiguration.scala | 0
.../scala/org/apache/texera/service/resource/ConfigResource.scala | 0
.../org/apache/texera/service/resource/HealthCheckResource.scala | 0
core/config/src/main/scala/org/apache/amber/util/PathUtils.scala | 2 --
8 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index ba83094dc8..e886bb21ae 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ lazy val DAO = project in file("core/dao")
lazy val Config = project in file("core/config")
lazy val Auth = (project in file("core/auth"))
.dependsOn(DAO, Config)
-lazy val ConfigService = (project in file("core/config-service"))
+lazy val ConfigService = (project in file("config-service"))
.dependsOn(Auth, Config)
.settings(
dependencyOverrides ++= Seq(
diff --git a/core/config-service/build.sbt b/config-service/build.sbt
similarity index 100%
rename from core/config-service/build.sbt
rename to config-service/build.sbt
diff --git
a/core/config-service/src/main/resources/config-service-web-config.yaml
b/config-service/src/main/resources/config-service-web-config.yaml
similarity index 100%
rename from
core/config-service/src/main/resources/config-service-web-config.yaml
rename to config-service/src/main/resources/config-service-web-config.yaml
diff --git
a/core/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
similarity index 96%
rename from
core/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
rename to
config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
index 75601bf225..ca3c291740 100644
---
a/core/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
+++
b/config-service/src/main/scala/org/apache/texera/service/ConfigService.scala
@@ -25,7 +25,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.configServicePath
import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
import org.apache.texera.config.DefaultsConfig
import org.apache.texera.dao.SqlServer
@@ -33,6 +32,8 @@ import org.apache.texera.service.resource.{ConfigResource,
HealthCheckResource}
import org.eclipse.jetty.server.session.SessionHandler
import org.jooq.impl.DSL
+import java.nio.file.Path
+
class ConfigService extends Application[ConfigServiceConfiguration] with
LazyLogging {
override def initialize(bootstrap: Bootstrap[ConfigServiceConfiguration]):
Unit = {
// Register Scala module to Dropwizard default object mapper
@@ -98,7 +99,9 @@ class ConfigService extends
Application[ConfigServiceConfiguration] with LazyLog
object ConfigService {
def main(args: Array[String]): Unit = {
- val configFilePath = configServicePath
+ val configFilePath = Path
+ .of(sys.env.getOrElse("TEXERA_HOME", "."))
+ .resolve("config-service")
.resolve("src")
.resolve("main")
.resolve("resources")
diff --git
a/core/config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
b/config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
similarity index 100%
rename from
core/config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
rename to
config-service/src/main/scala/org/apache/texera/service/ConfigServiceConfiguration.scala
diff --git
a/core/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
b/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
similarity index 100%
rename from
core/config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
rename to
config-service/src/main/scala/org/apache/texera/service/resource/ConfigResource.scala
diff --git
a/core/config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
b/config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 100%
rename from
core/config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
rename to
config-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
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 3b71848961..f3a433c7b5 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
@@ -54,8 +54,6 @@ object PathUtils {
}
}
- lazy val configServicePath: Path = corePath.resolve("config-service")
-
lazy val accessControlServicePath: Path =
corePath.resolve("access-control-service")
private lazy val datasetsRootPath =
