pipeline-manager: rename api-server /binary/ to pipeline-manager

lalithsuresh · lalithsuresh · commit bfbe7eb36580 · 2023-08-10T13:04:02.000-07:00
Signed-off-by: Lalith Suresh &lt;lalith@feldera.com&gt;
diff --git a/Earthfile b/Earthfile
@@ -286,11 +286,11 @@ build-manager:
     RUN cargo +$RUST_TOOLCHAIN clippy $RUST_BUILD_PROFILE --package pipeline-manager -- -D warnings
     RUN cargo +$RUST_TOOLCHAIN test $RUST_BUILD_PROFILE --package pipeline-manager --no-run
 
-    IF [ -f ./target/debug/api-server ]
-        SAVE ARTIFACT --keep-ts ./target/debug/api-server api-server
+    IF [ -f ./target/debug/pipeline-manager ]
+        SAVE ARTIFACT --keep-ts ./target/debug/pipeline-manager pipeline-manager
     END
-    IF [ -f ./target/release/api-server ]
-        SAVE ARTIFACT --keep-ts ./target/release/api-server api-server
+    IF [ -f ./target/release/pipeline-manager ]
+        SAVE ARTIFACT --keep-ts ./target/release/pipeline-manager pipeline-manager
     END
 
 build-sql:
@@ -330,8 +330,8 @@ install-docs-deps:
 build-docs:
     FROM +install-docs-deps
     COPY docs/ docs/
-    COPY ( +build-manager/api-server ) ./docs/api-server
-    RUN cd docs && ./api-server --dump-openapi \
+    COPY ( +build-manager/pipeline-manager ) ./docs/pipeline-manager
+    RUN cd docs && ./pipeline-manager --dump-openapi \
         && (jq '.servers= [{url: "http://localhost:8080/v0"}]' openapi.json > openapi_docs.json) \
         && rm openapi.json
     RUN cd docs && yarn format:check
@@ -438,20 +438,20 @@ python-bindings-checker:
     ARG RUST_BUILD_PROFILE=$RUST_BUILD_MODE
 
     FROM +build-manager --RUST_TOOLCHAIN=$RUST_TOOLCHAIN --RUST_BUILD_PROFILE=$RUST_BUILD_PROFILE
-    COPY +build-manager/api-server .
+    COPY +build-manager/pipeline-manager .
     RUN mkdir -p /root/.local/lib/python3.10
     RUN mkdir -p /root/.local/bin
 
     COPY +install-python/python3.10 /root/.local/lib/python3.10
     COPY +install-python/bin /root/.local/bin
 
     RUN pip3 install openapi-python-client==0.15.0 && openapi-python-client --version
-    COPY +build-manager/api-server .
+    COPY +build-manager/pipeline-manager .
     COPY python/feldera-api-client feldera-api-client-base
 
     # This line will fail if the python bindings need to be regenerated
     RUN mkdir checker
-    RUN cd checker && ../api-server --dump-openapi &&  \
+    RUN cd checker && ../pipeline-manager --dump-openapi &&  \
         openapi-python-client generate --path openapi.json --fail-on-warning && \
         diff -bur feldera-api-client ../feldera-api-client-base
 
@@ -461,14 +461,14 @@ test-python:
     ARG RUST_BUILD_PROFILE=$RUST_BUILD_MODE
 
     FROM +build-manager --RUST_TOOLCHAIN=$RUST_TOOLCHAIN --RUST_BUILD_PROFILE=$RUST_BUILD_PROFILE
-    COPY +build-manager/api-server .
+    COPY +build-manager/pipeline-manager .
     RUN mkdir -p /root/.local/lib/python3.10
     RUN mkdir -p /root/.local/bin
 
     COPY +install-python/python3.10 /root/.local/lib/python3.10
     COPY +install-python/bin /root/.local/bin
 
-    COPY +build-manager/api-server .
+    COPY +build-manager/pipeline-manager .
     COPY +build-sql/sql-to-dbsp-compiler sql-to-dbsp-compiler
 
     COPY demo/demo_notebooks demo/demo_notebooks
@@ -484,7 +484,7 @@ test-python:
     WITH DOCKER --pull postgres
         RUN docker run --shm-size=512MB -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust -e PGDATA=/dev/shm -d postgres && \
             sleep 3 && \
-            ./api-server --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/dbsp/sql-to-dbsp-compiler --dbsp-override-path=/dbsp --db-connection-string=postgresql://postgres:postgres@localhost:5432 --unix-daemon && \
+            ./pipeline-manager --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/dbsp/sql-to-dbsp-compiler --dbsp-override-path=/dbsp --db-connection-string=postgresql://postgres:postgres@localhost:5432 --unix-daemon && \
             sleep 1 && \
             python3 python/test.py && \
             cd demo/demo_notebooks && jupyter execute fraud_detection.ipynb --JupyterApp.log_level='DEBUG'
@@ -508,7 +508,7 @@ build-dbsp-manager-container:
 
     # First, copy over the artifacts built from previous stages
     RUN mkdir -p database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/target
-    COPY +build-manager/api-server .
+    COPY +build-manager/pipeline-manager .
     COPY +build-sql/sql2dbsp-jar-with-dependencies.jar database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/target/
 
     # Then copy over the crates needed by the sql compiler
@@ -521,8 +521,8 @@ build-dbsp-manager-container:
     COPY sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp /database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp
     COPY sql-to-dbsp-compiler/lib /database-stream-processor/sql-to-dbsp-compiler/lib
     COPY sql-to-dbsp-compiler/temp /database-stream-processor/sql-to-dbsp-compiler/temp
-    RUN ./api-server --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --precompile
-    ENTRYPOINT ["./api-server", "--bind-address=0.0.0.0", "--manager-working-directory=/working-dir", "--compiler-working-directory=/working-dir", "--sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler", "--dbsp-override-path=/database-stream-processor"]
+    RUN ./pipeline-manager --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --precompile
+    ENTRYPOINT ["./pipeline-manager", "--bind-address=0.0.0.0", "--manager-working-directory=/working-dir", "--compiler-working-directory=/working-dir", "--sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler", "--dbsp-override-path=/database-stream-processor"]
     SAVE IMAGE ghcr.io/feldera/dbsp-manager
 
 # TODO: mirrors the Dockerfile. See note above.
diff --git a/crates/pipeline_manager/Makefile.toml b/crates/pipeline_manager/Makefile.toml
@@ -10,7 +10,7 @@ description = "Dump OpenAPI specification of the REST API to 'openapi.json'"
 dependencies = ["build"]
 script = '''
 cd ../../
-cargo run --package pipeline-manager --features=pg-embed --bin api-server $RUST_BUILD_PROFILE -- --dump-openapi
+cargo run --package pipeline-manager --features=pg-embed --bin pipeline-manager $RUST_BUILD_PROFILE -- --dump-openapi
 '''
 
 [tasks.openapi_python]
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -35,9 +35,9 @@ RUN /root/.cargo/bin/cargo chef prepare --recipe-path recipe.json
 # layer for faster incremental builds of source-code only changes
 FROM chef AS builder
 COPY --from=planner /app/recipe.json recipe.json
-RUN /root/.cargo/bin/cargo chef cook --release --recipe-path recipe.json --bin=api-server --no-default-features
+RUN /root/.cargo/bin/cargo chef cook --release --recipe-path recipe.json --bin=pipeline-manager --no-default-features
 COPY . .
-RUN /root/.cargo/bin/cargo build --release --bin=api-server --no-default-features
+RUN /root/.cargo/bin/cargo build --release --bin=pipeline-manager --no-default-features
 
 # Java build can be performed in parallel
 FROM base as javabuild
@@ -50,7 +50,7 @@ RUN cd /sql/sql-to-dbsp-compiler/SQL-compiler && mvn -DskipTests package
 FROM base as release
 ENV PATH="$PATH:/root/.cargo/bin"
 # Pipeline manager binary
-COPY --from=builder /app/target/release/api-server api-server
+COPY --from=builder /app/target/release/pipeline-manager pipeline-manager
 # SQL compiler uber jar
 RUN mkdir -p database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/target
 COPY --from=javabuild /sql/sql-to-dbsp-compiler/SQL-compiler/target/sql2dbsp-jar-with-dependencies.jar database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/target/sql2dbsp-jar-with-dependencies.jar
@@ -66,8 +66,8 @@ COPY sql-to-dbsp-compiler/lib database-stream-processor/sql-to-dbsp-compiler/lib
 COPY sql-to-dbsp-compiler/temp database-stream-processor/sql-to-dbsp-compiler/temp
 COPY sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp database-stream-processor/sql-to-dbsp-compiler/SQL-compiler/sql-to-dbsp
 # Run the precompile phase to speed up Rust compilations during deployment
