Maskinrommet Rust-skjelett med Dockerfile (oppgave 2.1)
Axum-server med health-endepunkt, PostgreSQL-tilkobling via sqlx, strukturert logging med tracing. Flertrinns Dockerfile for produksjon. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6129c1a265
commit
9f2667ba87
6 changed files with 2650 additions and 2 deletions
1
maskinrommet/.gitignore
vendored
Normal file
1
maskinrommet/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
/target
|
||||||
2545
maskinrommet/Cargo.lock
generated
Normal file
2545
maskinrommet/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
16
maskinrommet/Cargo.toml
Normal file
16
maskinrommet/Cargo.toml
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
[package]
|
||||||
|
name = "maskinrommet"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
axum = "0.8"
|
||||||
|
tokio = { version = "1", features = ["full"] }
|
||||||
|
sqlx = { version = "0.8", features = ["runtime-tokio", "tls-rustls", "postgres", "uuid", "chrono", "json"] }
|
||||||
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
serde_json = "1"
|
||||||
|
uuid = { version = "1", features = ["v7", "serde"] }
|
||||||
|
chrono = { version = "0.4", features = ["serde"] }
|
||||||
|
tracing = "0.1"
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||||
|
tower-http = { version = "0.6", features = ["cors", "trace"] }
|
||||||
22
maskinrommet/Dockerfile
Normal file
22
maskinrommet/Dockerfile
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
# Maskinrommet — flertrinns Docker-bygg
|
||||||
|
# Bygger Rust-binæren i et kompileringssteg, kopierer til minimal runtime.
|
||||||
|
|
||||||
|
FROM rust:1.86 AS builder
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY Cargo.toml Cargo.lock* ./
|
||||||
|
# Forhåndsbygg avhengigheter (cache-lag)
|
||||||
|
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build --release && rm -rf src
|
||||||
|
|
||||||
|
COPY src/ src/
|
||||||
|
RUN touch src/main.rs && cargo build --release
|
||||||
|
|
||||||
|
FROM debian:bookworm-slim
|
||||||
|
RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
COPY --from=builder /app/target/release/maskinrommet /usr/local/bin/maskinrommet
|
||||||
|
|
||||||
|
ENV BIND_ADDR=0.0.0.0:3100
|
||||||
|
EXPOSE 3100
|
||||||
|
|
||||||
|
CMD ["maskinrommet"]
|
||||||
65
maskinrommet/src/main.rs
Normal file
65
maskinrommet/src/main.rs
Normal file
|
|
@ -0,0 +1,65 @@
|
||||||
|
use axum::{extract::State, http::StatusCode, routing::get, Json, Router};
|
||||||
|
use serde::Serialize;
|
||||||
|
use sqlx::postgres::PgPoolOptions;
|
||||||
|
use sqlx::PgPool;
|
||||||
|
use tower_http::trace::TraceLayer;
|
||||||
|
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct AppState {
|
||||||
|
db: PgPool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct HealthResponse {
|
||||||
|
status: &'static str,
|
||||||
|
version: &'static str,
|
||||||
|
db: &'static str,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() {
|
||||||
|
tracing_subscriber::registry()
|
||||||
|
.with(
|
||||||
|
EnvFilter::try_from_default_env()
|
||||||
|
.unwrap_or_else(|_| "maskinrommet=debug,tower_http=debug".parse().unwrap()),
|
||||||
|
)
|
||||||
|
.with(tracing_subscriber::fmt::layer())
|
||||||
|
.init();
|
||||||
|
|
||||||
|
let database_url = std::env::var("DATABASE_URL")
|
||||||
|
.unwrap_or_else(|_| "postgres://sidelinja:sidelinja@localhost:5432/synops".to_string());
|
||||||
|
|
||||||
|
let db = PgPoolOptions::new()
|
||||||
|
.max_connections(10)
|
||||||
|
.connect(&database_url)
|
||||||
|
.await
|
||||||
|
.expect("Kunne ikke koble til PostgreSQL");
|
||||||
|
|
||||||
|
tracing::info!("Koblet til PostgreSQL");
|
||||||
|
|
||||||
|
let state = AppState { db };
|
||||||
|
|
||||||
|
let app = Router::new()
|
||||||
|
.route("/health", get(health))
|
||||||
|
.layer(TraceLayer::new_for_http())
|
||||||
|
.with_state(state);
|
||||||
|
|
||||||
|
let bind = std::env::var("BIND_ADDR").unwrap_or_else(|_| "0.0.0.0:3100".to_string());
|
||||||
|
let listener = tokio::net::TcpListener::bind(&bind).await.unwrap();
|
||||||
|
tracing::info!("Maskinrommet lytter på {bind}");
|
||||||
|
axum::serve(listener, app).await.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn health(State(state): State<AppState>) -> Result<Json<HealthResponse>, StatusCode> {
|
||||||
|
sqlx::query("SELECT 1")
|
||||||
|
.execute(&state.db)
|
||||||
|
.await
|
||||||
|
.map_err(|_| StatusCode::SERVICE_UNAVAILABLE)?;
|
||||||
|
|
||||||
|
Ok(Json(HealthResponse {
|
||||||
|
status: "ok",
|
||||||
|
version: env!("CARGO_PKG_VERSION"),
|
||||||
|
db: "connected",
|
||||||
|
}))
|
||||||
|
}
|
||||||
3
tasks.md
3
tasks.md
|
|
@ -51,8 +51,7 @@ Uavhengige faser kan fortsatt plukkes.
|
||||||
|
|
||||||
## Fase 2: Maskinrommet — skjelett
|
## Fase 2: Maskinrommet — skjelett
|
||||||
|
|
||||||
- [~] 2.1 Rust-prosjekt: opprett `maskinrommet/` med axum, tokio, sqlx (PG), serde. Dockerfile. Kompilerer og starter. Ref: `docs/retninger/maskinrommet.md`.
|
- [x] 2.1 Rust-prosjekt: opprett `maskinrommet/` med axum, tokio, sqlx (PG), serde. Dockerfile. Kompilerer og starter. Ref: `docs/retninger/maskinrommet.md`.
|
||||||
> Påbegynt: 2026-03-17T12:17
|
|
||||||
- [ ] 2.2 Auth-middleware: valider Authentik JWT-tokens, slå opp `auth_identities` → node_id. Returner 401 for ugyldige tokens.
|
- [ ] 2.2 Auth-middleware: valider Authentik JWT-tokens, slå opp `auth_identities` → node_id. Returner 401 for ugyldige tokens.
|
||||||
- [ ] 2.3 SpacetimeDB-klient i maskinrommet: koble til STDB, skriv noder og edges via reducers.
|
- [ ] 2.3 SpacetimeDB-klient i maskinrommet: koble til STDB, skriv noder og edges via reducers.
|
||||||
- [ ] 2.4 Skrivestien: `POST /intentions/create_node` — valider, skriv STDB (instant), spawn async PG-skriving. Returner node_id umiddelbart.
|
- [ ] 2.4 Skrivestien: `POST /intentions/create_node` — valider, skriv STDB (instant), spawn async PG-skriving. Returner node_id umiddelbart.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue