Less smart database setup, single user for the app

Makes this run on Scaleway where you only get a single database user.
Can probably be improved later.

.gitignore

@@ -4,3 +4,4 @@
 *.tmp.*
 tmp
 *.tmp
+*.env

.settings.sh

@@ -10,4 +10,4 @@ export PGPORT=5555
 export PGUSER=postgres
 export PGPASSWORD=postgres
 
-export DATABASE_URL="postgres://skjera-owner:skjera-owner@localhost/skjera"
+export DATABASE_URL="postgres://localhost/skjera"

backend/src/main.rs

@@ -31,7 +31,7 @@ use std::process::exit;
 use tokio::net::TcpListener;
 use tokio::signal;
 use tower_http::{services::ServeDir, trace::TraceLayer};
-use tracing::{debug, info, span, Level};
+use tracing::{debug, info, span, warn, Level};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 static COOKIE_NAME: &str = "SESSION";
@@ -46,6 +46,8 @@ async fn main() {
         .with(tracing_subscriber::fmt::layer())
         .init();
 
+    warn!("skjera starting");
+
     // We don't care if there is a problem here
     let env = dotenv::dotenv();
     let is_local = env.is_ok();
@@ -63,6 +65,11 @@ async fn main() {
 
     info!("DATABASE_URL: {:?}", &options);
 
+    // match run_migrations(options.clone()).await {
+    //     Ok(_) => info!("migrations applies"),
+    //     Err(err) => warn!("could not apply migrations: {}", err),
+    // }
+
     let pool = sqlx::postgres::PgPool::connect_lazy_with(options);
     let assets_path = if is_local { "backend/assets" } else { "assets" }.to_string();
     let ctx = ReqwestClient::new();
@@ -91,6 +98,28 @@ async fn main() {
     start_server(server_impl, "0.0.0.0:8080").await
 }
 
+// async fn run_migrations(pg_options: PgConnectOptions) -> Result<(), anyhow::Error> {
+//     let postgres_pool = PgPoolOptions::new()
+//         .max_connections(1)
+//         .after_connect(|conn, _meta| {
+//             Box::pin(async move {
+//                 conn.execute("SET search_path = 'public';").await?;
+//                 Ok(())
+//             })
+//         })
+//         .connect_with(pg_options)
+//         .await
+//         .map_err(|e| anyhow::anyhow!(e))?;
+//
+//     let migrator = Migrator::new(Path::new("./migrations"))
+//         .await
+//         .map_err(|e| anyhow::anyhow!(e))?;
+//     migrator
+//         .run(&postgres_pool)
+//         .await
+//         .map_err(|e| anyhow::anyhow!(e))
+// }
+
 #[derive(Clone, Debug)]
 struct ServerImpl {
     pool: sqlx::PgPool,
@@ -154,6 +183,7 @@ async fn start_server(server_impl: ServerImpl, addr: &str) {
 
     // Run the server with graceful shutdown
     let listener = TcpListener::bind(addr).await.unwrap();
+    info!("skjera is listening on {}", addr);
     axum::serve(listener, app)
         .with_graceful_shutdown(shutdown_signal())
         .await

init.sql → migrations/00-create.sql

@@ -1,24 +1,13 @@
-\c postgres
-
-SELECT PG_TERMINATE_BACKEND(pid)
-FROM pg_stat_activity
-WHERE datname = 'skjera';
-
-DROP DATABASE IF EXISTS skjera;
-DROP ROLE IF EXISTS "skjera-backend";
-DROP ROLE IF EXISTS "skjera-owner";
-
----
+-- This is a psql script, not a generic sql script
 
 CREATE DATABASE skjera;
 
+\c skjera
+
 CREATE ROLE "skjera-backend" WITH LOGIN ENCRYPTED PASSWORD 'skjera-backend';
--- GRANT ALL ON DATABASE skjera to "skjera-backend";
 
 CREATE ROLE "skjera-owner" WITH LOGIN ENCRYPTED PASSWORD 'skjera-owner';
 GRANT ALL ON DATABASE skjera TO "skjera-owner";
 
-\c skjera
-
 GRANT ALL ON SCHEMA public TO "skjera-owner";
 GRANT USAGE ON SCHEMA public TO "skjera-backend";

migrations/00-drop.sql

@@ -0,0 +1,11 @@
+-- This is a psql script, not a generic sql script
+
+\c postgres
+
+SELECT PG_TERMINATE_BACKEND(pid)
+FROM pg_stat_activity
+WHERE datname = 'skjera';
+
+DROP DATABASE IF EXISTS skjera;
+DROP ROLE IF EXISTS "skjera-backend";
+DROP ROLE IF EXISTS "skjera-owner";

migrations/20241225094146_baseline.sql

@@ -1,3 +1,3 @@
 CREATE SCHEMA skjera;
 
-GRANT ALL ON SCHEMA skjera TO "skjera-backend";
+-- GRANT ALL ON SCHEMA skjera TO "skjera-backend";

migrations/20241225161533_baseline.sql

@@ -9,7 +9,7 @@ CREATE TABLE skjera.employee
     PRIMARY KEY (id)
 );
 
-GRANT ALL ON skjera.employee TO "skjera-backend";
+-- GRANT ALL ON skjera.employee TO "skjera-backend";
 
 CREATE TABLE skjera.some_account
 (
@@ -22,7 +22,7 @@ CREATE TABLE skjera.some_account
     PRIMARY KEY (id)
 );
 
-GRANT ALL ON skjera.some_account TO "skjera-backend";
+-- GRANT ALL ON skjera.some_account TO "skjera-backend";
 
 INSERT INTO skjera.employee(name)
 VALUES ('Trygve Laugstøl'),

migrations/20241226063214_baseline.sql

@@ -10,7 +10,7 @@ CREATE TABLE skjera.employee
     PRIMARY KEY (id)
 );
 
-GRANT ALL ON skjera.employee TO "skjera-backend";
+-- GRANT ALL ON skjera.employee TO "skjera-backend";
 
 CREATE TABLE skjera.some_account
 (
@@ -23,7 +23,7 @@ CREATE TABLE skjera.some_account
     PRIMARY KEY (id)
 );
 
-GRANT ALL ON skjera.some_account TO "skjera-backend";
+-- GRANT ALL ON skjera.some_account TO "skjera-backend";
 
 INSERT INTO skjera.employee(email, name)
 VALUES ('[email protected]', 'Trygve Laugstøl'),