-RUN ./api-server --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --precompile
-ENTRYPOINT ["./api-server", "--bind-address=0.0.0.0", "--manager-working-directory=/working-dir", "--compiler-working-directory=/working-dir", "--sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler", "--dbsp-override-path=/database-stream-processor"]
+RUN ./pipeline-manager --bind-address=0.0.0.0 --manager-working-directory=/working-dir --compiler-working-directory=/working-dir --sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler --dbsp-override-path=/database-stream-processor --precompile
+ENTRYPOINT ["./pipeline-manager", "--bind-address=0.0.0.0", "--manager-working-directory=/working-dir", "--compiler-working-directory=/working-dir", "--sql-compiler-home=/database-stream-processor/sql-to-dbsp-compiler", "--dbsp-override-path=/database-stream-processor"]
 
 ##### The stages below are used to build the demo container
 
@@ -88,7 +88,7 @@ RUN /root/.cargo/bin/cargo build --release
 FROM ubuntu:22.04 AS client
 ENV DEBIAN_FRONTEND noninteractive
 ENV PATH="$PATH:/root/.cargo/bin"
-COPY --from=builder /app/target/release/api-server api-server
+COPY --from=builder /app/target/release/pipeline-manager pipeline-manager
 COPY demo demo
 # Remove the simulator cargo project and the corresponding build artifacts
 RUN rm -rf ./demo/project_demo00-SecOps/simulator/*
@@ -104,8 +104,8 @@ RUN apt update && apt install pkg-config \
       && rpk version \
       && rm rpk-linux-$arch.zip \
     # Install DBSP python library and dependencies
-    && ./api-server --dump-openapi \
-      && rm api-server \
+    && ./pipeline-manager --dump-openapi \
+      && rm pipeline-manager \
       && pip3 install openapi-python-client websockets \
       && cd python \
       && rm -rf feldera-api-client \
diff --git a/deploy/kind/dbsp-deploy.yml b/deploy/kind/dbsp-deploy.yml
@@ -62,7 +62,7 @@ spec:
         ports:
         - containerPort: 8080
         command:
-          - ./api-server
+          - ./pipeline-manager
         args:
           - --bind-address=0.0.0.0
           - --manager-working-directory=/working-dir
diff --git a/docs/README.md b/docs/README.md
@@ -13,7 +13,7 @@ You also need the OpenAPI JSON spec from the manager. This file is automatically
 generated during the CI build. For local development you need to run once:
 
 ```bash
-cargo run --bin api-server -- --dump-openapi
+cargo run --bin pipeline-manager -- --dump-openapi
 jq '.servers= [{url: "http://localhost:8080/v0"}]' openapi.json > openapi_docs.json
 ```
 
diff --git a/scripts/start_manager.sh b/scripts/start_manager.sh
@@ -41,7 +41,7 @@ else
 fi
 
 cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo build $RUST_BUILD_PROFILE $PG_EMBED
-cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo run --bin api-server $RUST_BUILD_PROFILE $PG_EMBED -- \
+cd "${MANAGER_DIR}" && ~/.cargo/bin/cargo run --bin pipeline-manager $RUST_BUILD_PROFILE $PG_EMBED -- \
     --bind-address="${BIND_ADDRESS}" \
     --manager-working-directory="${WORKING_DIR_ABS}" \
     --compiler-working-directory="${WORKING_DIR_ABS}" \
diff --git a/web-ui/package.json b/web-ui/package.json
@@ -24,7 +24,7 @@
     "lint": "eslint --max-warnings 0 --fix \"src/**/*.{js,jsx,ts,tsx}\"",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
     "format:check": "prettier --check \"src/**/*.{js,jsx,ts,tsx}\"",
-    "generate-openapi": "cargo run --bin api-server -- --dump-openapi && openapi --input ./openapi.json --output ./src/types/manager && rm ./openapi.json"
+    "generate-openapi": "cargo run --bin pipeline-manager -- --dump-openapi && openapi --input ./openapi.json --output ./src/types/manager && rm ./openapi.json"
   },
   "dependencies": {
     "@emotion/cache": "^11.10.7",
