From 064854e4d59c055b482fd31b8e56ab8fee1902ae Mon Sep 17 00:00:00 2001
From: Joey Kraut <joey@renegade.fi>
Date: Fri, 25 Oct 2024 13:41:35 -0700
Subject: [PATCH] auth-server: Fix dockerfile after crate refactor

---
 auth/{auth-server => }/Dockerfile | 6 +++---
 auth/auth-server/src/main.rs      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename auth/{auth-server => }/Dockerfile (92%)

diff --git a/auth/auth-server/Dockerfile b/auth/Dockerfile
similarity index 92%
rename from auth/auth-server/Dockerfile
rename to auth/Dockerfile
index a0f0097..260cb82 100644
--- a/auth/auth-server/Dockerfile
+++ b/auth/Dockerfile
@@ -14,7 +14,7 @@ RUN cargo install cargo-chef
 FROM chef AS sources
 WORKDIR /build
 COPY ./Cargo.toml ./Cargo.lock ./
-COPY ./auth-server ./auth-server
+COPY ./auth ./auth
 
 # === Builder === #
 # Pull the sources into their own layer
@@ -33,13 +33,13 @@ RUN apt-get update && \
     apt-get install -y pkg-config libssl-dev libclang-dev libpq-dev ca-certificates
 
 # Update Cargo.toml to include only "auth-server" in workspace members
-RUN sed -i '/members[[:space:]]*=[[:space:]]*\[/,/\]/c\members = ["auth-server"]' Cargo.toml
+RUN sed -i '/members[[:space:]]*=[[:space:]]*\[/,/\]/c\members = ["auth/auth-server"]' Cargo.toml
 RUN cargo chef prepare --recipe-path recipe.json --bin auth-server
 
 # Build only the dependencies to cache them in this layer
 RUN cargo chef cook --release --recipe-path recipe.json
 
-COPY --from=sources /build/auth-server /build/auth-server
+COPY --from=sources /build/auth /build/auth
 WORKDIR /build
 
 RUN cargo build --release -p auth-server
diff --git a/auth/auth-server/src/main.rs b/auth/auth-server/src/main.rs
index 2e682e3..76b7c75 100644
--- a/auth/auth-server/src/main.rs
+++ b/auth/auth-server/src/main.rs
@@ -63,7 +63,7 @@ pub struct Cli {
     #[arg(long, env = "PORT", default_value = "3000")]
     pub port: u16,
     /// Whether to enable datadog logging
-    #[arg(long)]
+    #[arg(long, env = "DATADOG_LOGGING_ENABLED")]
     pub datadog_logging: bool,
 }