BE-426: Merge graph test-server into admin endpoint in main binary

.env

@@ -50,20 +50,21 @@ HASH_TEMPORAL_PG_PASSWORD=temporal
 HASH_TEMPORAL_PG_DATABASE=temporal
 HASH_TEMPORAL_VISIBILITY_PG_DATABASE=temporal_visibility
 
-HASH_GRAPH_PG_USER=graph
-HASH_GRAPH_PG_PASSWORD=graph
-HASH_GRAPH_PG_DATABASE=graph
-HASH_GRAPH_LOG_LEVEL=info
-
-HASH_GRAPH_TYPE_FETCHER_HOST=localhost
-HASH_GRAPH_TYPE_FETCHER_PORT=4455
-
 HASH_GRAPH_HTTP_HOST=127.0.0.1
 HASH_GRAPH_HTTP_PORT=4000
 HASH_GRAPH_RPC_HOST=127.0.0.1
 HASH_GRAPH_RPC_PORT=4002
-HASH_GRAPH_TEST_API_HOST=127.0.0.1
-HASH_GRAPH_TEST_API_PORT=4001
+HASH_GRAPH_EMBED_TYPE_FETCHER=true
+HASH_GRAPH_TYPE_FETCHER_HOST=localhost
+HASH_GRAPH_TYPE_FETCHER_PORT=4455
+HASH_GRAPH_EMBED_ADMIN=true
+HASH_GRAPH_ADMIN_HOST=127.0.0.1
+HASH_GRAPH_ADMIN_PORT=4001
+
+HASH_GRAPH_PG_USER=graph
+HASH_GRAPH_PG_PASSWORD=graph
+HASH_GRAPH_PG_DATABASE=graph
+HASH_GRAPH_LOG_LEVEL=info
 
 HASH_REDIS_HOST=localhost
 HASH_REDIS_PORT=6379

.github/actions/build-docker-images/action.yml

@@ -89,7 +89,6 @@ runs:
         build-args: |
           PROFILE=${{ env.GRAPH_PROFILE }}
           ENABLE_TYPE_FETCHER=yes
-          ENABLE_TEST_SERVER=yes
 
     - name: Build hash-graph image (fork)
       if: inputs.hash-graph == 'true' && github.event.pull_request.head.repo.full_name != github.repository
@@ -107,7 +106,6 @@ runs:
         build-args: |
           PROFILE=${{ env.GRAPH_PROFILE }}
           ENABLE_TYPE_FETCHER=yes
-          ENABLE_TEST_SERVER=yes
 
     - name: Build hash-ai-worker-ts image
       if: inputs.hash-ai-worker-ts == 'true' && github.event.pull_request.head.repo.full_name == github.repository

.github/actions/prune-repository/prune.py

@@ -36,9 +36,6 @@
     # Test data crates
     "@blockprotocol/type-system-rs": ["@rust/hash-graph-test-data"],
     "@rust/hash-graph-types": ["@rust/hash-graph-test-data"],
