etcd to postgres

deployment/docker-compose.yaml

@@ -1,28 +1,19 @@
 services:
-  etcd:
-    image: quay.io/coreos/etcd:v3.5.9
-    entrypoint: /usr/local/bin/etcd
+  postgres:
+    image: postgres
     ports:
-        - "2379:2379"
-        - "2380:2380"
+      - 5432:5432
+    restart: always
 
-    command:
-      - '--data-dir=/etcd-data'
-      - '--name=node1'
-      - '--initial-advertise-peer-urls=http://127.0.0.1:2380'
-      - '--listen-peer-urls=http://0.0.0.0:2380'
-      - '--advertise-client-urls=https://127.0.0.1:2379'
-      - '--listen-client-urls=https://0.0.0.0:2379'
-      - '--initial-cluster=node1=http://127.0.0.1:2380'
-      - '--trusted-ca-file=/certs/ca.crt'
-      - '--client-cert-auth'
-      - '--cert-file=/certs/cert.crt'
-      - '--key-file=/certs/cert.key'
     volumes:
-        - "./data/etcd_data:/etcd-data"
-        - "../certs/Vicky_CA.crt:/certs/ca.crt"
-        - "../certs/etcd.crt:/certs/cert.crt"
-        - "../certs/etcd.key:/certs/cert.key"
+      # - "./config/postgres-passwd:/run/secrets/postgres-passwd"
+      - "./data/postgres_data:/var/lib/postgresql/data"
+    environment:
+      # POSTGRES_PASSWORD_FILE: /run/secrets/postgres-passwd
+      POSTGRES_USER: vicky
+      POSTGRES_PASSWORD: vicky
+      POSTGRES_DB: vicky
+
   minio:
     image: minio/minio
     ports:

vicky/Cargo.toml

@@ -9,22 +9,23 @@ edition = "2021"
 anyhow = "1.0.72"
 clap = { version = "4.3.17", features = ["derive"] }
 env_logger = "0.10.0"
