chore: remove builder (#1637)

Author: oddgrd

Cargo.lock

@@ -3,7 +3,6 @@ resolver = "2"
 members = [
   "admin",
   "auth",
-  "builder",
   "cargo-shuttle",
   "codegen",
   "common",

Cargo.toml

@@ -45,7 +45,6 @@ COPY --from=chef-planner /build .
 RUN cargo build \
     $(if [ "$CARGO_PROFILE" = "release" ]; then echo --release; fi) \
     --bin shuttle-auth \
-    # --bin shuttle-builder \
     --bin shuttle-deployer \
     --bin shuttle-gateway \
     --bin shuttle-logger \
@@ -71,20 +70,6 @@ ENTRYPOINT ["/usr/local/bin/shuttle-auth"]
 FROM shuttle-auth AS shuttle-auth-dev
 
 
-#### BUILDER
-# ARG RUSTUP_TOOLCHAIN
-# FROM docker.io/library/rust:${RUSTUP_TOOLCHAIN}-bookworm AS shuttle-builder
-# ARG SHUTTLE_SERVICE_VERSION
-# ENV SHUTTLE_SERVICE_VERSION=${SHUTTLE_SERVICE_VERSION}
-# ARG CARGO_PROFILE
-# ARG prepare_args
-# COPY builder/prepare.sh /prepare.sh
-# RUN /prepare.sh "${prepare_args}"
-# COPY --from=chef-builder /build/target/${CARGO_PROFILE}/shuttle-builder /usr/local/bin
-# ENTRYPOINT ["/usr/local/bin/shuttle-builder"]
-# FROM shuttle-builder AS shuttle-builder-dev
-
-
 #### DEPLOYER
 ARG RUSTUP_TOOLCHAIN
 FROM docker.io/library/rust:${RUSTUP_TOOLCHAIN}-bookworm AS shuttle-deployer

Containerfile

@@ -203,7 +203,7 @@ make images
 make docker-compose.rendered.yml
 
 # then run
-docker compose -f docker-compose.rendered.yml up provisioner resource-recorder logger otel-collector builder
+docker compose -f docker-compose.rendered.yml up provisioner resource-recorder logger otel-collector
 ```
 
 This starts the provisioner and the auth service, while preventing `gateway` from starting up.
@@ -212,7 +212,7 @@ Make sure an admin user is inserted into auth and that the key is used by cargo-
 We're now ready to start a local run of the deployer:
 
 ```bash
-OTLP_ADDRESS=http://127.0.0.1:4317 cargo run -p shuttle-deployer -- --provisioner-address http://localhost:3000 --auth-uri http://localhost:8008 --resource-recorder http://localhost:8007 --builder-uri http://localhost:8009 --logger-uri http://localhost:8010 --proxy-fqdn local.rs --admin-secret dh9z58jttoes3qvt --local --project-id "01H7WHDK23XYGSESCBG6XWJ1V0" --project <name>
+OTLP_ADDRESS=http://127.0.0.1:4317 cargo run -p shuttle-deployer -- --provisioner-address http://localhost:3000 --auth-uri http://localhost:8008 --resource-recorder http://localhost:8007 --logger-uri http://localhost:8010 --proxy-fqdn local.rs --admin-secret dh9z58jttoes3qvt --local --project-id "01H7WHDK23XYGSESCBG6XWJ1V0" --project <name>
 ```
 
 The `<name>` needs to match the name of the project that will be deployed to this deployer.

DEVELOPING.md

@@ -23,7 +23,6 @@ RUSTUP_TOOLCHAIN=1.76.0
 
 TAG?=$(shell git describe --tags --abbrev=0)
 AUTH_TAG?=$(TAG)
-BUILDER_TAG?=$(TAG)
 DEPLOYER_TAG?=$(TAG)
 GATEWAY_TAG?=$(TAG)
 LOGGER_TAG?=$(TAG)
@@ -58,7 +57,7 @@ CONTAINER_REGISTRY=public.ecr.aws/shuttle
 # make sure we only ever go to production with `--tls=enable`
 USE_TLS=enable
 CARGO_PROFILE=release
-RUST_LOG?=nbuild_core=warn,shuttle=debug,info
+RUST_LOG?=shuttle=debug,info
 else
 DOCKER_COMPOSE_FILES=docker-compose.yml docker-compose.dev.yml
 STACK?=shuttle-dev
@@ -68,7 +67,7 @@ CONTAINER_REGISTRY=public.ecr.aws/shuttle-dev
 USE_TLS?=disable
 # default for local run
 CARGO_PROFILE?=debug
-RUST_LOG?=nbuild_core=warn,shuttle=debug,info
+RUST_LOG?=shuttle=debug,info
 DEV_SUFFIX=-dev
 DEPLOYS_API_KEY?=gateway4deployes
 GATEWAY_ADMIN_KEY?=dh9z58jttoes3qvt
@@ -104,7 +103,6 @@ endif
 DOCKER_COMPOSE_ENV=\
 	STACK=$(STACK)\
 	AUTH_TAG=$(AUTH_TAG)\
-	BUILDER_TAG=$(BUILDER_TAG)\
 	DEPLOYER_TAG=$(DEPLOYER_TAG)\
 	GATEWAY_TAG=$(GATEWAY_TAG)\
 	LOGGER_TAG=$(LOGGER_TAG)\
@@ -147,7 +145,7 @@ cargo-clean:
 
 images: the-shuttle-images postgres otel
 
-the-shuttle-images: shuttle-auth shuttle-deployer shuttle-gateway shuttle-logger shuttle-provisioner shuttle-resource-recorder # shuttle-builder
+the-shuttle-images: shuttle-auth shuttle-deployer shuttle-gateway shuttle-logger shuttle-provisioner shuttle-resource-recorder
 
 shuttle-%:
 	$(DOCKER_BUILD) \

Makefile

@@ -107,7 +107,6 @@ proto-gen \
     $OP \
     -d proto \
     -o proto/src/generated \
-    -f proto/builder.proto \
     -f proto/logger.proto \
     -f proto/provisioner.proto \
     -f proto/resource-recorder.proto \

Makefile.toml

@@ -15,7 +15,7 @@ async fn main() -> io::Result<()> {
 
     trace!(args = ?args, "parsed args");
 
-    setup_tracing(tracing_subscriber::registry(), Backend::Auth, None);
+    setup_tracing(tracing_subscriber::registry(), Backend::Auth);
 
     let pool = pgpool_init(args.db_connection_uri.as_str())
         .await