-    # Graph app required for these crates
-    "@rust/hash-graph-type-fetcher": ["@apps/hash-graph"],
-    "@rust/hash-graph-test-server": ["@apps/hash-graph"],
 }
 
 TURBO_QUERY = """

.github/workflows/hash-backend-cd.yml

@@ -78,8 +78,6 @@ jobs:
           IMAGE_NAME: ${{ github.repository }}/graph
           IMAGE_TAG: staging
           GITHUB_TOKEN: ${{ github.token }}
-          BUILD_ARGS: |
-            ENABLE_TEST_SERVER=yes
 
   build-api:
     name: Build and push HASH api image

Cargo.toml

@@ -18,7 +18,6 @@ members = [
     "libs/@local/graph/postgres-store",
     "libs/@local/graph/store",
     "libs/@local/graph/temporal-versioning",
-    "libs/@local/graph/test-server",
     "libs/@local/graph/type-defs",
     "libs/@local/graph/type-fetcher",
     "libs/@local/graph/types",
@@ -82,7 +81,6 @@ hash-graph-postgres-store.path      = "libs/@local/graph/postgres-store"
 hash-graph-store.path               = "libs/@local/graph/store"
 hash-graph-temporal-versioning.path = "libs/@local/graph/temporal-versioning"
 hash-graph-test-data.path           = "tests/graph/test-data/rust"
-hash-graph-test-server.path         = "libs/@local/graph/test-server"
 hash-graph-type-defs.path           = "libs/@local/graph/type-defs"
 hash-graph-type-fetcher.path        = "libs/@local/graph/type-fetcher"
 hash-graph-types.path               = "libs/@local/graph/types"

apps/hash-graph/Cargo.toml

@@ -20,7 +20,6 @@ hash-graph-api            = { workspace = true }
 hash-graph-authorization  = { workspace = true }
 hash-graph-postgres-store = { workspace = true, features = ["clap"] }
 hash-graph-store          = { workspace = true }
-hash-graph-test-server    = { workspace = true, optional = true }
 hash-graph-type-fetcher   = { workspace = true }
 hash-telemetry            = { workspace = true, features = ["clap"] }
 hash-temporal-client      = { workspace = true }
@@ -49,8 +48,5 @@ tokio-postgres = { workspace = true }
 tokio-util = { workspace = true, features = ["codec"] }
 tracing = { workspace = true }
 
-[features]
-test-server = ["dep:hash-graph-test-server"]
-
 [lints]
 workspace = true

apps/hash-graph/docker/Dockerfile

@@ -83,22 +83,16 @@ RUN --mount=type=secret,id=GITHUB_TOKEN,env=GITHUB_TOKEN \
 COPY --from=base /app/out/full/ .
 
 ARG PROFILE=production
-ARG ENABLE_TEST_SERVER=no
 
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
     --mount=type=cache,target=/usr/local/cargo/git,sharing=locked \
     --mount=type=cache,target=/usr/local/src/target,sharing=locked \
-    FEATURES=() && \
-    if [[ ${ENABLE_TEST_SERVER^^} == Y* || ${ENABLE_TEST_SERVER^^} == T* || $ENABLE_TEST_SERVER == 1 ]]; then \
-    FEATURES+=("test-server"); \
-    fi && \
     if [[ ${PROFILE} == dev ]]; then \
     export RUSTFLAGS="-C debuginfo=line-tables-only" && \
     export PROFILE=dev-llvm; \
     fi && \
-    FEATURES=${FEATURES[@]} && \
     rustup target add "$(uname -m)-unknown-linux-musl" && \
-    cargo install --target "$(uname -m)-unknown-linux-musl" --path apps/hash-graph --root /tmp --features "${FEATURES// /,}" --profile $PROFILE --locked && \
+    cargo install --target "$(uname -m)-unknown-linux-musl" --path apps/hash-graph --root /tmp --profile $PROFILE --locked && \
     mkdir -p /out/etc && \
     cp /tmp/bin/hash-graph /out/hash-graph && \
     echo 'graph:x:61000:60000:hash-graph:/:' > /out/etc/passwd && \

apps/hash-graph/package.json

@@ -5,8 +5,8 @@
   "description": "The entity-graph query-layer for the HASH datastore",
   "license": "AGPL-3",
   "scripts": {
-    "build:docker": "docker buildx build --build-arg PROFILE=production --build-arg ENABLE_TEST_SERVER=yes --tag hash-graph --file docker/Dockerfile ../../ --load",
-    "build:docker:dev": "docker buildx build --build-arg PROFILE=dev --build-arg ENABLE_TEST_SERVER=yes --tag hash-graph --file docker/Dockerfile ../../ --load",
+    "build:docker": "docker buildx build --build-arg PROFILE=production --tag hash-graph --file docker/Dockerfile ../../ --load",
+    "build:docker:dev": "docker buildx build --build-arg PROFILE=dev --tag hash-graph --file docker/Dockerfile ../../ --load",
     "compile": "cargo build --bin hash-graph --all-features",
     "compile:release": "cargo build --bin hash-graph --all-features --release",
     "doc:dependency-diagram": "cargo run -p hash-repo-chores -- dependency-diagram --output docs/dependency-diagram.mmd --root hash-graph --root-deps-and-dependents --link-mode non-roots --include-dev-deps --include-build-deps --logging-console-level info",
@@ -29,7 +29,6 @@
     "@rust/hash-graph-authorization": "workspace:*",
     "@rust/hash-graph-postgres-store": "workspace:*",
     "@rust/hash-graph-store": "workspace:*",
-    "@rust/hash-graph-test-server": "workspace:*",
     "@rust/hash-graph-type-fetcher": "workspace:*",
     "@rust/hash-telemetry": "workspace:*",
     "@rust/hash-temporal-client": "workspace:*"