chore: relocate amber

.github/labeler.yml

@@ -34,12 +34,12 @@ service:
 engine:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/amber/**'
+          - 'amber/**'
 
 python:
   - changed-files:
       - any-glob-to-any-file:
-          - 'core/amber/src/main/python/**'
+          - 'amber/src/main/python/**'
           - '**/*.py'
 
 docs:

.github/workflows/github-action-build.yml

@@ -140,8 +140,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          if [ -f core/amber/requirements.txt ]; then pip install -r core/amber/requirements.txt; fi
-          if [ -f core/amber/operator-requirements.txt ]; then pip install -r core/amber/operator-requirements.txt; fi
+          if [ -f amber/requirements.txt ]; then pip install -r amber/requirements.txt; fi
+          if [ -f amber/operator-requirements.txt ]; then pip install -r amber/operator-requirements.txt; fi
       - name: Install PostgreSQL
         run: sudo apt-get update && sudo apt-get install -y postgresql
       - name: Start PostgreSQL Service
@@ -151,7 +151,7 @@ jobs:
           cd bin/sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql
       - name: Lint with flake8 and black
         run: |
-          cd core/amber/src/main/python && flake8 && black . --check
+          cd amber/src/main/python && flake8 && black . --check
       - name: Test with pytest
         run: |
-          cd core/amber/src/main/python && pytest -sv --ignore=core/models/test_RTableExecutor.py
+          cd amber/src/main/python && pytest -sv --ignore=core/models/test_RTableExecutor.py

CONTRIBUTING.md

@@ -61,10 +61,10 @@ Do not include any of the following in your PR:
 - To check format, under `core` run command `sbt scalafmtCheckAll`; to fix format, run `sbt scalafmtAll`. 
 - When you need to execute both, scalafmt is supposed to be executed after scalafix.
 #### Testing the backend
-1. The test framework is `scalatest`, for the amber engine, tests are located under `core/amber/src/test`; for `WorkflowCompilingService`, tests are located under `core/workflow-compiling-service`. You can find unit tests and e2e tests.
+1. The test framework is `scalatest`, for the amber engine, tests are located under `amber/src/test`; for `WorkflowCompilingService`, tests are located under `core/workflow-compiling-service`. You can find unit tests and e2e tests.
 2. To execute it, navigate to `core` directory in the command line and execute `sbt test`.
 3. If using IntelliJ to execute the test cases please make sure to be at the correct working directory.
-* For the amber engine's tests, the working directory should be `core/amber`
+* For the amber engine's tests, the working directory should be `amber`
 * For the other services' tests, the working directory should be `core`
 #### Testing the frontend 
 Before merging your code to the master branch, you need to pass the existing unit tests first.

access-control-service/src/main/scala/org/apache/texera/service/AccessControlService.scala

@@ -23,12 +23,13 @@ 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.accessControlServicePath
 import org.apache.texera.auth.{JwtAuthFilter, SessionUser}
 import org.apache.texera.dao.SqlServer
 import org.apache.texera.service.resource.{AccessControlResource, HealthCheckResource}
 import org.eclipse.jetty.server.session.SessionHandler
 
+import java.nio.file.Path
+
 class AccessControlService extends Application[AccessControlServiceConfiguration] with LazyLogging {
   override def initialize(bootstrap: Bootstrap[AccessControlServiceConfiguration]): Unit = {
     // Register Scala module to Dropwizard default object mapper
@@ -65,7 +66,9 @@ class AccessControlService extends Application[AccessControlServiceConfiguration
 }
 object AccessControlService {
   def main(args: Array[String]): Unit = {
-    val accessControlPath = accessControlServicePath
+    val accessControlPath = Path
+      .of(sys.env.getOrElse("TEXERA_HOME", "."))
+      .resolve("access-control-service")
       .resolve("src")
       .resolve("main")
       .resolve("resources")

core/amber/src/main/python/core/storage/iceberg/test_iceberg_document.py → amber/src/main/python/core/storage/iceberg/test_iceberg_document.py

@@ -41,7 +41,7 @@
     postgres_username="texera",
     postgres_password="password",
     table_result_namespace="operator-port-result",
-    directory_path="../../../../../../core/amber/user-resources/workflow-results",
+    directory_path="../../../../../../amber/user-resources/workflow-results",
     commit_batch_size=4096,
 )