-etcd-client = { version = "0.11.1", features = ["tls"] }
 log = "0.4.19"
 rand = "0.8.5"
 thiserror = "1.0.43"
 tokio = { version = "1", features = ["full", "sync"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_yaml = "0.9"
 serde_json = "1.0"
 async-trait = "0.1.71"
 aws-sdk-s3 = "0.28.0"
 aws-config = "0.55.3"
-uuid = { version="1.4.1", features = ["fast-rng", "v4", "serde"] }
-rocket = { version="0.5.0", features = ["json", "secrets"] } 
+uuid = { version = "1.4.1", features = ["fast-rng", "v4", "serde"] }
+rocket = { version = "0.5.0", features = ["json", "secrets"] }
 rocket_dyn_templates = { version = "0.1.0", features = ["tera"] }
-reqwest = { version="0.11.20", features = ["json"]}
+rocket_sync_db_pools = { version = "0.1", features = ["diesel_postgres_pool"] }
+reqwest = { version = "0.11.20", features = ["json"] }
 jwtk = "0.3.0"
+diesel = { version = "2.1.6", features = ["postgres", "uuid", "r2d2"] }
+itertools = { version = "0.12.1" }
 
 [[bin]]
 name = "vicky"

vicky/Rocket.example.toml

@@ -4,12 +4,8 @@ machines = [
     "abc1234"
 ]
 
-[default.etcd_config]
-endpoints = [ "https://localhost:2379" ]
-[default.etcd_config.tls_options]
-ca_file = "../certs/Vicky_CA.crt"
-certificate_file = "../certs/Vicky.crt"
-key_file = "../certs/Vicky.key"
+[default.databases]
+postgres_db = { url = "postgres://vicky:vicky@localhost/vicky" }
 
 [default.s3_config]
 endpoint = "http://localhost:9000"

vicky/diesel.toml

@@ -0,0 +1,9 @@
+# For documentation on how to configure this file,
+# see https://diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/lib/database/schema.rs"
+custom_type_derives = ["diesel::query_builder::QueryId"]
+
+[migrations_directory]
+dir = "migrations"

vicky/migrations/00000000000000_diesel_initial_setup/down.sql

@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();

vicky/migrations/00000000000000_diesel_initial_setup/up.sql

@@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;

vicky/migrations/2024-04-26-080445_create_tasks/down.sql

@@ -0,0 +1,2 @@
+DROP TABLE locks;
+DROP TABLE tasks;

vicky/migrations/2024-04-26-080445_create_tasks/up.sql

@@ -0,0 +1,20 @@
+CREATE TABLE tasks
+(
+    id             uuid    PRIMARY KEY,
+    display_name   VARCHAR NOT NULL,
+    status         VARCHAR NOT NULL,
+    features       text[] NOT NULL,
+    flake_ref_uri  VARCHAR NOT NULL,
+    flake_ref_args text[] NOT NULL
+);
+
+CREATE TABLE locks
+(
+    id      SERIAL  PRIMARY KEY,
+    task_id uuid    NOT NULL,
+    name    VARCHAR NOT NULL,
+    type    VARCHAR NOT NULL,
+    CONSTRAINT fk_task
+        FOREIGN KEY (task_id)
+            REFERENCES tasks (id)
+);

vicky/src/bin/vicky/auth.rs

@@ -13,6 +13,7 @@ pub enum Role {
     Admin,
 }
 
+#[allow(dead_code)]
 #[derive(Deserialize)]
 pub struct User {
     pub full_name: String,

vicky/src/bin/vicky/main.rs

@@ -1,18 +1,15 @@
 use std::time::Duration;
 
 use aws_sdk_s3::config::{Credentials, Region};
-use etcd_client::{Certificate, ConnectOptions, Identity, TlsOptions};
 use jwtk::jwk::RemoteJwksVerifier;
-use log::info;
 
-use rand::Rng;
 use rocket::fairing::AdHoc;
 use rocket::figment::providers::{Env, Format, Toml};
 use rocket::figment::{Figment, Profile};
 use rocket::routes;
 use serde::Deserialize;
 use tokio::sync::broadcast;
-use vickylib::etcd::election::{Election, NodeId};
+use vickylib::database::entities::Database;
 use vickylib::logs::LogDrain;
 use vickylib::s3::client::S3Client;
 
@@ -30,18 +27,6 @@ mod events;
 mod tasks;
 mod user;
 
-#[derive(Deserialize)]
-pub struct TlsConfigOptions {
-    ca_file: String,
-    certificate_file: String,
-    key_file: String,
-}
-#[derive(Deserialize)]
-pub struct EtcdConfig {
-    endpoints: Vec<String>,
-    tls_options: Option<TlsConfigOptions>,
-}
-
 #[derive(Deserialize)]
 pub struct S3Config {
     endpoint: String,
@@ -61,15 +46,16 @@ pub struct OIDCConfig {
 pub struct Config {
     machines: Vec<String>,
 
-    etcd_config: EtcdConfig,
     s3_config: S3Config,
 
     oidc_config: OIDCConfig,
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    env_logger::builder().filter_module("vicky", log::LevelFilter::Debug).init();
+    env_logger::builder()
+        .filter_module("vicky", log::LevelFilter::Debug)
+        .init();
 
     // Took from rocket source code and added .split("__") to be able to add keys in nested structures.
     let rocket_config_figment = Figment::from(rocket::Config::default())
@@ -89,28 +75,6 @@ async fn main() -> anyhow::Result<()> {
 
     let app_config = build_rocket.figment().extract::<Config>()?;
 
-    let options = match app_config.etcd_config.tls_options {
-        Some(tls_options) => {
-            let server_root_ca_cert = std::fs::read_to_string(tls_options.ca_file)?;
-            let server_root_ca_cert = Certificate::from_pem(server_root_ca_cert);
-            let client_cert = std::fs::read_to_string(tls_options.certificate_file)?;
-            let client_key = std::fs::read_to_string(tls_options.key_file)?;
-            let client_identity = Identity::from_pem(client_cert, client_key);
-
-            Some(
-                TlsOptions::new()
-                    .ca_certificate(server_root_ca_cert)
-                    .identity(client_identity),
-            )
-        }
-        None => None,
-    };
-
-    let connect_options =
-        options.map(|options: TlsOptions| ConnectOptions::new().with_tls(options));
-    let etcd_client =
-        etcd_client::Client::connect(app_config.etcd_config.endpoints, connect_options).await?;
-
     let jwks_verifier = RemoteJwksVerifier::new(
         app_config.oidc_config.jwks_url,
         None,
@@ -136,26 +100,16 @@ async fn main() -> anyhow::Result<()> {
     let s3_ext_client_drain = S3Client::new(s3_client.clone(), aws_cfg.log_bucket.clone());
     let s3_ext_client = S3Client::new(s3_client, aws_cfg.log_bucket.clone());
 
-    let mut rng = rand::thread_rng();
-    let node_id: NodeId = format!("node_{}", rng.gen::<i32>()).to_string();
-    info!("Generated unique node id as {}", node_id);
-
-    let mut election = Election::new(&etcd_client, node_id);
-    election.keep_alive();
-
-    election.elect().await?;
-    info!("Leader election won, we are now the leader!");
-
     let log_drain = LogDrain::new(s3_ext_client_drain);
 
     let (tx_global_events, _rx_task_events) = broadcast::channel::<GlobalEvent>(5);
 
     build_rocket
-        .manage(etcd_client)
         .manage(s3_ext_client)
         .manage(log_drain)
         .manage(jwks_verifier)
         .manage(tx_global_events)
+        .attach(Database::fairing())
         .attach(AdHoc::config::<Config>())
         .mount("/api/v1/user", routes![get_user])
         .mount("/api/v1/events", routes![get_global_events])