update client to 1.12

* update deps

* remove patch when 0 for deployments using specific build version

* implement custom git provider and image registry support

* common providers api

* toml array alias

* username alias account

* get fe to build

* http or https

* fix frontend build

* improve registry / provider config

* frontend build

* rework deployment / builds image registry

* frontend builds

* update build config fe

* configure builder additional accounts / secrets

* guard against managing non-github repo webhooks

* fmt

* md size dashboard

* lowercase organization in image name

* update config docs

* update example env

* provider configuration

* distribute migrator

* fix casing mismatch

* docs

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["bin/*", "lib/*", "client/core/rs", "client/periphery/rs"]
 
 [workspace.package]
-version = "1.5.0"
+version = "1.12.0"
 edition = "2021"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"
@@ -15,30 +15,33 @@ monitor_client = { path = "client/core/rs" }
 
 [workspace.dependencies]
 # LOCAL
-monitor_client = "1.5.0"
+monitor_client = "1.12.0"
 periphery_client = { path = "client/periphery/rs" }
+formatting = { path = "lib/formatting" }
+command = { path = "lib/command" }
 logger = { path = "lib/logger" }
+git = { path = "lib/git" }
 
 # MOGH
 run_command = { version = "0.0.6", features = ["async_tokio"] }
-serror = { version = "0.3.4", default-features = false }
+serror = { version = "0.4.6", default-features = false }
 slack = { version = "0.1.0", package = "slack_client_rs" }
 derive_default_builder = "0.1.8"
 derive_empty_traits = "0.1.0"
 merge_config_files = "0.1.5"
-termination_signal = "0.1.3"
-async_timing_util = "0.1.14"
-partial_derive2 = "0.4.2"
-derive_variants = "0.1.3"
-mongo_indexed = "0.3.0"
-resolver_api = "1.1.0"
+async_timing_util = "1.0.0"
+partial_derive2 = "0.4.3"
+derive_variants = "1.0.0"
+mongo_indexed = "1.0.0"
+resolver_api = "1.1.1"
+toml_pretty = "1.1.2"
 parse_csl = "0.1.0"
-mungos = "0.5.6"
+mungos = "1.0.0"
 svi = "1.0.1"
 
 # ASYNC
-tokio = { version = "1.37.0", features = ["full"] }
-reqwest = { version = "0.12.4", features = ["json"] }
+tokio = { version = "1.38.1", features = ["full"] }
+reqwest = { version = "0.12.5", features = ["json"] }
 tokio-util = "0.7.11"
 futures = "0.3.30"
 futures-util = "0.3.30"
@@ -48,51 +51,58 @@ axum = { version = "0.7.5", features = ["ws", "json"] }
 axum-extra = { version = "0.9.3", features = ["typed-header"] }
 tower = { version = "0.4.13", features = ["timeout"] }
 tower-http = { version = "0.5.2", features = ["fs", "cors"] }
-tokio-tungstenite = "0.21.0"
+tokio-tungstenite = "0.23.1"
 
 # SER/DE
-serde = { version = "1.0.202", features = ["derive"] }
-strum = { version = "0.26.2", features = ["derive"] }
-serde_json = "1.0.117"
-toml = "0.8.13"
+ordered_hash_map = { version = "0.4.0", features = ["serde"] }
+serde = { version = "1.0.204", features = ["derive"] }
+strum = { version = "0.26.3", features = ["derive"] }
+serde_json = "1.0.120"
+toml = "0.8.15"
 
 # ERROR
 anyhow = "1.0.86"
-thiserror = "1.0.61"
+thiserror = "1.0.63"
 
 # LOGGING
-opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] }
+opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] }
 tracing-subscriber = { version = "0.3.18", features = ["json"] }
-tracing-opentelemetry = "0.23.0"
-opentelemetry-otlp = "0.15.0"
-opentelemetry = "0.22.0"
+tracing-opentelemetry = "0.24.0"
+opentelemetry-otlp = "0.16.0"
+opentelemetry = "0.23.0"
 tracing = "0.1.40"
 
 # CONFIG
-clap = { version = "4.5.4", features = ["derive"] }
+clap = { version = "4.5.9", features = ["derive"] }
 dotenv = "0.15.0"
 envy = "0.4.2"
 
 # CRYPTO
-uuid = { version = "1.8.0", features = ["v4", "fast-rng", "serde"] }
+uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
 urlencoding = "2.1.3"
-rand = "0.8.5"
-jwt = "0.16.0"
+nom_pem = "4.0.0"
+bcrypt = "0.15.1"
+base64 = "0.22.1"
 hmac = "0.12.1"
 sha2 = "0.10.8"
-bcrypt = "0.15.1"
+rand = "0.8.5"
+jwt = "0.16.0"
 hex = "0.4.3"
 
 # SYSTEM
 bollard = "0.16.1"
-sysinfo = "0.30.12"
+sysinfo = "0.30.13"
 
 # CLOUD
-aws-config = "1.4.0"
-aws-sdk-ec2 = "1.42.0"
+aws-config = "1.5.4"
+aws-sdk-ec2 = "1.60.0"
+aws-sdk-ecr = "1.35.0"
 
 # MISC
 derive_builder = "0.20.0"
 typeshare = "1.0.3"
+octorust = "0.7.0"
 colored = "2.1.0"
-bson = "2.10.0"
+regex = "1.10.5"
+bson = "2.11.0"
+

bin/alerter/Cargo.toml

@@ -13,8 +13,6 @@ repository.workspace = true
 # local
 monitor_client.workspace = true
 logger.workspace = true
-# mogh
-termination_signal.workspace = true
 # external
 tokio.workspace = true
 tracing.workspace = true

bin/alerter/src/main.rs

@@ -9,7 +9,6 @@ use monitor_client::entities::{
   alert::Alert, server::stats::SeverityLevel,
 };
 use serde::Deserialize;
-use termination_signal::tokio::immediate_term_handle;
 
 #[derive(Deserialize)]
 struct Env {
@@ -57,13 +56,15 @@ async fn app() -> anyhow::Result<()> {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-  let term_signal = immediate_term_handle()?;
+  let mut term_signal = tokio::signal::unix::signal(
+    tokio::signal::unix::SignalKind::terminate(),
+  )?;
 
   let app = tokio::spawn(app());
 
   tokio::select! {
-      res = app => return res?,
-      _ = term_signal => {},
+    res = app => return res?,
+    _ = term_signal.recv() => {},
   }
 
   Ok(())

bin/cli/Cargo.toml

@@ -15,12 +15,13 @@ path = "src/main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# local client
+# local
 monitor_client.workspace = true
 # mogh
 partial_derive2.workspace = true
 # external
 tracing-subscriber.workspace = true
+merge_config_files.workspace = true
 serde_json.workspace = true
 futures.workspace = true
 tracing.workspace = true

bin/cli/README.md

@@ -1,6 +1,6 @@
 # Monitor CLI
 
-Monitor CLI is a tool to sync monitor resources and execute file defined procedures.
+Monitor CLI is a tool to sync monitor resources and execute operations.
 
 ## Install
 
@@ -10,6 +10,8 @@ cargo install monitor_cli
 
 ## Usage
 
+### Credentials
+
 Configure a file `~/.config/monitor/creds.toml` file with contents:
 ```toml
 url = "https://your.monitor.address"
@@ -18,8 +20,13 @@ secret = "YOUR-API-SECRET"
 ```
 
 Note. You can specify a different creds file by using `--creds ./other/path.toml`.
+You can also bypass using any file and pass the information using `--url`, `--key`, `--secret`:
 
-With your creds in place, you can run syncs:
+```sh
+monitor --url "https://your.monitor.address" --key "YOUR-API-KEY" --secret "YOUR-API-SECRET" ...
+```
+
+### Run Syncs
 
 ```sh
 ## Sync resources in a single file
@@ -32,9 +39,54 @@ monitor sync ./resources
 monitor sync
 ```
 
-And executions:
+#### Manual
+```md
+Runs syncs on resource files
+
+Usage: monitor sync [OPTIONS] [PATH]
+
+Arguments:
+  [PATH]  The path of the resource folder / file Folder paths will recursively incorporate all the resources it finds under the folder [default: ./resources]
+
+Options:
+      --delete  Will delete any resources that aren't included in the resource files
+  -h, --help    Print help
+```
+
+### Run Executions
 
 ```sh
-## Execute a TOML defined procedure
-monitor exec ./execution/execution.toml
-```
+# Triggers an example build
+monitor execute run-build test_build
+```
+
+#### Manual
+```md
+Runs an execution
+
+Usage: monitor execute <COMMAND>
+
+Commands:
+  none                 The "null" execution. Does nothing
+  run-procedure        Runs the target procedure. Response: [Update]
+  run-build            Runs the target build. Response: [Update]
+  deploy               Deploys the container for the target deployment. Response: [Update]
+  start-container      Starts the container for the target deployment. Response: [Update]
+  stop-container       Stops the container for the target deployment. Response: [Update]
+  stop-all-containers  Stops all deployments on the target server. Response: [Update]
+  remove-container     Stops and removes the container for the target deployment. Reponse: [Update]
+  clone-repo           Clones the target repo. Response: [Update]
+  pull-repo            Pulls the target repo. Response: [Update]
+  prune-networks       Prunes the docker networks on the target server. Response: [Update]
+  prune-images         Prunes the docker images on the target server. Response: [Update]
+  prune-containers     Prunes the docker containers on the target server. Response: [Update]
+  help                 Print this message or the help of the given subcommand(s)
+
+Options:
+  -h, --help  Print help
+```
+
+### --yes
+
+You can use `--yes` to avoid any human prompt to continue, for use in automated environments.
+

bin/cli/resources/builds.toml

@@ -1,81 +0,0 @@
-[[build]]
-name = "monitor_core"
-description = "Public monitor core build"
-tags = ["monitor"]
-
-[build.config]
-builder_id = "mogh-builder"
-repo = "mbecker20/monitor"
-branch = "main"
-docker_account = "mbecker2020"
-build_path = "."
-dockerfile_path = "bin/core/Dockerfile"
-
-[[build]]
-name = "monitor_core_dev"
-description = ""
-tags = ["monitor", "dev"]
-
-[build.config]
-builder_id = "mogh-builder"
-repo = "mbecker20/monitor"
-branch = "main"
-docker_account = "mbecker2020"
-build_path = "."
-dockerfile_path = "bin/core/Dockerfile"
-
-[[build]]
-name = "monitor_frontend"
-description = "standalone hosted frontend for monitor.mogh.tech"
-tags = ["monitor", "frontend"]
-
-[build.config]
-builder_id = "mogh-builder"
-repo = "mbecker20/monitor"
-branch = "main"
-docker_account = "mbecker2020"
-build_path = "."
-dockerfile_path = "frontend/Dockerfile"
-
-[[build.config.build_args]]
-variable = "VITE_MONITOR_HOST"
-value = "https://monitor.api.mogh.tech"
-
-[[build]]
-name = "monitor_frontend_dev"
-description = "standalone hosted frontend for monitor-dev.mogh.tech"
-tags = ["monitor", "frontend"]
-
-[build.config]
-builder_id = "mogh-builder"
-repo = "mbecker20/monitor"
-branch = "main"
-docker_account = "mbecker2020"
-build_path = "."
-dockerfile_path = "frontend/Dockerfile"
-
-[[build.config.build_args]]
-variable = "VITE_MONITOR_HOST"
-value = "https://monitor-dev.api.mogh.tech"
-
-## BUILDER
-
-[[builder]]
-name = "mogh-builder"
-description = ""
-tags = []
-
-[builder.config]
-type = "Aws"
-
-[builder.config.params]
-region = "us-east-2"
-instance_type = "c5.2xlarge"
-volume_gb = 20
-port = 8120
-ami_id = "ami-0c5d5efd79075c0e3"
-subnet_id = "subnet-02ae5ad480eacc4bc"
-security_group_ids = ["sg-049d98c819f9ace58", "sg-006c0ca638af8eb44"]
-key_pair_name = "mogh-key"
-assign_public_ip = true
-use_public_ip = true

bin/cli/resources/deployments.toml

@@ -1,213 +0,0 @@
-## MONITOR PROXY
-[[deployment]]
-name = "monitor-proxy"
-description = "An NGINX proxy for mogh.tech"
-tags = ["monitor"]
-config.server_id = "monitor-01"
-config.network = "host"
-config.restart = "unless-stopped"
-config.image.type = "Image"
-config.image.params.image = "jc21/nginx-proxy-manager"
-
-[[deployment.config.volumes]]
-local = "/data/nginx/data"
-container = "/data"
-
-[[deployment.config.volumes]]
-local = "/data/nginx/letsencrypt"
-container = "/etc/letsencrypt"
-
-## MONITOR MONGO
-[[deployment]]
-name = "monitor-mongo"
-description = "shared mongo deployment"
-tags = ["monitor"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "no"
-
-[deployment.config.image]
-type = "Image"
-params.image = "mongo"
-
-## MONITOR CORE
-[[deployment]]
-name = "monitor-core"
-description = ""
-tags = ["monitor"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "no"
-
-[deployment.config.image]
-type = "Image"
-params.image = "mbecker2020/monitor_core"
-
-## GRAFANA
-[[deployment]]
-name = "grafana"
-description = "runs on port 3080"
-tags = ["logging"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "unless-stopped"
-extra_args = ["--user root"]
-
-[deployment.config.image]
-type = "Image"
-params.image = "grafana/grafana"
-
-[[deployment.config.volumes]]
-local = "/data/grafana"
-container = "/var/lib/grafana"
-
-[[deployment.config.environment]]
-variable = "GF_SERVER_HTTP_PORT"
-value = "3080"
-
-[[deployment.config.labels]]
-variable = "vector"
-value = "key-value"
-
-## LOKI
-[[deployment]]
-name = "loki"
-description = "runs on 3100"
-tags = ["logging"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "unless-stopped"
-extra_args = ["--user root"]
-
-[deployment.config.image]
-type = "Image"
-params.image = "grafana/loki"
-
-[[deployment.config.volumes]]
-local = "/data/loki"
-container = "/loki"
-
-[[deployment]]
-name = "tempo"
-description = "OTLP: port 4317. HTTP: 3200"
-tags = ["logging"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "unless-stopped"
-command = "-server.http-listen-port=3200 -server.grpc-listen-port=9096 --storage.trace.backend=local --storage.trace.local.path=/tmp/tempo/traces --storage.trace.wal.path=/tmp/tempo/wal"
-extra_args = ["--user root"]
-
-[deployment.config.image]
-type = "Image"
-params.image = "grafana/tempo"
-
-[[deployment.config.volumes]]
-local = "/data/tempo"
-container = "/tmp/tempo"
-
-[[deployment.config.labels]]
-variable = "vector"
-value = "key-value"
-
-## VECTOR
-[[deployment]]
-name = "vector"
-description = "collects the docker logs (and alert endpoint)"
-tags = ["logging"]
-
-[deployment.config]
-server_id = "monitor-01"
-network = "host"
-restart = "unless-stopped"
-command = "--config /etc/vector/*.toml"
-extra_args = ["--user root"]
-
-[deployment.config.image]
-type = "Image"
-params.image = "timberio/vector:latest-debian"
-
-[[deployment.config.volumes]]
-local = "/root/.config/vector"
-container = "/etc/vector"
-
-[[deployment.config.volumes]]
-local = "/data/vector"
-container = "/var/lib/vector"
-
-[[deployment.config.volumes]]
-local = "/var/run/docker.sock"
-container = "/var/run/docker.sock"
-
-[[deployment.config.labels]]
-variable = "vector"
-value = "key-value"
-
-## MONITOR CORE DEV
-[[deployment]]
-name = "monitor-core-dev"
-description = "runs on 9001"
-tags = ["monitor", "dev"]
-
-[deployment.config]
-server_id = "monitor-01"
-redeploy_on_build = true
-network = "host"
-restart = "no"
-
-[deployment.config.image]
-type = "Build"
-params.build_id = "monitor_core"
-
-[[deployment.config.volumes]]
-local = "/root/.config/monitor/dev.core.config.toml"
-container = "/config/config.toml"
-
-[[deployment.config.volumes]]
-local = "/data/repos/monitor-dev-frontend/frontend/dist"
-container = "/frontend"
-
-[[deployment.config.labels]]
-variable = "vector"
-value = "rust"
-
-## MONITOR FRONTEND
-[[deployment]]
-name = "monitor-frontend"
-description = ""
-tags = ["monitor", "frontend"]
-
-[deployment.config]
-server_id = "monitor-01"
-redeploy_on_build = true
-network = "host"
-restart = "unless-stopped"
-image.type = "Build"
-image.params.build = "monitor_frontend"
-
-## MONITOR DEV FRONTEND
-[[deployment]]
-name = "monitor-dev-frontend"
-description = ""
-tags = ["monitor", "dev", "frontend"]
-
-[deployment.config]
-server_id = "monitor-01"
-redeploy_on_build = true
-network = "host"
-restart = "unless-stopped"
-image.type = "Build"
-image.params.build = "monitor_frontend_dev"
-
-[[deployment.config.environment]]
-variable = "PORT"
-value = "4175"

bin/cli/resources/procedures.toml

@@ -1,35 +0,0 @@
-[[procedure]]
-name = "build-monitor"
-description = ""
-tags = ["monitor"]
-
-[procedure.config]
-procedure_type = "Parallel"
-webhook_enabled = true
-
-[[procedure.config.executions]]
-enabled = true
-
-[procedure.config.executions.execution]
-type = "RunBuild"
-
-[procedure.config.executions.execution.params]
-build = "monitor_core"
-
-[[procedure.config.executions]]
-enabled = true
-
-[procedure.config.executions.execution]
-type = "RunBuild"
-
-[procedure.config.executions.execution.params]
-build = "monitor_frontend"
-
-[[procedure.config.executions]]
-enabled = false
-
-[procedure.config.executions.execution]
-type = "RunBuild"
-
-[procedure.config.executions.execution.params]
-build = "monitor_frontend_dev"

bin/cli/resources/repos.toml

@@ -1,37 +0,0 @@
-# [[repo]]
-# name = "monitor-dev-frontend"
-# description = "Used as frontend for monitor-core-dev"
-# tags = ["monitor", "dev"]
-
-# [repo.config]
-# server_id = "monitor-01"
-# repo = "mbecker20/monitor"
-# branch = "main"
-# github_account = ""
-
-# [repo.config.on_clone]
-# path = ""
-# command = ""
-
-# [repo.config.on_pull]
-# path = "frontend"
-# command = "sh on_pull.sh"
-
-[[repo]]
-name = "monitor-periphery"
-description = ""
-tags = ["monitor"]
-
-[repo.config]
-server_id = "monitor-01"
-repo = "mbecker20/monitor"
-branch = "main"
-github_account = ""
-
-[repo.config.on_clone]
-path = ""
-command = ""
-
-[repo.config.on_pull]
-path = "."
-command = "/root/.cargo/bin/cargo build -p monitor_periphery --release && cp ./target/release/periphery /home/ubuntu/periphery"

bin/cli/resources/servers.toml

@@ -1,51 +0,0 @@
-[[server]]
-name = "monitor-01"
-description = ""
-tags = ["monitor"]
-
-[server.config]
-address = "http://localhost:8120"
-enabled = true
-stats_monitoring = true
-auto_prune = true
-send_unreachable_alerts = true
-send_cpu_alerts = true
-send_mem_alerts = true
-send_disk_alerts = true
-region = "us-east-2"
-
-## TEMPLATE
-
-[[server_template]]
-name = "mogh-template"
-description = ""
-tags = []
-
-[server_template.config]
-type = "Aws"
-
-[server_template.config.params]
-region = "us-east-2"
-instance_type = "t3.medium"
-ami_id = "ami-0005a05fa63a080ab"
-subnet_id = "subnet-02ae5ad480eacc4bc"
-key_pair_name = "mogh-key"
-assign_public_ip = true
-use_public_ip = false
-port = 8120
-user_data = ""
-security_group_ids = ["sg-049d98c819f9ace58", "sg-006c0ca638af8eb44"]
-
-[[server_template.config.params.volumes]]
-device_name = "/dev/sda1"
-size_gb = 20
-volume_type = "gp2"
-iops = 0
-throughput = 0
-
-[[server_template.config.params.volumes]]
-device_name = "/dev/sdb"
-size_gb = 10
-volume_type = "gp3"
-iops = 0
-throughput = 0

bin/cli/src/args.rs

@@ -0,0 +1,66 @@
+use clap::{Parser, Subcommand};
+use monitor_client::api::execute::Execution;
+use serde::Deserialize;
+
+#[derive(Parser, Debug)]
+#[command(version, about, long_about = None)]
+pub struct CliArgs {
+  /// Sync or Exec
+  #[command(subcommand)]
+  pub command: Command,
+
+  /// The path to a creds file.
+  ///
+  /// Note: If each of `url`, `key` and `secret` are passed,
+  /// no file is required at this path.
+  #[arg(long, default_value_t = default_creds())]
+  pub creds: String,
+
+  /// Pass url in args instead of creds file
+  #[arg(long)]
+  pub url: Option<String>,
+  /// Pass api key in args instead of creds file
+  #[arg(long)]
+  pub key: Option<String>,
+  /// Pass api secret in args instead of creds file
+  #[arg(long)]
+  pub secret: Option<String>,
+
+  /// Always continue on user confirmation prompts.
+  #[arg(long, short, default_value_t = false)]
+  pub yes: bool,
+}
+
+fn default_creds() -> String {
+  let home = std::env::var("HOME")
+    .expect("no HOME env var. cannot get default config path.");
+  format!("{home}/.config/monitor/creds.toml")
+}
+
+#[derive(Debug, Clone, Subcommand)]
+pub enum Command {
+  /// Runs syncs on resource files
+  Sync {
+    /// The path of the resource folder / file
+    /// Folder paths will recursively incorporate all the resources it finds under the folder
+    #[arg(default_value_t = String::from("./resources"))]
+    path: String,
+
+    /// Will delete any resources that aren't included in the resource files.
+    #[arg(long, default_value_t = false)]
+    delete: bool,
+  },
+
+  /// Runs an execution
+  Execute {
+    #[command(subcommand)]
+    execution: Execution,
+  },
+}
+
+#[derive(Debug, Deserialize)]
+pub struct CredsFile {
+  pub url: String,
+  pub key: String,
+  pub secret: String,
+}

bin/cli/src/exec.rs

@@ -0,0 +1,130 @@
+use std::time::Duration;
+
+use colored::Colorize;
+use monitor_client::api::execute::Execution;
+
+use crate::{
+  helpers::wait_for_enter,
+  state::{cli_args, monitor_client},
+};
+
+pub async fn run(execution: Execution) -> anyhow::Result<()> {
+  if matches!(execution, Execution::None(_)) {
+    println!("Got 'none' execution. Doing nothing...");
+    tokio::time::sleep(Duration::from_secs(3)).await;
+    println!("Finished doing nothing. Exiting...");
+    std::process::exit(0);
+  }
+
+  println!("\n{}: Execution", "Mode".dimmed());
+  match &execution {
+    Execution::None(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunProcedure(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunBuild(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::Deploy(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StartContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::StopAllContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RemoveContainer(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::CloneRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PullRepo(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneNetworks(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneImages(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::PruneContainers(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::RunSync(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+    Execution::Sleep(data) => {
+      println!("{}: {data:?}", "Data".dimmed())
+    }
+  }
+
+  if !cli_args().yes {
+    wait_for_enter("run execution")?;
+  }
+
+  info!("Running Execution...");
+
+  let res = match execution {
+    Execution::RunProcedure(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::RunBuild(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::Deploy(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::StartContainer(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::StopContainer(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::StopAllContainers(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::RemoveContainer(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::CloneRepo(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::PullRepo(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::PruneNetworks(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::PruneImages(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::PruneContainers(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::RunSync(request) => {
+      monitor_client().execute(request).await
+    }
+    Execution::Sleep(request) => {
+      let duration =
+        Duration::from_millis(request.duration_ms as u64);
+      tokio::time::sleep(duration).await;
+      println!("Finished sleeping!");
+      std::process::exit(0)
+    }
+    Execution::None(_) => unreachable!(),
+  };
+
+  match res {
+    Ok(update) => println!("\n{}: {update:#?}", "SUCCESS".green()),
+    Err(e) => println!("{}\n\n{e:#?}", "ERROR".red()),
+  }
+
+  Ok(())
+}

bin/cli/src/execution.rs

@@ -1,189 +0,0 @@
-use std::path::Path;
-
-use anyhow::{anyhow, Context};
-use futures::future::join_all;
-use monitor_client::api::execute;
-use serde::Deserialize;
-use strum::Display;
-
-use crate::monitor_client;
-
-pub async fn run_execution(path: &Path) -> anyhow::Result<()> {
-  let ExecutionFile { name, stages } = crate::parse_toml_file(path)?;
-
-  info!("EXECUTION: {name}");
-  info!("path: {path:?}");
-  println!("{stages:#?}");
-
-  crate::wait_for_enter("EXECUTE")?;
-
-  run_stages(stages)
-    .await
-    .context("failed during a stage. terminating run.")?;
-
-  info!("finished successfully ✅");
-
-  Ok(())
-}
-
-/// Specifies sequence of stages (build / deploy) on resources
-#[derive(Debug, Clone, Deserialize)]
-pub struct ExecutionFile {
-  pub name: String,
-  #[serde(rename = "stage")]
-  pub stages: Vec<Stage>,
-}
-
-#[derive(Debug, Clone, Deserialize)]
-pub struct Stage {
-  pub name: String,
-  pub action: ExecutionType,
-  /// resource names
-  pub targets: Vec<String>,
-}
-
-#[derive(Debug, Clone, Copy, Deserialize, Display)]
-#[serde(rename_all = "snake_case")]
-#[strum(serialize_all = "snake_case")]
-pub enum ExecutionType {
-  Build,
-  Deploy,
-  StartContainer,
-  StopContainer,
-  DestroyContainer,
-}
-
-pub async fn run_stages(stages: Vec<Stage>) -> anyhow::Result<()> {
-  for Stage {
-    name,
-    action,
-    targets,
-  } in stages
-  {
-    info!("running {action} stage: {name}... ⏳");
-    match action {
-      ExecutionType::Build => {
-        trigger_builds_in_parallel(&targets).await?;
-      }
-      ExecutionType::Deploy => {
-        redeploy_deployments_in_parallel(&targets).await?;
-      }
-      ExecutionType::StartContainer => {
-        start_containers_in_parallel(&targets).await?
-      }
-      ExecutionType::StopContainer => {
-        stop_containers_in_parallel(&targets).await?
-      }
-      ExecutionType::DestroyContainer => {
-        destroy_containers_in_parallel(&targets).await?;
-      }
-    }
-    info!("finished {action} stage: {name} ✅");
-  }
-  Ok(())
-}
-
-async fn redeploy_deployments_in_parallel(
-  deployments: &[String],
-) -> anyhow::Result<()> {
-  let futes = deployments.iter().map(|deployment| async move {
-    monitor_client()
-      .execute(execute::Deploy { deployment: deployment.to_string(), stop_signal: None, stop_time: None })
-      .await
-      .with_context(|| format!("failed to deploy {deployment}"))
-      .and_then(|update| {
-        if update.success {
-          Ok(())
-        } else {
-          Err(anyhow!(
-            "failed to deploy {deployment}. operation unsuccessful, see monitor update"
-          ))
-        }
-      })
-  });
-  join_all(futes).await.into_iter().collect()
-}
-
-async fn start_containers_in_parallel(
-  deployments: &[String],
-) -> anyhow::Result<()> {
-  let futes = deployments.iter().map(|deployment| async move {
-    monitor_client()
-    .execute(execute::StartContainer { deployment: deployment.to_string() })
-      .await
-      .with_context(|| format!("failed to start container {deployment}"))
-      .and_then(|update| {
-        if update.success {
-          Ok(())
-        } else {
-          Err(anyhow!(
-            "failed to start container {deployment}. operation unsuccessful, see monitor update"
-          ))
-        }
-      })
-  });
-  join_all(futes).await.into_iter().collect()
-}
-
-async fn stop_containers_in_parallel(
-  deployments: &[String],
-) -> anyhow::Result<()> {
-  let futes = deployments.iter().map(|deployment| async move {
-    monitor_client()
-      .execute(execute::StopContainer { deployment: deployment.to_string(), signal: None, time: None })
-      .await
-      .with_context(|| format!("failed to stop container {deployment}"))
-      .and_then(|update| {
-        if update.success {
-          Ok(())
-        } else {
-          Err(anyhow!(
-            "failed to stop container {deployment}. operation unsuccessful, see monitor update"
-          ))
-        }
-      })
-  });
-  join_all(futes).await.into_iter().collect()
-}
-
-async fn destroy_containers_in_parallel(
-  deployments: &[String],
-) -> anyhow::Result<()> {
-  let futes = deployments.iter().map(|deployment| async move {
-    monitor_client()
-      .execute(execute::RemoveContainer { deployment: deployment.to_string(), signal: None, time: None })
-      .await
-      .with_context(|| format!("failed to destroy container {deployment}"))
-      .and_then(|update| {
-        if update.success {
-          Ok(())
-        } else {
-          Err(anyhow!(
-            "failed to destroy container {deployment}. operation unsuccessful, see monitor update"
-          ))
-        }
-      })
-  });
-  join_all(futes).await.into_iter().collect()
-}
-
-async fn trigger_builds_in_parallel(
-  builds: &[String],
-) -> anyhow::Result<()> {
-  let futes = builds.iter().map(|build| async move {
-    monitor_client()
-      .execute(execute::RunBuild { build: build.to_string() })
-      .await
-      .with_context(|| format!("failed to build {build}"))
-      .and_then(|update| {
-        if update.success {
-          Ok(())
-        } else {
-          Err(anyhow!(
-            "failed to build {build}. operation unsuccessful, see monitor update"
-          ))
-        }
-      })
-  });
-  join_all(futes).await.into_iter().collect()
-}

bin/cli/src/helpers.rs

@@ -0,0 +1,17 @@
+use std::io::Read;
+
+use anyhow::Context;
+use colored::Colorize;
+
+pub fn wait_for_enter(press_enter_to: &str) -> anyhow::Result<()> {
+  println!(
+    "\nPress {} to {}\n",
+    "ENTER".green(),
+    press_enter_to.bold()
+  );
+  let buffer = &mut [0u8];
+  std::io::stdin()
+    .read_exact(buffer)
+    .context("failed to read ENTER")?;
+  Ok(())
+}

bin/cli/src/main.rs

@@ -1,113 +1,32 @@
 #[macro_use]
 extern crate tracing;
 
-use std::{io::Read, path::PathBuf, str::FromStr, sync::OnceLock};
-
-use anyhow::Context;
-use clap::{Parser, Subcommand};
 use colored::Colorize;
-use monitor_client::{api::read, MonitorClient};
-use serde::{de::DeserializeOwned, Deserialize};
+use monitor_client::api::read::GetVersion;
 
-mod execution;
+mod args;
+mod exec;
+mod helpers;
 mod maps;
+mod state;
 mod sync;
 
-fn cli_args() -> &'static CliArgs {
-  static CLI_ARGS: OnceLock<CliArgs> = OnceLock::new();
-  CLI_ARGS.get_or_init(CliArgs::parse)
-}
-
-#[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
-struct CliArgs {
-  /// Sync or Exec
-  #[command(subcommand)]
-  command: Command,
-  /// The path to a creds file.
-  #[arg(long, default_value_t = default_creds())]
-  creds: String,
-  /// Log less (just resource names).
-  #[arg(long, default_value_t = false)]
-  quiet: bool,
-}
-
-fn default_creds() -> String {
-  let home = std::env::var("HOME")
-    .expect("no HOME env var. cannot get default config path.");
-  format!("{home}/.config/monitor/creds.toml")
-}
-
-#[derive(Debug, Clone, Subcommand)]
-enum Command {
-  /// Runs syncs on resource files
-  Sync {
-    /// The path of the resource folder / file
-    /// Folder paths will recursively incorporate all the resources it finds under the folder
-    #[arg(default_value_t = String::from("./resources"))]
-    path: String,
-  },
-
-  /// Runs execution files
-  Exec {
-    /// The path of the exec file
-    path: PathBuf,
-  },
-}
-
-#[derive(Debug, Deserialize)]
-struct CredsFile {
-  url: String,
-  key: String,
-  secret: String,
-}
-
-fn monitor_client() -> &'static MonitorClient {
-  static MONITOR_CLIENT: OnceLock<MonitorClient> = OnceLock::new();
-  MONITOR_CLIENT.get_or_init(|| {
-    let CredsFile { url, key, secret } =
-      parse_toml_file(&cli_args().creds)
-        .expect("failed to parse monitor credentials");
-    futures::executor::block_on(MonitorClient::new(url, key, secret))
-      .expect("failed to initialize monitor client")
-  })
-}
-
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
   tracing_subscriber::fmt().with_target(false).init();
 
   let version =
-    monitor_client().read(read::GetVersion {}).await?.version;
+    state::monitor_client().read(GetVersion {}).await?.version;
   info!("monitor version: {}", version.to_string().blue().bold());
 
-  match &cli_args().command {
-    Command::Exec { path } => execution::run_execution(path).await?,
-    Command::Sync { path } => {
-      sync::run_sync(&PathBuf::from_str(path)?).await?
+  match &state::cli_args().command {
+    args::Command::Sync { path, delete } => {
+      sync::run(path, *delete).await?
+    }
+    args::Command::Execute { execution } => {
+      exec::run(execution.to_owned()).await?
     }
   }
 
   Ok(())
 }
-
-fn parse_toml_file<T: DeserializeOwned>(
-  path: impl AsRef<std::path::Path>,
-) -> anyhow::Result<T> {
-  let contents = std::fs::read_to_string(path)
-    .context("failed to read file contents")?;
-  toml::from_str(&contents).context("failed to parse toml contents")
-}
-
-fn wait_for_enter(press_enter_to: &str) -> anyhow::Result<()> {
-  println!(
-    "\nPress {} to {}\n",
-    "ENTER".green(),
-    press_enter_to.bold()
-  );
-  let buffer = &mut [0u8];
-  std::io::stdin()
-    .read_exact(buffer)
-    .context("failed to read ENTER")?;
-  Ok(())
-}

bin/cli/src/maps.rs

@@ -3,216 +3,206 @@ use std::{collections::HashMap, sync::OnceLock};
 use monitor_client::{
   api::read,
   entities::{
-    alerter::AlerterListItem, build::BuildListItem,
-    builder::BuilderListItem, deployment::DeploymentListItem,
-    procedure::ProcedureListItem, repo::RepoListItem,
-    server::ServerListItem, server_template::ServerTemplateListItem,
-    tag::Tag, user::User, user_group::UserGroup,
+    alerter::Alerter, build::Build, builder::Builder,
+    deployment::Deployment, procedure::Procedure, repo::Repo,
+    server::Server, server_template::ServerTemplate,
+    sync::ResourceSync, tag::Tag, user::User, user_group::UserGroup,
+    variable::Variable,
   },
 };
 
-use crate::monitor_client;
+use crate::state::monitor_client;
 
-pub fn name_to_build() -> &'static HashMap<String, BuildListItem> {
-  static NAME_TO_BUILD: OnceLock<HashMap<String, BuildListItem>> =
+pub fn name_to_build() -> &'static HashMap<String, Build> {
+  static NAME_TO_BUILD: OnceLock<HashMap<String, Build>> =
     OnceLock::new();
   NAME_TO_BUILD.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListBuilds::default()),
+      monitor_client().read(read::ListFullBuilds::default()),
     )
-    .expect("failed to get builds from monitor")
+    .expect("failed to get builds")
     .into_iter()
     .map(|build| (build.name.clone(), build))
     .collect()
   })
 }
 
-pub fn id_to_build() -> &'static HashMap<String, BuildListItem> {
-  static ID_TO_BUILD: OnceLock<HashMap<String, BuildListItem>> =
+pub fn id_to_build() -> &'static HashMap<String, Build> {
+  static ID_TO_BUILD: OnceLock<HashMap<String, Build>> =
     OnceLock::new();
   ID_TO_BUILD.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListBuilds::default()),
+      monitor_client().read(read::ListFullBuilds::default()),
     )
-    .expect("failed to get builds from monitor")
+    .expect("failed to get builds")
     .into_iter()
     .map(|build| (build.id.clone(), build))
     .collect()
   })
 }
 
-pub fn name_to_deployment(
-) -> &'static HashMap<String, DeploymentListItem> {
-  static NAME_TO_DEPLOYMENT: OnceLock<
-    HashMap<String, DeploymentListItem>,
-  > = OnceLock::new();
+pub fn name_to_deployment() -> &'static HashMap<String, Deployment> {
+  static NAME_TO_DEPLOYMENT: OnceLock<HashMap<String, Deployment>> =
+    OnceLock::new();
   NAME_TO_DEPLOYMENT.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListDeployments::default()),
+      monitor_client().read(read::ListFullDeployments::default()),
     )
-    .expect("failed to get deployments from monitor")
+    .expect("failed to get deployments")
     .into_iter()
     .map(|deployment| (deployment.name.clone(), deployment))
     .collect()
   })
 }
 
-pub fn id_to_deployment(
-) -> &'static HashMap<String, DeploymentListItem> {
-  static ID_TO_DEPLOYMENT: OnceLock<
-    HashMap<String, DeploymentListItem>,
-  > = OnceLock::new();
+pub fn id_to_deployment() -> &'static HashMap<String, Deployment> {
+  static ID_TO_DEPLOYMENT: OnceLock<HashMap<String, Deployment>> =
+    OnceLock::new();
   ID_TO_DEPLOYMENT.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListDeployments::default()),
+      monitor_client().read(read::ListFullDeployments::default()),
     )
-    .expect("failed to get deployments from monitor")
+    .expect("failed to get deployments")
     .into_iter()
     .map(|deployment| (deployment.id.clone(), deployment))
     .collect()
   })
 }
 
-pub fn name_to_server() -> &'static HashMap<String, ServerListItem> {
-  static NAME_TO_SERVER: OnceLock<HashMap<String, ServerListItem>> =
+pub fn name_to_server() -> &'static HashMap<String, Server> {
+  static NAME_TO_SERVER: OnceLock<HashMap<String, Server>> =
     OnceLock::new();
   NAME_TO_SERVER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListServers::default()),
+      monitor_client().read(read::ListFullServers::default()),
     )
-    .expect("failed to get servers from monitor")
+    .expect("failed to get servers")
     .into_iter()
     .map(|server| (server.name.clone(), server))
     .collect()
   })
 }
 
-pub fn id_to_server() -> &'static HashMap<String, ServerListItem> {
-  static ID_TO_SERVER: OnceLock<HashMap<String, ServerListItem>> =
+pub fn id_to_server() -> &'static HashMap<String, Server> {
+  static ID_TO_SERVER: OnceLock<HashMap<String, Server>> =
     OnceLock::new();
   ID_TO_SERVER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListServers::default()),
+      monitor_client().read(read::ListFullServers::default()),
     )
-    .expect("failed to get servers from monitor")
+    .expect("failed to get servers")
     .into_iter()
     .map(|server| (server.id.clone(), server))
     .collect()
   })
 }
 
-pub fn name_to_builder() -> &'static HashMap<String, BuilderListItem>
-{
-  static NAME_TO_BUILDER: OnceLock<HashMap<String, BuilderListItem>> =
+pub fn name_to_builder() -> &'static HashMap<String, Builder> {
+  static NAME_TO_BUILDER: OnceLock<HashMap<String, Builder>> =
     OnceLock::new();
   NAME_TO_BUILDER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListBuilders::default()),
+      monitor_client().read(read::ListFullBuilders::default()),
     )
-    .expect("failed to get builders from monitor")
+    .expect("failed to get builders")
     .into_iter()
     .map(|builder| (builder.name.clone(), builder))
     .collect()
   })
 }
 
-pub fn id_to_builder() -> &'static HashMap<String, BuilderListItem> {
-  static ID_TO_BUILDER: OnceLock<HashMap<String, BuilderListItem>> =
+pub fn id_to_builder() -> &'static HashMap<String, Builder> {
+  static ID_TO_BUILDER: OnceLock<HashMap<String, Builder>> =
     OnceLock::new();
   ID_TO_BUILDER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListBuilders::default()),
+      monitor_client().read(read::ListFullBuilders::default()),
     )
-    .expect("failed to get builders from monitor")
+    .expect("failed to get builders")
     .into_iter()
     .map(|builder| (builder.id.clone(), builder))
     .collect()
   })
 }
 
-pub fn name_to_alerter() -> &'static HashMap<String, AlerterListItem>
-{
-  static NAME_TO_ALERTER: OnceLock<HashMap<String, AlerterListItem>> =
+pub fn name_to_alerter() -> &'static HashMap<String, Alerter> {
+  static NAME_TO_ALERTER: OnceLock<HashMap<String, Alerter>> =
     OnceLock::new();
   NAME_TO_ALERTER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListAlerters::default()),
+      monitor_client().read(read::ListFullAlerters::default()),
     )
-    .expect("failed to get alerters from monitor")
+    .expect("failed to get alerters")
     .into_iter()
     .map(|alerter| (alerter.name.clone(), alerter))
     .collect()
   })
 }
 
-pub fn id_to_alerter() -> &'static HashMap<String, AlerterListItem> {
-  static ID_TO_ALERTER: OnceLock<HashMap<String, AlerterListItem>> =
+pub fn id_to_alerter() -> &'static HashMap<String, Alerter> {
+  static ID_TO_ALERTER: OnceLock<HashMap<String, Alerter>> =
     OnceLock::new();
   ID_TO_ALERTER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListAlerters::default()),
+      monitor_client().read(read::ListFullAlerters::default()),
     )
-    .expect("failed to get alerters from monitor")
+    .expect("failed to get alerters")
     .into_iter()
     .map(|alerter| (alerter.id.clone(), alerter))
     .collect()
   })
 }
 
-pub fn name_to_repo() -> &'static HashMap<String, RepoListItem> {
-  static NAME_TO_ALERTER: OnceLock<HashMap<String, RepoListItem>> =
+pub fn name_to_repo() -> &'static HashMap<String, Repo> {
+  static NAME_TO_ALERTER: OnceLock<HashMap<String, Repo>> =
     OnceLock::new();
   NAME_TO_ALERTER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListRepos::default()),
+      monitor_client().read(read::ListFullRepos::default()),
     )
-    .expect("failed to get repos from monitor")
+    .expect("failed to get repos")
     .into_iter()
     .map(|repo| (repo.name.clone(), repo))
     .collect()
   })
 }
 
-pub fn id_to_repo() -> &'static HashMap<String, RepoListItem> {
-  static ID_TO_ALERTER: OnceLock<HashMap<String, RepoListItem>> =
+pub fn id_to_repo() -> &'static HashMap<String, Repo> {
+  static ID_TO_ALERTER: OnceLock<HashMap<String, Repo>> =
     OnceLock::new();
   ID_TO_ALERTER.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListRepos::default()),
+      monitor_client().read(read::ListFullRepos::default()),
     )
-    .expect("failed to get repos from monitor")
+    .expect("failed to get repos")
     .into_iter()
     .map(|repo| (repo.id.clone(), repo))
     .collect()
   })
 }
 
-pub fn name_to_procedure(
-) -> &'static HashMap<String, ProcedureListItem> {
-  static NAME_TO_PROCEDURE: OnceLock<
-    HashMap<String, ProcedureListItem>,
-  > = OnceLock::new();
+pub fn name_to_procedure() -> &'static HashMap<String, Procedure> {
+  static NAME_TO_PROCEDURE: OnceLock<HashMap<String, Procedure>> =
+    OnceLock::new();
   NAME_TO_PROCEDURE.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListProcedures::default()),
+      monitor_client().read(read::ListFullProcedures::default()),
     )
-    .expect("failed to get procedures from monitor")
+    .expect("failed to get procedures")
     .into_iter()
     .map(|procedure| (procedure.name.clone(), procedure))
     .collect()
   })
 }
 
-pub fn id_to_procedure() -> &'static HashMap<String, ProcedureListItem>
-{
-  static ID_TO_PROCEDURE: OnceLock<
-    HashMap<String, ProcedureListItem>,
-  > = OnceLock::new();
+pub fn id_to_procedure() -> &'static HashMap<String, Procedure> {
+  static ID_TO_PROCEDURE: OnceLock<HashMap<String, Procedure>> =
+    OnceLock::new();
   ID_TO_PROCEDURE.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListProcedures::default()),
+      monitor_client().read(read::ListFullProcedures::default()),
     )
-    .expect("failed to get procedures from monitor")
+    .expect("failed to get procedures")
     .into_iter()
     .map(|procedure| (procedure.id.clone(), procedure))
     .collect()
@@ -220,15 +210,15 @@ pub fn id_to_procedure() -> &'static HashMap<String, ProcedureListItem>
 }
 
 pub fn name_to_server_template(
-) -> &'static HashMap<String, ServerTemplateListItem> {
+) -> &'static HashMap<String, ServerTemplate> {
   static NAME_TO_SERVER_TEMPLATE: OnceLock<
-    HashMap<String, ServerTemplateListItem>,
+    HashMap<String, ServerTemplate>,
   > = OnceLock::new();
   NAME_TO_SERVER_TEMPLATE.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListServerTemplates::default()),
+      monitor_client().read(read::ListFullServerTemplates::default()),
     )
-    .expect("failed to get server templates from monitor")
+    .expect("failed to get server templates")
     .into_iter()
     .map(|procedure| (procedure.name.clone(), procedure))
     .collect()
@@ -236,21 +226,51 @@ pub fn name_to_server_template(
 }
 
 pub fn id_to_server_template(
-) -> &'static HashMap<String, ServerTemplateListItem> {
+) -> &'static HashMap<String, ServerTemplate> {
   static ID_TO_SERVER_TEMPLATE: OnceLock<
-    HashMap<String, ServerTemplateListItem>,
+    HashMap<String, ServerTemplate>,
   > = OnceLock::new();
   ID_TO_SERVER_TEMPLATE.get_or_init(|| {
     futures::executor::block_on(
-      monitor_client().read(read::ListServerTemplates::default()),
+      monitor_client().read(read::ListFullServerTemplates::default()),
     )
-    .expect("failed to get server templates from monitor")
+    .expect("failed to get server templates")
     .into_iter()
     .map(|procedure| (procedure.id.clone(), procedure))
     .collect()
   })
 }
 
+pub fn name_to_resource_sync(
+) -> &'static HashMap<String, ResourceSync> {
+  static NAME_TO_SYNC: OnceLock<HashMap<String, ResourceSync>> =
+    OnceLock::new();
+  NAME_TO_SYNC.get_or_init(|| {
+    futures::executor::block_on(
+      monitor_client().read(read::ListFullResourceSyncs::default()),
+    )
+    .expect("failed to get syncs")
+    .into_iter()
+    .map(|sync| (sync.name.clone(), sync))
+    .collect()
+  })
+}
+
+pub fn id_to_resource_sync() -> &'static HashMap<String, ResourceSync>
+{
+  static ID_TO_SYNC: OnceLock<HashMap<String, ResourceSync>> =
+    OnceLock::new();
+  ID_TO_SYNC.get_or_init(|| {
+    futures::executor::block_on(
+      monitor_client().read(read::ListFullResourceSyncs::default()),
+    )
+    .expect("failed to get syncs")
+    .into_iter()
+    .map(|sync| (sync.id.clone(), sync))
+    .collect()
+  })
+}
+
 pub fn name_to_user_group() -> &'static HashMap<String, UserGroup> {
   static NAME_TO_USER_GROUP: OnceLock<HashMap<String, UserGroup>> =
     OnceLock::new();
@@ -258,13 +278,27 @@ pub fn name_to_user_group() -> &'static HashMap<String, UserGroup> {
     futures::executor::block_on(
       monitor_client().read(read::ListUserGroups::default()),
     )
-    .expect("failed to get user groups from monitor")
+    .expect("failed to get user groups")
     .into_iter()
     .map(|user_group| (user_group.name.clone(), user_group))
     .collect()
   })
 }
 
+pub fn name_to_variable() -> &'static HashMap<String, Variable> {
+  static NAME_TO_VARIABLE: OnceLock<HashMap<String, Variable>> =
+    OnceLock::new();
+  NAME_TO_VARIABLE.get_or_init(|| {
+    futures::executor::block_on(
+      monitor_client().read(read::ListVariables::default()),
+    )
+    .expect("failed to get variables")
+    .into_iter()
+    .map(|variable| (variable.name.clone(), variable))
+    .collect()
+  })
+}
+
 pub fn id_to_user() -> &'static HashMap<String, User> {
   static ID_TO_USER: OnceLock<HashMap<String, User>> =
     OnceLock::new();
@@ -272,7 +306,7 @@ pub fn id_to_user() -> &'static HashMap<String, User> {
     futures::executor::block_on(
       monitor_client().read(read::ListUsers::default()),
     )
-    .expect("failed to get users from monitor")
+    .expect("failed to get users")
     .into_iter()
     .map(|user| (user.id.clone(), user))
     .collect()
@@ -285,7 +319,7 @@ pub fn id_to_tag() -> &'static HashMap<String, Tag> {
     futures::executor::block_on(
       monitor_client().read(read::ListTags::default()),
     )
-    .expect("failed to get tags from monitor")
+    .expect("failed to get tags")
     .into_iter()
     .map(|tag| (tag.id.clone(), tag))
     .collect()

bin/cli/src/state.rs

@@ -0,0 +1,46 @@
+use std::sync::OnceLock;
+
+use clap::Parser;
+use merge_config_files::parse_config_file;
+use monitor_client::MonitorClient;
+
+pub fn cli_args() -> &'static crate::args::CliArgs {
+  static CLI_ARGS: OnceLock<crate::args::CliArgs> = OnceLock::new();
+  CLI_ARGS.get_or_init(crate::args::CliArgs::parse)
+}
+
+pub fn monitor_client() -> &'static MonitorClient {
+  static MONITOR_CLIENT: OnceLock<MonitorClient> = OnceLock::new();
+  MONITOR_CLIENT.get_or_init(|| {
+    let args = cli_args();
+    let crate::args::CredsFile { url, key, secret } =
+      match (&args.url, &args.key, &args.secret) {
+        (Some(url), Some(key), Some(secret)) => {
+          crate::args::CredsFile {
+            url: url.clone(),
+            key: key.clone(),
+            secret: secret.clone(),
+          }
+        }
+        (url, key, secret) => {
+          let mut creds: crate::args::CredsFile =
+            parse_config_file(cli_args().creds.as_str())
+              .expect("failed to parse monitor credentials");
+
+          if let Some(url) = url {
+            creds.url.clone_from(url);
+          }
+          if let Some(key) = key {
+            creds.key.clone_from(key);
+          }
+          if let Some(secret) = secret {
+            creds.secret.clone_from(secret);
+          }
+
+          creds
+        }
+      };
+    futures::executor::block_on(MonitorClient::new(url, key, secret))
+      .expect("failed to initialize monitor client")
+  })
+}

bin/cli/src/sync/file.rs

@@ -1,12 +1,19 @@
-use std::{fs, path::Path};
+use std::{
+  fs,
+  path::{Path, PathBuf},
+  str::FromStr,
+};
 
 use anyhow::{anyhow, Context};
 use colored::Colorize;
 use monitor_client::entities::toml::ResourcesToml;
+use serde::de::DeserializeOwned;
 
-pub fn read_resources(path: &Path) -> anyhow::Result<ResourcesToml> {
+pub fn read_resources(path: &str) -> anyhow::Result<ResourcesToml> {
   let mut res = ResourcesToml::default();
-  read_resources_recursive(path, &mut res)?;
+  let path =
+    PathBuf::from_str(path).context("invalid resources path")?;
+  read_resources_recursive(&path, &mut res)?;
   Ok(res)
 }
 
@@ -24,7 +31,7 @@ fn read_resources_recursive(
     {
       return Ok(());
     }
-    let more = match crate::parse_toml_file::<ResourcesToml>(path) {
+    let more = match parse_toml_file::<ResourcesToml>(path) {
       Ok(res) => res,
       Err(e) => {
         warn!("failed to parse {:?}. skipping file | {e:#}", path);
@@ -36,15 +43,17 @@ fn read_resources_recursive(
       "adding resources".green().bold(),
       path.display().to_string().blue().bold()
     );
-    resources.server_templates.extend(more.server_templates);
     resources.servers.extend(more.servers);
-    resources.builds.extend(more.builds);
     resources.deployments.extend(more.deployments);
-    resources.builders.extend(more.builders);
+    resources.builds.extend(more.builds);
     resources.repos.extend(more.repos);
-    resources.alerters.extend(more.alerters);
     resources.procedures.extend(more.procedures);
+    resources.builders.extend(more.builders);
+    resources.alerters.extend(more.alerters);
+    resources.server_templates.extend(more.server_templates);
+    resources.resource_syncs.extend(more.resource_syncs);
     resources.user_groups.extend(more.user_groups);
+    resources.variables.extend(more.variables);
     Ok(())
   } else if res.is_dir() {
     let directory = fs::read_dir(path)
@@ -61,3 +70,11 @@ fn read_resources_recursive(
     Err(anyhow!("resources path is neither file nor directory"))
   }
 }
+
+fn parse_toml_file<T: DeserializeOwned>(
+  path: impl AsRef<std::path::Path>,
+) -> anyhow::Result<T> {
+  let contents = std::fs::read_to_string(path)
+    .context("failed to read file contents")?;
+  toml::from_str(&contents).context("failed to parse toml contents")
+}

bin/cli/src/sync/mod.rs

@@ -1,96 +1,174 @@
-use std::path::Path;
-
 use colored::Colorize;
 use monitor_client::entities::{
-  alerter::Alerter, build::Build, builder::Builder,
+  self, alerter::Alerter, build::Build, builder::Builder,
   deployment::Deployment, procedure::Procedure, repo::Repo,
   server::Server, server_template::ServerTemplate,
 };
 
-use crate::{sync::resources::ResourceSync, wait_for_enter};
+use crate::{helpers::wait_for_enter, state::cli_args};
 
 mod file;
+mod resource;
 mod resources;
 mod user_group;
+mod variables;
 
-pub async fn run_sync(path: &Path) -> anyhow::Result<()> {
-  info!(
-    "resources path: {}",
-    path.display().to_string().blue().bold()
-  );
+use resource::ResourceSync;
+
+pub async fn run(path: &str, delete: bool) -> anyhow::Result<()> {
+  info!("resources path: {}", path.blue().bold());
+  if delete {
+    warn!("Delete mode {}", "enabled".bold());
+  }
 
   let resources = file::read_resources(path)?;
 
   info!("computing sync actions...");
 
-  let (server_template_creates, server_template_updates) =
-    ServerTemplate::get_updates(resources.server_templates).await?;
-  let (server_creates, server_updates) =
-    Server::get_updates(resources.servers).await?;
-  let (deployment_creates, deployment_updates) =
-    Deployment::get_updates(resources.deployments).await?;
-  let (build_creates, build_updates) =
-    Build::get_updates(resources.builds).await?;
-  let (builder_creates, builder_updates) =
-    Builder::get_updates(resources.builders).await?;
-  let (alerter_creates, alerter_updates) =
-    Alerter::get_updates(resources.alerters).await?;
-  let (repo_creates, repo_updates) =
-    Repo::get_updates(resources.repos).await?;
-  let (procedure_creates, procedure_updates) =
-    Procedure::get_updates(resources.procedures).await?;
-  let (user_group_creates, user_group_updates) =
-    user_group::get_updates(resources.user_groups).await?;
+  let (server_creates, server_updates, server_deletes) =
+    resource::get_updates::<Server>(resources.servers, delete)?;
+  let (deployment_creates, deployment_updates, deployment_deletes) =
+    resource::get_updates::<Deployment>(
+      resources.deployments,
+      delete,
+    )?;
+  let (build_creates, build_updates, build_deletes) =
+    resource::get_updates::<Build>(resources.builds, delete)?;
+  let (repo_creates, repo_updates, repo_deletes) =
+    resource::get_updates::<Repo>(resources.repos, delete)?;
+  let (procedure_creates, procedure_updates, procedure_deletes) =
+    resource::get_updates::<Procedure>(resources.procedures, delete)?;
+  let (builder_creates, builder_updates, builder_deletes) =
+    resource::get_updates::<Builder>(resources.builders, delete)?;
+  let (alerter_creates, alerter_updates, alerter_deletes) =
+    resource::get_updates::<Alerter>(resources.alerters, delete)?;
+  let (
+    server_template_creates,
+    server_template_updates,
+    server_template_deletes,
+  ) = resource::get_updates::<ServerTemplate>(
+    resources.server_templates,
+    delete,
+  )?;
+  let (
+    resource_sync_creates,
+    resource_sync_updates,
+    resource_sync_deletes,
+  ) = resource::get_updates::<entities::sync::ResourceSync>(
+    resources.resource_syncs,
+    delete,
+  )?;
 
-  if server_template_creates.is_empty()
+  let (variable_creates, variable_updates, variable_deletes) =
+    variables::get_updates(resources.variables, delete)?;
+
+  let (user_group_creates, user_group_updates, user_group_deletes) =
+    user_group::get_updates(resources.user_groups, delete).await?;
+
+  if resource_sync_creates.is_empty()
+    && resource_sync_updates.is_empty()
+    && resource_sync_deletes.is_empty()
+    && server_template_creates.is_empty()
     && server_template_updates.is_empty()
+    && server_template_deletes.is_empty()
     && server_creates.is_empty()
     && server_updates.is_empty()
+    && server_deletes.is_empty()
     && deployment_creates.is_empty()
     && deployment_updates.is_empty()
+    && deployment_deletes.is_empty()
     && build_creates.is_empty()
     && build_updates.is_empty()
+    && build_deletes.is_empty()
     && builder_creates.is_empty()
     && builder_updates.is_empty()
+    && builder_deletes.is_empty()
     && alerter_creates.is_empty()
     && alerter_updates.is_empty()
+    && alerter_deletes.is_empty()
     && repo_creates.is_empty()
     && repo_updates.is_empty()
+    && repo_deletes.is_empty()
     && procedure_creates.is_empty()
     && procedure_updates.is_empty()
+    && procedure_deletes.is_empty()
     && user_group_creates.is_empty()
     && user_group_updates.is_empty()
+    && user_group_deletes.is_empty()
+    && variable_creates.is_empty()
+    && variable_updates.is_empty()
+    && variable_deletes.is_empty()
   {
     info!("{}. exiting.", "nothing to do".green().bold());
     return Ok(());
   }
 
-  wait_for_enter("run sync")?;
+  if !cli_args().yes {
+    wait_for_enter("run sync")?;
+  }
 
   // No deps
+  entities::sync::ResourceSync::run_updates(
+    resource_sync_creates,
+    resource_sync_updates,
+    resource_sync_deletes,
+  )
+  .await;
   ServerTemplate::run_updates(
     server_template_creates,
     server_template_updates,
+    server_template_deletes,
+  )
+  .await;
+  Server::run_updates(server_creates, server_updates, server_deletes)
+    .await;
+  Alerter::run_updates(
+    alerter_creates,
+    alerter_updates,
+    alerter_deletes,
   )
   .await;
-  Server::run_updates(server_creates, server_updates).await;
-  Alerter::run_updates(alerter_creates, alerter_updates).await;
 
   // Dependant on server
-  Builder::run_updates(builder_creates, builder_updates).await;
-  Repo::run_updates(repo_creates, repo_updates).await;
+  Builder::run_updates(
+    builder_creates,
+    builder_updates,
+    builder_deletes,
+  )
+  .await;
+  Repo::run_updates(repo_creates, repo_updates, repo_deletes).await;
 
   // Dependant on builder
-  Build::run_updates(build_creates, build_updates).await;
-
-  // Dependant on server / builder
-  Deployment::run_updates(deployment_creates, deployment_updates)
+  Build::run_updates(build_creates, build_updates, build_deletes)
     .await;
 
+  // Dependant on server / build
+  Deployment::run_updates(
+    deployment_creates,
+    deployment_updates,
+    deployment_deletes,
+  )
+  .await;
+
   // Dependant on everything
-  Procedure::run_updates(procedure_creates, procedure_updates).await;
-  user_group::run_updates(user_group_creates, user_group_updates)
-    .await;
+  Procedure::run_updates(
+    procedure_creates,
+    procedure_updates,
+    procedure_deletes,
+  )
+  .await;
+  variables::run_updates(
+    variable_creates,
+    variable_updates,
+    variable_deletes,
+  )
+  .await;
+  user_group::run_updates(
+    user_group_creates,
+    user_group_updates,
+    user_group_deletes,
+  )
+  .await;
 
   Ok(())
 }

bin/cli/src/sync/resource.rs

@@ -0,0 +1,358 @@
+use std::collections::HashMap;
+
+use colored::Colorize;
+use monitor_client::{
+  api::write::{UpdateDescription, UpdateTagsOnResource},
+  entities::{
+    resource::Resource, toml::ResourceToml, update::ResourceTarget,
+  },
+};
+use partial_derive2::{Diff, FieldDiff, MaybeNone, PartialDiff};
+use serde::Serialize;
+
+use crate::maps::id_to_tag;
+
+pub type ToUpdate<T> = Vec<ToUpdateItem<T>>;
+pub type ToCreate<T> = Vec<ResourceToml<T>>;
+/// Vec of resource names
+pub type ToDelete = Vec<String>;
+
+type UpdatesResult<T> = (ToCreate<T>, ToUpdate<T>, ToDelete);
+
+pub struct ToUpdateItem<T: Default> {
+  pub id: String,
+  pub resource: ResourceToml<T>,
+  pub update_description: bool,
+  pub update_tags: bool,
+}
+
+pub trait ResourceSync: Sized {
+  type Config: Clone
+    + Default
+    + Send
+    + From<Self::PartialConfig>
+    + PartialDiff<Self::PartialConfig, Self::ConfigDiff>
+    + 'static;
+  type Info: Default + 'static;
+  type PartialConfig: std::fmt::Debug
+    + Clone
+    + Send
+    + Default
+    + From<Self::Config>
+    + From<Self::ConfigDiff>
+    + Serialize
+    + MaybeNone
+    + 'static;
+  type ConfigDiff: Diff + MaybeNone;
+
+  fn display() -> &'static str;
+
+  fn resource_target(id: String) -> ResourceTarget;
+
+  fn name_to_resource(
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>;
+
+  /// Creates the resource and returns created id.
+  async fn create(
+    resource: ResourceToml<Self::PartialConfig>,
+  ) -> anyhow::Result<String>;
+
+  /// Updates the resource at id with the partial config.
+  async fn update(
+    id: String,
+    resource: ResourceToml<Self::PartialConfig>,
+  ) -> anyhow::Result<()>;
+
+  /// Apply any changes to incoming toml partial config
+  /// before it is diffed against existing config
+  fn validate_partial_config(_config: &mut Self::PartialConfig) {}
+
+  /// Diffs the declared toml (partial) against the full existing config.
+  /// Removes all fields from toml (partial) that haven't changed.
+  fn get_diff(
+    original: Self::Config,
+    update: Self::PartialConfig,
+  ) -> anyhow::Result<Self::ConfigDiff>;
+
+  /// Apply any changes to computed config diff
+  /// before logging
+  fn validate_diff(_diff: &mut Self::ConfigDiff) {}
+
+  /// Deletes the target resource
+  async fn delete(id_or_name: String) -> anyhow::Result<()>;
+
+  async fn run_updates(
+    to_create: ToCreate<Self::PartialConfig>,
+    to_update: ToUpdate<Self::PartialConfig>,
+    to_delete: ToDelete,
+  ) {
+    for resource in to_create {
+      let name = resource.name.clone();
+      let tags = resource.tags.clone();
+      let description = resource.description.clone();
+      let id = match Self::create(resource).await {
+        Ok(id) => id,
+        Err(e) => {
+          warn!(
+            "failed to create {} {name} | {e:#}",
+            Self::display(),
+          );
+          continue;
+        }
+      };
+      run_update_tags::<Self>(id.clone(), &name, tags).await;
+      run_update_description::<Self>(id, &name, description).await;
+      info!(
+        "{} {} '{}'",
+        "created".green().bold(),
+        Self::display(),
+        name.bold(),
+      );
+    }
+
+    for ToUpdateItem {
+      id,
+      resource,
+      update_description,
+      update_tags,
+    } in to_update
+    {
+      // Update resource
+      let name = resource.name.clone();
+      let tags = resource.tags.clone();
+      let description = resource.description.clone();
+
+      if update_description {
+        run_update_description::<Self>(
+          id.clone(),
+          &name,
+          description,
+        )
+        .await;
+      }
+
+      if update_tags {
+        run_update_tags::<Self>(id.clone(), &name, tags).await;
+      }
+
+      if !resource.config.is_none() {
+        if let Err(e) = Self::update(id, resource).await {
+          warn!(
+            "failed to update config on {} {name} | {e:#}",
+            Self::display()
+          );
+        } else {
+          info!(
+            "{} {} '{}' configuration",
+            "updated".blue().bold(),
+            Self::display(),
+            name.bold(),
+          );
+        }
+      }
+    }
+
+    for resource in to_delete {
+      if let Err(e) = Self::delete(resource.clone()).await {
+        warn!(
+          "failed to delete {} {resource} | {e:#}",
+          Self::display()
+        );
+      } else {
+        info!(
+          "{} {} '{}'",
+          "deleted".red().bold(),
+          Self::display(),
+          resource.bold(),
+        );
+      }
+    }
+  }
+}
+
+/// Gets all the resources to update, logging along the way.
+pub fn get_updates<Resource: ResourceSync>(
+  resources: Vec<ResourceToml<Resource::PartialConfig>>,
+  delete: bool,
+) -> anyhow::Result<UpdatesResult<Resource::PartialConfig>> {
+  let map = Resource::name_to_resource();
+
+  let mut to_create = ToCreate::<Resource::PartialConfig>::new();
+  let mut to_update = ToUpdate::<Resource::PartialConfig>::new();
+  let mut to_delete = ToDelete::new();
+
+  if delete {
+    for resource in map.values() {
+      if !resources.iter().any(|r| r.name == resource.name) {
+        to_delete.push(resource.name.clone());
+      }
+    }
+  }
+
+  for mut resource in resources {
+    match map.get(&resource.name) {
+      Some(original) => {
+        // First merge toml resource config (partial) onto default resource config.
+        // Makes sure things that aren't defined in toml (come through as None) actually get removed.
+        let config: Resource::Config = resource.config.into();
+        resource.config = config.into();
+
+        Resource::validate_partial_config(&mut resource.config);
+
+        let mut diff = Resource::get_diff(
+          original.config.clone(),
+          resource.config,
+        )?;
+
+        Resource::validate_diff(&mut diff);
+
+        let original_tags = original
+          .tags
+          .iter()
+          .filter_map(|id| {
+            id_to_tag().get(id).map(|t| t.name.clone())
+          })
+          .collect::<Vec<_>>();
+
+        // Only proceed if there are any fields to update,
+        // or a change to tags / description
+        if diff.is_none()
+          && resource.description == original.description
+          && resource.tags == original_tags
+        {
+          continue;
+        }
+
+        println!(
+          "\n{}: {}: '{}'\n-------------------",
+          "UPDATE".blue(),
+          Resource::display(),
+          resource.name.bold(),
+        );
+        let mut lines = Vec::<String>::new();
+        if resource.description != original.description {
+          lines.push(format!(
+            "{}: 'description'\n{}:  {}\n{}:    {}",
+            "field".dimmed(),
+            "from".dimmed(),
+            original.description.red(),
+            "to".dimmed(),
+            resource.description.green()
+          ))
+        }
+        if resource.tags != original_tags {
+          let from = format!("{:?}", original_tags).red();
+          let to = format!("{:?}", resource.tags).green();
+          lines.push(format!(
+            "{}: 'tags'\n{}:  {from}\n{}:    {to}",
+            "field".dimmed(),
+            "from".dimmed(),
+            "to".dimmed(),
+          ));
+        }
+        lines.extend(diff.iter_field_diffs().map(
+          |FieldDiff { field, from, to }| {
+            format!(
+              "{}: '{field}'\n{}:  {}\n{}:    {}",
+              "field".dimmed(),
+              "from".dimmed(),
+              from.red(),
+              "to".dimmed(),
+              to.green()
+            )
+          },
+        ));
+        println!("{}", lines.join("\n-------------------\n"));
+
+        // Minimizes updates through diffing.
+        resource.config = diff.into();
+
+        let update = ToUpdateItem {
+          id: original.id.clone(),
+          update_description: resource.description
+            != original.description,
+          update_tags: resource.tags != original_tags,
+          resource,
+        };
+
+        to_update.push(update);
+      }
+      None => {
+        println!(
+          "\n{}: {}: {}\n{}: {}\n{}: {:?}\n{}: {}",
+          "CREATE".green(),
+          Resource::display(),
+          resource.name.bold().green(),
+          "description".dimmed(),
+          resource.description,
+          "tags".dimmed(),
+          resource.tags,
+          "config".dimmed(),
+          serde_json::to_string_pretty(&resource.config)?
+        );
+        to_create.push(resource);
+      }
+    }
+  }
+
+  for name in &to_delete {
+    println!(
+      "\n{}: {}: '{}'\n-------------------",
+      "DELETE".red(),
+      Resource::display(),
+      name.bold(),
+    );
+  }
+
+  Ok((to_create, to_update, to_delete))
+}
+
+pub async fn run_update_tags<Resource: ResourceSync>(
+  id: String,
+  name: &str,
+  tags: Vec<String>,
+) {
+  // Update tags
+  if let Err(e) = crate::state::monitor_client()
+    .write(UpdateTagsOnResource {
+      target: Resource::resource_target(id),
+      tags,
+    })
+    .await
+  {
+    warn!(
+      "failed to update tags on {} {name} | {e:#}",
+      Resource::display(),
+    );
+  } else {
+    info!(
+      "{} {} '{}' tags",
+      "updated".blue().bold(),
+      Resource::display(),
+      name.bold(),
+    );
+  }
+}
+
+pub async fn run_update_description<Resource: ResourceSync>(
+  id: String,
+  name: &str,
+  description: String,
+) {
+  if let Err(e) = crate::state::monitor_client()
+    .write(UpdateDescription {
+      target: Resource::resource_target(id.clone()),
+      description,
+    })
+    .await
+  {
+    warn!("failed to update resource {id} description | {e:#}");
+  } else {
+    info!(
+      "{} {} '{}' description",
+      "updated".blue().bold(),
+      Resource::display(),
+      name.bold(),
+    );
+  }
+}

bin/cli/src/sync/resources/alerter.rs

@@ -1,31 +1,28 @@
+use partial_derive2::PartialDiff;
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetAlerter,
-    write::{CreateAlerter, UpdateAlerter},
-  },
+  api::write::{CreateAlerter, DeleteAlerter, UpdateAlerter},
   entities::{
     alerter::{
-      Alerter, AlerterConfig, AlerterConfigDiff, AlerterInfo, AlerterListItemInfo, PartialAlerterConfig
+      Alerter, AlerterConfig, AlerterConfigDiff, PartialAlerterConfig,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
 };
-use partial_derive2::PartialDiff;
 
-use crate::{maps::name_to_alerter, monitor_client};
-
-use super::ResourceSync;
+use crate::{
+  maps::name_to_alerter, state::monitor_client,
+  sync::resource::ResourceSync,
+};
 
 impl ResourceSync for Alerter {
   type Config = AlerterConfig;
-  type Info = AlerterInfo;
+  type Info = ();
   type PartialConfig = PartialAlerterConfig;
   type ConfigDiff = AlerterConfigDiff;
-  type ListItemInfo = AlerterListItemInfo;
 
   fn display() -> &'static str {
     "alerter"
@@ -36,7 +33,7 @@ impl ResourceSync for Alerter {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_alerter()
   }
@@ -66,16 +63,15 @@ impl ResourceSync for Alerter {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetAlerter { alerter: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteAlerter { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/build.rs

@@ -1,16 +1,13 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetBuild,
-    write::{CreateBuild, UpdateBuild},
-  },
+  api::write::{CreateBuild, DeleteBuild, UpdateBuild},
   entities::{
     build::{
       Build, BuildConfig, BuildConfigDiff, BuildInfo,
-      BuildListItemInfo, PartialBuildConfig,
+      PartialBuildConfig,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
@@ -19,17 +16,15 @@ use partial_derive2::PartialDiff;
 
 use crate::{
   maps::{id_to_builder, name_to_build},
-  monitor_client,
+  state::monitor_client,
+  sync::resource::ResourceSync,
 };
 
-use super::ResourceSync;
-
 impl ResourceSync for Build {
   type Config = BuildConfig;
   type Info = BuildInfo;
   type PartialConfig = PartialBuildConfig;
   type ConfigDiff = BuildConfigDiff;
-  type ListItemInfo = BuildListItemInfo;
 
   fn display() -> &'static str {
     "build"
@@ -40,7 +35,7 @@ impl ResourceSync for Build {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_build()
   }
@@ -70,13 +65,7 @@ impl ResourceSync for Build {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetBuild { build: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
@@ -88,4 +77,17 @@ impl ResourceSync for Build {
 
     Ok(original.partial_diff(update))
   }
+
+  fn validate_diff(diff: &mut Self::ConfigDiff) {
+    if let Some((_, to)) = &diff.version {
+      if to.is_none() {
+        diff.version = None;
+      }
+    }
+  }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteBuild { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/builder.rs

@@ -1,16 +1,12 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetBuilder,
-    write::{CreateBuilder, UpdateBuilder},
-  },
+  api::write::{CreateBuilder, DeleteBuilder, UpdateBuilder},
   entities::{
     builder::{
-      Builder, BuilderConfig, BuilderConfigDiff, BuilderListItemInfo,
-      PartialBuilderConfig,
+      Builder, BuilderConfig, BuilderConfigDiff, PartialBuilderConfig,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
@@ -19,17 +15,15 @@ use partial_derive2::PartialDiff;
 
 use crate::{
   maps::{id_to_server, name_to_builder},
-  monitor_client,
+  state::monitor_client,
+  sync::resource::ResourceSync,
 };
 
-use super::ResourceSync;
-
 impl ResourceSync for Builder {
   type Config = BuilderConfig;
   type Info = ();
   type PartialConfig = PartialBuilderConfig;
   type ConfigDiff = BuilderConfigDiff;
-  type ListItemInfo = BuilderListItemInfo;
 
   fn display() -> &'static str {
     "builder"
@@ -40,7 +34,7 @@ impl ResourceSync for Builder {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_builder()
   }
@@ -70,13 +64,7 @@ impl ResourceSync for Builder {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetBuilder { builder: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
@@ -90,4 +78,9 @@ impl ResourceSync for Builder {
 
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteBuilder { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/deployment.rs

@@ -1,14 +1,13 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{read::GetDeployment, write},
+  api::write::{self, DeleteDeployment},
   entities::{
     deployment::{
       Deployment, DeploymentConfig, DeploymentConfigDiff,
-      DeploymentImage, DeploymentListItemInfo,
-      PartialDeploymentConfig,
+      DeploymentImage, PartialDeploymentConfig,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
@@ -17,17 +16,15 @@ use partial_derive2::PartialDiff;
 
 use crate::{
   maps::{id_to_build, id_to_server, name_to_deployment},
-  monitor_client,
+  state::monitor_client,
+  sync::resource::ResourceSync,
 };
 
-use super::ResourceSync;
-
 impl ResourceSync for Deployment {
   type Config = DeploymentConfig;
   type Info = ();
   type PartialConfig = PartialDeploymentConfig;
   type ConfigDiff = DeploymentConfigDiff;
-  type ListItemInfo = DeploymentListItemInfo;
 
   fn display() -> &'static str {
     "deployment"
@@ -38,7 +35,7 @@ impl ResourceSync for Deployment {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_deployment()
   }
@@ -68,15 +65,7 @@ impl ResourceSync for Deployment {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client()
-      .read(GetDeployment { deployment: id })
-      .await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
@@ -95,10 +84,15 @@ impl ResourceSync for Deployment {
           .get(build_id)
           .map(|b| b.name.clone())
           .unwrap_or_default(),
-        version: version.clone(),
+        version: *version,
       };
     }
 
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteDeployment { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/mod.rs

@@ -1,330 +1,9 @@
-use std::collections::HashMap;
-
-use colored::Colorize;
-use monitor_client::{
-  api::write::{UpdateDescription, UpdateTagsOnResource},
-  entities::{
-    resource::{Resource, ResourceListItem},
-    toml::ResourceToml,
-    update::ResourceTarget,
-  },
-};
-use partial_derive2::{Diff, FieldDiff, MaybeNone, PartialDiff};
-use serde::Serialize;
-
-use crate::{cli_args, maps::id_to_tag, monitor_client};
-
-pub mod alerter;
-pub mod build;
-pub mod builder;
-pub mod deployment;
-pub mod procedure;
-pub mod repo;
-pub mod server;
-pub mod server_template;
-
-type ToUpdate<T> = Vec<ToUpdateItem<T>>;
-type ToCreate<T> = Vec<ResourceToml<T>>;
-type UpdatesResult<T> = (ToCreate<T>, ToUpdate<T>);
-
-pub struct ToUpdateItem<T> {
-  pub id: String,
-  pub resource: ResourceToml<T>,
-  pub update_description: bool,
-  pub update_tags: bool,
-}
-
-pub trait ResourceSync {
-  type Config: Clone
-    + Send
-    + PartialDiff<Self::PartialConfig, Self::ConfigDiff>
-    + 'static;
-  type Info: Default;
-  type PartialConfig: std::fmt::Debug
-    + Clone
-    + Send
-    + From<Self::ConfigDiff>
-    + Serialize
-    + MaybeNone
-    + 'static;
-  type ConfigDiff: Diff + MaybeNone;
-  type ListItemInfo: 'static;
-
-  fn display() -> &'static str;
-
-  fn resource_target(id: String) -> ResourceTarget;
-
-  fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>;
-
-  /// Creates the resource and returns created id.
-  async fn create(
-    resource: ResourceToml<Self::PartialConfig>,
-  ) -> anyhow::Result<String>;
-
-  /// Updates the resource at id with the partial config.
-  async fn update(
-    id: String,
-    resource: ResourceToml<Self::PartialConfig>,
-  ) -> anyhow::Result<()>;
-
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>>;
-
-  /// Diffs the declared toml (partial) against the full existing config.
-  /// Removes all fields from toml (partial) that haven't changed.
-  async fn get_diff(
-    original: Self::Config,
-    update: Self::PartialConfig,
-  ) -> anyhow::Result<Self::ConfigDiff>;
-
-  async fn get_updates(
-    resources: Vec<ResourceToml<Self::PartialConfig>>,
-  ) -> anyhow::Result<UpdatesResult<Self::PartialConfig>> {
-    let map = Self::name_to_resource();
-
-    let mut to_create = ToCreate::<Self::PartialConfig>::new();
-    let mut to_update = ToUpdate::<Self::PartialConfig>::new();
-
-    let quiet = cli_args().quiet;
-
-    for mut resource in resources {
-      match map.get(&resource.name).map(|s| s.id.clone()) {
-        Some(id) => {
-          // Get the full original config for the resource.
-          let original = Self::get(id.clone()).await?;
-
-          let diff =
-            Self::get_diff(original.config, resource.config).await?;
-
-          let original_tags = original
-            .tags
-            .iter()
-            .filter_map(|id| {
-              id_to_tag().get(id).map(|t| t.name.clone())
-            })
-            .collect::<Vec<_>>();
-
-          // Only proceed if there are any fields to update,
-          // or a change to tags / description
-          if diff.is_none()
-            && resource.description == original.description
-            && resource.tags == original_tags
-          {
-            continue;
-          }
-
-          if !quiet {
-            println!(
-              "\n{}: {}: '{}'\n-------------------",
-              "UPDATE".blue(),
-              Self::display(),
-              resource.name.bold(),
-            );
-            let mut lines = Vec::<String>::new();
-            if resource.description != original.description {
-              lines.push(format!(
-                "{}: 'description'\n{}:  {}\n{}:    {}",
-                "field".dimmed(),
-                "from".dimmed(),
-                original.description.red(),
-                "to".dimmed(),
-                resource.description.green()
-              ))
-            }
-            if resource.tags != original_tags {
-              let from = format!("{:?}", original_tags).red();
-              let to = format!("{:?}", resource.tags).green();
-              lines.push(format!(
-                "{}: 'tags'\n{}:  {from}\n{}:    {to}",
-                "field".dimmed(),
-                "from".dimmed(),
-                "to".dimmed(),
-              ));
-            }
-            lines.extend(diff.iter_field_diffs().map(
-              |FieldDiff { field, from, to }| {
-                format!(
-                  "{}: '{field}'\n{}:  {}\n{}:    {}",
-                  "field".dimmed(),
-                  "from".dimmed(),
-                  from.red(),
-                  "to".dimmed(),
-                  to.green()
-                )
-              },
-            ));
-            println!("{}", lines.join("\n-------------------\n"));
-          }
-
-          // Minimizes updates through diffing.
-          resource.config = diff.into();
-
-          let update = ToUpdateItem {
-            id,
-            update_description: resource.description
-              != original.description,
-            update_tags: resource.tags != original_tags,
-            resource,
-          };
-
-          to_update.push(update);
-        }
-        None => {
-          if !quiet {
-            println!(
-              "\n{}: {}: {}\n{}: {}\n{}: {:?}\n{}: {}",
-              "CREATE".green(),
-              Self::display(),
-              resource.name.bold().green(),
-              "description".dimmed(),
-              resource.description,
-              "tags".dimmed(),
-              resource.tags,
-              "config".dimmed(),
-              serde_json::to_string_pretty(&resource.config)?
-            )
-          }
-          to_create.push(resource);
-        }
-      }
-    }
-
-    if quiet && !to_create.is_empty() {
-      println!(
-        "\n{}s {}: {:#?}",
-        Self::display(),
-        "TO CREATE".green(),
-        to_create.iter().map(|item| item.name.as_str())
-      );
-    }
-
-    if quiet && !to_update.is_empty() {
-      println!(
-        "\n{}s {}: {:#?}",
-        Self::display(),
-        "TO UPDATE".blue(),
-        to_update
-          .iter()
-          .map(|update| update.resource.name.as_str())
-          .collect::<Vec<_>>()
-      );
-    }
-
-    Ok((to_create, to_update))
-  }
-
-  async fn run_updates(
-    to_create: ToCreate<Self::PartialConfig>,
-    to_update: ToUpdate<Self::PartialConfig>,
-  ) {
-    for resource in to_create {
-      let name = resource.name.clone();
-      let tags = resource.tags.clone();
-      let description = resource.description.clone();
-      let id = match Self::create(resource).await {
-        Ok(id) => id,
-        Err(e) => {
-          warn!(
-            "failed to create {} {name} | {e:#}",
-            Self::display(),
-          );
-          continue;
-        }
-      };
-      Self::update_tags(id.clone(), &name, tags).await;
-      Self::update_description(id, &name, description).await;
-      info!(
-        "{} {} '{}'",
-        "created".green().bold(),
-        Self::display(),
-        name.bold(),
-      );
-    }
-
-    for ToUpdateItem {
-      id,
-      resource,
-      update_description,
-      update_tags,
-    } in to_update
-    {
-      // Update resource
-      let name = resource.name.clone();
-      let tags = resource.tags.clone();
-      let description = resource.description.clone();
-
-      if update_description {
-        Self::update_description(id.clone(), &name, description)
-          .await;
-      }
-
-      if update_tags {
-        Self::update_tags(id.clone(), &name, tags).await;
-      }
-
-      if !resource.config.is_none() {
-        if let Err(e) = Self::update(id, resource).await {
-          warn!(
-            "failed to update config on {} {name} | {e:#}",
-            Self::display()
-          );
-        } else {
-          info!(
-            "{} {} '{}' configuration",
-            "updated".blue().bold(),
-            Self::display(),
-            name.bold(),
-          );
-        }
-      }
-    }
-  }
-
-  async fn update_tags(id: String, name: &str, tags: Vec<String>) {
-    // Update tags
-    if let Err(e) = monitor_client()
-      .write(UpdateTagsOnResource {
-        target: Self::resource_target(id),
-        tags,
-      })
-      .await
-    {
-      warn!(
-        "failed to update tags on {} {name} | {e:#}",
-        Self::display(),
-      );
-    } else {
-      info!(
-        "{} {} '{}' tags",
-        "updated".blue().bold(),
-        Self::display(),
-        name.bold(),
-      );
-    }
-  }
-
-  async fn update_description(
-    id: String,
-    name: &str,
-    description: String,
-  ) {
-    if let Err(e) = monitor_client()
-      .write(UpdateDescription {
-        target: Self::resource_target(id.clone()),
-        description,
-      })
-      .await
-    {
-      warn!("failed to update resource {id} description | {e:#}");
-    } else {
-      info!(
-        "{} {} '{}' description",
-        "updated".blue().bold(),
-        Self::display(),
-        name.bold(),
-      );
-    }
-  }
-}
+mod alerter;
+mod build;
+mod builder;
+mod deployment;
+mod procedure;
+mod repo;
+mod server;
+mod server_template;
+mod sync;

bin/cli/src/sync/resources/procedure.rs

@@ -1,16 +1,17 @@
 use std::collections::HashMap;
 
+use colored::Colorize;
 use monitor_client::{
   api::{
     execute::Execution,
-    read::GetProcedure,
-    write::{CreateProcedure, UpdateProcedure},
+    write::{CreateProcedure, DeleteProcedure, UpdateProcedure},
   },
   entities::{
     procedure::{
-      PartialProcedureConfig, Procedure, ProcedureConfig, ProcedureConfigDiff, ProcedureListItemInfo
+      PartialProcedureConfig, Procedure, ProcedureConfig,
+      ProcedureConfigDiff,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
@@ -20,20 +21,20 @@ use partial_derive2::{MaybeNone, PartialDiff};
 use crate::{
   maps::{
     id_to_build, id_to_deployment, id_to_procedure, id_to_repo,
-    id_to_server, name_to_procedure,
+    id_to_resource_sync, id_to_server, name_to_procedure,
+  },
+  state::monitor_client,
+  sync::resource::{
+    run_update_description, run_update_tags, ResourceSync, ToCreate,
+    ToDelete, ToUpdate, ToUpdateItem,
   },
-  monitor_client,
-  sync::resources::ToUpdateItem,
 };
 
-use super::{ResourceSync, ToCreate, ToUpdate};
-
 impl ResourceSync for Procedure {
   type Config = ProcedureConfig;
   type Info = ();
   type PartialConfig = PartialProcedureConfig;
   type ConfigDiff = ProcedureConfigDiff;
-  type ListItemInfo = ProcedureListItemInfo;
 
   fn display() -> &'static str {
     "procedure"
@@ -44,7 +45,7 @@ impl ResourceSync for Procedure {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_procedure()
   }
@@ -77,7 +78,23 @@ impl ResourceSync for Procedure {
   async fn run_updates(
     mut to_create: ToCreate<Self::PartialConfig>,
     mut to_update: ToUpdate<Self::PartialConfig>,
+    to_delete: ToDelete,
   ) {
+    for name in to_delete {
+      if let Err(e) = crate::state::monitor_client()
+        .write(DeleteProcedure { id: name.clone() })
+        .await
+      {
+        warn!("failed to delete procedure {name} | {e:#}",);
+      } else {
+        info!(
+          "{} procedure '{}'",
+          "deleted".red().bold(),
+          name.bold(),
+        );
+      }
+    }
+
     if to_update.is_empty() && to_create.is_empty() {
       return;
     }
@@ -96,11 +113,15 @@ impl ResourceSync for Procedure {
         let tags = resource.tags.clone();
         let description = resource.description.clone();
         if *update_description {
-          Self::update_description(id.clone(), &name, description)
-            .await;
+          run_update_description::<Procedure>(
+            id.clone(),
+            &name,
+            description,
+          )
+          .await;
         }
         if *update_tags {
-          Self::update_tags(id.clone(), &name, tags).await;
+          run_update_tags::<Procedure>(id.clone(), &name, tags).await;
         }
         if !resource.config.is_none() {
           if let Err(e) =
@@ -112,6 +133,7 @@ impl ResourceSync for Procedure {
                 Self::display()
               );
             }
+            continue;
           }
         }
 
@@ -139,112 +161,115 @@ impl ResourceSync for Procedure {
             continue;
           }
         };
-        Self::update_tags(id.clone(), &name, tags).await;
-        Self::update_description(id, &name, description).await;
+        run_update_tags::<Procedure>(id.clone(), &name, tags).await;
+        run_update_description::<Procedure>(id, &name, description)
+          .await;
         info!("{} {name} created", Self::display());
         to_pull.push(name);
       }
       to_create.retain(|resource| !to_pull.contains(&resource.name));
 
       if to_update.is_empty() && to_create.is_empty() {
-        info!(
-          "============ {}s synced ✅ ============",
-          Self::display()
-        );
+        // info!("all procedures synced");
         return;
       }
     }
     warn!("procedure sync loop exited after max iterations");
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetProcedure { procedure: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
-    for execution in &mut original.executions {
-      match &mut execution.execution {
-        Execution::None(_) => {}
-        Execution::RunProcedure(config) => {
-          config.procedure = id_to_procedure()
-            .get(&config.procedure)
-            .map(|p| p.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::RunBuild(config) => {
-          config.build = id_to_build()
-            .get(&config.build)
-            .map(|b| b.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::Deploy(config) => {
-          config.deployment = id_to_deployment()
-            .get(&config.deployment)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::StartContainer(config) => {
-          config.deployment = id_to_deployment()
-            .get(&config.deployment)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::StopContainer(config) => {
-          config.deployment = id_to_deployment()
-            .get(&config.deployment)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::RemoveContainer(config) => {
-          config.deployment = id_to_deployment()
-            .get(&config.deployment)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::CloneRepo(config) => {
-          config.repo = id_to_repo()
-            .get(&config.repo)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::PullRepo(config) => {
-          config.repo = id_to_repo()
-            .get(&config.repo)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::StopAllContainers(config) => {
-          config.server = id_to_server()
-            .get(&config.server)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::PruneDockerNetworks(config) => {
-          config.server = id_to_server()
-            .get(&config.server)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::PruneDockerImages(config) => {
-          config.server = id_to_server()
-            .get(&config.server)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
-        }
-        Execution::PruneDockerContainers(config) => {
-          config.server = id_to_server()
-            .get(&config.server)
-            .map(|d| d.name.clone())
-            .unwrap_or_default();
+    for stage in &mut original.stages {
+      for execution in &mut stage.executions {
+        match &mut execution.execution {
+          Execution::None(_) | Execution::Sleep(_) => {}
+          Execution::RunProcedure(config) => {
+            config.procedure = id_to_procedure()
+              .get(&config.procedure)
+              .map(|p| p.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::RunBuild(config) => {
+            config.build = id_to_build()
+              .get(&config.build)
+              .map(|b| b.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::Deploy(config) => {
+            config.deployment = id_to_deployment()
+              .get(&config.deployment)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::StartContainer(config) => {
+            config.deployment = id_to_deployment()
+              .get(&config.deployment)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::StopContainer(config) => {
+            config.deployment = id_to_deployment()
+              .get(&config.deployment)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::RemoveContainer(config) => {
+            config.deployment = id_to_deployment()
+              .get(&config.deployment)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::CloneRepo(config) => {
+            config.repo = id_to_repo()
+              .get(&config.repo)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::PullRepo(config) => {
+            config.repo = id_to_repo()
+              .get(&config.repo)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::StopAllContainers(config) => {
+            config.server = id_to_server()
+              .get(&config.server)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::PruneNetworks(config) => {
+            config.server = id_to_server()
+              .get(&config.server)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::PruneImages(config) => {
+            config.server = id_to_server()
+              .get(&config.server)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::PruneContainers(config) => {
+            config.server = id_to_server()
+              .get(&config.server)
+              .map(|d| d.name.clone())
+              .unwrap_or_default();
+          }
+          Execution::RunSync(config) => {
+            config.sync = id_to_resource_sync()
+              .get(&config.sync)
+              .map(|s| s.name.clone())
+              .unwrap_or_default();
+          }
         }
       }
     }
-
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(_: String) -> anyhow::Result<()> {
+    unreachable!()
+  }
 }

bin/cli/src/sync/resources/repo.rs

@@ -1,16 +1,12 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetRepo,
-    write::{CreateRepo, UpdateRepo},
-  },
+  api::write::{CreateRepo, DeleteRepo, UpdateRepo},
   entities::{
     repo::{
       PartialRepoConfig, Repo, RepoConfig, RepoConfigDiff, RepoInfo,
-      RepoListItemInfo,
     },
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     toml::ResourceToml,
     update::ResourceTarget,
   },
@@ -19,17 +15,15 @@ use partial_derive2::PartialDiff;
 
 use crate::{
   maps::{id_to_server, name_to_repo},
-  monitor_client,
+  state::monitor_client,
+  sync::resource::ResourceSync,
 };
 
-use super::ResourceSync;
-
 impl ResourceSync for Repo {
   type Config = RepoConfig;
   type Info = RepoInfo;
   type PartialConfig = PartialRepoConfig;
   type ConfigDiff = RepoConfigDiff;
-  type ListItemInfo = RepoListItemInfo;
 
   fn display() -> &'static str {
     "repo"
@@ -40,7 +34,7 @@ impl ResourceSync for Repo {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_repo()
   }
@@ -70,13 +64,7 @@ impl ResourceSync for Repo {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetRepo { repo: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     mut original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
@@ -88,4 +76,9 @@ impl ResourceSync for Repo {
 
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteRepo { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/server.rs

@@ -1,15 +1,11 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetServer,
-    write::{CreateServer, UpdateServer},
-  },
+  api::write::{CreateServer, DeleteServer, UpdateServer},
   entities::{
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     server::{
       PartialServerConfig, Server, ServerConfig, ServerConfigDiff,
-      ServerListItemInfo,
     },
     toml::ResourceToml,
     update::ResourceTarget,
@@ -17,16 +13,16 @@ use monitor_client::{
 };
 use partial_derive2::PartialDiff;
 
-use crate::{maps::name_to_server, monitor_client};
-
-use super::ResourceSync;
+use crate::{
+  maps::name_to_server, state::monitor_client,
+  sync::resource::ResourceSync,
+};
 
 impl ResourceSync for Server {
   type Config = ServerConfig;
   type Info = ();
   type PartialConfig = PartialServerConfig;
   type ConfigDiff = ServerConfigDiff;
-  type ListItemInfo = ServerListItemInfo;
 
   fn display() -> &'static str {
     "server"
@@ -37,7 +33,7 @@ impl ResourceSync for Server {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_server()
   }
@@ -67,16 +63,15 @@ impl ResourceSync for Server {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client().read(GetServer { server: id }).await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteServer { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/server_template.rs

@@ -1,14 +1,14 @@
 use std::collections::HashMap;
 
 use monitor_client::{
-  api::{
-    read::GetServerTemplate,
-    write::{CreateServerTemplate, UpdateServerTemplate},
+  api::write::{
+    CreateServerTemplate, DeleteServerTemplate, UpdateServerTemplate,
   },
   entities::{
-    resource::{Resource, ResourceListItem},
+    resource::Resource,
     server_template::{
-      PartialServerTemplateConfig, ServerTemplate, ServerTemplateConfig, ServerTemplateConfigDiff, ServerTemplateListItemInfo
+      PartialServerTemplateConfig, ServerTemplate,
+      ServerTemplateConfig, ServerTemplateConfigDiff,
     },
     toml::ResourceToml,
     update::ResourceTarget,
@@ -16,16 +16,16 @@ use monitor_client::{
 };
 use partial_derive2::PartialDiff;
 
-use crate::{maps::name_to_server_template, monitor_client};
-
-use super::ResourceSync;
+use crate::{
+  maps::name_to_server_template, state::monitor_client,
+  sync::resource::ResourceSync,
+};
 
 impl ResourceSync for ServerTemplate {
   type Config = ServerTemplateConfig;
   type Info = ();
   type PartialConfig = PartialServerTemplateConfig;
   type ConfigDiff = ServerTemplateConfigDiff;
-  type ListItemInfo = ServerTemplateListItemInfo;
 
   fn display() -> &'static str {
     "server template"
@@ -36,7 +36,7 @@ impl ResourceSync for ServerTemplate {
   }
 
   fn name_to_resource(
-  ) -> &'static HashMap<String, ResourceListItem<Self::ListItemInfo>>
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
   {
     name_to_server_template()
   }
@@ -66,20 +66,15 @@ impl ResourceSync for ServerTemplate {
     Ok(())
   }
 
-  async fn get(
-    id: String,
-  ) -> anyhow::Result<Resource<Self::Config, Self::Info>> {
-    monitor_client()
-      .read(GetServerTemplate {
-        server_template: id,
-      })
-      .await
-  }
-
-  async fn get_diff(
+  fn get_diff(
     original: Self::Config,
     update: Self::PartialConfig,
   ) -> anyhow::Result<Self::ConfigDiff> {
     Ok(original.partial_diff(update))
   }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteServerTemplate { id }).await?;
+    Ok(())
+  }
 }

bin/cli/src/sync/resources/sync.rs

@@ -0,0 +1,81 @@
+use std::collections::HashMap;
+
+use monitor_client::{
+  api::write::{
+    CreateResourceSync, DeleteResourceSync, UpdateResourceSync,
+  },
+  entities::{
+    self,
+    resource::Resource,
+    sync::{
+      PartialResourceSyncConfig, ResourceSyncConfig,
+      ResourceSyncConfigDiff, ResourceSyncInfo,
+    },
+    toml::ResourceToml,
+    update::ResourceTarget,
+  },
+};
+use partial_derive2::PartialDiff;
+
+use crate::{
+  maps::name_to_resource_sync, state::monitor_client,
+  sync::resource::ResourceSync,
+};
+
+impl ResourceSync for entities::sync::ResourceSync {
+  type Config = ResourceSyncConfig;
+  type Info = ResourceSyncInfo;
+  type PartialConfig = PartialResourceSyncConfig;
+  type ConfigDiff = ResourceSyncConfigDiff;
+
+  fn display() -> &'static str {
+    "resource sync"
+  }
+
+  fn resource_target(id: String) -> ResourceTarget {
+    ResourceTarget::ResourceSync(id)
+  }
+
+  fn name_to_resource(
+  ) -> &'static HashMap<String, Resource<Self::Config, Self::Info>>
+  {
+    name_to_resource_sync()
+  }
+
+  async fn create(
+    resource: ResourceToml<Self::PartialConfig>,
+  ) -> anyhow::Result<String> {
+    monitor_client()
+      .write(CreateResourceSync {
+        name: resource.name,
+        config: resource.config,
+      })
+      .await
+      .map(|res| res.id)
+  }
+
+  async fn update(
+    id: String,
+    resource: ResourceToml<Self::PartialConfig>,
+  ) -> anyhow::Result<()> {
+    monitor_client()
+      .write(UpdateResourceSync {
+        id,
+        config: resource.config,
+      })
+      .await?;
+    Ok(())
+  }
+
+  fn get_diff(
+    original: Self::Config,
+    update: Self::PartialConfig,
+  ) -> anyhow::Result<Self::ConfigDiff> {
+    Ok(original.partial_diff(update))
+  }
+
+  async fn delete(id: String) -> anyhow::Result<()> {
+    monitor_client().write(DeleteResourceSync { id }).await?;
+    Ok(())
+  }
+}

bin/cli/src/sync/user_group.rs

@@ -1,11 +1,13 @@
 use std::cmp::Ordering;
 
 use anyhow::Context;
+use colored::Colorize;
 use monitor_client::{
   api::{
     read::ListUserTargetPermissions,
     write::{
-      CreateUserGroup, SetUsersInUserGroup, UpdatePermissionOnTarget,
+      CreateUserGroup, DeleteUserGroup, SetUsersInUserGroup,
+      UpdatePermissionOnTarget,
     },
   },
   entities::{
@@ -15,143 +17,247 @@ use monitor_client::{
   },
 };
 
-use crate::{
-  maps::{
-    id_to_alerter, id_to_build, id_to_builder, id_to_deployment,
-    id_to_procedure, id_to_repo, id_to_server, id_to_server_template,
-    id_to_user, name_to_user_group,
-  },
-  monitor_client,
+use crate::maps::{
+  id_to_alerter, id_to_build, id_to_builder, id_to_deployment,
+  id_to_procedure, id_to_repo, id_to_resource_sync, id_to_server,
+  id_to_server_template, id_to_user, name_to_user_group,
 };
 
+pub struct UpdateItem {
+  user_group: UserGroupToml,
+  update_users: bool,
+  update_permissions: bool,
+}
+
+pub struct DeleteItem {
+  id: String,
+  name: String,
+}
+
 pub async fn get_updates(
   user_groups: Vec<UserGroupToml>,
-) -> anyhow::Result<(Vec<UserGroupToml>, Vec<UserGroupToml>)> {
+  delete: bool,
+) -> anyhow::Result<(
+  Vec<UserGroupToml>,
+  Vec<UpdateItem>,
+  Vec<DeleteItem>,
+)> {
   let map = name_to_user_group();
 
   let mut to_create = Vec::<UserGroupToml>::new();
-  let mut to_update = Vec::<UserGroupToml>::new();
+  let mut to_update = Vec::<UpdateItem>::new();
+  let mut to_delete = Vec::<DeleteItem>::new();
 
-  for mut user_group in user_groups {
-    match map.get(&user_group.name).cloned() {
-      Some(original) => {
-        // replace the user ids with usernames
-        let mut users = original
-          .users
-          .into_iter()
-          .filter_map(|user_id| {
-            id_to_user().get(&user_id).map(|u| u.username.clone())
-          })
-          .collect::<Vec<_>>();
-
-        let mut permissions = monitor_client()
-          .read(ListUserTargetPermissions {
-            user_target: UserTarget::UserGroup(original.id),
-          })
-          .await
-          .context("failed to query for UserGroup permissions")?
-          .into_iter()
-          .map(|mut p| {
-            // replace the ids with names
-            match &mut p.resource_target {
-              ResourceTarget::System(_) => {}
-              ResourceTarget::Build(id) => {
-                *id = id_to_build()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Builder(id) => {
-                *id = id_to_builder()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Deployment(id) => {
-                *id = id_to_deployment()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Server(id) => {
-                *id = id_to_server()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Repo(id) => {
-                *id = id_to_repo()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Alerter(id) => {
-                *id = id_to_alerter()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::Procedure(id) => {
-                *id = id_to_procedure()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-              ResourceTarget::ServerTemplate(id) => {
-                *id = id_to_server_template()
-                  .get(id)
-                  .map(|b| b.name.clone())
-                  .unwrap_or_default()
-              }
-            }
-            PermissionToml {
-              target: p.resource_target,
-              level: p.level,
-            }
-          })
-          .collect::<Vec<_>>();
-
-        users.sort();
-        user_group.users.sort();
-
-        user_group.permissions.sort_by(sort_permissions);
-        permissions.sort_by(sort_permissions);
-
-        // only push update after failed diff
-        if user_group.users != users
-          || user_group.permissions != permissions
-        {
-          // no update from users
-          to_update.push(user_group);
-        }
+  if delete {
+    for user_group in map.values() {
+      if !user_groups.iter().any(|ug| ug.name == user_group.name) {
+        to_delete.push(DeleteItem {
+          id: user_group.id.clone(),
+          name: user_group.name.clone(),
+        });
       }
-      None => to_create.push(user_group),
     }
   }
 
-  if !to_create.is_empty() {
+  let id_to_user = id_to_user();
+
+  for mut user_group in user_groups {
+    let original = match map.get(&user_group.name).cloned() {
+      Some(original) => original,
+      None => {
+        println!(
+          "\n{}: user group: {}\n{}: {:?}\n{}: {:?}",
+          "CREATE".green(),
+          user_group.name.bold().green(),
+          "users".dimmed(),
+          user_group.users,
+          "permissions".dimmed(),
+          user_group.permissions,
+        );
+        to_create.push(user_group);
+        continue;
+      }
+    };
+
+    let mut original_users = original
+      .users
+      .into_iter()
+      .filter_map(|user_id| {
+        id_to_user.get(&user_id).map(|u| u.username.clone())
+      })
+      .collect::<Vec<_>>();
+
+    let mut original_permissions = crate::state::monitor_client()
+      .read(ListUserTargetPermissions {
+        user_target: UserTarget::UserGroup(original.id),
+      })
+      .await
+      .context("failed to query for existing UserGroup permissions")?
+      .into_iter()
+      .map(|mut p| {
+        // replace the ids with names
+        match &mut p.resource_target {
+          ResourceTarget::System(_) => {}
+          ResourceTarget::Build(id) => {
+            *id = id_to_build()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Builder(id) => {
+            *id = id_to_builder()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Deployment(id) => {
+            *id = id_to_deployment()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Server(id) => {
+            *id = id_to_server()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Repo(id) => {
+            *id = id_to_repo()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Alerter(id) => {
+            *id = id_to_alerter()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::Procedure(id) => {
+            *id = id_to_procedure()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::ServerTemplate(id) => {
+            *id = id_to_server_template()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+          ResourceTarget::ResourceSync(id) => {
+            *id = id_to_resource_sync()
+              .get(id)
+              .map(|b| b.name.clone())
+              .unwrap_or_default()
+          }
+        }
+        PermissionToml {
+          target: p.resource_target,
+          level: p.level,
+        }
+      })
+      .collect::<Vec<_>>();
+
+    original_users.sort();
+    user_group.users.sort();
+
+    user_group.permissions.sort_by(sort_permissions);
+    original_permissions.sort_by(sort_permissions);
+
+    let update_users = user_group.users != original_users;
+    let update_permissions =
+      user_group.permissions != original_permissions;
+
+    // only push update after failed diff
+    if update_users || update_permissions {
+      println!(
+        "\n{}: user group: '{}'\n-------------------",
+        "UPDATE".blue(),
+        user_group.name.bold(),
+      );
+      let mut lines = Vec::<String>::new();
+      if update_users {
+        let adding = user_group
+          .users
+          .iter()
+          .filter(|user| !original_users.contains(user))
+          .map(|user| user.as_str())
+          .collect::<Vec<_>>();
+        let adding = if adding.is_empty() {
+          String::from("None").into()
+        } else {
+          adding.join(", ").green()
+        };
+        let removing = original_users
+          .iter()
+          .filter(|user| !user_group.users.contains(user))
+          .map(|user| user.as_str())
+          .collect::<Vec<_>>();
+        let removing = if removing.is_empty() {
+          String::from("None").into()
+        } else {
+          removing.join(", ").red()
+        };
+        lines.push(format!(
+          "{}:    'users'\n{}: {removing}\n{}:   {adding}",
+          "field".dimmed(),
+          "removing".dimmed(),
+          "adding".dimmed(),
+        ))
+      }
+      if update_permissions {
+        let adding = user_group
+          .permissions
+          .iter()
+          .filter(|permission| {
+            !original_permissions.contains(permission)
+          })
+          .map(|permission| format!("{permission:?}"))
+          .collect::<Vec<_>>();
+        let adding = if adding.is_empty() {
+          String::from("None").into()
+        } else {
+          adding.join(", ").green()
+        };
+        let removing = original_permissions
+          .iter()
+          .filter(|permission| {
+            !user_group.permissions.contains(permission)
+          })
+          .map(|permission| format!("{permission:?}"))
+          .collect::<Vec<_>>();
+        let removing = if removing.is_empty() {
+          String::from("None").into()
+        } else {
+          removing.join(", ").red()
+        };
+        lines.push(format!(
+          "{}:    'permissions'\n{}: {removing}\n{}:   {adding}",
+          "field".dimmed(),
+          "removing".dimmed(),
+          "adding".dimmed()
+        ))
+      }
+      println!("{}", lines.join("\n-------------------\n"));
+      to_update.push(UpdateItem {
+        user_group,
+        update_users,
+        update_permissions,
+      });
+    }
+  }
+
+  for d in &to_delete {
     println!(
-      "\nUSER GROUPS TO CREATE: {}",
-      to_create
-        .iter()
-        .map(|item| item.name.as_str())
-        .collect::<Vec<_>>()
-        .join(", ")
+      "\n{}: user group: '{}'\n-------------------",
+      "DELETE".red(),
+      d.name.bold(),
     );
   }
 
-  if !to_update.is_empty() {
-    println!(
-      "\nUSER GROUPS TO UPDATE: {}",
-      to_update
-        .iter()
-        .map(|item| item.name.as_str())
-        .collect::<Vec<_>>()
-        .join(", ")
-    );
-  }
-
-  Ok((to_create, to_update))
+  Ok((to_create, to_update, to_delete))
 }
 
 /// order permissions in deterministic way
@@ -172,14 +278,13 @@ fn sort_permissions(
 
 pub async fn run_updates(
   to_create: Vec<UserGroupToml>,
-  to_update: Vec<UserGroupToml>,
+  to_update: Vec<UpdateItem>,
+  to_delete: Vec<DeleteItem>,
 ) {
-  let log_after = !to_update.is_empty() || !to_create.is_empty();
-
   // Create the non-existant user groups
   for user_group in to_create {
     // Create the user group
-    if let Err(e) = monitor_client()
+    if let Err(e) = crate::state::monitor_client()
       .write(CreateUserGroup {
         name: user_group.name.clone(),
       })
@@ -190,43 +295,78 @@ pub async fn run_updates(
         user_group.name
       );
       continue;
+    } else {
+      info!(
+        "{} user group '{}'",
+        "created".green().bold(),
+        user_group.name.bold(),
+      );
     };
 
     set_users(user_group.name.clone(), user_group.users).await;
-    update_permissions(user_group.name, user_group.permissions).await;
+    run_update_permissions(user_group.name, user_group.permissions)
+      .await;
   }
 
   // Update the existing user groups
-  for user_group in to_update {
-    set_users(user_group.name.clone(), user_group.users).await;
-    update_permissions(user_group.name, user_group.permissions).await;
+  for UpdateItem {
+    user_group,
+    update_users,
+    update_permissions,
+  } in to_update
+  {
+    if update_users {
+      set_users(user_group.name.clone(), user_group.users).await;
+    }
+    if update_permissions {
+      run_update_permissions(user_group.name, user_group.permissions)
+        .await;
+    }
   }
 
-  if log_after {
-    info!("============ user groups synced ✅ ============");
-  }
-}
-
-async fn set_users(user_group: String, users: Vec<String>) {
-  if !users.is_empty() {
-    if let Err(e) = monitor_client()
-      .write(SetUsersInUserGroup {
-        user_group: user_group.clone(),
-        users,
-      })
+  for user_group in to_delete {
+    if let Err(e) = crate::state::monitor_client()
+      .write(DeleteUserGroup { id: user_group.id })
       .await
     {
-      warn!("failed to set users in group {user_group} | {e:#}");
+      warn!(
+        "failed to delete user group {} | {e:#}",
+        user_group.name
+      );
+    } else {
+      info!(
+        "{} user group '{}'",
+        "deleted".red().bold(),
+        user_group.name.bold(),
+      );
     }
   }
 }
 
-async fn update_permissions(
+async fn set_users(user_group: String, users: Vec<String>) {
+  if let Err(e) = crate::state::monitor_client()
+    .write(SetUsersInUserGroup {
+      user_group: user_group.clone(),
+      users,
+    })
+    .await
+  {
+    warn!("failed to set users in group {user_group} | {e:#}");
+  } else {
+    info!(
+      "{} user group '{}' users",
+      "updated".blue().bold(),
+      user_group.bold(),
+    );
+  }
+}
+
+async fn run_update_permissions(
   user_group: String,
   permissions: Vec<PermissionToml>,
 ) {
   for PermissionToml { target, level } in permissions {
-    if let Err(e) = monitor_client()
+    if let Err(e) = crate::state::monitor_client()
       .write(UpdatePermissionOnTarget {
         user_target: UserTarget::UserGroup(user_group.clone()),
         resource_target: target.clone(),
@@ -237,6 +377,12 @@ async fn update_permissions(
       warn!(
         "failed to set permssion in group {user_group} | target: {target:?} | {e:#}",
       );
+    } else {
+      info!(
+        "{} user group '{}' permissions",
+        "updated".blue().bold(),
+        user_group.bold(),
+      );
     }
   }
 }

bin/cli/src/sync/variables.rs

@@ -0,0 +1,206 @@
+use colored::Colorize;
+use monitor_client::{
+  api::write::{
+    CreateVariable, DeleteVariable, UpdateVariableDescription,
+    UpdateVariableValue,
+  },
+  entities::variable::Variable,
+};
+
+use crate::{maps::name_to_variable, state::monitor_client};
+
+pub struct ToUpdateItem {
+  pub variable: Variable,
+  pub update_value: bool,
+  pub update_description: bool,
+}
+
+pub fn get_updates(
+  variables: Vec<Variable>,
+  delete: bool,
+) -> anyhow::Result<(Vec<Variable>, Vec<ToUpdateItem>, Vec<String>)> {
+  let map = name_to_variable();
+
+  let mut to_create = Vec::<Variable>::new();
+  let mut to_update = Vec::<ToUpdateItem>::new();
+  let mut to_delete = Vec::<String>::new();
+
+  if delete {
+    for variable in map.values() {
+      if !variables.iter().any(|v| v.name == variable.name) {
+        to_delete.push(variable.name.clone());
+      }
+    }
+  }
+
+  for variable in variables {
+    match map.get(&variable.name) {
+      Some(original) => {
+        let item = ToUpdateItem {
+          update_value: original.value != variable.value,
+          update_description: original.description
+            != variable.description,
+          variable,
+        };
+        if !item.update_value && !item.update_description {
+          continue;
+        }
+        println!(
+          "\n{}: variable: '{}'\n-------------------",
+          "UPDATE".blue(),
+          item.variable.name.bold(),
+        );
+
+        let mut lines = Vec::<String>::new();
+
+        if item.update_value {
+          lines.push(format!(
+            "{}: 'value'\n{}:  {}\n{}:    {}",
+            "field".dimmed(),
+            "from".dimmed(),
+            original.value.red(),
+            "to".dimmed(),
+            item.variable.value.green()
+          ))
+        }
+
+        if item.update_description {
+          lines.push(format!(
+            "{}: 'description'\n{}:  {}\n{}:    {}",
+            "field".dimmed(),
+            "from".dimmed(),
+            original.description.red(),
+            "to".dimmed(),
+            item.variable.description.green()
+          ))
+        }
+
+        println!("{}", lines.join("\n-------------------\n"));
+
+        to_update.push(item);
+      }
+      None => {
+        if variable.description.is_empty() {
+          println!(
+            "\n{}: variable: {}\n{}: {}",
+            "CREATE".green(),
+            variable.name.bold().green(),
+            "value".dimmed(),
+            variable.value,
+          );
+        } else {
+          println!(
+            "\n{}: variable: {}\n{}: {}\n{}: {}",
+            "CREATE".green(),
+            variable.name.bold().green(),
+            "description".dimmed(),
+            variable.description,
+            "value".dimmed(),
+            variable.value,
+          );
+        }
+        to_create.push(variable)
+      }
+    }
+  }
+
+  for name in &to_delete {
+    println!(
+      "\n{}: variable: '{}'\n-------------------",
+      "DELETE".red(),
+      name.bold(),
+    );
+  }
+
+  Ok((to_create, to_update, to_delete))
+}
+
+pub async fn run_updates(
+  to_create: Vec<Variable>,
+  to_update: Vec<ToUpdateItem>,
+  to_delete: Vec<String>,
+) {
+  for variable in to_create {
+    if let Err(e) = monitor_client()
+      .write(CreateVariable {
+        name: variable.name.clone(),
+        value: variable.value,
+        description: variable.description,
+      })
+      .await
+    {
+      warn!("failed to create variable {} | {e:#}", variable.name);
+    } else {
+      info!(
+        "{} variable '{}'",
+        "created".green().bold(),
+        variable.name.bold(),
+      );
+    };
+  }
+
+  for ToUpdateItem {
+    variable,
+    update_value,
+    update_description,
+  } in to_update
+  {
+    if update_value {
+      if let Err(e) = monitor_client()
+        .write(UpdateVariableValue {
+          name: variable.name.clone(),
+          value: variable.value,
+        })
+        .await
+      {
+        warn!(
+          "failed to update variable value for {} | {e:#}",
+          variable.name
+        );
+      } else {
+        info!(
+          "{} variable '{}' value",
+          "updated".blue().bold(),
+          variable.name.bold(),
+        );
+      };
+    }
+    if update_description {
+      if let Err(e) = monitor_client()
+        .write(UpdateVariableDescription {
+          name: variable.name.clone(),
+          description: variable.description,
+        })
+        .await
+      {
+        warn!(
+          "failed to update variable description for {} | {e:#}",
+          variable.name
+        );
+      } else {
+        info!(
+          "{} variable '{}' description",
+          "updated".blue().bold(),
+          variable.name.bold(),
+        );
+      };
+    }
+  }
+
+  for variable in to_delete {
+    if let Err(e) = crate::state::monitor_client()
+      .write(DeleteVariable {
+        name: variable.clone(),
+      })
+      .await
+    {
+      warn!("failed to delete variable {variable} | {e:#}",);
+    } else {
+      info!(
+        "{} variable '{}'",
+        "deleted".red().bold(),
+        variable.bold(),
+      );
+    }
+  }
+}

bin/core/Cargo.toml

@@ -17,37 +17,48 @@ path = "src/main.rs"
 # local
 monitor_client = { workspace = true, features = ["mongo"] }
 periphery_client.workspace = true
+formatting.workspace = true
 logger.workspace = true
+git.workspace = true
 # mogh
 serror = { workspace = true, features = ["axum"] }
 merge_config_files.workspace = true
-termination_signal.workspace = true
 async_timing_util.workspace = true
 partial_derive2.workspace = true
+derive_variants.workspace = true
 mongo_indexed.workspace = true
 resolver_api.workspace = true
+toml_pretty.workspace = true
+run_command.workspace = true
 parse_csl.workspace = true
 mungos.workspace = true
 slack.workspace = true
 svi.workspace = true
 # external
+ordered_hash_map.workspace = true
 urlencoding.workspace = true
 aws-sdk-ec2.workspace = true
+aws-sdk-ecr.workspace = true
 aws-config.workspace = true
 tokio-util.workspace = true
 axum-extra.workspace = true
 tower-http.workspace = true
 serde_json.workspace = true
 typeshare.workspace = true
+octorust.workspace = true
 tracing.workspace = true
 reqwest.workspace = true
 futures.workspace = true
+nom_pem.workspace = true
 anyhow.workspace = true
 dotenv.workspace = true
 bcrypt.workspace = true
+base64.workspace = true
 tokio.workspace = true
 tower.workspace = true
 serde.workspace = true
+strum.workspace = true
+regex.workspace = true
 axum.workspace = true
 toml.workspace = true
 uuid.workspace = true

bin/core/Dockerfile

@@ -1,5 +1,5 @@
 # Build Core
-FROM rust:1.78.0-bullseye as core-builder
+FROM rust:1.79.0-bookworm as core-builder
 WORKDIR /builder
 COPY . .
 RUN cargo build -p monitor_core --release
@@ -13,11 +13,25 @@ RUN cd client && yarn && yarn build && yarn link
 RUN cd frontend && yarn link @monitor/client && yarn && yarn build
 
 # Final Image
-# FROM gcr.io/distroless/cc
-FROM debian:bullseye-slim
-RUN apt update && apt install -y ca-certificates
+FROM debian:bookworm-slim
+
+# Install Deps
+RUN apt update && apt install -y git curl unzip ca-certificates && \
+	curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+	unzip awscliv2.zip && \
+	./aws/install
+	
+# Copy
 COPY ./config_example/core.config.example.toml /config/config.toml
 COPY --from=core-builder /builder/target/release/core /
 COPY --from=frontend-builder /builder/frontend/dist /frontend
+
+# Hint at the port
 EXPOSE 9000
+
+# Label for Ghcr
+LABEL org.opencontainers.image.source=https://github.com/mbecker20/monitor
+LABEL org.opencontainers.image.description="A tool to build and deploy software across many servers"
+LABEL org.opencontainers.image.licenses=GPL-3.0
+
 CMD ["./core"]

bin/core/src/api/execute/build.rs

@@ -1,63 +1,76 @@
-use std::{collections::HashSet, time::Duration};
+use std::{collections::HashSet, future::IntoFuture, time::Duration};
 
 use anyhow::{anyhow, Context};
+use formatting::{format_serror, muted};
 use futures::future::join_all;
 use monitor_client::{
   api::execute::{
     CancelBuild, CancelBuildResponse, Deploy, RunBuild,
   },
   entities::{
+    alert::{Alert, AlertData},
     all_logs_success,
-    build::Build,
+    build::{Build, ImageRegistry, StandardRegistryConfig},
     builder::{AwsBuilderConfig, Builder, BuilderConfig},
+    config::core::{AwsEcrConfig, AwsEcrConfigWithCredentials},
     deployment::DeploymentState,
     monitor_timestamp,
     permission::PermissionLevel,
-    server::Server,
+    server::{stats::SeverityLevel, Server},
     server_template::aws::AwsServerTemplateConfig,
+    to_monitor_name,
     update::{Log, Update},
     user::{auto_redeploy_user, User},
-    Operation,
   },
 };
 use mungos::{
   by_id::update_one_by_id,
   find::find_collect,
-  mongodb::bson::{doc, to_bson, to_document},
+  mongodb::{
+    bson::{doc, to_bson, to_document},
+    options::FindOneOptions,
+  },
 };
 use periphery_client::{
   api::{self, GetVersionResponse},
   PeripheryClient,
 };
 use resolver_api::Resolve;
-use serror::{serialize_error, serialize_error_pretty};
 use tokio_util::sync::CancellationToken;
 
 use crate::{
   cloud::{
     aws::{
-      launch_ec2_instance, terminate_ec2_instance_with_retry,
-      Ec2Instance,
+      ec2::{
+        launch_ec2_instance, terminate_ec2_instance_with_retry,
+        Ec2Instance,
+      },
+      ecr,
     },
     BuildCleanupData,
   },
   config::core_config,
   helpers::{
+    alert::send_alerts,
     channel::build_cancel_channel,
     periphery_client,
     query::{get_deployment_state, get_global_variables},
-    update::{add_update, make_update, update_update},
+    update::update_update,
   },
   resource::{self, refresh_build_state_cache},
   state::{action_states, db_client, State},
 };
 
-impl Resolve<RunBuild, User> for State {
-  #[instrument(name = "RunBuild", skip(self, user))]
+use crate::helpers::update::init_execution_update;
+
+use super::ExecuteRequest;
+
+impl Resolve<RunBuild, (User, Update)> for State {
+  #[instrument(name = "RunBuild", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     RunBuild { build }: RunBuild,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let mut build = resource::get_check_permissions::<Build>(
       &build,
@@ -75,11 +88,12 @@ impl Resolve<RunBuild, User> for State {
     let _action_guard =
       action_state.update(|state| state.building = true)?;
 
-    build.config.version.increment();
+    let (registry_token, aws_ecr) =
+      validate_account_extract_registry_token_aws_ecr(&build).await?;
 
-    let mut update = make_update(&build, Operation::RunBuild, &user);
-    update.in_progress();
-    update.version = build.config.version.clone();
+    build.config.version.increment();
+    update.version = build.config.version;
+    update_update(update.clone()).await?;
 
     let cancel = CancellationToken::new();
     let cancel_clone = cancel.clone();
@@ -95,10 +109,9 @@ impl Resolve<RunBuild, User> for State {
             id = cancel_recv.recv() => id?
           };
           if incoming_build_id == build_id {
-            info!("build cancel acknowledged");
             update.push_simple_log(
               "cancel acknowledged",
-              "the build cancellation has been queud, it may still take some time",
+              "the build cancellation has been queued, it may still take some time",
             );
             update.finalize();
             let id = update.id.clone();
@@ -113,13 +126,11 @@ impl Resolve<RunBuild, User> for State {
         anyhow::Ok(())
       };
       tokio::select! {
-          _ = cancel_clone.cancelled() => {}
-          _ = poll => {}
+        _ = cancel_clone.cancelled() => {}
+        _ = poll => {}
       }
     });
 
-    update.id = add_update(update.clone()).await?;
-
     // GET BUILDER PERIPHERY
 
     let (periphery, cleanup_data) =
@@ -132,9 +143,12 @@ impl Resolve<RunBuild, User> for State {
           warn!("failed to get builder | {e:#}");
           update.logs.push(Log::error(
             "get builder",
-            serialize_error_pretty(&e),
+            format_serror(&e.context("failed to get builder").into()),
           ));
-          return handle_early_return(update).await;
+          return handle_early_return(
+            update, build.id, build.name, false,
+          )
+          .await;
         }
       };
 
@@ -142,17 +156,26 @@ impl Resolve<RunBuild, User> for State {
     let variables = get_global_variables().await?;
 
     // CLONE REPO
-
-    let github_token = core_config
-      .github_accounts
-      .get(&build.config.github_account)
-      .cloned();
+    let git_token = core_config
+      .git_providers
+      .iter()
+      .find(|provider| provider.domain == build.config.git_provider)
+      .and_then(|provider| {
+        build.config.git_https = provider.https;
+        provider
+          .accounts
+          .iter()
+          .find(|account| {
+            account.username == build.config.git_account
+          })
+          .map(|account| account.token.clone())
+      });
 
     let res = tokio::select! {
       res = periphery
         .request(api::git::CloneRepo {
           args: (&build).into(),
-          github_token,
+          git_token,
         }) => res,
       _ = cancel.cancelled() => {
         info!("build cancelled during clone, cleaning up builder");
@@ -160,7 +183,7 @@ impl Resolve<RunBuild, User> for State {
         cleanup_builder_instance(periphery, cleanup_data, &mut update)
           .await;
         info!("builder cleaned up");
-        return handle_early_return(update).await
+        return handle_early_return(update, build.id, build.name, true).await
       },
     };
 
@@ -171,21 +194,22 @@ impl Resolve<RunBuild, User> for State {
       }
       Err(e) => {
         warn!("failed build at clone repo | {e:#}");
-        update.push_error_log("clone repo", serialize_error(&e));
+        update.push_error_log(
+          "clone repo",
+          format_serror(&e.context("failed to clone repo").into()),
+        );
       }
     }
 
     update_update(update.clone()).await?;
 
     if all_logs_success(&update.logs) {
-      let docker_token = core_config
-        .docker_accounts
-        .get(&build.config.docker_account)
-        .cloned();
-
       // Interpolate variables / secrets into build args
       let mut global_replacers = HashSet::new();
       let mut secret_replacers = HashSet::new();
+      let mut secret_replacers_for_log = HashSet::new();
+
+      // Interpolate into build args
       for arg in &mut build.config.build_args {
         // first pass - global variables
         let (res, more_replacers) = svi::interpolate_variables(
@@ -204,10 +228,40 @@ impl Resolve<RunBuild, User> for State {
           false,
         )
         .context("failed to interpolate core secrets")?;
+        secret_replacers_for_log.extend(
+          more_replacers.iter().map(|(_, variable)| variable.clone()),
+        );
         secret_replacers.extend(more_replacers);
         arg.value = res;
       }
 
+      // Interpolate into secret args
+      for arg in &mut build.config.secret_args {
+        // first pass - global variables
+        let (res, more_replacers) = svi::interpolate_variables(
+          &arg.value,
+          &variables,
+          svi::Interpolator::DoubleBrackets,
+          false,
+        )
+        .context("failed to interpolate global variables")?;
+        global_replacers.extend(more_replacers);
+        // second pass - core secrets
+        let (res, more_replacers) = svi::interpolate_variables(
+          &res,
+          &core_config.secrets,
+          svi::Interpolator::DoubleBrackets,
+          false,
+        )
+        .context("failed to interpolate core secrets")?;
+        secret_replacers_for_log.extend(
+          more_replacers.into_iter().map(|(_, variable)| variable),
+        );
+        // Secret args don't need to be in replacers sent to periphery.
+        // The secret args don't end up in the command like build args do.
+        arg.value = res;
+      }
+
       // Show which variables were interpolated
       if !global_replacers.is_empty() {
         update.push_simple_log(
@@ -219,12 +273,12 @@ impl Resolve<RunBuild, User> for State {
             .join("\n"),
         );
       }
-      if !secret_replacers.is_empty() {
+      if !secret_replacers_for_log.is_empty() {
         update.push_simple_log(
           "interpolate core secrets",
-          secret_replacers
-            .iter()
-            .map(|(_, variable)| format!("<span class=\"text-muted-foreground\">replaced:</span> {variable}"))
+          secret_replacers_for_log
+            .into_iter()
+            .map(|variable| format!("<span class=\"text-muted-foreground\">replaced:</span> {variable}"))
             .collect::<Vec<_>>()
             .join("\n"),
         );
@@ -234,7 +288,8 @@ impl Resolve<RunBuild, User> for State {
         res = periphery
           .request(api::build::Build {
             build: build.clone(),
-            docker_token,
+            registry_token,
+            aws_ecr,
             replacers: secret_replacers.into_iter().collect(),
           }) => res.context("failed at call to periphery to build"),
         _ = cancel.cancelled() => {
@@ -242,7 +297,7 @@ impl Resolve<RunBuild, User> for State {
           update.push_error_log("build cancelled", String::from("user cancelled build during docker build"));
           cleanup_builder_instance(periphery, cleanup_data, &mut update)
             .await;
-          return handle_early_return(update).await
+          return handle_early_return(update, build.id, build.name, true).await
         },
       };
 
@@ -253,7 +308,10 @@ impl Resolve<RunBuild, User> for State {
         }
         Err(e) => {
           warn!("error in build | {e:#}");
-          update.push_error_log("build", serialize_error(&e))
+          update.push_error_log(
+            "build",
+            format_serror(&e.context("failed to build").into()),
+          )
         }
       };
     }
@@ -274,11 +332,11 @@ impl Resolve<RunBuild, User> for State {
               "info.last_built_at": monitor_timestamp(),
             }
           },
-          None,
         )
         .await;
     }
 
+    // stop the cancel listening task from going forever
     cancel.cancel();
 
     cleanup_builder_instance(periphery, cleanup_data, &mut update)
@@ -305,7 +363,26 @@ impl Resolve<RunBuild, User> for State {
       // don't hold response up for user
       tokio::spawn(async move {
         handle_post_build_redeploy(&build.id).await;
-        info!("post build redeploy handled");
+      });
+    } else {
+      warn!("build unsuccessful, alerting...");
+      let target = update.target.clone();
+      let version = update.version;
+      tokio::spawn(async move {
+        let alert = Alert {
+          id: Default::default(),
+          target,
+          ts: monitor_timestamp(),
+          resolved_ts: Some(monitor_timestamp()),
+          resolved: true,
+          level: SeverityLevel::Warning,
+          data: AlertData::BuildFailed {
+            id: build.id,
+            name: build.name,
+            version,
+          },
+        };
+        send_alerts(&[alert]).await
       });
     }
 
@@ -313,8 +390,12 @@ impl Resolve<RunBuild, User> for State {
   }
 }
 
+#[instrument(skip(update))]
 async fn handle_early_return(
   mut update: Update,
+  build_id: String,
+  build_name: String,
+  is_cancel: bool,
 ) -> anyhow::Result<Update> {
   update.finalize();
   // Need to manually update the update before cache refresh,
@@ -332,15 +413,83 @@ async fn handle_early_return(
     refresh_build_state_cache().await;
   }
   update_update(update.clone()).await?;
+  if !update.success && !is_cancel {
+    warn!("build unsuccessful, alerting...");
+    let target = update.target.clone();
+    let version = update.version;
+    tokio::spawn(async move {
+      let alert = Alert {
+        id: Default::default(),
+        target,
+        ts: monitor_timestamp(),
+        resolved_ts: Some(monitor_timestamp()),
+        resolved: true,
+        level: SeverityLevel::Warning,
+        data: AlertData::BuildFailed {
+          id: build_id,
+          name: build_name,
+          version,
+        },
+      };
+      send_alerts(&[alert]).await
+    });
+  }
   Ok(update)
 }
 
-impl Resolve<CancelBuild, User> for State {
-  #[instrument(name = "CancelBuild", skip(self, user))]
+#[instrument(skip_all)]
+pub async fn validate_cancel_build(
+  request: &ExecuteRequest,
+) -> anyhow::Result<()> {
+  if let ExecuteRequest::CancelBuild(req) = request {
+    let build = resource::get::<Build>(&req.build).await?;
+
+    let db = db_client().await;
+
+    let (latest_build, latest_cancel) = tokio::try_join!(
+      db.updates
+        .find_one(doc! {
+          "operation": "RunBuild",
+          "target.id": &build.id,
+        },)
+        .with_options(
+          FindOneOptions::builder()
+            .sort(doc! { "start_ts": -1 })
+            .build()
+        )
+        .into_future(),
+      db.updates
+        .find_one(doc! {
+          "operation": "CancelBuild",
+          "target.id": &build.id,
+        },)
+        .with_options(
+          FindOneOptions::builder()
+            .sort(doc! { "start_ts": -1 })
+            .build()
+        )
+        .into_future()
+    )?;
+
+    match (latest_build, latest_cancel) {
+      (Some(build), Some(cancel)) => {
+        if cancel.start_ts > build.start_ts {
+          return Err(anyhow!("Build has already been cancelled"));
+        }
+      }
+      (None, _) => return Err(anyhow!("No build in progress")),
+      _ => {}
+    };
+  }
+  Ok(())
+}
+
+impl Resolve<CancelBuild, (User, Update)> for State {
+  #[instrument(name = "CancelBuild", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     CancelBuild { build }: CancelBuild,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<CancelBuildResponse> {
     let build = resource::get_check_permissions::<Build>(
       &build,
@@ -349,37 +498,24 @@ impl Resolve<CancelBuild, User> for State {
     )
     .await?;
 
-    // check if theres already an open cancel build update
-    if db_client()
+    // make sure the build is building
+    if !action_states()
+      .build
+      .get(&build.id)
       .await
-      .updates
-      .find_one(
-        doc! {
-          "operation": "CancelBuild",
-          "status": "InProgress",
-          "target.id": &build.id,
-        },
-        None,
-      )
-      .await
-      .context("failed to query updates")?
-      .is_some()
+      .and_then(|s| s.get().ok().map(|s| s.building))
+      .unwrap_or_default()
     {
-      return Err(anyhow!("Build cancel is already in progress"));
+      return Err(anyhow!("Build is not building."));
     }
 
-    let mut update =
-      make_update(&build, Operation::CancelBuild, &user);
-
     update.push_simple_log(
       "cancel triggered",
       "the build cancel has been triggered",
     );
-    update.in_progress();
+    update_update(update.clone()).await?;
 
-    update.id =
-      add_update(make_update(&build, Operation::CancelBuild, &user))
-        .await?;
+    let update_id = update.id.clone();
 
     build_cancel_channel()
       .sender
@@ -387,6 +523,22 @@ impl Resolve<CancelBuild, User> for State {
       .await
       .send((build.id, update))?;
 
+    // Make sure cancel is set to complete after some time in case
+    // no reciever is there to do it. Prevents update stuck in InProgress.
+    tokio::spawn(async move {
+      tokio::time::sleep(Duration::from_secs(60)).await;
+      if let Err(e) = update_one_by_id(
+        &db_client().await.updates,
+        &update_id,
+        doc! { "$set": { "status": "Complete" } },
+        None,
+      )
+      .await
+      {
+        warn!("failed to set BuildCancel Update status Complete after timeout | {e:#}")
+      }
+    });
+
     Ok(CancelBuildResponse {})
   }
 }
@@ -394,7 +546,7 @@ impl Resolve<CancelBuild, User> for State {
 const BUILDER_POLL_RATE_SECS: u64 = 2;
 const BUILDER_POLL_MAX_TRIES: usize = 30;
 
-#[instrument]
+#[instrument(skip_all, fields(build_id = build.id, update_id = update.id))]
 async fn get_build_builder(
   build: &Build,
   update: &mut Update,
@@ -424,7 +576,7 @@ async fn get_build_builder(
   }
 }
 
-#[instrument]
+#[instrument(skip_all, fields(build_id = build.id, update_id = update.id))]
 async fn get_aws_builder(
   build: &Build,
   config: AwsBuilderConfig,
@@ -494,6 +646,8 @@ async fn get_aws_builder(
     tokio::time::sleep(Duration::from_secs(BUILDER_POLL_RATE_SECS))
       .await;
   }
+
+  // Spawn terminate task in failure case (if loop is passed without return)
   tokio::spawn(async move {
     let _ =
       terminate_ec2_instance_with_retry(config.region, &instance_id)
@@ -501,10 +655,14 @@ async fn get_aws_builder(
   });
 
   // Unwrap is safe, only way to get here is after check Ok / early return, so it must be err
-  Err(res.err().unwrap())
+  Err(
+    res.err().unwrap().context(
+      "failed to start usable builder. terminating instance.",
+    ),
+  )
 }
 
-#[instrument(skip(periphery))]
+#[instrument(skip(periphery, update))]
 async fn cleanup_builder_instance(
   periphery: PeripheryClient,
   cleanup_data: BuildCleanupData,
@@ -556,35 +714,38 @@ async fn handle_post_build_redeploy(build_id: &str) {
         let state =
           get_deployment_state(&deployment).await.unwrap_or_default();
         if state == DeploymentState::Running {
-          let res = State
-            .resolve(
-              Deploy {
-                deployment: deployment.id.clone(),
-                stop_signal: None,
-                stop_time: None,
-              },
-              auto_redeploy_user().to_owned(),
-            )
-            .await;
+          let req = super::ExecuteRequest::Deploy(Deploy {
+            deployment: deployment.id.clone(),
+            stop_signal: None,
+            stop_time: None,
+          });
+          let user = auto_redeploy_user().to_owned();
+          let res = async {
+            let update = init_execution_update(&req, &user).await?;
+            State
+              .resolve(
+                Deploy {
+                  deployment: deployment.id.clone(),
+                  stop_signal: None,
+                  stop_time: None,
+                },
+                (user, update),
+              )
+              .await
+          }
+          .await;
           Some((deployment.id.clone(), res))
         } else {
           None
         }
       });
 
-  let redeploy_results = join_all(futures).await;
-
-  let mut redeploys = Vec::<String>::new();
-  let mut redeploy_failures = Vec::<String>::new();
-
-  for res in redeploy_results {
-    if res.is_none() {
+  for res in join_all(futures).await {
+    let Some((id, res)) = res else {
       continue;
-    }
-    let (id, res) = res.unwrap();
-    match res {
-      Ok(_) => redeploys.push(id),
-      Err(e) => redeploy_failures.push(format!("{id}: {e:#?}")),
+    };
+    if let Err(e) = res {
+      warn!("failed post build redeploy for deployment {id}: {e:#}");
     }
   }
 }
@@ -607,5 +768,88 @@ fn start_aws_builder_log(
 
   let readable_sec_group_ids = security_group_ids.join(", ");
 
-  format!("instance id: {instance_id}\nip: {ip}\nami id: {ami_id}\ninstance type: {instance_type}\nvolume size: {volume_gb} GB\nsubnet id: {subnet_id}\nsecurity groups: {readable_sec_group_ids}\nassign public ip: {assign_public_ip}\nuse public ip: {use_public_ip}")
+  [
+    format!("{}: {instance_id}", muted("instance id")),
+    format!("{}: {ip}", muted("ip")),
+    format!("{}: {ami_id}", muted("ami id")),
+    format!("{}: {instance_type}", muted("instance type")),
+    format!("{}: {volume_gb} GB", muted("volume size")),
+    format!("{}: {subnet_id}", muted("subnet id")),
+    format!("{}: {readable_sec_group_ids}", muted("security groups")),
+    format!("{}: {assign_public_ip}", muted("assign public ip")),
+    format!("{}: {use_public_ip}", muted("use public ip")),
+  ]
+  .join("\n")
+}
+
+/// This will make sure that a build with non-none image registry has an account attached,
+/// and will check the core config for a token / aws ecr config matching requirements.
+/// Otherwise it is left to periphery.
+async fn validate_account_extract_registry_token_aws_ecr(
+  build: &Build,
+) -> anyhow::Result<(Option<String>, Option<AwsEcrConfig>)> {
+  let (domain, account) = match &build.config.image_registry {
+    // Early return for None
+    ImageRegistry::None(_) => return Ok((None, None)),
+    // Early return for AwsEcr
+    ImageRegistry::AwsEcr(label) => {
+      let config = core_config()
+        .aws_ecr_registries
+        .iter()
+        .find(|reg| &reg.label == label);
+      let token = match config {
+        Some(AwsEcrConfigWithCredentials {
+          region,
+          access_key_id,
+          secret_access_key,
+          ..
+        }) => {
+          let token = ecr::get_ecr_token(
+            region,
+            access_key_id,
+            secret_access_key,
+          )
+          .await
+          .context("failed to get aws ecr token")?;
+          ecr::maybe_create_repo(
+            &to_monitor_name(&build.name),
+            region.to_string(),
+            access_key_id,
+            secret_access_key,
+          )
+          .await
+          .context("failed to create aws ecr repo")?;
+          Some(token)
+        }
+        None => None,
+      };
+      return Ok((token, config.map(AwsEcrConfig::from)));
+    }
+    ImageRegistry::Standard(StandardRegistryConfig {
+      domain,
+      account,
+      ..
+    }) => (domain.as_str(), account),
+  };
+
+  if account.is_empty() {
+    return Err(anyhow!(
+      "Must attach account to use registry provider {domain}"
+    ));
+  }
+
+  Ok((
+    core_config()
+      .docker_registries
+      .iter()
+      .find(|provider| provider.domain == domain)
+      .and_then(|provider| {
+        provider
+          .accounts
+          .iter()
+          .find(|_account| &_account.username == account)
+          .map(|account| account.token.clone())
+      }),
+    None,
+  ))
 }

bin/core/src/api/execute/deployment.rs

@@ -1,39 +1,45 @@
 use std::collections::HashSet;
 
 use anyhow::{anyhow, Context};
+use formatting::format_serror;
 use futures::future::join_all;
 use monitor_client::{
   api::execute::*,
   entities::{
-    build::Build,
-    deployment::{Deployment, DeploymentImage},
-    get_image_name, monitor_timestamp,
+    build::{Build, ImageRegistry},
+    config::core::AwsEcrConfig,
+    deployment::{
+      extract_registry_domain, Deployment, DeploymentImage,
+    },
+    get_image_name,
     permission::PermissionLevel,
     server::ServerState,
-    update::{Log, ResourceTarget, Update, UpdateStatus},
+    update::{Log, Update},
     user::User,
-    Operation, Version,
+    Version,
   },
 };
 use mungos::{find::find_collect, mongodb::bson::doc};
 use periphery_client::api;
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 
 use crate::{
+  cloud::aws::ecr,
   config::core_config,
   helpers::{
     periphery_client,
     query::{get_global_variables, get_server_with_status},
-    update::{add_update, make_update, update_update},
+    update::update_update,
   },
   monitor::update_cache_for_server,
   resource,
   state::{action_states, db_client, State},
 };
 
-impl Resolve<Deploy, User> for State {
-  #[instrument(name = "Deploy", skip(self, user))]
+use crate::helpers::update::init_execution_update;
+
+impl Resolve<Deploy, (User, Update)> for State {
+  #[instrument(name = "Deploy", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     Deploy {
@@ -41,7 +47,7 @@ impl Resolve<Deploy, User> for State {
       stop_signal,
       stop_time,
     }: Deploy,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let mut deployment =
       resource::get_check_permissions::<Deployment>(
@@ -76,28 +82,101 @@ impl Resolve<Deploy, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let version = match deployment.config.image {
-      DeploymentImage::Build { build_id, version } => {
-        let build = resource::get::<Build>(&build_id).await?;
-        let image_name = get_image_name(&build);
-        let version = if version.is_none() {
-          build.config.version
-        } else {
-          version
-        };
-        // replace image with corresponding build image.
-        deployment.config.image = DeploymentImage::Image {
-          image: format!("{image_name}:{version}"),
-        };
-        // set docker account to match build docker account if it's not overridden by deployment
-        if deployment.config.docker_account.is_empty() {
-          deployment.config.docker_account =
-            build.config.docker_account;
+    let (version, registry_token, aws_ecr) =
+      match &deployment.config.image {
+        DeploymentImage::Build { build_id, version } => {
+          let build = resource::get::<Build>(build_id).await?;
+          let image_name = get_image_name(&build, |label| {
+            core_config()
+              .aws_ecr_registries
+              .iter()
+              .find(|reg| &reg.label == label)
+              .map(AwsEcrConfig::from)
+          })
+          .context("failed to create image name")?;
+          let version = if version.is_none() {
+            build.config.version
+          } else {
+            *version
+          };
+          // Remove ending patch if it is 0, this means use latest patch.
+          let version_str = if version.patch == 0 {
+            format!("{}.{}", version.major, version.minor)
+          } else {
+            version.to_string()
+          };
+          // replace image with corresponding build image.
+          deployment.config.image = DeploymentImage::Image {
+            image: format!("{image_name}:{version_str}"),
+          };
+          match build.config.image_registry {
+            ImageRegistry::None(_) => (version, None, None),
+            ImageRegistry::AwsEcr(label) => {
+              let config = core_config()
+                .aws_ecr_registries
+                .iter()
+                .find(|reg| reg.label == label)
+                .with_context(|| {
+                  format!(
+                  "did not find config for aws ecr registry {label}"
+                )
+                })?;
+              let token = ecr::get_ecr_token(
+                &config.region,
+                &config.access_key_id,
+                &config.secret_access_key,
+              )
+              .await
+              .context("failed to create aws ecr login token")?;
+              (version, Some(token), Some(AwsEcrConfig::from(config)))
+            }
+            ImageRegistry::Standard(params) => {
+              if deployment.config.image_registry_account.is_empty() {
+                deployment.config.image_registry_account =
+                  params.account
+              }
+              let token = core_config()
+                .docker_registries
+                .iter()
+                .find(|registry| registry.domain == params.domain)
+                .and_then(|provider| {
+                  provider
+                    .accounts
+                    .iter()
+                    .find(|account| {
+                      account.username
+                        == deployment.config.image_registry_account
+                    })
+                    .map(|account| account.token.clone())
+                });
+              (version, token, None)
+            }
+          }
         }
-        version
-      }
-      DeploymentImage::Image { .. } => Version::default(),
-    };
+        DeploymentImage::Image { image } => {
+          let domain = extract_registry_domain(image)?;
+          let token =
+            (!deployment.config.image_registry_account.is_empty())
+              .then(|| {
+                core_config()
+                  .docker_registries
+                  .iter()
+                  .find(|registry| registry.domain == domain)
+                  .and_then(|provider| {
+                    provider
+                      .accounts
+                      .iter()
+                      .find(|account| {
+                        account.username
+                          == deployment.config.image_registry_account
+                      })
+                      .map(|account| account.token.clone())
+                  })
+              })
+              .flatten();
+          (Version::default(), token, None)
+        }
+      };
 
     let variables = get_global_variables().await?;
     let core_config = core_config();
@@ -129,11 +208,6 @@ impl Resolve<Deploy, User> for State {
       env.value = res;
     }
 
-    let mut update =
-      make_update(&deployment, Operation::DeployContainer, &user);
-    update.in_progress();
-    update.version = version;
-
     // Show which variables were interpolated
     if !global_replacers.is_empty() {
       update.push_simple_log(
@@ -156,19 +230,16 @@ impl Resolve<Deploy, User> for State {
       );
     }
 
-    update.id = add_update(update.clone()).await?;
-
-    let docker_token = core_config
-      .docker_accounts
-      .get(&deployment.config.docker_account)
-      .cloned();
+    update.version = version;
+    update_update(update.clone()).await?;
 
     match periphery
       .request(api::container::Deploy {
         deployment,
         stop_signal,
         stop_time,
-        docker_token,
+        registry_token,
+        aws_ecr,
         replacers: secret_replacers.into_iter().collect(),
       })
       .await
@@ -177,7 +248,9 @@ impl Resolve<Deploy, User> for State {
       Err(e) => {
         update.push_error_log(
           "deploy container",
-          serialize_error_pretty(&e),
+          format_serror(
+            &e.context("failed to deploy container").into(),
+          ),
         );
       }
     };
@@ -191,12 +264,12 @@ impl Resolve<Deploy, User> for State {
   }
 }
 
-impl Resolve<StartContainer, User> for State {
-  #[instrument(name = "StartContainer", skip(self, user))]
+impl Resolve<StartContainer, (User, Update)> for State {
+  #[instrument(name = "StartContainer", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     StartContainer { deployment }: StartContainer,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let deployment = resource::get_check_permissions::<Deployment>(
       &deployment,
@@ -230,20 +303,6 @@ impl Resolve<StartContainer, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let start_ts = monitor_timestamp();
-
-    let mut update = Update {
-      target: ResourceTarget::Deployment(deployment.id.clone()),
-      operation: Operation::StartContainer,
-      start_ts,
-      status: UpdateStatus::InProgress,
-      success: true,
-      operator: user.id.clone(),
-      ..Default::default()
-    };
-
-    update.id = add_update(update.clone()).await?;
-
     let log = match periphery
       .request(api::container::StartContainer {
         name: deployment.name.clone(),
@@ -251,22 +310,23 @@ impl Resolve<StartContainer, User> for State {
       .await
     {
       Ok(log) => log,
-      Err(e) => {
-        Log::error("start container", serialize_error_pretty(&e))
-      }
+      Err(e) => Log::error(
+        "start container",
+        format_serror(&e.context("failed to start container").into()),
+      ),
     };
 
     update.logs.push(log);
-    update.finalize();
     update_cache_for_server(&server).await;
+    update.finalize();
     update_update(update.clone()).await?;
 
     Ok(update)
   }
 }
 
-impl Resolve<StopContainer, User> for State {
-  #[instrument(name = "StopContainer", skip(self, user))]
+impl Resolve<StopContainer, (User, Update)> for State {
+  #[instrument(name = "StopContainer", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     StopContainer {
@@ -274,7 +334,7 @@ impl Resolve<StopContainer, User> for State {
       signal,
       time,
     }: StopContainer,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let deployment = resource::get_check_permissions::<Deployment>(
       &deployment,
@@ -308,11 +368,6 @@ impl Resolve<StopContainer, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let mut update =
-      make_update(&deployment, Operation::StopContainer, &user);
-
-    update.id = add_update(update.clone()).await?;
-
     let log = match periphery
       .request(api::container::StopContainer {
         name: deployment.name.clone(),
@@ -326,26 +381,27 @@ impl Resolve<StopContainer, User> for State {
       .await
     {
       Ok(log) => log,
-      Err(e) => {
-        Log::error("stop container", serialize_error_pretty(&e))
-      }
+      Err(e) => Log::error(
+        "stop container",
+        format_serror(&e.context("failed to stop container").into()),
+      ),
     };
 
     update.logs.push(log);
-    update.finalize();
     update_cache_for_server(&server).await;
+    update.finalize();
     update_update(update.clone()).await?;
 
     Ok(update)
   }
 }
 
-impl Resolve<StopAllContainers, User> for State {
-  #[instrument(name = "StopAllContainers", skip(self, user))]
+impl Resolve<StopAllContainers, (User, Update)> for State {
+  #[instrument(name = "StopAllContainers", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     StopAllContainers { server }: StopAllContainers,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let (server, status) = get_server_with_status(&server).await?;
     if status != ServerState::Ok {
@@ -375,23 +431,27 @@ impl Resolve<StopAllContainers, User> for State {
     .await
     .context("failed to find deployments on server")?;
 
-    let mut update =
-      make_update(&server, Operation::StopAllContainers, &user);
-    update.in_progress();
-    update.id = add_update(update.clone()).await?;
-
     let futures = deployments.iter().map(|deployment| async {
+      let req = super::ExecuteRequest::StopContainer(StopContainer {
+        deployment: deployment.id.clone(),
+        signal: None,
+        time: None,
+      });
       (
-        self
-          .resolve(
-            StopContainer {
-              deployment: deployment.id.clone(),
-              signal: None,
-              time: None,
-            },
-            user.clone(),
-          )
-          .await,
+        async {
+          let update = init_execution_update(&req, &user).await?;
+          State
+            .resolve(
+              StopContainer {
+                deployment: deployment.id.clone(),
+                signal: None,
+                time: None,
+              },
+              (user.clone(), update),
+            )
+            .await
+        }
+        .await,
         deployment.name.clone(),
         deployment.id.clone(),
       )
@@ -407,9 +467,11 @@ impl Resolve<StopAllContainers, User> for State {
       if let Err(e) = res {
         update.push_error_log(
           "stop container failure",
-          format!(
-            "failed to stop container {name} ({id})\n\n{}",
-            serialize_error_pretty(&e)
+          format_serror(
+            &e.context(format!(
+              "failed to stop container {name} ({id})"
+            ))
+            .into(),
           ),
         );
       }
@@ -422,8 +484,8 @@ impl Resolve<StopAllContainers, User> for State {
   }
 }
 
-impl Resolve<RemoveContainer, User> for State {
-  #[instrument(name = "RemoveContainer", skip(self, user))]
+impl Resolve<RemoveContainer, (User, Update)> for State {
+  #[instrument(name = "RemoveContainer", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     RemoveContainer {
@@ -431,7 +493,7 @@ impl Resolve<RemoveContainer, User> for State {
       signal,
       time,
     }: RemoveContainer,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let deployment = resource::get_check_permissions::<Deployment>(
       &deployment,
@@ -465,20 +527,6 @@ impl Resolve<RemoveContainer, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let start_ts = monitor_timestamp();
-
-    let mut update = Update {
-      target: ResourceTarget::Deployment(deployment.id.clone()),
-      operation: Operation::RemoveContainer,
-      start_ts,
-      status: UpdateStatus::InProgress,
-      success: true,
-      operator: user.id.clone(),
-      ..Default::default()
-    };
-
-    update.id = add_update(update.clone()).await?;
-
     let log = match periphery
       .request(api::container::RemoveContainer {
         name: deployment.name.clone(),
@@ -492,9 +540,10 @@ impl Resolve<RemoveContainer, User> for State {
       .await
     {
       Ok(log) => log,
-      Err(e) => {
-        Log::error("stop container", serialize_error_pretty(&e))
-      }
+      Err(e) => Log::error(
+        "stop container",
+        format_serror(&e.context("failed to stop container").into()),
+      ),
     };
 
     update.logs.push(log);

bin/core/src/api/execute/mod.rs

@@ -2,15 +2,26 @@ use std::time::Instant;
 
 use anyhow::{anyhow, Context};
 use axum::{middleware, routing::post, Extension, Router};
-use axum_extra::{headers::ContentType, TypedHeader};
-use monitor_client::{api::execute::*, entities::user::User};
+use formatting::format_serror;
+use monitor_client::{
+  api::execute::*,
+  entities::{
+    update::{Log, Update},
+    user::User,
+  },
+};
+use mungos::by_id::find_one_by_id;
 use resolver_api::{derive::Resolver, Resolver};
 use serde::{Deserialize, Serialize};
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
-use crate::{auth::auth_request, state::State};
+use crate::{
+  auth::auth_request,
+  helpers::update::{init_execution_update, update_update},
+  state::{db_client, State},
+};
 
 mod build;
 mod deployment;
@@ -18,17 +29,18 @@ mod procedure;
 mod repo;
 mod server;
 mod server_template;
+mod sync;
 
 #[typeshare]
 #[derive(Serialize, Deserialize, Debug, Clone, Resolver)]
 #[resolver_target(State)]
-#[resolver_args(User)]
+#[resolver_args((User, Update))]
 #[serde(tag = "type", content = "params")]
-enum ExecuteRequest {
+pub enum ExecuteRequest {
   // ==== SERVER ====
-  PruneContainers(PruneDockerContainers),
-  PruneImages(PruneDockerImages),
-  PruneNetworks(PruneDockerNetworks),
+  PruneContainers(PruneContainers),
+  PruneImages(PruneImages),
+  PruneNetworks(PruneNetworks),
 
   // ==== DEPLOYMENT ====
   Deploy(Deploy),
@@ -50,6 +62,9 @@ enum ExecuteRequest {
 
   // ==== SERVER TEMPLATE ====
   LaunchServer(LaunchServer),
+
+  // ==== SYNC ====
+  RunSync(RunSync),
 }
 
 pub fn router() -> Router {
@@ -61,25 +76,58 @@ pub fn router() -> Router {
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<ExecuteRequest>,
-) -> serror::Result<(TypedHeader<ContentType>, String)> {
+) -> serror::Result<Json<Update>> {
   let req_id = Uuid::new_v4();
 
-  let res = tokio::spawn(task(req_id, request, user))
-    .await
-    .context("failure in spawned execute task");
+  // need to validate no cancel is active before any update is created.
+  build::validate_cancel_build(&request).await?;
 
-  if let Err(e) = &res {
-    warn!("/execute request {req_id} spawn error: {e:#}",);
-  }
+  let update = init_execution_update(&request, &user).await?;
 
-  Ok((TypedHeader(ContentType::json()), res??))
+  let handle =
+    tokio::spawn(task(req_id, request, user, update.clone()));
+
+  tokio::spawn({
+    let update_id = update.id.clone();
+    async move {
+      let log = match handle.await {
+        Ok(Err(e)) => {
+          warn!("/execute request {req_id} task error: {e:#}",);
+          Log::error("task error", format_serror(&e.into()))
+        }
+        Err(e) => {
+          warn!("/execute request {req_id} spawn error: {e:?}",);
+          Log::error("spawn error", format!("{e:#?}"))
+        }
+        _ => return,
+      };
+      let res = async {
+        let mut update =
+          find_one_by_id(&db_client().await.updates, &update_id)
+            .await
+            .context("failed to query to db")?
+            .context("no update exists with given id")?;
+        update.logs.push(log);
+        update.finalize();
+        update_update(update).await
+      }
+      .await;
+
+      if let Err(e) = res {
+        warn!("failed to update update with task error log | {e:#}");
+      }
+    }
+  });
+
+  Ok(Json(update))
 }
 
-#[instrument(name = "ExecuteRequest", skip(user))]
+#[instrument(name = "ExecuteRequest", skip(user, update), fields(user_id = user.id, update_id = update.id))]
 async fn task(
   req_id: Uuid,
   request: ExecuteRequest,
   user: User,
+  update: Update,
 ) -> anyhow::Result<String> {
   info!(
     "/execute request {req_id} | user: {} ({})",
@@ -87,23 +135,22 @@ async fn task(
   );
   let timer = Instant::now();
 
-  let res =
-    State
-      .resolve_request(request, user)
-      .await
-      .map_err(|e| match e {
-        resolver_api::Error::Serialization(e) => {
-          anyhow!("{e:?}").context("response serialization error")
-        }
-        resolver_api::Error::Inner(e) => e,
-      });
+  let res = State
+    .resolve_request(request, (user, update))
+    .await
+    .map_err(|e| match e {
+      resolver_api::Error::Serialization(e) => {
+        anyhow!("{e:?}").context("response serialization error")
+      }
+      resolver_api::Error::Inner(e) => e,
+    });
 
   if let Err(e) = &res {
     warn!("/execute request {req_id} error: {e:#}");
   }
 
   let elapsed = timer.elapsed();
-  info!("/execute request {req_id} | resolve time: {elapsed:?}");
+  debug!("/execute request {req_id} | resolve time: {elapsed:?}");
 
   res
 }

bin/core/src/api/execute/procedure.rs

@@ -1,40 +1,38 @@
 use std::pin::Pin;
 
+use formatting::{bold, colored, format_serror, muted, Color};
 use monitor_client::{
   api::execute::RunProcedure,
   entities::{
     permission::PermissionLevel, procedure::Procedure,
-    update::Update, user::User, Operation,
+    update::Update, user::User,
   },
 };
 use mungos::{by_id::update_one_by_id, mongodb::bson::to_document};
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 use tokio::sync::Mutex;
 
 use crate::{
-  helpers::{
-    procedure::execute_procedure,
-    update::{add_update, make_update, update_update},
-  },
+  helpers::{procedure::execute_procedure, update::update_update},
   resource::{self, refresh_procedure_state_cache},
   state::{action_states, db_client, State},
 };
 
-impl Resolve<RunProcedure, User> for State {
-  #[instrument(name = "RunProcedure", skip(self, user))]
+impl Resolve<RunProcedure, (User, Update)> for State {
+  #[instrument(name = "RunProcedure", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     RunProcedure { procedure }: RunProcedure,
-    user: User,
+    (user, update): (User, Update),
   ) -> anyhow::Result<Update> {
-    resolve_inner(procedure, user).await
+    resolve_inner(procedure, user, update).await
   }
 }
 
 fn resolve_inner(
   procedure: String,
   user: User,
+  mut update: Update,
 ) -> Pin<
   Box<
     dyn std::future::Future<Output = anyhow::Result<Update>> + Send,
@@ -48,6 +46,18 @@ fn resolve_inner(
     )
     .await?;
 
+    // Need to push the initial log, as execute_procedure
+    // assumes first log is already created
+    // and will panic otherwise.
+    update.push_simple_log(
+      "execute_procedure",
+      format!(
+        "{}: executing procedure '{}'",
+        muted("INFO"),
+        bold(&procedure.name)
+      ),
+    );
+
     // get the action state for the procedure (or insert default).
     let action_state = action_states()
       .procedure
@@ -59,16 +69,6 @@ fn resolve_inner(
     let _action_guard =
       action_state.update(|state| state.running = true)?;
 
-    let mut update =
-      make_update(&procedure, Operation::RunProcedure, &user);
-    update.in_progress();
-    update.push_simple_log(
-      "execute procedure",
-      format!("Executing procedure: {}", procedure.name),
-    );
-
-    update.id = add_update(update.clone()).await?;
-
     let update = Mutex::new(update);
 
     let res = execute_procedure(&procedure, &update).await;
@@ -79,13 +79,15 @@ fn resolve_inner(
       Ok(_) => {
         update.push_simple_log(
           "execution ok",
-          "the procedure has completed with no errors",
+          format!(
+            "{}: the procedure has {} with no errors",
+            muted("INFO"),
+            colored("completed", Color::Green)
+          ),
         );
       }
-      Err(e) => update.push_error_log(
-        "execution error",
-        serialize_error_pretty(&e),
-      ),
+      Err(e) => update
+        .push_error_log("execution error", format_serror(&e.into())),
     }
 
     update.finalize();

bin/core/src/api/execute/repo.rs

@@ -1,4 +1,5 @@
 use anyhow::anyhow;
+use formatting::format_serror;
 use monitor_client::{
   api::execute::*,
   entities::{
@@ -6,9 +7,8 @@ use monitor_client::{
     permission::PermissionLevel,
     repo::Repo,
     server::Server,
-    update::{Log, ResourceTarget, Update, UpdateStatus},
+    update::{Log, Update},
     user::User,
-    Operation,
   },
 };
 use mungos::{
@@ -17,26 +17,22 @@ use mungos::{
 };
 use periphery_client::api;
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 
 use crate::{
   config::core_config,
-  helpers::{
-    periphery_client,
-    update::{add_update, update_update},
-  },
+  helpers::{periphery_client, update::update_update},
   resource::{self, refresh_repo_state_cache},
   state::{action_states, db_client, State},
 };
 
-impl Resolve<CloneRepo, User> for State {
-  #[instrument(name = "CloneRepo", skip(self, user))]
+impl Resolve<CloneRepo, (User, Update)> for State {
+  #[instrument(name = "CloneRepo", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     CloneRepo { repo }: CloneRepo,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
-    let repo = resource::get_check_permissions::<Repo>(
+    let mut repo = resource::get_check_permissions::<Repo>(
       &repo,
       &user,
       PermissionLevel::Execute,
@@ -61,35 +57,32 @@ impl Resolve<CloneRepo, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let start_ts = monitor_timestamp();
-
-    let mut update = Update {
-      operation: Operation::CloneRepo,
-      target: ResourceTarget::Repo(repo.id.clone()),
-      start_ts,
-      status: UpdateStatus::InProgress,
-      operator: user.id.clone(),
-      success: true,
-      ..Default::default()
-    };
-
-    update.id = add_update(update.clone()).await?;
-
-    let github_token = core_config()
-      .github_accounts
-      .get(&repo.config.github_account)
-      .cloned();
+    let git_token = core_config()
+      .git_providers
+      .iter()
+      .find(|provider| provider.domain == repo.config.git_provider)
+      .and_then(|provider| {
+        repo.config.git_https = provider.https;
+        provider
+          .accounts
+          .iter()
+          .find(|account| account.username == repo.config.git_account)
+          .map(|account| account.token.clone())
+      });
 
     let logs = match periphery
       .request(api::git::CloneRepo {
         args: (&repo).into(),
-        github_token,
+        git_token,
       })
       .await
     {
       Ok(logs) => logs,
       Err(e) => {
-        vec![Log::error("clone repo", serialize_error_pretty(&e))]
+        vec![Log::error(
+          "clone repo",
+          format_serror(&e.context("failed to clone repo").into()),
+        )]
       }
     };
 
@@ -97,19 +90,19 @@ impl Resolve<CloneRepo, User> for State {
     update.finalize();
 
     if update.success {
-      update_last_pulled(&repo.name).await;
+      update_last_pulled_time(&repo.name).await;
     }
 
     handle_update_return(update).await
   }
 }
 
-impl Resolve<PullRepo, User> for State {
-  #[instrument(name = "PullRepo", skip(self, user))]
+impl Resolve<PullRepo, (User, Update)> for State {
+  #[instrument(name = "PullRepo", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     PullRepo { repo }: PullRepo,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let repo = resource::get_check_permissions::<Repo>(
       &repo,
@@ -136,20 +129,6 @@ impl Resolve<PullRepo, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let start_ts = monitor_timestamp();
-
-    let mut update = Update {
-      operation: Operation::PullRepo,
-      target: ResourceTarget::Repo(repo.id.clone()),
-      start_ts,
-      status: UpdateStatus::InProgress,
-      operator: user.id.clone(),
-      success: true,
-      ..Default::default()
-    };
-
-    update.id = add_update(update.clone()).await?;
-
     let logs = match periphery
       .request(api::git::PullRepo {
         name: repo.name.clone(),
@@ -161,7 +140,10 @@ impl Resolve<PullRepo, User> for State {
     {
       Ok(logs) => logs,
       Err(e) => {
-        vec![Log::error("pull repo", serialize_error_pretty(&e))]
+        vec![Log::error(
+          "pull repo",
+          format_serror(&e.context("failed to pull repo").into()),
+        )]
       }
     };
 
@@ -170,13 +152,14 @@ impl Resolve<PullRepo, User> for State {
     update.finalize();
 
     if update.success {
-      update_last_pulled(&repo.name).await;
+      update_last_pulled_time(&repo.name).await;
     }
 
     handle_update_return(update).await
   }
 }
 
+#[instrument(skip_all, fields(update_id = update.id))]
 async fn handle_update_return(
   update: Update,
 ) -> anyhow::Result<Update> {
@@ -198,14 +181,14 @@ async fn handle_update_return(
   Ok(update)
 }
 
-async fn update_last_pulled(repo_name: &str) {
+#[instrument]
+async fn update_last_pulled_time(repo_name: &str) {
   let res = db_client()
     .await
     .repos
     .update_one(
       doc! { "name": repo_name },
       doc! { "$set": { "info.last_pulled_at": monitor_timestamp() } },
-      None,
     )
     .await;
   if let Err(e) = res {

bin/core/src/api/execute/server.rs

@@ -1,4 +1,5 @@
 use anyhow::Context;
+use formatting::format_serror;
 use monitor_client::{
   api::execute::*,
   entities::{
@@ -7,28 +8,23 @@ use monitor_client::{
     server::Server,
     update::{Log, Update, UpdateStatus},
     user::User,
-    Operation,
   },
 };
 use periphery_client::api;
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 
 use crate::{
-  helpers::{
-    periphery_client,
-    update::{add_update, make_update, update_update},
-  },
+  helpers::{periphery_client, update::update_update},
   resource,
   state::{action_states, State},
 };
 
-impl Resolve<PruneDockerContainers, User> for State {
-  #[instrument(name = "PruneDockerContainers", skip(self, user))]
+impl Resolve<PruneContainers, (User, Update)> for State {
+  #[instrument(name = "PruneContainers", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
-    PruneDockerContainers { server }: PruneDockerContainers,
-    user: User,
+    PruneContainers { server }: PruneContainers,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let server = resource::get_check_permissions::<Server>(
       &server,
@@ -50,11 +46,6 @@ impl Resolve<PruneDockerContainers, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let mut update =
-      make_update(&server, Operation::PruneContainersServer, &user);
-    update.in_progress();
-    update.id = add_update(update.clone()).await?;
-
     let log = match periphery
       .request(api::container::PruneContainers {})
       .await
@@ -63,9 +54,12 @@ impl Resolve<PruneDockerContainers, User> for State {
         server.name
       )) {
       Ok(log) => log,
-      Err(e) => {
-        Log::error("prune containers", serialize_error_pretty(&e))
-      }
+      Err(e) => Log::error(
+        "prune containers",
+        format_serror(
+          &e.context("failed to prune containers").into(),
+        ),
+      ),
     };
 
     update.success = log.success;
@@ -79,12 +73,12 @@ impl Resolve<PruneDockerContainers, User> for State {
   }
 }
 
-impl Resolve<PruneDockerNetworks, User> for State {
-  #[instrument(name = "PruneDockerNetworks", skip(self, user))]
+impl Resolve<PruneNetworks, (User, Update)> for State {
+  #[instrument(name = "PruneNetworks", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
-    PruneDockerNetworks { server }: PruneDockerNetworks,
-    user: User,
+    PruneNetworks { server }: PruneNetworks,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let server = resource::get_check_permissions::<Server>(
       &server,
@@ -106,11 +100,6 @@ impl Resolve<PruneDockerNetworks, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let mut update =
-      make_update(&server, Operation::PruneNetworksServer, &user);
-    update.in_progress();
-    update.id = add_update(update.clone()).await?;
-
     let log = match periphery
       .request(api::network::PruneNetworks {})
       .await
@@ -119,9 +108,10 @@ impl Resolve<PruneDockerNetworks, User> for State {
         server.name
       )) {
       Ok(log) => log,
-      Err(e) => {
-        Log::error("prune networks", serialize_error_pretty(&e))
-      }
+      Err(e) => Log::error(
+        "prune networks",
+        format_serror(&e.context("failed to prune networks").into()),
+      ),
     };
 
     update.success = log.success;
@@ -135,12 +125,12 @@ impl Resolve<PruneDockerNetworks, User> for State {
   }
 }
 
-impl Resolve<PruneDockerImages, User> for State {
-  #[instrument(name = "PruneDockerImages", skip(self, user))]
+impl Resolve<PruneImages, (User, Update)> for State {
+  #[instrument(name = "PruneImages", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
-    PruneDockerImages { server }: PruneDockerImages,
-    user: User,
+    PruneImages { server }: PruneImages,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     let server = resource::get_check_permissions::<Server>(
       &server,
@@ -162,11 +152,6 @@ impl Resolve<PruneDockerImages, User> for State {
 
     let periphery = periphery_client(&server)?;
 
-    let mut update =
-      make_update(&server, Operation::PruneImagesServer, &user);
-    update.in_progress();
-    update.id = add_update(update.clone()).await?;
-
     let log =
       match periphery.request(api::build::PruneImages {}).await {
         Ok(log) => log,

bin/core/src/api/execute/server_template.rs

@@ -1,4 +1,5 @@
 use anyhow::{anyhow, Context};
+use formatting::format_serror;
 use monitor_client::{
   api::{execute::LaunchServer, write::CreateServer},
   entities::{
@@ -7,40 +8,37 @@ use monitor_client::{
     server_template::{ServerTemplate, ServerTemplateConfig},
     update::Update,
     user::User,
-    Operation,
   },
 };
 use mungos::mongodb::bson::doc;
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 
 use crate::{
-  cloud::{aws::launch_ec2_instance, hetzner::launch_hetzner_server},
-  helpers::update::{add_update, make_update, update_update},
+  cloud::{
+    aws::ec2::launch_ec2_instance, hetzner::launch_hetzner_server,
+  },
+  helpers::update::update_update,
   resource,
   state::{db_client, State},
 };
 
-impl Resolve<LaunchServer, User> for State {
-  #[instrument(name = "LaunchServer", skip(self, user))]
+impl Resolve<LaunchServer, (User, Update)> for State {
+  #[instrument(name = "LaunchServer", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
   async fn resolve(
     &self,
     LaunchServer {
       name,
       server_template,
     }: LaunchServer,
-    user: User,
+    (user, mut update): (User, Update),
   ) -> anyhow::Result<Update> {
     // validate name isn't already taken by another server
     if db_client()
       .await
       .servers
-      .find_one(
-        doc! {
-          "name": &name
-        },
-        None,
-      )
+      .find_one(doc! {
+        "name": &name
+      })
       .await
       .context("failed to query db for servers")?
       .is_some()
@@ -55,14 +53,11 @@ impl Resolve<LaunchServer, User> for State {
     )
     .await?;
 
-    let mut update =
-      make_update(&template, Operation::LaunchServer, &user);
-    update.in_progress();
     update.push_simple_log(
       "launching server",
       format!("{:#?}", template.config),
     );
-    update.id = add_update(update.clone()).await?;
+    update_update(update.clone()).await?;
 
     let config = match template.config {
       ServerTemplateConfig::Aws(config) => {
@@ -134,10 +129,7 @@ impl Resolve<LaunchServer, User> for State {
       Err(e) => {
         update.push_error_log(
           "create server",
-          format!(
-            "failed to create server\n\n{}",
-            serialize_error_pretty(&e)
-          ),
+          format_serror(&e.context("failed to create server").into()),
         );
       }
     };

bin/core/src/api/execute/sync.rs

@@ -0,0 +1,394 @@
+use anyhow::{anyhow, Context};
+use formatting::{colored, format_serror, Color};
+use mongo_indexed::doc;
+use monitor_client::{
+  api::{execute::RunSync, write::RefreshResourceSyncPending},
+  entities::{
+    self,
+    alerter::Alerter,
+    build::Build,
+    builder::Builder,
+    monitor_timestamp,
+    permission::PermissionLevel,
+    procedure::Procedure,
+    repo::Repo,
+    server::Server,
+    server_template::ServerTemplate,
+    update::{Log, Update},
+    user::{sync_user, User},
+  },
+};
+use mungos::{by_id::update_one_by_id, mongodb::bson::to_document};
+use resolver_api::Resolve;
+
+use crate::{
+  helpers::{
+    query::get_id_to_tags,
+    sync::{
+      deployment,
+      resource::{
+        get_updates_for_execution, AllResourcesById, ResourceSync,
+      },
+    },
+    update::update_update,
+  },
+  resource::{self, refresh_resource_sync_state_cache},
+  state::{db_client, State},
+};
+
+impl Resolve<RunSync, (User, Update)> for State {
+  #[instrument(name = "RunSync", skip(self, user, update), fields(user_id = user.id, update_id = update.id))]
+  async fn resolve(
+    &self,
+    RunSync { sync }: RunSync,
+    (user, mut update): (User, Update),
+  ) -> anyhow::Result<Update> {
+    let sync = resource::get_check_permissions::<
+      entities::sync::ResourceSync,
+    >(&sync, &user, PermissionLevel::Execute)
+    .await?;
+
+    if sync.config.repo.is_empty() {
+      return Err(anyhow!("resource sync repo not configured"));
+    }
+
+    let (res, logs, hash, message) =
+      crate::helpers::sync::remote::get_remote_resources(&sync)
+        .await
+        .context("failed to get remote resources")?;
+
+    update.logs.extend(logs);
+    update_update(update.clone()).await?;
+
+    let resources = res?;
+
+    let all_resources = AllResourcesById::load().await?;
+    let id_to_tags = get_id_to_tags(None).await?;
+
+    let (servers_to_create, servers_to_update, servers_to_delete) =
+      get_updates_for_execution::<Server>(
+        resources.servers,
+        sync.config.delete,
+        &all_resources,
+        &id_to_tags,
+      )
+      .await?;
+    let (
+      deployments_to_create,
+      deployments_to_update,
+      deployments_to_delete,
+    ) = deployment::get_updates_for_execution(
+      resources.deployments,
+      sync.config.delete,
+      &all_resources,
+      &id_to_tags,
+    )
+    .await?;
+    let (builds_to_create, builds_to_update, builds_to_delete) =
+      get_updates_for_execution::<Build>(
+        resources.builds,
+        sync.config.delete,
+        &all_resources,
+        &id_to_tags,
+      )
+      .await?;
+    let (repos_to_create, repos_to_update, repos_to_delete) =
+      get_updates_for_execution::<Repo>(
+        resources.repos,
+        sync.config.delete,
+        &all_resources,
+        &id_to_tags,
+      )
+      .await?;
+    let (
+      procedures_to_create,
+      procedures_to_update,
+      procedures_to_delete,
+    ) = get_updates_for_execution::<Procedure>(
+      resources.procedures,
+      sync.config.delete,
+      &all_resources,
+      &id_to_tags,
+    )
+    .await?;
+    let (builders_to_create, builders_to_update, builders_to_delete) =
+      get_updates_for_execution::<Builder>(
+        resources.builders,
+        sync.config.delete,
+        &all_resources,
+        &id_to_tags,
+      )
+      .await?;
+    let (alerters_to_create, alerters_to_update, alerters_to_delete) =
+      get_updates_for_execution::<Alerter>(
+        resources.alerters,
+        sync.config.delete,
+        &all_resources,
+        &id_to_tags,
+      )
+      .await?;
+    let (
+      server_templates_to_create,
+      server_templates_to_update,
+      server_templates_to_delete,
+    ) = get_updates_for_execution::<ServerTemplate>(
+      resources.server_templates,
+      sync.config.delete,
+      &all_resources,
+      &id_to_tags,
+    )
+    .await?;
+    let (
+      resource_syncs_to_create,
+      resource_syncs_to_update,
+      resource_syncs_to_delete,
+    ) = get_updates_for_execution::<entities::sync::ResourceSync>(
+      resources.resource_syncs,
+      sync.config.delete,
+      &all_resources,
+      &id_to_tags,
+    )
+    .await?;
+    let (
+      variables_to_create,
+      variables_to_update,
+      variables_to_delete,
+    ) = crate::helpers::sync::variables::get_updates_for_execution(
+      resources.variables,
+      sync.config.delete,
+    )
+    .await?;
+    let (
+      user_groups_to_create,
+      user_groups_to_update,
+      user_groups_to_delete,
+    ) = crate::helpers::sync::user_groups::get_updates_for_execution(
+      resources.user_groups,
+      sync.config.delete,
+      &all_resources,
+    )
+    .await?;
+
+    if resource_syncs_to_create.is_empty()
+      && resource_syncs_to_update.is_empty()
+      && resource_syncs_to_delete.is_empty()
+      && server_templates_to_create.is_empty()
+      && server_templates_to_update.is_empty()
+      && server_templates_to_delete.is_empty()
+      && servers_to_create.is_empty()
+      && servers_to_update.is_empty()
+      && servers_to_delete.is_empty()
+      && deployments_to_create.is_empty()
+      && deployments_to_update.is_empty()
+      && deployments_to_delete.is_empty()
+      && builds_to_create.is_empty()
+      && builds_to_update.is_empty()
+      && builds_to_delete.is_empty()
+      && builders_to_create.is_empty()
+      && builders_to_update.is_empty()
+      && builders_to_delete.is_empty()
+      && alerters_to_create.is_empty()
+      && alerters_to_update.is_empty()
+      && alerters_to_delete.is_empty()
+      && repos_to_create.is_empty()
+      && repos_to_update.is_empty()
+      && repos_to_delete.is_empty()
+      && procedures_to_create.is_empty()
+      && procedures_to_update.is_empty()
+      && procedures_to_delete.is_empty()
+      && user_groups_to_create.is_empty()
+      && user_groups_to_update.is_empty()
+      && user_groups_to_delete.is_empty()
+      && variables_to_create.is_empty()
+      && variables_to_update.is_empty()
+      && variables_to_delete.is_empty()
+    {
+      update.push_simple_log(
+        "No Changes",
+        format!(
+          "{}. exiting.",
+          colored("nothing to do", Color::Green)
+        ),
+      );
+      update.finalize();
+      update_update(update.clone()).await?;
+      return Ok(update);
+    }
+
+    // =================
+
+    // No deps
+    maybe_extend(
+      &mut update.logs,
+      crate::helpers::sync::variables::run_updates(
+        variables_to_create,
+        variables_to_update,
+        variables_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      crate::helpers::sync::user_groups::run_updates(
+        user_groups_to_create,
+        user_groups_to_update,
+        user_groups_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      entities::sync::ResourceSync::run_updates(
+        resource_syncs_to_create,
+        resource_syncs_to_update,
+        resource_syncs_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      ServerTemplate::run_updates(
+        server_templates_to_create,
+        server_templates_to_update,
+        server_templates_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      Server::run_updates(
+        servers_to_create,
+        servers_to_update,
+        servers_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      Alerter::run_updates(
+        alerters_to_create,
+        alerters_to_update,
+        alerters_to_delete,
+      )
+      .await,
+    );
+
+    // Dependent on server
+    maybe_extend(
+      &mut update.logs,
+      Builder::run_updates(
+        builders_to_create,
+        builders_to_update,
+        builders_to_delete,
+      )
+      .await,
+    );
+    maybe_extend(
+      &mut update.logs,
+      Repo::run_updates(
+        repos_to_create,
+        repos_to_update,
+        repos_to_delete,
+      )
+      .await,
+    );
+
+    // Dependant on builder
+    maybe_extend(
+      &mut update.logs,
+      Build::run_updates(
+        builds_to_create,
+        builds_to_update,
+        builds_to_delete,
+      )
+      .await,
+    );
+
+    // Dependant on server / build
+    if let Some(res) = deployment::run_updates(
+      deployments_to_create,
+      deployments_to_update,
+      deployments_to_delete,
+    )
+    .await
+    {
+      update.logs.extend(res);
+    }
+
+    // Dependant on everything
+    maybe_extend(
+      &mut update.logs,
+      Procedure::run_updates(
+        procedures_to_create,
+        procedures_to_update,
+        procedures_to_delete,
+      )
+      .await,
+    );
+
+    let db = db_client().await;
+
+    if let Err(e) = update_one_by_id(
+      &db.resource_syncs,
+      &sync.id,
+      doc! {
+        "$set": {
+          "info.last_sync_ts": monitor_timestamp(),
+          "info.last_sync_hash": hash,
+          "info.last_sync_message": message,
+        }
+      },
+      None,
+    )
+    .await
+    {
+      warn!(
+        "failed to update resource sync {} info after sync | {e:#}",
+        sync.name
+      )
+    }
+
+    if let Err(e) = State
+      .resolve(
+        RefreshResourceSyncPending { sync: sync.id },
+        sync_user().to_owned(),
+      )
+      .await
+    {
+      warn!("failed to refresh sync {} after run | {e:#}", sync.name);
+      update.push_error_log(
+        "refresh sync",
+        format_serror(
+          &e.context("failed to refresh sync pending after run")
+            .into(),
+        ),
+      );
+    }
+
+    update.finalize();
+
+    // Need to manually update the update before cache refresh,
+    // and before broadcast with add_update.
+    // The Err case of to_document should be unreachable,
+    // but will fail to update cache in that case.
+    if let Ok(update_doc) = to_document(&update) {
+      let _ = update_one_by_id(
+        &db.updates,
+        &update.id,
+        mungos::update::Update::Set(update_doc),
+        None,
+      )
+      .await;
+      refresh_resource_sync_state_cache().await;
+    }
+    update_update(update.clone()).await?;
+
+    Ok(update)
+  }
+}
+
+fn maybe_extend(logs: &mut Vec<Log>, log: Option<Log>) {
+  if let Some(log) = log {
+    logs.push(log);
+  }
+}

bin/core/src/api/mod.rs

@@ -1,4 +1,5 @@
 pub mod auth;
 pub mod execute;
 pub mod read;
+pub mod user;
 pub mod write;

bin/core/src/api/read/alert.rs

@@ -13,7 +13,9 @@ use mungos::{
 use resolver_api::Resolve;
 
 use crate::{
-  config::core_config, helpers::query::get_resource_ids_for_non_admin, state::{db_client, State}
+  config::core_config,
+  helpers::query::get_resource_ids_for_user,
+  state::{db_client, State},
 };
 
 const NUM_ALERTS_PER_PAGE: u64 = 100;
@@ -26,13 +28,13 @@ impl Resolve<ListAlerts, User> for State {
   ) -> anyhow::Result<ListAlertsResponse> {
     let mut query = query.unwrap_or_default();
     if !user.admin && !core_config().transparent_mode {
-      let server_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      let server_ids = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Server,
       )
       .await?;
-      let deployment_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      let deployment_ids = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Deployment,
       )
       .await?;

bin/core/src/api/read/alerter.rs

@@ -1,6 +1,5 @@
-use std::str::FromStr;
-
 use anyhow::Context;
+use mongo_indexed::Document;
 use monitor_client::{
   api::read::*,
   entities::{
@@ -10,11 +9,13 @@ use monitor_client::{
     user::User,
   },
 };
-use mungos::mongodb::bson::{doc, oid::ObjectId};
+use mungos::mongodb::bson::doc;
 use resolver_api::Resolve;
 
 use crate::{
-  config::core_config, helpers::query::get_resource_ids_for_non_admin, resource, state::{db_client, State}
+  helpers::query::get_resource_ids_for_user,
+  resource,
+  state::{db_client, State},
 };
 
 impl Resolve<GetAlerter, User> for State {
@@ -42,32 +43,37 @@ impl Resolve<ListAlerters, User> for State {
   }
 }
 
+impl Resolve<ListFullAlerters, User> for State {
+  async fn resolve(
+    &self,
+    ListFullAlerters { query }: ListFullAlerters,
+    user: User,
+  ) -> anyhow::Result<ListFullAlertersResponse> {
+    resource::list_full_for_user::<Alerter>(query, &user).await
+  }
+}
+
 impl Resolve<GetAlertersSummary, User> for State {
   async fn resolve(
     &self,
     GetAlertersSummary {}: GetAlertersSummary,
     user: User,
   ) -> anyhow::Result<GetAlertersSummaryResponse> {
-    let query = if user.admin || core_config().transparent_mode {
-      None
-    } else {
-      let ids = get_resource_ids_for_non_admin(
-        &user.id,
-        ResourceTargetVariant::Alerter,
-      )
-      .await?
-      .into_iter()
-      .flat_map(|id| ObjectId::from_str(&id))
-      .collect::<Vec<_>>();
-      let query = doc! {
+    let query = match get_resource_ids_for_user(
+      &user,
+      ResourceTargetVariant::Alerter,
+    )
+    .await?
+    {
+      Some(ids) => doc! {
         "_id": { "$in": ids }
-      };
-      Some(query)
+      },
+      None => Document::new(),
     };
     let total = db_client()
       .await
       .alerters
-      .count_documents(query, None)
+      .count_documents(query)
       .await
       .context("failed to count all alerter documents")?;
     let res = GetAlertersSummaryResponse {

bin/core/src/api/read/build.rs

@@ -1,7 +1,4 @@
-use std::{
-  collections::{HashMap, HashSet},
-  sync::OnceLock,
-};
+use std::collections::{HashMap, HashSet};
 
 use anyhow::Context;
 use async_timing_util::unix_timestamp_ms;
@@ -10,6 +7,7 @@ use monitor_client::{
   api::read::*,
   entities::{
     build::{Build, BuildActionState, BuildListItem, BuildState},
+    config::core::CoreConfig,
     permission::PermissionLevel,
     update::UpdateStatus,
     user::User,
@@ -20,12 +18,14 @@ use mungos::{
   find::find_collect,
   mongodb::{bson::doc, options::FindOptions},
 };
-use resolver_api::{Resolve, ResolveToString};
+use resolver_api::Resolve;
 
 use crate::{
   config::core_config,
   resource,
-  state::{action_states, build_state_cache, db_client, State},
+  state::{
+    action_states, build_state_cache, db_client, github_client, State,
+  },
 };
 
 impl Resolve<GetBuild, User> for State {
@@ -53,6 +53,16 @@ impl Resolve<ListBuilds, User> for State {
   }
 }
 
+impl Resolve<ListFullBuilds, User> for State {
+  async fn resolve(
+    &self,
+    ListFullBuilds { query }: ListFullBuilds,
+    user: User,
+  ) -> anyhow::Result<ListFullBuildsResponse> {
+    resource::list_full_for_user::<Build>(query, &user).await
+  }
+}
+
 impl Resolve<GetBuildActionState, User> for State {
   async fn resolve(
     &self,
@@ -137,16 +147,13 @@ impl Resolve<GetBuildMonthlyStats, User> for State {
     let mut build_updates = db_client()
       .await
       .updates
-      .find(
-        doc! {
-          "start_ts": {
-            "$gte": open_ts,
-            "$lt": close_ts
-          },
-          "operation": Operation::RunBuild.to_string(),
+      .find(doc! {
+        "start_ts": {
+          "$gte": open_ts,
+          "$lt": close_ts
         },
-        None,
-      )
+        "operation": Operation::RunBuild.to_string(),
+      })
       .await
       .context("failed to get updates cursor")?;
 
@@ -183,15 +190,16 @@ fn ms_to_hour(duration: i64) -> f64 {
   duration as f64 / MS_TO_HOUR_DIVISOR
 }
 
-impl Resolve<GetBuildVersions, User> for State {
+impl Resolve<ListBuildVersions, User> for State {
   async fn resolve(
     &self,
-    GetBuildVersions {
+    ListBuildVersions {
       build,
       major,
       minor,
       patch,
-    }: GetBuildVersions,
+      limit,
+    }: ListBuildVersions,
     user: User,
   ) -> anyhow::Result<Vec<BuildVersionResponseItem>> {
     let build = resource::get_check_permissions::<Build>(
@@ -223,7 +231,10 @@ impl Resolve<GetBuildVersions, User> for State {
     let versions = find_collect(
       &db_client().await.updates,
       filter,
-      FindOptions::builder().sort(doc! { "_id": -1 }).build(),
+      FindOptions::builder()
+        .sort(doc! { "_id": -1 })
+        .limit(limit)
+        .build(),
     )
     .await
     .context("failed to pull versions from mongo")?
@@ -236,24 +247,6 @@ impl Resolve<GetBuildVersions, User> for State {
   }
 }
 
-fn docker_organizations() -> &'static String {
-  static DOCKER_ORGANIZATIONS: OnceLock<String> = OnceLock::new();
-  DOCKER_ORGANIZATIONS.get_or_init(|| {
-    serde_json::to_string(&core_config().docker_organizations)
-      .expect("failed to serialize docker organizations")
-  })
-}
-
-impl ResolveToString<ListDockerOrganizations, User> for State {
-  async fn resolve_to_string(
-    &self,
-    ListDockerOrganizations {}: ListDockerOrganizations,
-    _: User,
-  ) -> anyhow::Result<String> {
-    Ok(docker_organizations().clone())
-  }
-}
-
 impl Resolve<ListCommonBuildExtraArgs, User> for State {
   async fn resolve(
     &self,
@@ -273,6 +266,83 @@ impl Resolve<ListCommonBuildExtraArgs, User> for State {
       }
     }
 
-    Ok(res.into_iter().collect())
+    let mut res = res.into_iter().collect::<Vec<_>>();
+    res.sort();
+    Ok(res)
+  }
+}
+
+impl Resolve<GetBuildWebhookEnabled, User> for State {
+  async fn resolve(
+    &self,
+    GetBuildWebhookEnabled { build }: GetBuildWebhookEnabled,
+    user: User,
+  ) -> anyhow::Result<GetBuildWebhookEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    };
+
+    let build = resource::get_check_permissions::<Build>(
+      &build,
+      &user,
+      PermissionLevel::Read,
+    )
+    .await?;
+
+    if build.config.git_provider != "github.com"
+      || build.config.repo.is_empty()
+    {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetBuildWebhookEnabledResponse {
+        managed: false,
+        enabled: false,
+      });
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(GetBuildWebhookEnabledResponse {
+          managed: true,
+          enabled: true,
+        });
+      }
+    }
+
+    Ok(GetBuildWebhookEnabledResponse {
+      managed: true,
+      enabled: false,
+    })
   }
 }

bin/core/src/api/read/builder.rs

@@ -1,21 +1,19 @@
-use std::{collections::HashSet, str::FromStr};
-
 use anyhow::Context;
+use mongo_indexed::Document;
 use monitor_client::{
-  api::read::{self, *},
+  api::read::*,
   entities::{
-    builder::{Builder, BuilderConfig, BuilderListItem},
+    builder::{Builder, BuilderListItem},
     permission::PermissionLevel,
     update::ResourceTargetVariant,
     user::User,
   },
 };
-use mungos::mongodb::bson::{doc, oid::ObjectId};
+use mungos::mongodb::bson::doc;
 use resolver_api::Resolve;
 
 use crate::{
-  config::core_config,
-  helpers::query::get_resource_ids_for_non_admin,
+  helpers::query::get_resource_ids_for_user,
   resource,
   state::{db_client, State},
 };
@@ -45,32 +43,37 @@ impl Resolve<ListBuilders, User> for State {
   }
 }
 
+impl Resolve<ListFullBuilders, User> for State {
+  async fn resolve(
+    &self,
+    ListFullBuilders { query }: ListFullBuilders,
+    user: User,
+  ) -> anyhow::Result<ListFullBuildersResponse> {
+    resource::list_full_for_user::<Builder>(query, &user).await
+  }
+}
+
 impl Resolve<GetBuildersSummary, User> for State {
   async fn resolve(
     &self,
     GetBuildersSummary {}: GetBuildersSummary,
     user: User,
   ) -> anyhow::Result<GetBuildersSummaryResponse> {
-    let query = if user.admin || core_config().transparent_mode {
-      None
-    } else {
-      let ids = get_resource_ids_for_non_admin(
-        &user.id,
-        ResourceTargetVariant::Builder,
-      )
-      .await?
-      .into_iter()
-      .flat_map(|id| ObjectId::from_str(&id))
-      .collect::<Vec<_>>();
-      let query = doc! {
+    let query = match get_resource_ids_for_user(
+      &user,
+      ResourceTargetVariant::Builder,
+    )
+    .await?
+    {
+      Some(ids) => doc! {
         "_id": { "$in": ids }
-      };
-      Some(query)
+      },
+      None => Document::new(),
     };
     let total = db_client()
       .await
       .builders
-      .count_documents(query, None)
+      .count_documents(query)
       .await
       .context("failed to count all builder documents")?;
     let res = GetBuildersSummaryResponse {
@@ -79,52 +82,3 @@ impl Resolve<GetBuildersSummary, User> for State {
     Ok(res)
   }
 }
-
-impl Resolve<GetBuilderAvailableAccounts, User> for State {
-  async fn resolve(
-    &self,
-    GetBuilderAvailableAccounts { builder }: GetBuilderAvailableAccounts,
-    user: User,
-  ) -> anyhow::Result<GetBuilderAvailableAccountsResponse> {
-    let builder = resource::get_check_permissions::<Builder>(
-      &builder,
-      &user,
-      PermissionLevel::Read,
-    )
-    .await?;
-    let (github, docker) = match builder.config {
-      BuilderConfig::Aws(config) => {
-        (config.github_accounts, config.docker_accounts)
-      }
-      BuilderConfig::Server(config) => {
-        let res = self
-          .resolve(
-            read::GetAvailableAccounts {
-              server: config.server_id,
-            },
-            user,
-          )
-          .await?;
-        (res.github, res.docker)
-      }
-    };
-
-    let mut github_set = HashSet::<String>::new();
-
-    github_set.extend(core_config().github_accounts.keys().cloned());
-    github_set.extend(github);
-
-    let mut github = github_set.into_iter().collect::<Vec<_>>();
-    github.sort();
-
-    let mut docker_set = HashSet::<String>::new();
-
-    docker_set.extend(core_config().docker_accounts.keys().cloned());
-    docker_set.extend(docker);
-
-    let mut docker = docker_set.into_iter().collect::<Vec<_>>();
-    docker.sort();
-
-    Ok(GetBuilderAvailableAccountsResponse { github, docker })
-  }
-}

bin/core/src/api/read/deployment.rs

@@ -48,6 +48,16 @@ impl Resolve<ListDeployments, User> for State {
   }
 }
 
+impl Resolve<ListFullDeployments, User> for State {
+  async fn resolve(
+    &self,
+    ListFullDeployments { query }: ListFullDeployments,
+    user: User,
+  ) -> anyhow::Result<ListFullDeploymentsResponse> {
+    resource::list_full_for_user::<Deployment>(query, &user).await
+  }
+}
+
 impl Resolve<GetDeploymentContainer, User> for State {
   async fn resolve(
     &self,
@@ -111,6 +121,7 @@ impl Resolve<SearchLog, User> for State {
       deployment,
       terms,
       combinator,
+      invert,
     }: SearchLog,
     user: User,
   ) -> anyhow::Result<Log> {
@@ -133,6 +144,7 @@ impl Resolve<SearchLog, User> for State {
         name,
         terms,
         combinator,
+        invert,
       })
       .await
       .context("failed at call to periphery")
@@ -245,6 +257,8 @@ impl Resolve<ListCommonDeploymentExtraArgs, User> for State {
       }
     }
 
-    Ok(res.into_iter().collect())
+    let mut res = res.into_iter().collect::<Vec<_>>();
+    res.sort();
+    Ok(res)
   }
 }

bin/core/src/api/read/mod.rs

@@ -1,16 +1,33 @@
-use std::time::Instant;
+use std::{collections::HashSet, sync::OnceLock, time::Instant};
 
-use anyhow::anyhow;
+use anyhow::{anyhow, Context};
 use axum::{middleware, routing::post, Extension, Router};
 use axum_extra::{headers::ContentType, TypedHeader};
-use monitor_client::{api::read::*, entities::user::User};
-use resolver_api::{derive::Resolver, Resolve, Resolver};
+use monitor_client::{
+  api::read::*,
+  entities::{
+    build::Build,
+    builder::{Builder, BuilderConfig},
+    config::{DockerRegistry, GitProvider},
+    repo::Repo,
+    server::Server,
+    sync::ResourceSync,
+    update::ResourceTarget,
+    user::User,
+  },
+};
+use resolver_api::{
+  derive::Resolver, Resolve, ResolveToString, Resolver,
+};
 use serde::{Deserialize, Serialize};
 use serror::Json;
 use typeshare::typeshare;
 use uuid::Uuid;
 
-use crate::{auth::auth_request, config::core_config, state::State};
+use crate::{
+  auth::auth_request, config::core_config, helpers::periphery_client,
+  resource, state::State,
+};
 
 mod alert;
 mod alerter;
@@ -23,6 +40,7 @@ mod repo;
 mod search;
 mod server;
 mod server_template;
+mod sync;
 mod tag;
 mod toml;
 mod update;
@@ -36,16 +54,24 @@ mod variable;
 #[resolver_args(User)]
 #[serde(tag = "type", content = "params")]
 enum ReadRequest {
+  #[to_string_resolver]
   GetVersion(GetVersion),
+  #[to_string_resolver]
   GetCoreInfo(GetCoreInfo),
+  #[to_string_resolver]
+  ListAwsEcrLabels(ListAwsEcrLabels),
+  ListSecrets(ListSecrets),
+  ListGitProviders(ListGitProviders),
+  ListDockerRegistries(ListDockerRegistries),
 
   // ==== USER ====
-  ListUsers(ListUsers),
   GetUsername(GetUsername),
+  GetPermissionLevel(GetPermissionLevel),
+  FindUser(FindUser),
+  ListUsers(ListUsers),
   ListApiKeys(ListApiKeys),
   ListApiKeysForServiceUser(ListApiKeysForServiceUser),
   ListPermissions(ListPermissions),
-  GetPermissionLevel(GetPermissionLevel),
   ListUserTargetPermissions(ListUserTargetPermissions),
 
   // ==== USER GROUP ====
@@ -60,16 +86,17 @@ enum ReadRequest {
   GetProcedure(GetProcedure),
   GetProcedureActionState(GetProcedureActionState),
   ListProcedures(ListProcedures),
+  ListFullProcedures(ListFullProcedures),
 
   // ==== SERVER TEMPLATE ====
   GetServerTemplate(GetServerTemplate),
-  ListServerTemplates(ListServerTemplates),
   GetServerTemplatesSummary(GetServerTemplatesSummary),
+  ListServerTemplates(ListServerTemplates),
+  ListFullServerTemplates(ListFullServerTemplates),
 
   // ==== SERVER ====
   GetServersSummary(GetServersSummary),
   GetServer(GetServer),
-  ListServers(ListServers),
   GetServerState(GetServerState),
   GetPeripheryVersion(GetPeripheryVersion),
   GetDockerContainers(GetDockerContainers),
@@ -77,47 +104,59 @@ enum ReadRequest {
   GetDockerNetworks(GetDockerNetworks),
   GetServerActionState(GetServerActionState),
   GetHistoricalServerStats(GetHistoricalServerStats),
-  GetAvailableAccounts(GetAvailableAccounts),
-  GetAvailableSecrets(GetAvailableSecrets),
+  ListServers(ListServers),
+  ListFullServers(ListFullServers),
 
   // ==== DEPLOYMENT ====
   GetDeploymentsSummary(GetDeploymentsSummary),
   GetDeployment(GetDeployment),
-  ListDeployments(ListDeployments),
   GetDeploymentContainer(GetDeploymentContainer),
   GetDeploymentActionState(GetDeploymentActionState),
   GetDeploymentStats(GetDeploymentStats),
   GetLog(GetLog),
   SearchLog(SearchLog),
+  ListDeployments(ListDeployments),
+  ListFullDeployments(ListFullDeployments),
   ListCommonDeploymentExtraArgs(ListCommonDeploymentExtraArgs),
 
   // ==== BUILD ====
   GetBuildsSummary(GetBuildsSummary),
   GetBuild(GetBuild),
-  ListBuilds(ListBuilds),
   GetBuildActionState(GetBuildActionState),
   GetBuildMonthlyStats(GetBuildMonthlyStats),
-  GetBuildVersions(GetBuildVersions),
+  ListBuildVersions(ListBuildVersions),
+  GetBuildWebhookEnabled(GetBuildWebhookEnabled),
+  ListBuilds(ListBuilds),
+  ListFullBuilds(ListFullBuilds),
   ListCommonBuildExtraArgs(ListCommonBuildExtraArgs),
-  #[to_string_resolver]
-  ListDockerOrganizations(ListDockerOrganizations),
 
   // ==== REPO ====
   GetReposSummary(GetReposSummary),
   GetRepo(GetRepo),
-  ListRepos(ListRepos),
   GetRepoActionState(GetRepoActionState),
+  GetRepoWebhooksEnabled(GetRepoWebhooksEnabled),
+  ListRepos(ListRepos),
+  ListFullRepos(ListFullRepos),
+
+  // ==== SYNC ====
+  GetResourceSyncsSummary(GetResourceSyncsSummary),
+  GetResourceSync(GetResourceSync),
+  GetResourceSyncActionState(GetResourceSyncActionState),
+  GetSyncWebhooksEnabled(GetSyncWebhooksEnabled),
+  ListResourceSyncs(ListResourceSyncs),
+  ListFullResourceSyncs(ListFullResourceSyncs),
 
   // ==== BUILDER ====
   GetBuildersSummary(GetBuildersSummary),
   GetBuilder(GetBuilder),
   ListBuilders(ListBuilders),
-  GetBuilderAvailableAccounts(GetBuilderAvailableAccounts),
+  ListFullBuilders(ListFullBuilders),
 
   // ==== ALERTER ====
   GetAlertersSummary(GetAlertersSummary),
   GetAlerter(GetAlerter),
   ListAlerters(ListAlerters),
+  ListFullAlerters(ListFullAlerters),
 
   // ==== TOML ====
   ExportAllResourcesToToml(ExportAllResourcesToToml),
@@ -154,17 +193,14 @@ pub fn router() -> Router {
     .layer(middleware::from_fn(auth_request))
 }
 
-#[instrument(name = "ReadHandler", level = "debug", skip(user))]
+#[instrument(name = "ReadHandler", level = "debug", skip(user), fields(user_id = user.id))]
 async fn handler(
   Extension(user): Extension<User>,
   Json(request): Json<ReadRequest>,
 ) -> serror::Result<(TypedHeader<ContentType>, String)> {
   let timer = Instant::now();
   let req_id = Uuid::new_v4();
-  debug!(
-    "/read request {req_id} | user: {} ({})",
-    user.username, user.id
-  );
+  debug!("/read request | user: {}", user.username);
   let res =
     State
       .resolve_request(request, user)
@@ -176,42 +212,351 @@ async fn handler(
         resolver_api::Error::Inner(e) => e,
       });
   if let Err(e) = &res {
-    warn!("/read request {req_id} error: {e:#}");
+    debug!("/read request {req_id} error: {e:#}");
   }
   let elapsed = timer.elapsed();
   debug!("/read request {req_id} | resolve time: {elapsed:?}");
   Ok((TypedHeader(ContentType::json()), res?))
 }
 
-impl Resolve<GetVersion, User> for State {
-  #[instrument(name = "GetVersion", level = "debug", skip(self))]
-  async fn resolve(
+fn version() -> &'static String {
+  static VERSION: OnceLock<String> = OnceLock::new();
+  VERSION.get_or_init(|| {
+    serde_json::to_string(&GetVersionResponse {
+      version: env!("CARGO_PKG_VERSION").to_string(),
+    })
+    .context("failed to serialize GetVersionResponse")
+    .unwrap()
+  })
+}
+
+impl ResolveToString<GetVersion, User> for State {
+  async fn resolve_to_string(
     &self,
     GetVersion {}: GetVersion,
     _: User,
-  ) -> anyhow::Result<GetVersionResponse> {
-    Ok(GetVersionResponse {
-      version: env!("CARGO_PKG_VERSION").to_string(),
-    })
+  ) -> anyhow::Result<String> {
+    Ok(version().to_string())
   }
 }
 
-impl Resolve<GetCoreInfo, User> for State {
-  #[instrument(name = "GetCoreInfo", level = "debug", skip(self))]
-  async fn resolve(
-    &self,
-    GetCoreInfo {}: GetCoreInfo,
-    _: User,
-  ) -> anyhow::Result<GetCoreInfoResponse> {
+fn core_info() -> &'static String {
+  static CORE_INFO: OnceLock<String> = OnceLock::new();
+  CORE_INFO.get_or_init(|| {
     let config = core_config();
-    Ok(GetCoreInfoResponse {
+    let info = GetCoreInfoResponse {
       title: config.title.clone(),
       monitoring_interval: config.monitoring_interval,
-      github_webhook_base_url: config
-        .github_webhook_base_url
+      webhook_base_url: config
+        .webhook_base_url
         .clone()
         .unwrap_or_else(|| config.host.clone()),
       transparent_mode: config.transparent_mode,
-    })
+      ui_write_disabled: config.ui_write_disabled,
+      github_webhook_owners: config
+        .github_webhook_app
+        .installations
+        .iter()
+        .map(|i| i.namespace.to_string())
+        .collect(),
+    };
+    serde_json::to_string(&info)
+      .context("failed to serialize GetCoreInfoResponse")
+      .unwrap()
+  })
+}
+
+impl ResolveToString<GetCoreInfo, User> for State {
+  async fn resolve_to_string(
+    &self,
+    GetCoreInfo {}: GetCoreInfo,
+    _: User,
+  ) -> anyhow::Result<String> {
+    Ok(core_info().to_string())
+  }
+}
+
+fn ecr_labels() -> &'static String {
+  static ECR_LABELS: OnceLock<String> = OnceLock::new();
+  ECR_LABELS.get_or_init(|| {
+    serde_json::to_string(
+      &core_config()
+        .aws_ecr_registries
+        .iter()
+        .map(|reg| reg.label.clone())
+        .collect::<Vec<_>>(),
+    )
+    .context("failed to serialize ecr registries")
+    .unwrap()
+  })
+}
+
+impl ResolveToString<ListAwsEcrLabels, User> for State {
+  async fn resolve_to_string(
+    &self,
+    ListAwsEcrLabels {}: ListAwsEcrLabels,
+    _: User,
+  ) -> anyhow::Result<String> {
+    Ok(ecr_labels().to_string())
+  }
+}
+
+impl Resolve<ListSecrets, User> for State {
+  async fn resolve(
+    &self,
+    ListSecrets { target }: ListSecrets,
+    _: User,
+  ) -> anyhow::Result<ListSecretsResponse> {
+    let mut secrets = core_config()
+      .secrets
+      .keys()
+      .cloned()
+      .collect::<HashSet<_>>();
+
+    if let Some(target) = target {
+      let server_id = match target {
+        ResourceTarget::Server(id) => Some(id),
+        ResourceTarget::Builder(id) => {
+          match resource::get::<Builder>(&id).await?.config {
+            BuilderConfig::Server(config) => Some(config.server_id),
+            BuilderConfig::Aws(config) => {
+              secrets.extend(config.secrets);
+              None
+            }
+          }
+        }
+        _ => {
+          return Err(anyhow!("target must be `Server` or `Builder`"))
+        }
+      };
+      if let Some(id) = server_id {
+        let server = resource::get::<Server>(&id).await?;
+        let more = periphery_client(&server)?
+          .request(periphery_client::api::ListSecrets {})
+          .await
+          .with_context(|| {
+            format!(
+              "failed to get secrets from server {}",
+              server.name
+            )
+          })?;
+        secrets.extend(more);
+      }
+    }
+
+    let mut secrets = secrets.into_iter().collect::<Vec<_>>();
+    secrets.sort();
+
+    Ok(secrets)
+  }
+}
+
+impl Resolve<ListGitProviders, User> for State {
+  async fn resolve(
+    &self,
+    ListGitProviders { target }: ListGitProviders,
+    user: User,
+  ) -> anyhow::Result<ListGitProvidersResponse> {
+    let mut providers = core_config().git_providers.clone();
+
+    if let Some(target) = target {
+      match target {
+        ResourceTarget::Server(id) => {
+          merge_git_providers_for_server(&mut providers, &id).await?;
+        }
+        ResourceTarget::Builder(id) => {
+          match resource::get::<Builder>(&id).await?.config {
+            BuilderConfig::Server(config) => {
+              merge_git_providers_for_server(
+                &mut providers,
+                &config.server_id,
+              )
+              .await?;
+            }
+            BuilderConfig::Aws(config) => {
+              merge_git_providers(
+                &mut providers,
+                config.git_providers,
+              );
+            }
+          }
+        }
+        _ => {
+          return Err(anyhow!("target must be `Server` or `Builder`"))
+        }
+      }
+    }
+
+    let (builds, repos, syncs) = tokio::try_join!(
+      resource::list_full_for_user::<Build>(
+        Default::default(),
+        &user
+      ),
+      resource::list_full_for_user::<Repo>(Default::default(), &user),
+      resource::list_full_for_user::<ResourceSync>(
+        Default::default(),
+        &user
+      ),
+    )?;
+
+    for build in builds {
+      if !providers
+        .iter()
+        .any(|provider| provider.domain == build.config.git_provider)
+      {
+        providers.push(GitProvider {
+          domain: build.config.git_provider,
+          https: build.config.git_https,
+          accounts: Default::default(),
+        });
+      }
+    }
+    for repo in repos {
+      if !providers
+        .iter()
+        .any(|provider| provider.domain == repo.config.git_provider)
+      {
+        providers.push(GitProvider {
+          domain: repo.config.git_provider,
+          https: repo.config.git_https,
+          accounts: Default::default(),
+        });
+      }
+    }
+    for sync in syncs {
+      if !providers
+        .iter()
+        .any(|provider| provider.domain == sync.config.git_provider)
+      {
+        providers.push(GitProvider {
+          domain: sync.config.git_provider,
+          https: sync.config.git_https,
+          accounts: Default::default(),
+        });
+      }
+    }
+
+    providers.sort();
+
+    Ok(providers)
+  }
+}
+
+impl Resolve<ListDockerRegistries, User> for State {
+  async fn resolve(
+    &self,
+    ListDockerRegistries { target }: ListDockerRegistries,
+    _: User,
+  ) -> anyhow::Result<ListDockerRegistriesResponse> {
+    let mut registries = core_config().docker_registries.clone();
+
+    if let Some(target) = target {
+      match target {
+        ResourceTarget::Server(id) => {
+          merge_docker_registries_for_server(&mut registries, &id)
+            .await?;
+        }
+        ResourceTarget::Builder(id) => {
+          match resource::get::<Builder>(&id).await?.config {
+            BuilderConfig::Server(config) => {
+              merge_docker_registries_for_server(
+                &mut registries,
+                &config.server_id,
+              )
+              .await?;
+            }
+            BuilderConfig::Aws(config) => {
+              merge_docker_registries(
+                &mut registries,
+                config.docker_registries,
+              );
+            }
+          }
+        }
+        _ => {
+          return Err(anyhow!("target must be `Server` or `Builder`"))
+        }
+      }
+    }
+
+    registries.sort();
+
+    Ok(registries)
+  }
+}
+
+async fn merge_git_providers_for_server(
+  providers: &mut Vec<GitProvider>,
+  server_id: &str,
+) -> anyhow::Result<()> {
+  let server = resource::get::<Server>(server_id).await?;
+  let more = periphery_client(&server)?
+    .request(periphery_client::api::ListGitProviders {})
+    .await
+    .with_context(|| {
+      format!(
+        "failed to get git providers from server {}",
+        server.name
+      )
+    })?;
+  merge_git_providers(providers, more);
+  Ok(())
+}
+
+fn merge_git_providers(
+  providers: &mut Vec<GitProvider>,
+  more: Vec<GitProvider>,
+) {
+  for incoming_provider in more {
+    if let Some(provider) = providers
+      .iter_mut()
+      .find(|provider| provider.domain == incoming_provider.domain)
+    {
+      for account in incoming_provider.accounts {
+        if !provider.accounts.contains(&account) {
+          provider.accounts.push(account);
+        }
+      }
+    } else {
+      providers.push(incoming_provider);
+    }
+  }
+}
+
+async fn merge_docker_registries_for_server(
+  registries: &mut Vec<DockerRegistry>,
+  server_id: &str,
+) -> anyhow::Result<()> {
+  let server = resource::get::<Server>(server_id).await?;
+  let more = periphery_client(&server)?
+    .request(periphery_client::api::ListDockerRegistries {})
+    .await
+    .with_context(|| {
+      format!(
+        "failed to get docker registries from server {}",
+        server.name
+      )
+    })?;
+  merge_docker_registries(registries, more);
+  Ok(())
+}
+
+fn merge_docker_registries(
+  registries: &mut Vec<DockerRegistry>,
+  more: Vec<DockerRegistry>,
+) {
+  for incoming_registry in more {
+    if let Some(registry) = registries
+      .iter_mut()
+      .find(|registry| registry.domain == incoming_registry.domain)
+    {
+      for account in incoming_registry.accounts {
+        if !registry.accounts.contains(&account) {
+          registry.accounts.push(account);
+        }
+      }
+    } else {
+      registries.push(incoming_registry);
+    }
   }
 }

bin/core/src/api/read/permission.rs

@@ -44,7 +44,7 @@ impl Resolve<GetPermissionLevel, User> for State {
       return Ok(PermissionLevel::Write);
     }
     let (variant, id) = target.extract_variant_id();
-    get_user_permission_on_resource(&user.id, variant, id).await
+    get_user_permission_on_resource(&user, variant, id).await
   }
 }
 

bin/core/src/api/read/procedure.rs

@@ -1,11 +1,6 @@
 use anyhow::Context;
 use monitor_client::{
-  api::read::{
-    GetProcedure, GetProcedureActionState,
-    GetProcedureActionStateResponse, GetProcedureResponse,
-    GetProceduresSummary, GetProceduresSummaryResponse,
-    ListProcedures, ListProceduresResponse,
-  },
+  api::read::*,
   entities::{
     permission::PermissionLevel,
     procedure::{Procedure, ProcedureState},
@@ -44,6 +39,16 @@ impl Resolve<ListProcedures, User> for State {
   }
 }
 
+impl Resolve<ListFullProcedures, User> for State {
+  async fn resolve(
+    &self,
+    ListFullProcedures { query }: ListFullProcedures,
+    user: User,
+  ) -> anyhow::Result<ListFullProceduresResponse> {
+    resource::list_full_for_user::<Procedure>(query, &user).await
+  }
+}
+
 impl Resolve<GetProceduresSummary, User> for State {
   async fn resolve(
     &self,

bin/core/src/api/read/repo.rs

@@ -2,6 +2,7 @@ use anyhow::Context;
 use monitor_client::{
   api::read::*,
   entities::{
+    config::core::CoreConfig,
     permission::PermissionLevel,
     repo::{Repo, RepoActionState, RepoListItem, RepoState},
     user::User,
@@ -10,8 +11,9 @@ use monitor_client::{
 use resolver_api::Resolve;
 
 use crate::{
+  config::core_config,
   resource,
-  state::{action_states, repo_state_cache, State},
+  state::{action_states, github_client, repo_state_cache, State},
 };
 
 impl Resolve<GetRepo, User> for State {
@@ -39,6 +41,16 @@ impl Resolve<ListRepos, User> for State {
   }
 }
 
+impl Resolve<ListFullRepos, User> for State {
+  async fn resolve(
+    &self,
+    ListFullRepos { query }: ListFullRepos,
+    user: User,
+  ) -> anyhow::Result<ListFullReposResponse> {
+    resource::list_full_for_user::<Repo>(query, &user).await
+  }
+}
+
 impl Resolve<GetRepoActionState, User> for State {
   async fn resolve(
     &self,
@@ -108,3 +120,88 @@ impl Resolve<GetReposSummary, User> for State {
     Ok(res)
   }
 }
+
+impl Resolve<GetRepoWebhooksEnabled, User> for State {
+  async fn resolve(
+    &self,
+    GetRepoWebhooksEnabled { repo }: GetRepoWebhooksEnabled,
+    user: User,
+  ) -> anyhow::Result<GetRepoWebhooksEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+      });
+    };
+
+    let repo = resource::get_check_permissions::<Repo>(
+      &repo,
+      &user,
+      PermissionLevel::Read,
+    )
+    .await?;
+
+    if repo.config.git_provider != "github.com"
+      || repo.config.repo.is_empty()
+    {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+      });
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetRepoWebhooksEnabledResponse {
+        managed: false,
+        clone_enabled: false,
+        pull_enabled: false,
+      });
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let clone_url =
+      format!("{host}/listener/github/repo/{}/clone", repo.id);
+    let pull_url =
+      format!("{host}/listener/github/repo/{}/pull", repo.id);
+
+    let mut clone_enabled = false;
+    let mut pull_enabled = false;
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == clone_url {
+        clone_enabled = true
+      }
+      if webhook.active && webhook.config.url == pull_url {
+        pull_enabled = true
+      }
+    }
+
+    Ok(GetRepoWebhooksEnabledResponse {
+      managed: true,
+      clone_enabled,
+      pull_enabled,
+    })
+  }
+}

bin/core/src/api/read/server.rs

@@ -1,5 +1,5 @@
 use std::{
-  collections::{HashMap, HashSet},
+  collections::HashMap,
   sync::{Arc, OnceLock},
 };
 
@@ -23,12 +23,11 @@ use mungos::{
   find::find_collect,
   mongodb::{bson::doc, options::FindOptions},
 };
-use periphery_client::api::{self, GetAccountsResponse};
+use periphery_client::api as periphery;
 use resolver_api::{Resolve, ResolveToString};
 use tokio::sync::Mutex;
 
 use crate::{
-  config::core_config,
   helpers::periphery_client,
   resource,
   state::{action_states, db_client, server_status_cache, State},
@@ -108,6 +107,16 @@ impl Resolve<ListServers, User> for State {
   }
 }
 
+impl Resolve<ListFullServers, User> for State {
+  async fn resolve(
+    &self,
+    ListFullServers { query }: ListFullServers,
+    user: User,
+  ) -> anyhow::Result<ListFullServersResponse> {
+    resource::list_full_for_user::<Server>(query, &user).await
+  }
+}
+
 impl Resolve<GetServerState, User> for State {
   async fn resolve(
     &self,
@@ -182,7 +191,7 @@ impl ResolveToString<GetSystemInformation, User> for State {
       }
       _ => {
         let stats = periphery_client(&server)?
-          .request(api::stats::GetSystemInformation {})
+          .request(periphery::stats::GetSystemInformation {})
           .await?;
         let res = serde_json::to_string(&stats)?;
         lock.insert(
@@ -249,7 +258,7 @@ impl ResolveToString<GetSystemProcesses, User> for State {
       }
       _ => {
         let stats = periphery_client(&server)?
-          .request(api::stats::GetSystemProcesses {})
+          .request(periphery::stats::GetSystemProcesses {})
           .await?;
         let res = serde_json::to_string(&stats)?;
         lock.insert(
@@ -332,7 +341,7 @@ impl Resolve<GetDockerImages, User> for State {
     )
     .await?;
     periphery_client(&server)?
-      .request(api::build::GetImageList {})
+      .request(periphery::build::GetImageList {})
       .await
   }
 }
@@ -350,7 +359,7 @@ impl Resolve<GetDockerNetworks, User> for State {
     )
     .await?;
     periphery_client(&server)?
-      .request(api::network::GetNetworkList {})
+      .request(periphery::network::GetNetworkList {})
       .await
   }
 }
@@ -368,67 +377,7 @@ impl Resolve<GetDockerContainers, User> for State {
     )
     .await?;
     periphery_client(&server)?
-      .request(api::container::GetContainerList {})
+      .request(periphery::container::GetContainerList {})
       .await
   }
 }
-
-impl Resolve<GetAvailableAccounts, User> for State {
-  async fn resolve(
-    &self,
-    GetAvailableAccounts { server }: GetAvailableAccounts,
-    user: User,
-  ) -> anyhow::Result<GetAvailableAccountsResponse> {
-    let server = resource::get_check_permissions::<Server>(
-      &server,
-      &user,
-      PermissionLevel::Read,
-    )
-    .await?;
-
-    let GetAccountsResponse { github, docker } =
-      periphery_client(&server)?
-        .request(api::GetAccounts {})
-        .await
-        .context("failed to get accounts from periphery")?;
-
-    let mut github_set = HashSet::<String>::new();
-
-    github_set.extend(core_config().github_accounts.keys().cloned());
-    github_set.extend(github);
-
-    let mut github = github_set.into_iter().collect::<Vec<_>>();
-    github.sort();
-
-    let mut docker_set = HashSet::<String>::new();
-
-    docker_set.extend(core_config().docker_accounts.keys().cloned());
-    docker_set.extend(docker);
-
-    let mut docker = docker_set.into_iter().collect::<Vec<_>>();
-    docker.sort();
-
-    let res = GetAvailableAccountsResponse { github, docker };
-    Ok(res)
-  }
-}
-
-impl Resolve<GetAvailableSecrets, User> for State {
-  async fn resolve(
-    &self,
-    GetAvailableSecrets { server }: GetAvailableSecrets,
-    user: User,
-  ) -> anyhow::Result<GetAvailableSecretsResponse> {
-    let server = resource::get_check_permissions::<Server>(
-      &server,
-      &user,
-      PermissionLevel::Read,
-    )
-    .await?;
-    let secrets = periphery_client(&server)?
-      .request(api::GetSecrets {})
-      .await
-      .context("failed to get accounts from periphery")?;
-    Ok(secrets)
-  }
-}

bin/core/src/api/read/server_template.rs

@@ -1,22 +1,19 @@
-use std::str::FromStr;
-
 use anyhow::Context;
+use mongo_indexed::Document;
 use monitor_client::{
-  api::read::{
-    GetServerTemplate, GetServerTemplateResponse,
-    GetServerTemplatesSummary, GetServerTemplatesSummaryResponse,
-    ListServerTemplates, ListServerTemplatesResponse,
-  },
+  api::read::*,
   entities::{
     permission::PermissionLevel, server_template::ServerTemplate,
     update::ResourceTargetVariant, user::User,
   },
 };
-use mungos::mongodb::bson::{doc, oid::ObjectId};
+use mungos::mongodb::bson::doc;
 use resolver_api::Resolve;
 
 use crate::{
-  helpers::query::get_resource_ids_for_non_admin, resource, state::{db_client, State}
+  helpers::query::get_resource_ids_for_user,
+  resource,
+  state::{db_client, State},
 };
 
 impl Resolve<GetServerTemplate, User> for State {
@@ -44,32 +41,37 @@ impl Resolve<ListServerTemplates, User> for State {
   }
 }
 
+impl Resolve<ListFullServerTemplates, User> for State {
+  async fn resolve(
+    &self,
+    ListFullServerTemplates { query }: ListFullServerTemplates,
+    user: User,
+  ) -> anyhow::Result<ListFullServerTemplatesResponse> {
+    resource::list_full_for_user::<ServerTemplate>(query, &user).await
+  }
+}
+
 impl Resolve<GetServerTemplatesSummary, User> for State {
   async fn resolve(
     &self,
     GetServerTemplatesSummary {}: GetServerTemplatesSummary,
     user: User,
   ) -> anyhow::Result<GetServerTemplatesSummaryResponse> {
-    let query = if user.admin {
-      None
-    } else {
-      let ids = get_resource_ids_for_non_admin(
-        &user.id,
-        ResourceTargetVariant::ServerTemplate,
-      )
-      .await?
-      .into_iter()
-      .flat_map(|id| ObjectId::from_str(&id))
-      .collect::<Vec<_>>();
-      let query = doc! {
+    let query = match get_resource_ids_for_user(
+      &user,
+      ResourceTargetVariant::ServerTemplate,
+    )
+    .await?
+    {
+      Some(ids) => doc! {
         "_id": { "$in": ids }
-      };
-      Some(query)
+      },
+      None => Document::new(),
     };
     let total = db_client()
       .await
       .server_templates
-      .count_documents(query, None)
+      .count_documents(query)
       .await
       .context("failed to count all server template documents")?;
     let res = GetServerTemplatesSummaryResponse {

bin/core/src/api/read/sync.rs

@@ -0,0 +1,228 @@
+use anyhow::Context;
+use monitor_client::{
+  api::read::*,
+  entities::{
+    config::core::CoreConfig,
+    permission::PermissionLevel,
+    sync::{
+      PendingSyncUpdatesData, ResourceSync, ResourceSyncActionState,
+      ResourceSyncListItem, ResourceSyncState,
+    },
+    user::User,
+  },
+};
+use resolver_api::Resolve;
+
+use crate::{
+  config::core_config,
+  resource,
+  state::{
+    action_states, github_client, resource_sync_state_cache, State,
+  },
+};
+
+impl Resolve<GetResourceSync, User> for State {
+  async fn resolve(
+    &self,
+    GetResourceSync { sync }: GetResourceSync,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    resource::get_check_permissions::<ResourceSync>(
+      &sync,
+      &user,
+      PermissionLevel::Read,
+    )
+    .await
+  }
+}
+
+impl Resolve<ListResourceSyncs, User> for State {
+  async fn resolve(
+    &self,
+    ListResourceSyncs { query }: ListResourceSyncs,
+    user: User,
+  ) -> anyhow::Result<Vec<ResourceSyncListItem>> {
+    resource::list_for_user::<ResourceSync>(query, &user).await
+  }
+}
+
+impl Resolve<ListFullResourceSyncs, User> for State {
+  async fn resolve(
+    &self,
+    ListFullResourceSyncs { query }: ListFullResourceSyncs,
+    user: User,
+  ) -> anyhow::Result<ListFullResourceSyncsResponse> {
+    resource::list_full_for_user::<ResourceSync>(query, &user).await
+  }
+}
+
+impl Resolve<GetResourceSyncActionState, User> for State {
+  async fn resolve(
+    &self,
+    GetResourceSyncActionState { sync }: GetResourceSyncActionState,
+    user: User,
+  ) -> anyhow::Result<ResourceSyncActionState> {
+    let sync = resource::get_check_permissions::<ResourceSync>(
+      &sync,
+      &user,
+      PermissionLevel::Read,
+    )
+    .await?;
+    let action_state = action_states()
+      .resource_sync
+      .get(&sync.id)
+      .await
+      .unwrap_or_default()
+      .get()?;
+    Ok(action_state)
+  }
+}
+
+impl Resolve<GetResourceSyncsSummary, User> for State {
+  async fn resolve(
+    &self,
+    GetResourceSyncsSummary {}: GetResourceSyncsSummary,
+    user: User,
+  ) -> anyhow::Result<GetResourceSyncsSummaryResponse> {
+    let resource_syncs =
+      resource::list_full_for_user::<ResourceSync>(
+        Default::default(),
+        &user,
+      )
+      .await
+      .context("failed to get resource_syncs from db")?;
+
+    let mut res = GetResourceSyncsSummaryResponse::default();
+
+    let cache = resource_sync_state_cache();
+    let action_states = action_states();
+
+    for resource_sync in resource_syncs {
+      res.total += 1;
+
+      match resource_sync.info.pending.data {
+        PendingSyncUpdatesData::Ok(data) => {
+          if !data.no_updates() {
+            res.pending += 1;
+            continue;
+          }
+        }
+        PendingSyncUpdatesData::Err(_) => {
+          res.failed += 1;
+          continue;
+        }
+      }
+
+      match (
+        cache.get(&resource_sync.id).await.unwrap_or_default(),
+        action_states
+          .resource_sync
+          .get(&resource_sync.id)
+          .await
+          .unwrap_or_default()
+          .get()?,
+      ) {
+        (_, action_states) if action_states.syncing => {
+          res.syncing += 1;
+        }
+        (ResourceSyncState::Ok, _) => res.ok += 1,
+        (ResourceSyncState::Failed, _) => res.failed += 1,
+        (ResourceSyncState::Unknown, _) => res.unknown += 1,
+        // will never come off the cache in the building state, since that comes from action states
+        (ResourceSyncState::Syncing, _) => {
+          unreachable!()
+        }
+        (ResourceSyncState::Pending, _) => {
+          unreachable!()
+        }
+      }
+    }
+
+    Ok(res)
+  }
+}
+
+impl Resolve<GetSyncWebhooksEnabled, User> for State {
+  async fn resolve(
+    &self,
+    GetSyncWebhooksEnabled { sync }: GetSyncWebhooksEnabled,
+    user: User,
+  ) -> anyhow::Result<GetSyncWebhooksEnabledResponse> {
+    let Some(github) = github_client() else {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    };
+
+    let sync = resource::get_check_permissions::<ResourceSync>(
+      &sync,
+      &user,
+      PermissionLevel::Read,
+    )
+    .await?;
+
+    if sync.config.git_provider != "github.com"
+      || sync.config.repo.is_empty()
+    {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Ok(GetSyncWebhooksEnabledResponse {
+        managed: false,
+        refresh_enabled: false,
+        sync_enabled: false,
+      });
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let refresh_url =
+      format!("{host}/listener/github/sync/{}/refresh", sync.id);
+    let sync_url =
+      format!("{host}/listener/github/sync/{}/sync", sync.id);
+
+    let mut refresh_enabled = false;
+    let mut sync_enabled = false;
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == refresh_url {
+        refresh_enabled = true
+      }
+      if webhook.active && webhook.config.url == sync_url {
+        sync_enabled = true
+      }
+    }
+
+    Ok(GetSyncWebhooksEnabledResponse {
+      managed: true,
+      refresh_enabled,
+      sync_enabled,
+    })
+  }
+}

bin/core/src/api/read/tag.rs

@@ -1,9 +1,10 @@
 use anyhow::Context;
+use mongo_indexed::doc;
 use monitor_client::{
   api::read::{GetTag, ListTags},
   entities::{tag::Tag, user::User},
 };
-use mungos::find::find_collect;
+use mungos::{find::find_collect, mongodb::options::FindOptions};
 use resolver_api::Resolve;
 
 use crate::{
@@ -27,8 +28,12 @@ impl Resolve<ListTags, User> for State {
     ListTags { query }: ListTags,
     _: User,
   ) -> anyhow::Result<Vec<Tag>> {
-    find_collect(&db_client().await.tags, query, None)
-      .await
-      .context("failed to get tags from db")
+    find_collect(
+      &db_client().await.tags,
+      query,
+      FindOptions::builder().sort(doc! { "name": 1 }).build(),
+    )
+    .await
+    .context("failed to get tags from db")
   }
 }

bin/core/src/api/read/toml.rs

@@ -14,13 +14,18 @@ use monitor_client::{
     alerter::Alerter,
     build::Build,
     builder::{Builder, BuilderConfig},
-    deployment::{Deployment, DeploymentImage},
+    deployment::{
+      conversions_to_string, term_signal_labels_to_string,
+      Deployment, DeploymentImage,
+    },
+    environment_vars_to_string,
     permission::{PermissionLevel, UserTarget},
     procedure::Procedure,
     repo::Repo,
-    resource::Resource,
+    resource::{Resource, ResourceQuery},
     server::Server,
     server_template::ServerTemplate,
+    sync::ResourceSync,
     toml::{
       PermissionToml, ResourceToml, ResourcesToml, UserGroupToml,
     },
@@ -29,43 +34,55 @@ use monitor_client::{
   },
 };
 use mungos::find::find_collect;
+use ordered_hash_map::OrderedHashMap;
+use partial_derive2::PartialDiff;
 use resolver_api::Resolve;
+use serde_json::Value;
 
 use crate::{
   helpers::query::get_user_user_group_ids,
-  resource,
+  resource::{self, MonitorResource},
   state::{db_client, State},
 };
 
 impl Resolve<ExportAllResourcesToToml, User> for State {
   async fn resolve(
     &self,
-    ExportAllResourcesToToml {}: ExportAllResourcesToToml,
+    ExportAllResourcesToToml { tags }: ExportAllResourcesToToml,
     user: User,
   ) -> anyhow::Result<ExportAllResourcesToTomlResponse> {
     let mut targets = Vec::<ResourceTarget>::new();
 
     targets.extend(
-      resource::list_for_user::<Alerter>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Alerter(resource.id)),
+      resource::list_for_user::<Alerter>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Alerter(resource.id)),
     );
     targets.extend(
-      resource::list_for_user::<Builder>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Builder(resource.id)),
+      resource::list_for_user::<Builder>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Builder(resource.id)),
     );
     targets.extend(
-      resource::list_for_user::<Server>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Server(resource.id)),
+      resource::list_for_user::<Server>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Server(resource.id)),
     );
     targets.extend(
       resource::list_for_user::<Deployment>(
-        Default::default(),
+        ResourceQuery::builder().tags(tags.clone()).build(),
         &user,
       )
       .await?
@@ -73,32 +90,50 @@ impl Resolve<ExportAllResourcesToToml, User> for State {
       .map(|resource| ResourceTarget::Deployment(resource.id)),
     );
     targets.extend(
-      resource::list_for_user::<Build>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Build(resource.id)),
+      resource::list_for_user::<Build>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Build(resource.id)),
     );
     targets.extend(
-      resource::list_for_user::<Repo>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Repo(resource.id)),
+      resource::list_for_user::<Repo>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Repo(resource.id)),
     );
     targets.extend(
-      resource::list_for_user::<Procedure>(Default::default(), &user)
-        .await?
-        .into_iter()
-        .map(|resource| ResourceTarget::Procedure(resource.id)),
+      resource::list_for_user::<Procedure>(
+        ResourceQuery::builder().tags(tags.clone()).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::Procedure(resource.id)),
     );
     targets.extend(
       resource::list_for_user::<ServerTemplate>(
-        Default::default(),
+        ResourceQuery::builder().tags(tags.clone()).build(),
         &user,
       )
       .await?
       .into_iter()
       .map(|resource| ResourceTarget::ServerTemplate(resource.id)),
     );
+    targets.extend(
+      resource::list_for_user::<ResourceSync>(
+        ResourceQuery::builder().tags(tags).build(),
+        &user,
+      )
+      .await?
+      .into_iter()
+      .map(|resource| ResourceTarget::ResourceSync(resource.id)),
+    );
 
     let user_groups = if user.admin {
       find_collect(&db_client().await.user_groups, None, None)
@@ -116,6 +151,7 @@ impl Resolve<ExportAllResourcesToToml, User> for State {
         ExportResourcesToToml {
           targets,
           user_groups,
+          include_variables: true,
         },
         user,
       )
@@ -129,6 +165,7 @@ impl Resolve<ExportResourcesToToml, User> for State {
     ExportResourcesToToml {
       targets,
       user_groups,
+      include_variables,
     }: ExportResourcesToToml,
     user: User,
   ) -> anyhow::Result<ExportResourcesToTomlResponse> {
@@ -145,7 +182,20 @@ impl Resolve<ExportResourcesToToml, User> for State {
             PermissionLevel::Read,
           )
           .await?;
-          res.alerters.push(convert_resource(alerter, &names.tags))
+          res
+            .alerters
+            .push(convert_resource::<Alerter>(alerter, &names.tags))
+        }
+        ResourceTarget::ResourceSync(id) => {
+          let sync = resource::get_check_permissions::<ResourceSync>(
+            &id,
+            &user,
+            PermissionLevel::Read,
+          )
+          .await?;
+          res
+            .resource_syncs
+            .push(convert_resource::<ResourceSync>(sync, &names.tags))
         }
         ResourceTarget::ServerTemplate(id) => {
           let template = resource::get_check_permissions::<
@@ -154,9 +204,9 @@ impl Resolve<ExportResourcesToToml, User> for State {
             &id, &user, PermissionLevel::Read
           )
           .await?;
-          res
-            .server_templates
-            .push(convert_resource(template, &names.tags))
+          res.server_templates.push(
+            convert_resource::<ServerTemplate>(template, &names.tags),
+          )
         }
         ResourceTarget::Server(id) => {
           let server = resource::get_check_permissions::<Server>(
@@ -165,7 +215,9 @@ impl Resolve<ExportResourcesToToml, User> for State {
             PermissionLevel::Read,
           )
           .await?;
-          res.servers.push(convert_resource(server, &names.tags))
+          res
+            .servers
+            .push(convert_resource::<Server>(server, &names.tags))
         }
         ResourceTarget::Builder(id) => {
           let mut builder =
@@ -178,10 +230,15 @@ impl Resolve<ExportResourcesToToml, User> for State {
           // replace server id of builder
           if let BuilderConfig::Server(config) = &mut builder.config {
             config.server_id.clone_from(
-              names.servers.get(&id).unwrap_or(&String::new()),
+              names
+                .servers
+                .get(&config.server_id)
+                .unwrap_or(&String::new()),
             )
           }
-          res.builders.push(convert_resource(builder, &names.tags))
+          res
+            .builders
+            .push(convert_resource::<Builder>(builder, &names.tags))
         }
         ResourceTarget::Build(id) => {
           let mut build = resource::get_check_permissions::<Build>(
@@ -197,7 +254,9 @@ impl Resolve<ExportResourcesToToml, User> for State {
               .get(&build.config.builder_id)
               .unwrap_or(&String::new()),
           );
-          res.builds.push(convert_resource(build, &names.tags))
+          res
+            .builds
+            .push(convert_resource::<Build>(build, &names.tags))
         }
         ResourceTarget::Deployment(id) => {
           let mut deployment = resource::get_check_permissions::<
@@ -221,9 +280,10 @@ impl Resolve<ExportResourcesToToml, User> for State {
               names.builds.get(build_id).unwrap_or(&String::new()),
             );
           }
-          res
-            .deployments
-            .push(convert_resource(deployment, &names.tags))
+          res.deployments.push(convert_resource::<Deployment>(
+            deployment,
+            &names.tags,
+          ))
         }
         ResourceTarget::Repo(id) => {
           let mut repo = resource::get_check_permissions::<Repo>(
@@ -239,7 +299,7 @@ impl Resolve<ExportResourcesToToml, User> for State {
               .get(&repo.config.server_id)
               .unwrap_or(&String::new()),
           );
-          res.repos.push(convert_resource(repo, &names.tags))
+          res.repos.push(convert_resource::<Repo>(repo, &names.tags))
         }
         ResourceTarget::Procedure(id) => {
           add_procedure(&id, &mut res, &user, &names)
@@ -252,11 +312,18 @@ impl Resolve<ExportResourcesToToml, User> for State {
       };
     }
 
-    add_user_groups(user_groups, &mut res, &user)
+    add_user_groups(user_groups, &mut res, &names, &user)
       .await
       .context("failed to add user groups")?;
 
-    let toml = toml::to_string(&res)
+    if include_variables {
+      res.variables =
+        find_collect(&db_client().await.variables, None, None)
+          .await
+          .context("failed to get variables from db")?;
+    }
+
+    let toml = serialize_resources_toml(&res)
       .context("failed to serialize resources to toml")?;
 
     Ok(ExportResourcesToTomlResponse { toml })
@@ -275,67 +342,76 @@ async fn add_procedure(
     PermissionLevel::Read,
   )
   .await?;
-  for execution in &mut procedure.config.executions {
-    match &mut execution.execution {
-      Execution::RunProcedure(exec) => exec.procedure.clone_from(
-        names
-          .procedures
-          .get(&exec.procedure)
-          .unwrap_or(&String::new()),
-      ),
-      Execution::RunBuild(exec) => exec.build.clone_from(
-        names.builds.get(&exec.build).unwrap_or(&String::new()),
-      ),
-      Execution::Deploy(exec) => exec.deployment.clone_from(
-        names
-          .deployments
-          .get(&exec.deployment)
-          .unwrap_or(&String::new()),
-      ),
-      Execution::StartContainer(exec) => exec.deployment.clone_from(
-        names
-          .deployments
-          .get(&exec.deployment)
-          .unwrap_or(&String::new()),
-      ),
-      Execution::StopContainer(exec) => exec.deployment.clone_from(
-        names
-          .deployments
-          .get(&exec.deployment)
-          .unwrap_or(&String::new()),
-      ),
-      Execution::RemoveContainer(exec) => exec.deployment.clone_from(
-        names
-          .deployments
-          .get(&exec.deployment)
-          .unwrap_or(&String::new()),
-      ),
-      Execution::CloneRepo(exec) => exec.repo.clone_from(
-        names.repos.get(&exec.repo).unwrap_or(&String::new()),
-      ),
-      Execution::PullRepo(exec) => exec.repo.clone_from(
-        names.repos.get(&exec.repo).unwrap_or(&String::new()),
-      ),
-      Execution::StopAllContainers(exec) => exec.server.clone_from(
-        names.servers.get(&exec.server).unwrap_or(&String::new()),
-      ),
-      Execution::PruneDockerNetworks(exec) => exec.server.clone_from(
-        names.servers.get(&exec.server).unwrap_or(&String::new()),
-      ),
-      Execution::PruneDockerImages(exec) => exec.server.clone_from(
-        names.servers.get(&exec.server).unwrap_or(&String::new()),
-      ),
-      Execution::PruneDockerContainers(exec) => {
-        exec.server.clone_from(
+
+  for stage in &mut procedure.config.stages {
+    for execution in &mut stage.executions {
+      match &mut execution.execution {
+        Execution::RunProcedure(exec) => exec.procedure.clone_from(
+          names
+            .procedures
+            .get(&exec.procedure)
+            .unwrap_or(&String::new()),
+        ),
+        Execution::RunBuild(exec) => exec.build.clone_from(
+          names.builds.get(&exec.build).unwrap_or(&String::new()),
+        ),
+        Execution::Deploy(exec) => exec.deployment.clone_from(
+          names
+            .deployments
+            .get(&exec.deployment)
+            .unwrap_or(&String::new()),
+        ),
+        Execution::StartContainer(exec) => {
+          exec.deployment.clone_from(
+            names
+              .deployments
+              .get(&exec.deployment)
+              .unwrap_or(&String::new()),
+          )
+        }
+        Execution::StopContainer(exec) => exec.deployment.clone_from(
+          names
+            .deployments
+            .get(&exec.deployment)
+            .unwrap_or(&String::new()),
+        ),
+        Execution::RemoveContainer(exec) => {
+          exec.deployment.clone_from(
+            names
+              .deployments
+              .get(&exec.deployment)
+              .unwrap_or(&String::new()),
+          )
+        }
+        Execution::CloneRepo(exec) => exec.repo.clone_from(
+          names.repos.get(&exec.repo).unwrap_or(&String::new()),
+        ),
+        Execution::PullRepo(exec) => exec.repo.clone_from(
+          names.repos.get(&exec.repo).unwrap_or(&String::new()),
+        ),
+        Execution::StopAllContainers(exec) => exec.server.clone_from(
           names.servers.get(&exec.server).unwrap_or(&String::new()),
-        )
+        ),
+        Execution::PruneNetworks(exec) => exec.server.clone_from(
+          names.servers.get(&exec.server).unwrap_or(&String::new()),
+        ),
+        Execution::PruneImages(exec) => exec.server.clone_from(
+          names.servers.get(&exec.server).unwrap_or(&String::new()),
+        ),
+        Execution::PruneContainers(exec) => exec.server.clone_from(
+          names.servers.get(&exec.server).unwrap_or(&String::new()),
+        ),
+        Execution::RunSync(exec) => exec.sync.clone_from(
+          names.syncs.get(&exec.sync).unwrap_or(&String::new()),
+        ),
+        Execution::Sleep(_) | Execution::None(_) => {}
       }
-      Execution::None(_) => continue,
     }
   }
+
   res
     .procedures
-    .push(convert_resource(procedure, &names.tags));
+    .push(convert_resource::<Procedure>(procedure, &names.tags));
   Ok(())
 }
 
@@ -347,6 +423,9 @@ struct ResourceNames {
   repos: HashMap<String, String>,
   deployments: HashMap<String, String>,
   procedures: HashMap<String, String>,
+  syncs: HashMap<String, String>,
+  alerters: HashMap<String, String>,
+  templates: HashMap<String, String>,
 }
 
 impl ResourceNames {
@@ -395,6 +474,24 @@ impl ResourceNames {
         .into_iter()
         .map(|t| (t.id, t.name))
         .collect::<HashMap<_, _>>(),
+      syncs: find_collect(&db.resource_syncs, None, None)
+        .await
+        .context("failed to get all resource syncs")?
+        .into_iter()
+        .map(|t| (t.id, t.name))
+        .collect::<HashMap<_, _>>(),
+      alerters: find_collect(&db.alerters, None, None)
+        .await
+        .context("failed to get all alerters")?
+        .into_iter()
+        .map(|t| (t.id, t.name))
+        .collect::<HashMap<_, _>>(),
+      templates: find_collect(&db.server_templates, None, None)
+        .await
+        .context("failed to get all server templates")?
+        .into_iter()
+        .map(|t| (t.id, t.name))
+        .collect::<HashMap<_, _>>(),
     })
   }
 }
@@ -402,6 +499,7 @@ impl ResourceNames {
 async fn add_user_groups(
   user_groups: Vec<String>,
   res: &mut ResourcesToml,
+  names: &ResourceNames,
   user: &User,
 ) -> anyhow::Result<()> {
   let db = db_client().await;
@@ -429,9 +527,43 @@ async fn add_user_groups(
       )
       .await?
       .into_iter()
-      .map(|permission| PermissionToml {
-        target: permission.resource_target,
-        level: permission.level,
+      .map(|mut permission| {
+        match &mut permission.resource_target {
+          ResourceTarget::Build(id) => {
+            *id = names.builds.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Builder(id) => {
+            *id = names.builders.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Deployment(id) => {
+            *id =
+              names.deployments.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Server(id) => {
+            *id = names.servers.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Repo(id) => {
+            *id = names.repos.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Alerter(id) => {
+            *id = names.alerters.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::Procedure(id) => {
+            *id =
+              names.procedures.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::ServerTemplate(id) => {
+            *id = names.templates.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::ResourceSync(id) => {
+            *id = names.syncs.get(id).cloned().unwrap_or_default()
+          }
+          ResourceTarget::System(_) => {}
+        }
+        PermissionToml {
+          target: permission.resource_target,
+          level: permission.level,
+        }
       })
       .collect();
     res.user_groups.push(UserGroupToml {
@@ -441,19 +573,20 @@ async fn add_user_groups(
         .into_iter()
         .filter_map(|user_id| usernames.get(&user_id).cloned())
         .collect(),
+      all: ug.all,
       permissions,
     });
   }
   Ok(())
 }
 
-fn convert_resource<Config, Info: Default, PartialConfig>(
-  resource: Resource<Config, Info>,
+fn convert_resource<R: MonitorResource>(
+  resource: Resource<R::Config, R::Info>,
   tag_names: &HashMap<String, String>,
-) -> ResourceToml<PartialConfig>
-where
-  Config: Into<PartialConfig>,
-{
+) -> ResourceToml<R::PartialConfig> {
+  // This makes sure all non-necessary (defaulted) fields don't make it into final toml
+  let partial: R::PartialConfig = resource.config.into();
+  let config = R::Config::default().minimize_partial(partial);
   ResourceToml {
     name: resource.name,
     tags: resource
@@ -462,6 +595,248 @@ where
       .filter_map(|t| tag_names.get(t).cloned())
       .collect(),
     description: resource.description,
-    config: resource.config.into(),
+    deploy: false,
+    after: Default::default(),
+    config,
   }
 }
+
+fn serialize_resources_toml(
+  resources: &ResourcesToml,
+) -> anyhow::Result<String> {
+  let mut res = String::new();
+
+  let options = toml_pretty::Options::default()
+    .tab("  ")
+    .skip_empty_string(true)
+    .max_inline_array_length(30);
+
+  for server in &resources.servers {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[server]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&server, options)
+        .context("failed to serialize servers to toml")?,
+    );
+  }
+
+  for deployment in &resources.deployments {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[deployment]]\n");
+    let mut parsed: OrderedHashMap<String, Value> =
+      serde_json::from_str(&serde_json::to_string(&deployment)?)?;
+    let config = parsed
+      .get_mut("config")
+      .context("deployment has no config?")?
+      .as_object_mut()
+      .context("config is not object?")?;
+    if let Some(DeploymentImage::Build { version, .. }) =
+      &deployment.config.image
+    {
+      let image = config
+        .get_mut("image")
+        .context("deployment has no image")?
+        .get_mut("params")
+        .context("deployment image has no params")?
+        .as_object_mut()
+        .context("deployment image params is not object")?;
+      if version.is_none() {
+        image.remove("version");
+      } else {
+        image.insert(
+          "version".to_string(),
+          Value::String(version.to_string()),
+        );
+      }
+    }
+    if let Some(term_signal_labels) =
+      &deployment.config.term_signal_labels
+    {
+      config.insert(
+        "term_signal_labels".to_string(),
+        Value::String(term_signal_labels_to_string(
+          term_signal_labels,
+        )),
+      );
+    }
+    if let Some(ports) = &deployment.config.ports {
+      config.insert(
+        "ports".to_string(),
+        Value::String(conversions_to_string(ports)),
+      );
+    }
+    if let Some(volumes) = &deployment.config.volumes {
+      config.insert(
+        "volumes".to_string(),
+        Value::String(conversions_to_string(volumes)),
+      );
+    }
+    if let Some(environment) = &deployment.config.environment {
+      config.insert(
+        "environment".to_string(),
+        Value::String(environment_vars_to_string(environment)),
+      );
+    }
+    if let Some(labels) = &deployment.config.labels {
+      config.insert(
+        "labels".to_string(),
+        Value::String(environment_vars_to_string(labels)),
+      );
+    }
+    res.push_str(
+      &toml_pretty::to_string(&parsed, options)
+        .context("failed to serialize deployments to toml")?,
+    );
+  }
+
+  for build in &resources.builds {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    let mut parsed: OrderedHashMap<String, Value> =
+      serde_json::from_str(&serde_json::to_string(&build)?)?;
+    let config = parsed
+      .get_mut("config")
+      .context("build has no config?")?
+      .as_object_mut()
+      .context("config is not object?")?;
+    if let Some(version) = &build.config.version {
+      config.insert(
+        "version".to_string(),
+        Value::String(version.to_string()),
+      );
+    }
+    if let Some(build_args) = &build.config.build_args {
+      config.insert(
+        "build_args".to_string(),
+        Value::String(environment_vars_to_string(build_args)),
+      );
+    }
+    if let Some(labels) = &build.config.labels {
+      config.insert(
+        "labels".to_string(),
+        Value::String(environment_vars_to_string(labels)),
+      );
+    }
+    res.push_str("[[build]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&parsed, options)
+        .context("failed to serialize builds to toml")?,
+    );
+  }
+
+  for repo in &resources.repos {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[repo]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&repo, options)
+        .context("failed to serialize repos to toml")?,
+    );
+  }
+
+  for procedure in &resources.procedures {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    let mut parsed: OrderedHashMap<String, Value> =
+      serde_json::from_str(&serde_json::to_string(&procedure)?)?;
+    let config = parsed
+      .get_mut("config")
+      .context("procedure has no config?")?
+      .as_object_mut()
+      .context("config is not object?")?;
+
+    let stages = config
+      .remove("stages")
+      .context("procedure config has no stages")?;
+    let stages = stages.as_array().context("stages is not array")?;
+
+    res.push_str("[[procedure]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&parsed, options)
+        .context("failed to serialize procedures to toml")?,
+    );
+
+    for stage in stages {
+      res.push_str("\n\n[[procedure.config.stage]]\n");
+      res.push_str(
+        &toml_pretty::to_string(stage, options)
+          .context("failed to serialize procedures to toml")?,
+      );
+    }
+  }
+
+  for alerter in &resources.alerters {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[alerter]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&alerter, options)
+        .context("failed to serialize alerters to toml")?,
+    );
+  }
+
+  for builder in &resources.builders {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[builder]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&builder, options)
+        .context("failed to serialize builders to toml")?,
+    );
+  }
+
+  for server_template in &resources.server_templates {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[server_template]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&server_template, options)
+        .context("failed to serialize server_templates to toml")?,
+    );
+  }
+
+  for resource_sync in &resources.resource_syncs {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[resource_sync]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&resource_sync, options)
+        .context("failed to serialize resource_syncs to toml")?,
+    );
+  }
+
+  for variable in &resources.variables {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[variable]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&variable, options)
+        .context("failed to serialize variables to toml")?,
+    );
+  }
+
+  for user_group in &resources.user_groups {
+    if !res.is_empty() {
+      res.push_str("\n\n##\n\n");
+    }
+    res.push_str("[[user_group]]\n");
+    res.push_str(
+      &toml_pretty::to_string(&user_group, options)
+        .context("failed to serialize user_groups to toml")?,
+    );
+  }
+
+  Ok(res)
+}

bin/core/src/api/read/update.rs

@@ -13,6 +13,7 @@ use monitor_client::{
     repo::Repo,
     server::Server,
     server_template::ServerTemplate,
+    sync::ResourceSync,
     update::{
       ResourceTarget, ResourceTargetVariant, Update, UpdateListItem,
     },
@@ -28,7 +29,7 @@ use resolver_api::Resolve;
 
 use crate::{
   config::core_config,
-  helpers::query::get_resource_ids_for_non_admin,
+  helpers::query::get_resource_ids_for_user,
   resource,
   state::{db_client, State},
 };
@@ -44,58 +45,124 @@ impl Resolve<ListUpdates, User> for State {
     let query = if user.admin || core_config().transparent_mode {
       query
     } else {
-      let server_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      let server_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Server,
       )
-      .await?;
-      let deployment_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Server", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Server" });
+
+      let deployment_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Deployment,
       )
-      .await?;
-      let build_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Deployment", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Deployment" });
+
+      let build_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Build,
       )
-      .await?;
-      let repo_ids = get_resource_ids_for_non_admin(
-        &user.id,
-        ResourceTargetVariant::Repo,
-      )
-      .await?;
-      let procedure_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Build", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Build" });
+
+      let repo_query =
+        get_resource_ids_for_user(&user, ResourceTargetVariant::Repo)
+          .await?
+          .map(|ids| {
+            doc! {
+              "target.type": "Repo", "target.id": { "$in": ids }
+            }
+          })
+          .unwrap_or_else(|| doc! { "target.type": "Repo" });
+
+      let procedure_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Procedure,
       )
-      .await?;
-      let builder_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Procedure", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Procedure" });
+
+      let builder_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Builder,
       )
-      .await?;
-      let alerter_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Builder", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Builder" });
+
+      let alerter_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::Alerter,
       )
-      .await?;
-      let server_template_ids = get_resource_ids_for_non_admin(
-        &user.id,
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "Alerter", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "Alerter" });
+
+      let server_template_query = get_resource_ids_for_user(
+        &user,
         ResourceTargetVariant::ServerTemplate,
       )
-      .await?;
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "ServerTemplate", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "ServerTemplate" });
+
+      let resource_sync_query = get_resource_ids_for_user(
+        &user,
+        ResourceTargetVariant::ResourceSync,
+      )
+      .await?
+      .map(|ids| {
+        doc! {
+          "target.type": "ResourceSync", "target.id": { "$in": ids }
+        }
+      })
+      .unwrap_or_else(|| doc! { "target.type": "ResourceSync" });
 
       let mut query = query.unwrap_or_default();
       query.extend(doc! {
         "$or": [
-          { "target.type": "Server", "target.id": { "$in": &server_ids } },
-          { "target.type": "Deployment", "target.id": { "$in": &deployment_ids } },
-          { "target.type": "Build", "target.id": { "$in": &build_ids } },
-          { "target.type": "Repo", "target.id": { "$in": &repo_ids } },
-          { "target.type": "Procedure", "target.id": { "$in": &procedure_ids } },
-          { "target.type": "Builder", "target.id": { "$in": &builder_ids } },
-          { "target.type": "Alerter", "target.id": { "$in": &alerter_ids } },
-          { "target.type": "ServerTemplate", "target.id": { "$in": &server_template_ids } },
+          server_query,
+          build_query,
+          deployment_query,
+          repo_query,
+          procedure_query,
+          alerter_query,
+          builder_query,
+          server_template_query,
+          resource_sync_query,
         ]
       });
       query.into()
@@ -238,6 +305,14 @@ impl Resolve<GetUpdate, User> for State {
         )
         .await?;
       }
+      ResourceTarget::ResourceSync(id) => {
+        resource::get_check_permissions::<ResourceSync>(
+          id,
+          &user,
+          PermissionLevel::Read,
+        )
+        .await?;
+      }
     }
     Ok(update)
   }

bin/core/src/api/read/user.rs

@@ -1,18 +1,24 @@
 use anyhow::{anyhow, Context};
 use monitor_client::{
   api::read::{
-    GetUsername, GetUsernameResponse, ListApiKeys,
-    ListApiKeysForServiceUser, ListApiKeysForServiceUserResponse,
-    ListApiKeysResponse, ListUsers, ListUsersResponse,
+    FindUser, FindUserResponse, GetUsername, GetUsernameResponse,
+    ListApiKeys, ListApiKeysForServiceUser,
+    ListApiKeysForServiceUserResponse, ListApiKeysResponse,
+    ListUsers, ListUsersResponse,
   },
   entities::user::{User, UserConfig},
 };
 use mungos::{
-  by_id::find_one_by_id, find::find_collect, mongodb::bson::doc,
+  by_id::find_one_by_id,
+  find::find_collect,
+  mongodb::{bson::doc, options::FindOptions},
 };
 use resolver_api::Resolve;
 
-use crate::state::{db_client, State};
+use crate::{
+  helpers::query::get_user,
+  state::{db_client, State},
+};
 
 impl Resolve<GetUsername, User> for State {
   async fn resolve(
@@ -38,6 +44,19 @@ impl Resolve<GetUsername, User> for State {
   }
 }
 
+impl Resolve<FindUser, User> for State {
+  async fn resolve(
+    &self,
+    FindUser { user }: FindUser,
+    admin: User,
+  ) -> anyhow::Result<FindUserResponse> {
+    if !admin.admin {
+      return Err(anyhow!("This method is admin only."));
+    }
+    get_user(&user).await
+  }
+}
+
 impl Resolve<ListUsers, User> for State {
   async fn resolve(
     &self,
@@ -47,10 +66,13 @@ impl Resolve<ListUsers, User> for State {
     if !user.admin {
       return Err(anyhow!("this route is only accessable by admins"));
     }
-    let mut users =
-      find_collect(&db_client().await.users, None, None)
-        .await
-        .context("failed to pull users from db")?;
+    let mut users = find_collect(
+      &db_client().await.users,
+      None,
+      FindOptions::builder().sort(doc! { "username": 1 }).build(),
+    )
+    .await
+    .context("failed to pull users from db")?;
     users.iter_mut().for_each(|user| user.sanitize());
     Ok(users)
   }
@@ -65,7 +87,7 @@ impl Resolve<ListApiKeys, User> for State {
     let api_keys = find_collect(
       &db_client().await.api_keys,
       doc! { "user_id": &user.id },
-      None,
+      FindOptions::builder().sort(doc! { "name": 1 }).build(),
     )
     .await
     .context("failed to query db for api keys")?
@@ -82,22 +104,21 @@ impl Resolve<ListApiKeys, User> for State {
 impl Resolve<ListApiKeysForServiceUser, User> for State {
   async fn resolve(
     &self,
-    ListApiKeysForServiceUser { user_id }: ListApiKeysForServiceUser,
+    ListApiKeysForServiceUser { user }: ListApiKeysForServiceUser,
     admin: User,
   ) -> anyhow::Result<ListApiKeysForServiceUserResponse> {
     if !admin.admin {
       return Err(anyhow!("This method is admin only."));
     }
-    let user = find_one_by_id(&db_client().await.users, &user_id)
-      .await
-      .context("failed to query db for users")?
-      .context("user at id not found")?;
+
+    let user = get_user(&user).await?;
+
     let UserConfig::Service { .. } = user.config else {
       return Err(anyhow!("Given user is not service user"));
     };
     let api_keys = find_collect(
       &db_client().await.api_keys,
-      doc! { "user_id": user_id },
+      doc! { "user_id": &user.id },
       None,
     )
     .await

bin/core/src/api/read/user_group.rs

@@ -10,7 +10,10 @@ use monitor_client::{
 };
 use mungos::{
   find::find_collect,
-  mongodb::bson::{doc, oid::ObjectId, Document},
+  mongodb::{
+    bson::{doc, oid::ObjectId, Document},
+    options::FindOptions,
+  },
 };
 use resolver_api::Resolve;
 
@@ -34,7 +37,7 @@ impl Resolve<GetUserGroup, User> for State {
     db_client()
       .await
       .user_groups
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query db for user groups")?
       .context("no UserGroup found with given name or id")
@@ -51,8 +54,12 @@ impl Resolve<ListUserGroups, User> for State {
     if !user.admin {
       filter.insert("users", &user.id);
     }
-    find_collect(&db_client().await.user_groups, filter, None)
-      .await
-      .context("failed to query db for UserGroups")
+    find_collect(
+      &db_client().await.user_groups,
+      filter,
+      FindOptions::builder().sort(doc! { "name": 1 }).build(),
+    )
+    .await
+    .context("failed to query db for UserGroups")
   }
 }

bin/core/src/api/read/variable.rs

@@ -1,4 +1,5 @@
 use anyhow::Context;
+use mongo_indexed::doc;
 use monitor_client::{
   api::read::{
     GetVariable, GetVariableResponse, ListVariables,
@@ -6,11 +7,10 @@ use monitor_client::{
   },
   entities::user::User,
 };
-use mungos::find::find_collect;
+use mungos::{find::find_collect, mongodb::options::FindOptions};
 use resolver_api::Resolve;
 
 use crate::{
-  config::core_config,
   helpers::query::get_variable,
   state::{db_client, State},
 };
@@ -31,13 +31,12 @@ impl Resolve<ListVariables, User> for State {
     ListVariables {}: ListVariables,
     _: User,
   ) -> anyhow::Result<ListVariablesResponse> {
-    let variables =
-      find_collect(&db_client().await.variables, None, None)
-        .await
-        .context("failed to query db for variables")?;
-    Ok(ListVariablesResponse {
-      variables,
-      secrets: core_config().secrets.keys().cloned().collect(),
-    })
+    find_collect(
+      &db_client().await.variables,
+      None,
+      FindOptions::builder().sort(doc! { "name": 1 }).build(),
+    )
+    .await
+    .context("failed to query db for variables")
   }
 }

bin/core/src/api/user.rs

@@ -0,0 +1,212 @@
+use std::{collections::VecDeque, time::Instant};
+
+use anyhow::{anyhow, Context};
+use axum::{middleware, routing::post, Extension, Json, Router};
+use axum_extra::{headers::ContentType, TypedHeader};
+use mongo_indexed::doc;
+use monitor_client::{
+  api::user::{
+    CreateApiKey, CreateApiKeyResponse, DeleteApiKey,
+    DeleteApiKeyResponse, PushRecentlyViewed,
+    PushRecentlyViewedResponse, SetLastSeenUpdate,
+    SetLastSeenUpdateResponse,
+  },
+  entities::{api_key::ApiKey, monitor_timestamp, user::User},
+};
+use mungos::{by_id::update_one_by_id, mongodb::bson::to_bson};
+use resolver_api::{derive::Resolver, Resolve, Resolver};
+use serde::{Deserialize, Serialize};
+use typeshare::typeshare;
+use uuid::Uuid;
+
+use crate::{
+  auth::{auth_request, random_string},
+  helpers::query::get_user,
+  state::{db_client, State},
+};
+
+#[typeshare]
+#[derive(Serialize, Deserialize, Debug, Clone, Resolver)]
+#[resolver_target(State)]
+#[resolver_args(User)]
+#[serde(tag = "type", content = "params")]
+enum UserRequest {
+  PushRecentlyViewed(PushRecentlyViewed),
+  SetLastSeenUpdate(SetLastSeenUpdate),
+  CreateApiKey(CreateApiKey),
+  DeleteApiKey(DeleteApiKey),
+}
+
+pub fn router() -> Router {
+  Router::new()
+    .route("/", post(handler))
+    .layer(middleware::from_fn(auth_request))
+}
+
+#[instrument(name = "UserHandler", level = "debug", skip(user))]
+async fn handler(
+  Extension(user): Extension<User>,
+  Json(request): Json<UserRequest>,
+) -> serror::Result<(TypedHeader<ContentType>, String)> {
+  let timer = Instant::now();
+  let req_id = Uuid::new_v4();
+  debug!(
+    "/user request {req_id} | user: {} ({})",
+    user.username, user.id
+  );
+  let res =
+    State
+      .resolve_request(request, user)
+      .await
+      .map_err(|e| match e {
+        resolver_api::Error::Serialization(e) => {
+          anyhow!("{e:?}").context("response serialization error")
+        }
+        resolver_api::Error::Inner(e) => e,
+      });
+  if let Err(e) = &res {
+    warn!("/user request {req_id} error: {e:#}");
+  }
+  let elapsed = timer.elapsed();
+  debug!("/user request {req_id} | resolve time: {elapsed:?}");
+  Ok((TypedHeader(ContentType::json()), res?))
+}
+
+const RECENTLY_VIEWED_MAX: usize = 10;
+
+impl Resolve<PushRecentlyViewed, User> for State {
+  #[instrument(
+    name = "PushRecentlyViewed",
+    level = "debug",
+    skip(self, user)
+  )]
+  async fn resolve(
+    &self,
+    PushRecentlyViewed { resource }: PushRecentlyViewed,
+    user: User,
+  ) -> anyhow::Result<PushRecentlyViewedResponse> {
+    let user = get_user(&user.id).await?;
+
+    let (resource_type, id) = resource.extract_variant_id();
+    let update = match user.recents.get(&resource_type) {
+      Some(recents) => {
+        let mut recents = recents
+          .iter()
+          .filter(|_id| !id.eq(*_id))
+          .take(RECENTLY_VIEWED_MAX - 1)
+          .collect::<VecDeque<_>>();
+        recents.push_front(id);
+        doc! { format!("recents.{resource_type}"): to_bson(&recents)? }
+      }
+      None => {
+        doc! { format!("recents.{resource_type}"): [id] }
+      }
+    };
+    update_one_by_id(
+      &db_client().await.users,
+      &user.id,
+      mungos::update::Update::Set(update),
+      None,
+    )
+    .await
+    .with_context(|| {
+      format!("failed to update recents.{resource_type}")
+    })?;
+
+    Ok(PushRecentlyViewedResponse {})
+  }
+}
+
+impl Resolve<SetLastSeenUpdate, User> for State {
+  #[instrument(
+    name = "SetLastSeenUpdate",
+    level = "debug",
+    skip(self, user)
+  )]
+  async fn resolve(
+    &self,
+    SetLastSeenUpdate {}: SetLastSeenUpdate,
+    user: User,
+  ) -> anyhow::Result<SetLastSeenUpdateResponse> {
+    update_one_by_id(
+      &db_client().await.users,
+      &user.id,
+      mungos::update::Update::Set(doc! {
+        "last_update_view": monitor_timestamp()
+      }),
+      None,
+    )
+    .await
+    .context("failed to update user last_update_view")?;
+    Ok(SetLastSeenUpdateResponse {})
+  }
+}
+
+const SECRET_LENGTH: usize = 40;
+const BCRYPT_COST: u32 = 10;
+
+impl Resolve<CreateApiKey, User> for State {
+  #[instrument(
+    name = "CreateApiKey",
+    level = "debug",
+    skip(self, user)
+  )]
+  async fn resolve(
+    &self,
+    CreateApiKey { name, expires }: CreateApiKey,
+    user: User,
+  ) -> anyhow::Result<CreateApiKeyResponse> {
+    let user = get_user(&user.id).await?;
+
+    let key = format!("K-{}", random_string(SECRET_LENGTH));
+    let secret = format!("S-{}", random_string(SECRET_LENGTH));
+    let secret_hash = bcrypt::hash(&secret, BCRYPT_COST)
+      .context("failed at hashing secret string")?;
+
+    let api_key = ApiKey {
+      name,
+      key: key.clone(),
+      secret: secret_hash,
+      user_id: user.id.clone(),
+      created_at: monitor_timestamp(),
+      expires,
+    };
+    db_client()
+      .await
+      .api_keys
+      .insert_one(api_key)
+      .await
+      .context("failed to create api key on db")?;
+    Ok(CreateApiKeyResponse { key, secret })
+  }
+}
+
+impl Resolve<DeleteApiKey, User> for State {
+  #[instrument(
+    name = "DeleteApiKey",
+    level = "debug",
+    skip(self, user)
+  )]
+  async fn resolve(
+    &self,
+    DeleteApiKey { key }: DeleteApiKey,
+    user: User,
+  ) -> anyhow::Result<DeleteApiKeyResponse> {
+    let client = db_client().await;
+    let key = client
+      .api_keys
+      .find_one(doc! { "key": &key })
+      .await
+      .context("failed at db query")?
+      .context("no api key with key found")?;
+    if user.id != key.user_id {
+      return Err(anyhow!("api key does not belong to user"));
+    }
+    client
+      .api_keys
+      .delete_one(doc! { "key": key.key })
+      .await
+      .context("failed to delete api key from db")?;
+    Ok(DeleteApiKeyResponse {})
+  }
+}

bin/core/src/api/write/alerter.rs

@@ -28,13 +28,10 @@ impl Resolve<CopyAlerter, User> for State {
     CopyAlerter { name, id }: CopyAlerter,
     user: User,
   ) -> anyhow::Result<Alerter> {
-    let Alerter {
-      config,
-      ..
-    } = resource::get_check_permissions::<Alerter>(
-      &id,
-      &user,
-      PermissionLevel::Write,
+    let Alerter { config, .. } = resource::get_check_permissions::<
+      Alerter,
+    >(
+      &id, &user, PermissionLevel::Write
     )
     .await?;
     resource::create::<Alerter>(&name, config.into(), &user).await

bin/core/src/api/write/api_key.rs

@@ -1,147 +0,0 @@
-use anyhow::{anyhow, Context};
-use monitor_client::{
-  api::write::*,
-  entities::{
-    api_key::ApiKey,
-    monitor_timestamp,
-    user::{User, UserConfig},
-  },
-};
-use mungos::{by_id::find_one_by_id, mongodb::bson::doc};
-use resolver_api::Resolve;
-
-use crate::{
-  auth::random_string,
-  helpers::query::get_user,
-  state::{db_client, State},
-};
-
-const SECRET_LENGTH: usize = 40;
-const BCRYPT_COST: u32 = 10;
-
-impl Resolve<CreateApiKey, User> for State {
-  #[instrument(
-    name = "CreateApiKey",
-    level = "debug",
-    skip(self, user)
-  )]
-  async fn resolve(
-    &self,
-    CreateApiKey { name, expires }: CreateApiKey,
-    user: User,
-  ) -> anyhow::Result<CreateApiKeyResponse> {
-    let user = get_user(&user.id).await?;
-
-    let key = format!("K-{}", random_string(SECRET_LENGTH));
-    let secret = format!("S-{}", random_string(SECRET_LENGTH));
-    let secret_hash = bcrypt::hash(&secret, BCRYPT_COST)
-      .context("failed at hashing secret string")?;
-
-    let api_key = ApiKey {
-      name,
-      key: key.clone(),
-      secret: secret_hash,
-      user_id: user.id.clone(),
-      created_at: monitor_timestamp(),
-      expires,
-    };
-    db_client()
-      .await
-      .api_keys
-      .insert_one(api_key, None)
-      .await
-      .context("failed to create api key on db")?;
-    Ok(CreateApiKeyResponse { key, secret })
-  }
-}
-
-impl Resolve<DeleteApiKey, User> for State {
-  #[instrument(
-    name = "DeleteApiKey",
-    level = "debug",
-    skip(self, user)
-  )]
-  async fn resolve(
-    &self,
-    DeleteApiKey { key }: DeleteApiKey,
-    user: User,
-  ) -> anyhow::Result<DeleteApiKeyResponse> {
-    let client = db_client().await;
-    let key = client
-      .api_keys
-      .find_one(doc! { "key": &key }, None)
-      .await
-      .context("failed at db query")?
-      .context("no api key with key found")?;
-    if user.id != key.user_id {
-      return Err(anyhow!("api key does not belong to user"));
-    }
-    client
-      .api_keys
-      .delete_one(doc! { "key": key.key }, None)
-      .await
-      .context("failed to delete api key from db")?;
-    Ok(DeleteApiKeyResponse {})
-  }
-}
-
-impl Resolve<CreateApiKeyForServiceUser, User> for State {
-  #[instrument(name = "CreateApiKeyForServiceUser", skip(self, user))]
-  async fn resolve(
-    &self,
-    CreateApiKeyForServiceUser {
-      user_id,
-      name,
-      expires,
-    }: CreateApiKeyForServiceUser,
-    user: User,
-  ) -> anyhow::Result<CreateApiKeyForServiceUserResponse> {
-    if !user.admin {
-      return Err(anyhow!("user not admin"));
-    }
-    let service_user =
-      find_one_by_id(&db_client().await.users, &user_id)
-        .await
-        .context("failed to query db for user")?
-        .context("no user found with id")?;
-    let UserConfig::Service { .. } = &service_user.config else {
-      return Err(anyhow!("user is not service user"));
-    };
-    self
-      .resolve(CreateApiKey { name, expires }, service_user)
-      .await
-  }
-}
-
-impl Resolve<DeleteApiKeyForServiceUser, User> for State {
-  #[instrument(name = "DeleteApiKeyForServiceUser", skip(self, user))]
-  async fn resolve(
-    &self,
-    DeleteApiKeyForServiceUser { key }: DeleteApiKeyForServiceUser,
-    user: User,
-  ) -> anyhow::Result<DeleteApiKeyForServiceUserResponse> {
-    if !user.admin {
-      return Err(anyhow!("user not admin"));
-    }
-    let db = db_client().await;
-    let api_key = db
-      .api_keys
-      .find_one(doc! { "key": &key }, None)
-      .await
-      .context("failed to query db for api key")?
-      .context("did not find matching api key")?;
-    let service_user =
-      find_one_by_id(&db_client().await.users, &api_key.user_id)
-        .await
-        .context("failed to query db for user")?
-        .context("no user found with id")?;
-    let UserConfig::Service { .. } = &service_user.config else {
-      return Err(anyhow!("user is not service user"));
-    };
-    db.api_keys
-      .delete_one(doc! { "key": key }, None)
-      .await
-      .context("failed to delete api key on db")?;
-    Ok(DeleteApiKeyForServiceUserResponse {})
-  }
-}

bin/core/src/api/write/build.rs

@@ -1,10 +1,24 @@
+use anyhow::{anyhow, Context};
 use monitor_client::{
   api::write::*,
-  entities::{build::Build, permission::PermissionLevel, user::User},
+  entities::{
+    build::{Build, PartialBuildConfig},
+    config::core::CoreConfig,
+    permission::PermissionLevel,
+    user::User,
+    NoData,
+  },
+};
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
 };
 use resolver_api::Resolve;
 
-use crate::{resource, state::State};
+use crate::{
+  config::core_config,
+  resource,
+  state::{github_client, State},
+};
 
 impl Resolve<CreateBuild, User> for State {
   #[instrument(name = "CreateBuild", skip(self, user))]
@@ -24,15 +38,13 @@ impl Resolve<CopyBuild, User> for State {
     CopyBuild { name, id }: CopyBuild,
     user: User,
   ) -> anyhow::Result<Build> {
-    let Build {
-      config,
-      ..
-    } = resource::get_check_permissions::<Build>(
-      &id,
-      &user,
-      PermissionLevel::Write,
-    )
-    .await?;
+    let Build { config, .. } =
+      resource::get_check_permissions::<Build>(
+        &id,
+        &user,
+        PermissionLevel::Write,
+      )
+      .await?;
     resource::create::<Build>(&name, config.into(), &user).await
   }
 }
@@ -58,3 +70,181 @@ impl Resolve<UpdateBuild, User> for State {
     resource::update::<Build>(&id, config, &user).await
   }
 }
+
+impl Resolve<CreateBuildWebhook, User> for State {
+  #[instrument(name = "CreateBuildWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateBuildWebhook { build }: CreateBuildWebhook,
+    user: User,
+  ) -> anyhow::Result<CreateBuildWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let build = resource::get_check_permissions::<Build>(
+      &build,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if build.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't create webhook"
+      ));
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !build.config.webhook_enabled {
+      self
+        .resolve(
+          UpdateBuild {
+            id: build.id,
+            config: PartialBuildConfig {
+              webhook_enabled: Some(true),
+              ..Default::default()
+            },
+          },
+          user,
+        )
+        .await
+        .context("failed to update build to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<DeleteBuildWebhook, User> for State {
+  #[instrument(name = "DeleteBuildWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    DeleteBuildWebhook { build }: DeleteBuildWebhook,
+    user: User,
+  ) -> anyhow::Result<DeleteBuildWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let build = resource::get_check_permissions::<Build>(
+      &build,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if build.config.git_provider != "github.com" {
+      return Err(anyhow!(
+        "Can only manage github.com repo webhooks"
+      ));
+    }
+
+    if build.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't delete webhook"
+      ));
+    }
+
+    let mut split = build.config.repo.split('/');
+    let owner = split.next().context("Build repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo =
+      split.next().context("Build repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = format!("{host}/listener/github/build/{}", build.id);
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
+}

bin/core/src/api/write/description.rs

@@ -5,7 +5,7 @@ use monitor_client::{
     alerter::Alerter, build::Build, builder::Builder,
     deployment::Deployment, procedure::Procedure, repo::Repo,
     server::Server, server_template::ServerTemplate,
-    update::ResourceTarget, user::User,
+    sync::ResourceSync, update::ResourceTarget, user::User,
   },
 };
 use resolver_api::Resolve;
@@ -92,6 +92,14 @@ impl Resolve<UpdateDescription, User> for State {
         )
         .await?;
       }
+      ResourceTarget::ResourceSync(id) => {
+        resource::update_description::<ResourceSync>(
+          &id,
+          &description,
+          &user,
+        )
+        .await?;
+      }
     }
     Ok(UpdateDescriptionResponse {})
   }

bin/core/src/api/write/mod.rs

@@ -13,7 +13,6 @@ use uuid::Uuid;
 use crate::{auth::auth_request, state::State};
 
 mod alerter;
-mod api_key;
 mod build;
 mod builder;
 mod deployment;
@@ -23,8 +22,9 @@ mod procedure;
 mod repo;
 mod server;
 mod server_template;
+mod service_user;
+mod sync;
 mod tag;
-mod user;
 mod user_group;
 mod variable;
 
@@ -33,18 +33,12 @@ mod variable;
 #[resolver_target(State)]
 #[resolver_args(User)]
 #[serde(tag = "type", content = "params")]
-enum WriteRequest {
-  // ==== API KEY ====
-  CreateApiKey(CreateApiKey),
-  DeleteApiKey(DeleteApiKey),
-  CreateApiKeyForServiceUser(CreateApiKeyForServiceUser),
-  DeleteApiKeyForServiceUser(DeleteApiKeyForServiceUser),
-
-  // ==== USER ====
-  PushRecentlyViewed(PushRecentlyViewed),
-  SetLastSeenUpdate(SetLastSeenUpdate),
+pub enum WriteRequest {
+  // ==== SERVICE USER ====
   CreateServiceUser(CreateServiceUser),
   UpdateServiceUserDescription(UpdateServiceUserDescription),
+  CreateApiKeyForServiceUser(CreateApiKeyForServiceUser),
+  DeleteApiKeyForServiceUser(DeleteApiKeyForServiceUser),
 
   // ==== USER GROUP ====
   CreateUserGroup(CreateUserGroup),
@@ -56,6 +50,7 @@ enum WriteRequest {
 
   // ==== PERMISSIONS ====
   UpdateUserBasePermissions(UpdateUserBasePermissions),
+  UpdatePermissionOnResourceType(UpdatePermissionOnResourceType),
   UpdatePermissionOnTarget(UpdatePermissionOnTarget),
 
   // ==== DESCRIPTION ====
@@ -81,6 +76,8 @@ enum WriteRequest {
   CopyBuild(CopyBuild),
   DeleteBuild(DeleteBuild),
   UpdateBuild(UpdateBuild),
+  CreateBuildWebhook(CreateBuildWebhook),
+  DeleteBuildWebhook(DeleteBuildWebhook),
 
   // ==== BUILDER ====
   CreateBuilder(CreateBuilder),
@@ -99,6 +96,8 @@ enum WriteRequest {
   CopyRepo(CopyRepo),
   DeleteRepo(DeleteRepo),
   UpdateRepo(UpdateRepo),
+  CreateRepoWebhook(CreateRepoWebhook),
+  DeleteRepoWebhook(DeleteRepoWebhook),
 
   // ==== ALERTER ====
   CreateAlerter(CreateAlerter),
@@ -112,6 +111,15 @@ enum WriteRequest {
   DeleteProcedure(DeleteProcedure),
   UpdateProcedure(UpdateProcedure),
 
+  // ==== SYNC ====
+  CreateResourceSync(CreateResourceSync),
+  CopyResourceSync(CopyResourceSync),
+  DeleteResourceSync(DeleteResourceSync),
+  UpdateResourceSync(UpdateResourceSync),
+  RefreshResourceSyncPending(RefreshResourceSyncPending),
+  CreateSyncWebhook(CreateSyncWebhook),
+  DeleteSyncWebhook(DeleteSyncWebhook),
+
   // ==== TAG ====
   CreateTag(CreateTag),
   DeleteTag(DeleteTag),
@@ -148,16 +156,13 @@ async fn handler(
   Ok((TypedHeader(ContentType::json()), res??))
 }
 
-#[instrument(name = "WriteRequest", skip(user))]
+#[instrument(name = "WriteRequest", skip(user), fields(user_id = user.id))]
 async fn task(
   req_id: Uuid,
   request: WriteRequest,
   user: User,
 ) -> anyhow::Result<String> {
-  info!(
-    "/write request {req_id} | user: {} ({})",
-    user.username, user.id
-  );
+  info!("/write request | user: {}", user.username);
 
   let timer = Instant::now();
 
@@ -177,7 +182,7 @@ async fn task(
   }
 
   let elapsed = timer.elapsed();
-  info!("/write request {req_id} | resolve time: {elapsed:?}");
+  debug!("/write request {req_id} | resolve time: {elapsed:?}");
 
   res
 }

bin/core/src/api/write/permissions.rs

@@ -3,8 +3,10 @@ use std::str::FromStr;
 use anyhow::{anyhow, Context};
 use monitor_client::{
   api::write::{
-    UpdatePermissionOnTarget, UpdatePermissionOnTargetResponse,
-    UpdateUserBasePermissions, UpdateUserBasePermissionsResponse,
+    UpdatePermissionOnResourceType,
+    UpdatePermissionOnResourceTypeResponse, UpdatePermissionOnTarget,
+    UpdatePermissionOnTargetResponse, UpdateUserBasePermissions,
+    UpdateUserBasePermissionsResponse,
   },
   entities::{
     permission::{UserTarget, UserTargetVariant},
@@ -41,6 +43,7 @@ impl Resolve<UpdateUserBasePermissions, User> for State {
     if !admin.admin {
       return Err(anyhow!("this method is admin only"));
     }
+
     let user = find_one_by_id(&db_client().await.users, &user_id)
       .await
       .context("failed to query mongo for user")?
@@ -73,6 +76,73 @@ impl Resolve<UpdateUserBasePermissions, User> for State {
   }
 }
 
+impl Resolve<UpdatePermissionOnResourceType, User> for State {
+  #[instrument(
+    name = "UpdatePermissionOnResourceType",
+    skip(self, admin)
+  )]
+  async fn resolve(
+    &self,
+    UpdatePermissionOnResourceType {
+      user_target,
+      resource_type,
+      permission,
+    }: UpdatePermissionOnResourceType,
+    admin: User,
+  ) -> anyhow::Result<UpdatePermissionOnResourceTypeResponse> {
+    if !admin.admin {
+      return Err(anyhow!("this method is admin only"));
+    }
+
+    // Some extra checks if user target is an actual User
+    if let UserTarget::User(user_id) = &user_target {
+      let user = get_user(user_id).await?;
+      if user.admin {
+        return Err(anyhow!(
+          "cannot use this method to update other admins permissions"
+        ));
+      }
+      if !user.enabled {
+        return Err(anyhow!("user not enabled"));
+      }
+    }
+
+    let (user_target_variant, user_target_id) =
+      extract_user_target_with_validation(&user_target).await?;
+
+    let id = ObjectId::from_str(&user_target_id)
+      .context("id is not ObjectId")?;
+    let field = format!("all.{resource_type}");
+    let filter = doc! { "_id": id };
+    let update = doc! { "$set": { &field: permission.as_ref() } };
+
+    match user_target_variant {
+      UserTargetVariant::User => {
+        db_client()
+          .await
+          .users
+          .update_one(filter, update)
+          .await
+          .with_context(|| {
+            format!("failed to set {field}: {permission} on db")
+          })?;
+      }
+      UserTargetVariant::UserGroup => {
+        db_client()
+          .await
+          .user_groups
+          .update_one(filter, update)
+          .await
+          .with_context(|| {
+            format!("failed to set {field}: {permission} on db")
+          })?;
+      }
+    }
+
+    Ok(UpdatePermissionOnResourceTypeResponse {})
+  }
+}
+
 impl Resolve<UpdatePermissionOnTarget, User> for State {
   #[instrument(name = "UpdatePermissionOnTarget", skip(self, admin))]
   async fn resolve(
@@ -129,8 +199,8 @@ impl Resolve<UpdatePermissionOnTarget, User> for State {
             "level": permission.as_ref(),
           }
         },
-        UpdateOptions::builder().upsert(true).build(),
       )
+      .with_options(UpdateOptions::builder().upsert(true).build())
       .await?;
 
     Ok(UpdatePermissionOnTargetResponse {})
@@ -150,7 +220,7 @@ async fn extract_user_target_with_validation(
       let id = db_client()
         .await
         .users
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for users")?
         .context("no matching user found")?
@@ -165,7 +235,7 @@ async fn extract_user_target_with_validation(
       let id = db_client()
         .await
         .user_groups
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for user_groups")?
         .context("no matching user_group found")?
@@ -192,7 +262,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .builds
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for builds")?
         .context("no matching build found")?
@@ -207,7 +277,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .builders
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for builders")?
         .context("no matching builder found")?
@@ -222,7 +292,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .deployments
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for deployments")?
         .context("no matching deployment found")?
@@ -237,7 +307,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .servers
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for servers")?
         .context("no matching server found")?
@@ -252,7 +322,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .repos
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for repos")?
         .context("no matching repo found")?
@@ -267,7 +337,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .alerters
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for alerters")?
         .context("no matching alerter found")?
@@ -282,7 +352,7 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .procedures
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for procedures")?
         .context("no matching procedure found")?
@@ -297,12 +367,27 @@ async fn extract_resource_target_with_validation(
       let id = db_client()
         .await
         .server_templates
-        .find_one(filter, None)
+        .find_one(filter)
         .await
         .context("failed to query db for server templates")?
         .context("no matching server template found")?
         .id;
       Ok((ResourceTargetVariant::ServerTemplate, id))
     }
+    ResourceTarget::ResourceSync(ident) => {
+      let filter = match ObjectId::from_str(ident) {
+        Ok(id) => doc! { "_id": id },
+        Err(_) => doc! { "name": ident },
+      };
+      let id = db_client()
+        .await
+        .resource_syncs
+        .find_one(filter)
+        .await
+        .context("failed to query db for resource syncs")?
+        .context("no matching resource sync found")?
+        .id;
+      Ok((ResourceTargetVariant::ResourceSync, id))
+    }
   }
 }

bin/core/src/api/write/repo.rs

@@ -1,10 +1,24 @@
+use anyhow::{anyhow, Context};
 use monitor_client::{
   api::write::*,
-  entities::{permission::PermissionLevel, repo::Repo, user::User},
+  entities::{
+    config::core::CoreConfig,
+    permission::PermissionLevel,
+    repo::{PartialRepoConfig, Repo},
+    user::User,
+    NoData,
+  },
+};
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
 };
 use resolver_api::Resolve;
 
-use crate::{resource, state::State};
+use crate::{
+  config::core_config,
+  resource,
+  state::{github_client, State},
+};
 
 impl Resolve<CreateRepo, User> for State {
   #[instrument(name = "CreateRepo", skip(self, user))]
@@ -56,3 +70,196 @@ impl Resolve<UpdateRepo, User> for State {
     resource::update::<Repo>(&id, config, &user).await
   }
 }
+
+impl Resolve<CreateRepoWebhook, User> for State {
+  #[instrument(name = "CreateRepoWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateRepoWebhook { repo, action }: CreateRepoWebhook,
+    user: User,
+  ) -> anyhow::Result<CreateRepoWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let repo = resource::get_check_permissions::<Repo>(
+      &repo,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if repo.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't create webhook"
+      ));
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = match action {
+      RepoWebhookAction::Clone => {
+        format!("{host}/listener/github/repo/{}/clone", repo.id)
+      }
+      RepoWebhookAction::Pull => {
+        format!("{host}/listener/github/repo/{}/pull", repo.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo_name, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !repo.config.webhook_enabled {
+      self
+        .resolve(
+          UpdateRepo {
+            id: repo.id,
+            config: PartialRepoConfig {
+              webhook_enabled: Some(true),
+              ..Default::default()
+            },
+          },
+          user,
+        )
+        .await
+        .context("failed to update repo to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<DeleteRepoWebhook, User> for State {
+  #[instrument(name = "DeleteRepoWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    DeleteRepoWebhook { repo, action }: DeleteRepoWebhook,
+    user: User,
+  ) -> anyhow::Result<DeleteRepoWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let repo = resource::get_check_permissions::<Repo>(
+      &repo,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if repo.config.git_provider != "github.com" {
+      return Err(anyhow!(
+        "Can only manage github.com repo webhooks"
+      ));
+    }
+
+    if repo.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't create webhook"
+      ));
+    }
+
+    let mut split = repo.config.repo.split('/');
+    let owner = split.next().context("Repo repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo_name =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo_name)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = match action {
+      RepoWebhookAction::Clone => {
+        format!("{host}/listener/github/repo/{}/clone", repo.id)
+      }
+      RepoWebhookAction::Pull => {
+        format!("{host}/listener/github/repo/{}/pull", repo.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo_name, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
+}

bin/core/src/api/write/server.rs

@@ -1,4 +1,5 @@
 use anyhow::Context;
+use formatting::format_serror;
 use monitor_client::{
   api::write::*,
   entities::{
@@ -13,7 +14,6 @@ use monitor_client::{
 use mungos::{by_id::update_one_by_id, mongodb::bson::doc};
 use periphery_client::api;
 use resolver_api::Resolve;
-use serror::serialize_error_pretty;
 
 use crate::{
   helpers::{
@@ -112,8 +112,10 @@ impl Resolve<CreateNetwork, User> for State {
       .await
     {
       Ok(log) => update.logs.push(log),
-      Err(e) => update
-        .push_error_log("create network", serialize_error_pretty(&e)),
+      Err(e) => update.push_error_log(
+        "create network",
+        format_serror(&e.context("failed to create network").into()),
+      ),
     };
 
     update.finalize();
@@ -149,8 +151,10 @@ impl Resolve<DeleteNetwork, User> for State {
       .await
     {
       Ok(log) => update.logs.push(log),
-      Err(e) => update
-        .push_error_log("delete network", serialize_error_pretty(&e)),
+      Err(e) => update.push_error_log(
+        "delete network",
+        format_serror(&e.context("failed to delete network").into()),
+      ),
     };
 
     update.finalize();

bin/core/src/api/write/server_template.rs

@@ -13,6 +13,7 @@ use resolver_api::Resolve;
 use crate::{resource, state::State};
 
 impl Resolve<CreateServerTemplate, User> for State {
+  #[instrument(name = "CreateServerTemplate", skip(self, user))]
   async fn resolve(
     &self,
     CreateServerTemplate { name, config }: CreateServerTemplate,
@@ -23,6 +24,7 @@ impl Resolve<CreateServerTemplate, User> for State {
 }
 
 impl Resolve<CopyServerTemplate, User> for State {
+  #[instrument(name = "CopyServerTemplate", skip(self, user))]
   async fn resolve(
     &self,
     CopyServerTemplate { name, id }: CopyServerTemplate,
@@ -41,6 +43,7 @@ impl Resolve<CopyServerTemplate, User> for State {
 }
 
 impl Resolve<DeleteServerTemplate, User> for State {
+  #[instrument(name = "DeleteServerTemplate", skip(self, user))]
   async fn resolve(
     &self,
     DeleteServerTemplate { id }: DeleteServerTemplate,
@@ -51,6 +54,7 @@ impl Resolve<DeleteServerTemplate, User> for State {
 }
 
 impl Resolve<UpdateServerTemplate, User> for State {
+  #[instrument(name = "UpdateServerTemplate", skip(self, user))]
   async fn resolve(
     &self,
     UpdateServerTemplate { id, config }: UpdateServerTemplate,

bin/core/src/api/write/service_user.rs

@@ -0,0 +1,172 @@
+use std::str::FromStr;
+
+use anyhow::{anyhow, Context};
+use monitor_client::{
+  api::{
+    user::CreateApiKey,
+    write::{
+      CreateApiKeyForServiceUser, CreateApiKeyForServiceUserResponse,
+      CreateServiceUser, CreateServiceUserResponse,
+      DeleteApiKeyForServiceUser, DeleteApiKeyForServiceUserResponse,
+      UpdateServiceUserDescription,
+      UpdateServiceUserDescriptionResponse,
+    },
+  },
+  entities::{
+    monitor_timestamp,
+    user::{User, UserConfig},
+  },
+};
+use mungos::{
+  by_id::find_one_by_id,
+  mongodb::bson::{doc, oid::ObjectId},
+};
+use resolver_api::Resolve;
+
+use crate::state::{db_client, State};
+
+impl Resolve<CreateServiceUser, User> for State {
+  #[instrument(name = "CreateServiceUser", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateServiceUser {
+      username,
+      description,
+    }: CreateServiceUser,
+    user: User,
+  ) -> anyhow::Result<CreateServiceUserResponse> {
+    if !user.admin {
+      return Err(anyhow!("user not admin"));
+    }
+    if ObjectId::from_str(&username).is_ok() {
+      return Err(anyhow!("username cannot be valid ObjectId"));
+    }
+    let config = UserConfig::Service { description };
+    let mut user = User {
+      id: Default::default(),
+      username,
+      config,
+      enabled: true,
+      admin: false,
+      create_server_permissions: false,
+      create_build_permissions: false,
+      last_update_view: 0,
+      recents: Default::default(),
+      all: Default::default(),
+      updated_at: monitor_timestamp(),
+    };
+    user.id = db_client()
+      .await
+      .users
+      .insert_one(&user)
+      .await
+      .context("failed to create service user on db")?
+      .inserted_id
+      .as_object_id()
+      .context("inserted id is not object id")?
+      .to_string();
+    Ok(user)
+  }
+}
+
+impl Resolve<UpdateServiceUserDescription, User> for State {
+  #[instrument(
+    name = "UpdateServiceUserDescription",
+    skip(self, user)
+  )]
+  async fn resolve(
+    &self,
+    UpdateServiceUserDescription {
+      username,
+      description,
+    }: UpdateServiceUserDescription,
+    user: User,
+  ) -> anyhow::Result<UpdateServiceUserDescriptionResponse> {
+    if !user.admin {
+      return Err(anyhow!("user not admin"));
+    }
+    let db = db_client().await;
+    let service_user = db
+      .users
+      .find_one(doc! { "username": &username })
+      .await
+      .context("failed to query db for user")?
+      .context("no user with given username")?;
+    let UserConfig::Service { .. } = &service_user.config else {
+      return Err(anyhow!("user is not service user"));
+    };
+    db.users
+      .update_one(
+        doc! { "username": &username },
+        doc! { "$set": { "config.data.description": description } },
+      )
+      .await
+      .context("failed to update user on db")?;
+    db.users
+      .find_one(doc! { "username": &username })
+      .await
+      .context("failed to query db for user")?
+      .context("user with username not found")
+  }
+}
+
+impl Resolve<CreateApiKeyForServiceUser, User> for State {
+  #[instrument(name = "CreateApiKeyForServiceUser", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateApiKeyForServiceUser {
+      user_id,
+      name,
+      expires,
+    }: CreateApiKeyForServiceUser,
+    user: User,
+  ) -> anyhow::Result<CreateApiKeyForServiceUserResponse> {
+    if !user.admin {
+      return Err(anyhow!("user not admin"));
+    }
+    let service_user =
+      find_one_by_id(&db_client().await.users, &user_id)
+        .await
+        .context("failed to query db for user")?
+        .context("no user found with id")?;
+    let UserConfig::Service { .. } = &service_user.config else {
+      return Err(anyhow!("user is not service user"));
+    };
+    self
+      .resolve(CreateApiKey { name, expires }, service_user)
+      .await
+  }
+}
+
+impl Resolve<DeleteApiKeyForServiceUser, User> for State {
+  #[instrument(name = "DeleteApiKeyForServiceUser", skip(self, user))]
+  async fn resolve(
+    &self,
+    DeleteApiKeyForServiceUser { key }: DeleteApiKeyForServiceUser,
+    user: User,
+  ) -> anyhow::Result<DeleteApiKeyForServiceUserResponse> {
+    if !user.admin {
+      return Err(anyhow!("user not admin"));
+    }
+    let db = db_client().await;
+    let api_key = db
+      .api_keys
+      .find_one(doc! { "key": &key })
+      .await
+      .context("failed to query db for api key")?
+      .context("did not find matching api key")?;
+    let service_user =
+      find_one_by_id(&db_client().await.users, &api_key.user_id)
+        .await
+        .context("failed to query db for user")?
+        .context("no user found with id")?;
+    let UserConfig::Service { .. } = &service_user.config else {
+      return Err(anyhow!("user is not service user"));
+    };
+    db.api_keys
+      .delete_one(doc! { "key": key })
+      .await
+      .context("failed to delete api key on db")?;
+    Ok(DeleteApiKeyForServiceUserResponse {})
+  }
+}

bin/core/src/api/write/sync.rs

@@ -0,0 +1,521 @@
+use anyhow::{anyhow, Context};
+use formatting::format_serror;
+use monitor_client::{
+  api::write::*,
+  entities::{
+    self,
+    alert::{Alert, AlertData},
+    alerter::Alerter,
+    build::Build,
+    builder::Builder,
+    config::core::CoreConfig,
+    monitor_timestamp,
+    permission::PermissionLevel,
+    procedure::Procedure,
+    repo::Repo,
+    server::{stats::SeverityLevel, Server},
+    server_template::ServerTemplate,
+    sync::{
+      PartialResourceSyncConfig, PendingSyncUpdates,
+      PendingSyncUpdatesData, PendingSyncUpdatesDataErr,
+      PendingSyncUpdatesDataOk, ResourceSync,
+    },
+    update::ResourceTarget,
+    user::User,
+    NoData,
+  },
+};
+use mungos::{
+  by_id::update_one_by_id,
+  mongodb::bson::{doc, to_document},
+};
+use octorust::types::{
+  ReposCreateWebhookRequest, ReposCreateWebhookRequestConfig,
+};
+use resolver_api::Resolve;
+
+use crate::{
+  config::core_config,
+  helpers::{
+    alert::send_alerts,
+    query::get_id_to_tags,
+    sync::{
+      deployment,
+      resource::{get_updates_for_view, AllResourcesById},
+    },
+  },
+  resource,
+  state::{db_client, github_client, State},
+};
+
+impl Resolve<CreateResourceSync, User> for State {
+  #[instrument(name = "CreateResourceSync", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateResourceSync { name, config }: CreateResourceSync,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    resource::create::<ResourceSync>(&name, config, &user).await
+  }
+}
+
+impl Resolve<CopyResourceSync, User> for State {
+  #[instrument(name = "CopyResourceSync", skip(self, user))]
+  async fn resolve(
+    &self,
+    CopyResourceSync { name, id }: CopyResourceSync,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    let ResourceSync { config, .. } =
+      resource::get_check_permissions::<ResourceSync>(
+        &id,
+        &user,
+        PermissionLevel::Write,
+      )
+      .await?;
+    resource::create::<ResourceSync>(&name, config.into(), &user)
+      .await
+  }
+}
+
+impl Resolve<DeleteResourceSync, User> for State {
+  #[instrument(name = "DeleteResourceSync", skip(self, user))]
+  async fn resolve(
+    &self,
+    DeleteResourceSync { id }: DeleteResourceSync,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    resource::delete::<ResourceSync>(&id, &user).await
+  }
+}
+
+impl Resolve<UpdateResourceSync, User> for State {
+  #[instrument(name = "UpdateResourceSync", skip(self, user))]
+  async fn resolve(
+    &self,
+    UpdateResourceSync { id, config }: UpdateResourceSync,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    resource::update::<ResourceSync>(&id, config, &user).await
+  }
+}
+
+impl Resolve<RefreshResourceSyncPending, User> for State {
+  async fn resolve(
+    &self,
+    RefreshResourceSyncPending { sync }: RefreshResourceSyncPending,
+    user: User,
+  ) -> anyhow::Result<ResourceSync> {
+    // Even though this is a write request, this doesn't change any config. Anyone that can execute the
+    // sync should be able to do this.
+    let sync = resource::get_check_permissions::<
+      entities::sync::ResourceSync,
+    >(&sync, &user, PermissionLevel::Execute)
+    .await?;
+
+    if sync.config.repo.is_empty() {
+      return Err(anyhow!("resource sync repo not configured"));
+    }
+
+    let res = async {
+      let (res, _, hash, message) =
+        crate::helpers::sync::remote::get_remote_resources(&sync)
+          .await
+          .context("failed to get remote resources")?;
+      let resources = res?;
+
+      let all_resources = AllResourcesById::load().await?;
+      let id_to_tags = get_id_to_tags(None).await?;
+
+      let data = PendingSyncUpdatesDataOk {
+        server_updates: get_updates_for_view::<Server>(
+          resources.servers,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get server updates")?,
+        deployment_updates: deployment::get_updates_for_view(
+          resources.deployments,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get deployment updates")?,
+        build_updates: get_updates_for_view::<Build>(
+          resources.builds,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get build updates")?,
+        repo_updates: get_updates_for_view::<Repo>(
+          resources.repos,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get repo updates")?,
+        procedure_updates: get_updates_for_view::<Procedure>(
+          resources.procedures,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get procedure updates")?,
+        alerter_updates: get_updates_for_view::<Alerter>(
+          resources.alerters,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get alerter updates")?,
+        builder_updates: get_updates_for_view::<Builder>(
+          resources.builders,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get builder updates")?,
+        server_template_updates:
+          get_updates_for_view::<ServerTemplate>(
+            resources.server_templates,
+            sync.config.delete,
+            &all_resources,
+            &id_to_tags,
+          )
+          .await
+          .context("failed to get server template updates")?,
+        resource_sync_updates: get_updates_for_view::<
+          entities::sync::ResourceSync,
+        >(
+          resources.resource_syncs,
+          sync.config.delete,
+          &all_resources,
+          &id_to_tags,
+        )
+        .await
+        .context("failed to get resource sync updates")?,
+        variable_updates:
+          crate::helpers::sync::variables::get_updates_for_view(
+            resources.variables,
+            sync.config.delete,
+          )
+          .await
+          .context("failed to get variable updates")?,
+        user_group_updates:
+          crate::helpers::sync::user_groups::get_updates_for_view(
+            resources.user_groups,
+            sync.config.delete,
+            &all_resources,
+          )
+          .await
+          .context("failed to get user group updates")?,
+      };
+      anyhow::Ok((hash, message, data))
+    }
+    .await;
+
+    let (pending, has_updates) = match res {
+      Ok((hash, message, data)) => {
+        let has_updates = !data.no_updates();
+        (
+          PendingSyncUpdates {
+            hash: Some(hash),
+            message: Some(message),
+            data: PendingSyncUpdatesData::Ok(data),
+          },
+          has_updates,
+        )
+      }
+      Err(e) => (
+        PendingSyncUpdates {
+          hash: None,
+          message: None,
+          data: PendingSyncUpdatesData::Err(
+            PendingSyncUpdatesDataErr {
+              message: format_serror(&e.into()),
+            },
+          ),
+        },
+        false,
+      ),
+    };
+
+    let pending = to_document(&pending)
+      .context("failed to serialize pending to document")?;
+
+    update_one_by_id(
+      &db_client().await.resource_syncs,
+      &sync.id,
+      doc! { "$set": { "info.pending": pending } },
+      None,
+    )
+    .await?;
+
+    // check to update alert
+    let id = sync.id.clone();
+    let name = sync.name.clone();
+    tokio::task::spawn(async move {
+      let db = db_client().await;
+      let Some(existing) = db_client()
+        .await
+        .alerts
+        .find_one(doc! {
+          "resolved": false,
+          "target.type": "ResourceSync",
+          "target.id": &id,
+        })
+        .await
+        .context("failed to query db for alert")
+        .inspect_err(|e| warn!("{e:#}"))
+        .ok()
+      else {
+        return;
+      };
+      match (existing, has_updates) {
+        // OPEN A NEW ALERT
+        (None, true) => {
+          let alert = Alert {
+            id: Default::default(),
+            ts: monitor_timestamp(),
+            resolved: false,
+            level: SeverityLevel::Ok,
+            target: ResourceTarget::ResourceSync(id.clone()),
+            data: AlertData::ResourceSyncPendingUpdates { id, name },
+            resolved_ts: None,
+          };
+          db.alerts
+            .insert_one(&alert)
+            .await
+            .context("failed to open existing pending resource sync updates alert")
+            .inspect_err(|e| warn!("{e:#}"))
+            .ok();
+          send_alerts(&[alert]).await;
+        }
+        // CLOSE ALERT
+        (Some(existing), false) => {
+          update_one_by_id(
+            &db.alerts,
+            &existing.id,
+            doc! {
+              "$set": {
+                "resolved": true,
+                "resolved_ts": monitor_timestamp()
+              }
+            },
+            None,
+          )
+          .await
+          .context("failed to close existing pending resource sync updates alert")
+          .inspect_err(|e| warn!("{e:#}"))
+          .ok();
+        }
+        // NOTHING TO DO
+        _ => {}
+      }
+    });
+
+    crate::resource::get::<ResourceSync>(&sync.id).await
+  }
+}
+
+impl Resolve<CreateSyncWebhook, User> for State {
+  #[instrument(name = "CreateSyncWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    CreateSyncWebhook { sync, action }: CreateSyncWebhook,
+    user: User,
+  ) -> anyhow::Result<CreateSyncWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let sync = resource::get_check_permissions::<ResourceSync>(
+      &sync,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if sync.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't create webhook"
+      ));
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo =
+      split.next().context("Repo repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      webhook_secret,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = match action {
+      SyncWebhookAction::Refresh => {
+        format!("{host}/listener/github/sync/{}/refresh", sync.id)
+      }
+      SyncWebhookAction::Sync => {
+        format!("{host}/listener/github/sync/{}/sync", sync.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        return Ok(NoData {});
+      }
+    }
+
+    // Now good to create the webhook
+    let request = ReposCreateWebhookRequest {
+      active: Some(true),
+      config: Some(ReposCreateWebhookRequestConfig {
+        url,
+        secret: webhook_secret.to_string(),
+        content_type: String::from("json"),
+        insecure_ssl: None,
+        digest: Default::default(),
+        token: Default::default(),
+      }),
+      events: vec![String::from("push")],
+      name: String::from("web"),
+    };
+    github_repos
+      .create_webhook(owner, repo, &request)
+      .await
+      .context("failed to create webhook")?;
+
+    if !sync.config.webhook_enabled {
+      self
+        .resolve(
+          UpdateResourceSync {
+            id: sync.id,
+            config: PartialResourceSyncConfig {
+              webhook_enabled: Some(true),
+              ..Default::default()
+            },
+          },
+          user,
+        )
+        .await
+        .context("failed to update sync to enable webhook")?;
+    }
+
+    Ok(NoData {})
+  }
+}
+
+impl Resolve<DeleteSyncWebhook, User> for State {
+  #[instrument(name = "DeleteSyncWebhook", skip(self, user))]
+  async fn resolve(
+    &self,
+    DeleteSyncWebhook { sync, action }: DeleteSyncWebhook,
+    user: User,
+  ) -> anyhow::Result<DeleteSyncWebhookResponse> {
+    let Some(github) = github_client() else {
+      return Err(anyhow!(
+        "github_webhook_app is not configured in core config toml"
+      ));
+    };
+
+    let sync = resource::get_check_permissions::<ResourceSync>(
+      &sync,
+      &user,
+      PermissionLevel::Write,
+    )
+    .await?;
+
+    if sync.config.git_provider != "github.com" {
+      return Err(anyhow!(
+        "Can only manage github.com repo webhooks"
+      ));
+    }
+
+    if sync.config.repo.is_empty() {
+      return Err(anyhow!(
+        "No repo configured, can't create webhook"
+      ));
+    }
+
+    let mut split = sync.config.repo.split('/');
+    let owner = split.next().context("Sync repo has no owner")?;
+
+    let Some(github) = github.get(owner) else {
+      return Err(anyhow!(
+        "Cannot manage repo webhooks under owner {owner}"
+      ));
+    };
+
+    let repo =
+      split.next().context("Sync repo has no repo after the /")?;
+
+    let github_repos = github.repos();
+
+    // First make sure the webhook isn't already created (inactive ones are ignored)
+    let webhooks = github_repos
+      .list_all_webhooks(owner, repo)
+      .await
+      .context("failed to list all webhooks on repo")?
+      .body;
+
+    let CoreConfig {
+      host,
+      webhook_base_url,
+      ..
+    } = core_config();
+
+    let host = webhook_base_url.as_ref().unwrap_or(host);
+    let url = match action {
+      SyncWebhookAction::Refresh => {
+        format!("{host}/listener/github/sync/{}/refresh", sync.id)
+      }
+      SyncWebhookAction::Sync => {
+        format!("{host}/listener/github/sync/{}/sync", sync.id)
+      }
+    };
+
+    for webhook in webhooks {
+      if webhook.active && webhook.config.url == url {
+        github_repos
+          .delete_webhook(owner, repo, webhook.id)
+          .await
+          .context("failed to delete webhook")?;
+        return Ok(NoData {});
+      }
+    }
+
+    // No webhook to delete, all good
+    Ok(NoData {})
+  }
+}

bin/core/src/api/write/tag.rs

@@ -10,7 +10,7 @@ use monitor_client::{
     alerter::Alerter, build::Build, builder::Builder,
     deployment::Deployment, permission::PermissionLevel,
     procedure::Procedure, repo::Repo, server::Server,
-    server_template::ServerTemplate, tag::Tag,
+    server_template::ServerTemplate, sync::ResourceSync, tag::Tag,
     update::ResourceTarget, user::User,
   },
 };
@@ -46,7 +46,7 @@ impl Resolve<CreateTag, User> for State {
     tag.id = db_client()
       .await
       .tags
-      .insert_one(&tag, None)
+      .insert_one(&tag)
       .await
       .context("failed to create tag on db")?
       .inserted_id
@@ -191,6 +191,15 @@ impl Resolve<UpdateTagsOnResource, User> for State {
         resource::update_tags::<ServerTemplate>(&id, tags, user)
           .await?
       }
+      ResourceTarget::ResourceSync(id) => {
+        resource::get_check_permissions::<ResourceSync>(
+          &id,
+          &user,
+          PermissionLevel::Write,
+        )
+        .await?;
+        resource::update_tags::<ResourceSync>(&id, tags, user).await?
+      }
     };
     Ok(UpdateTagsOnResourceResponse {})
   }

bin/core/src/api/write/user.rs

@@ -1,187 +0,0 @@
-use std::{collections::VecDeque, str::FromStr};
-
-use anyhow::{anyhow, Context};
-use monitor_client::{
-  api::write::{
-    CreateServiceUser, CreateServiceUserResponse, PushRecentlyViewed,
-    PushRecentlyViewedResponse, SetLastSeenUpdate,
-    SetLastSeenUpdateResponse, UpdateServiceUserDescription,
-    UpdateServiceUserDescriptionResponse,
-  },
-  entities::{
-    monitor_timestamp,
-    update::ResourceTarget,
-    user::{User, UserConfig},
-  },
-};
-use mungos::{
-  by_id::update_one_by_id,
-  mongodb::bson::{doc, oid::ObjectId, to_bson},
-};
-use resolver_api::Resolve;
-
-use crate::{
-  helpers::query::get_user,
-  state::{db_client, State},
-};
-
-const RECENTLY_VIEWED_MAX: usize = 10;
-
-impl Resolve<PushRecentlyViewed, User> for State {
-  #[instrument(name = "PushRecentlyViewed", skip(self, user))]
-  async fn resolve(
-    &self,
-    PushRecentlyViewed { resource }: PushRecentlyViewed,
-    user: User,
-  ) -> anyhow::Result<PushRecentlyViewedResponse> {
-    let user = get_user(&user.id).await?;
-
-    let (recents, id, field) = match resource {
-      ResourceTarget::Server(id) => {
-        (user.recent_servers, id, "recent_servers")
-      }
-      ResourceTarget::Deployment(id) => {
-        (user.recent_deployments, id, "recent_deployments")
-      }
-      ResourceTarget::Build(id) => {
-        (user.recent_builds, id, "recent_builds")
-      }
-      ResourceTarget::Repo(id) => {
-        (user.recent_repos, id, "recent_repos")
-      }
-      ResourceTarget::Procedure(id) => {
-        (user.recent_procedures, id, "recent_procedures")
-      }
-      _ => return Ok(PushRecentlyViewedResponse {}),
-    };
-
-    let mut recents = recents
-      .into_iter()
-      .filter(|_id| !id.eq(_id))
-      .take(RECENTLY_VIEWED_MAX - 1)
-      .collect::<VecDeque<_>>();
-    recents.push_front(id);
-    let update = doc! { field: to_bson(&recents)? };
-
-    update_one_by_id(
-      &db_client().await.users,
-      &user.id,
-      mungos::update::Update::Set(update),
-      None,
-    )
-    .await
-    .with_context(|| format!("failed to update {field}"))?;
-
-    Ok(PushRecentlyViewedResponse {})
-  }
-}
-
-impl Resolve<SetLastSeenUpdate, User> for State {
-  #[instrument(name = "SetLastSeenUpdate", skip(self, user))]
-  async fn resolve(
-    &self,
-    SetLastSeenUpdate {}: SetLastSeenUpdate,
-    user: User,
-  ) -> anyhow::Result<SetLastSeenUpdateResponse> {
-    update_one_by_id(
-      &db_client().await.users,
-      &user.id,
-      mungos::update::Update::Set(doc! {
-        "last_update_view": monitor_timestamp()
-      }),
-      None,
-    )
-    .await
-    .context("failed to update user last_update_view")?;
-    Ok(SetLastSeenUpdateResponse {})
-  }
-}
-
-impl Resolve<CreateServiceUser, User> for State {
-  #[instrument(name = "CreateServiceUser", skip(self, user))]
-  async fn resolve(
-    &self,
-    CreateServiceUser {
-      username,
-      description,
-    }: CreateServiceUser,
-    user: User,
-  ) -> anyhow::Result<CreateServiceUserResponse> {
-    if !user.admin {
-      return Err(anyhow!("user not admin"));
-    }
-    if ObjectId::from_str(&username).is_ok() {
-      return Err(anyhow!("username cannot be valid ObjectId"));
-    }
-    let config = UserConfig::Service { description };
-    let mut user = User {
-      id: Default::default(),
-      username,
-      config,
-      enabled: true,
-      admin: false,
-      create_server_permissions: false,
-      create_build_permissions: false,
-      last_update_view: 0,
-      recent_servers: Vec::new(),
-      recent_deployments: Vec::new(),
-      recent_builds: Vec::new(),
-      recent_repos: Vec::new(),
-      recent_procedures: Vec::new(),
-      updated_at: monitor_timestamp(),
-    };
-    user.id = db_client()
-      .await
-      .users
-      .insert_one(&user, None)
-      .await
-      .context("failed to create service user on db")?
-      .inserted_id
-      .as_object_id()
-      .context("inserted id is not object id")?
-      .to_string();
-    Ok(user)
-  }
-}
-
-impl Resolve<UpdateServiceUserDescription, User> for State {
-  #[instrument(
-    name = "UpdateServiceUserDescription",
-    skip(self, user)
-  )]
-  async fn resolve(
-    &self,
-    UpdateServiceUserDescription {
-      username,
-      description,
-    }: UpdateServiceUserDescription,
-    user: User,
-  ) -> anyhow::Result<UpdateServiceUserDescriptionResponse> {
-    if !user.admin {
-      return Err(anyhow!("user not admin"));
-    }
-    let db = db_client().await;
-    let service_user = db
-      .users
-      .find_one(doc! { "username": &username }, None)
-      .await
-      .context("failed to query db for user")?
-      .context("no user with given username")?;
-    let UserConfig::Service { .. } = &service_user.config else {
-      return Err(anyhow!("user is not service user"));
-    };
-    db.users
-      .update_one(
-        doc! { "username": &username },
-        doc! { "$set": { "config.data.description": description } },
-        None,
-      )
-      .await
-      .context("failed to update user on db")?;
-    db.users
-      .find_one(doc! { "username": &username }, None)
-      .await
-      .context("failed to query db for user")?
-      .context("user with username not found")
-  }
-}

bin/core/src/api/write/user_group.rs

@@ -29,13 +29,14 @@ impl Resolve<CreateUserGroup, User> for State {
     let user_group = UserGroup {
       id: Default::default(),
       users: Default::default(),
+      all: Default::default(),
       updated_at: monitor_timestamp(),
       name,
     };
     let db = db_client().await;
     let id = db
       .user_groups
-      .insert_one(user_group, None)
+      .insert_one(user_group)
       .await
       .context("failed to create UserGroup on db")?
       .inserted_id
@@ -99,7 +100,7 @@ impl Resolve<DeleteUserGroup, User> for State {
       .delete_many(doc! {
         "user_target.type": "UserGroup",
         "user_target.id": id,
-      }, None)
+      })
       .await
       .context("failed to clean up UserGroups permissions. User Group has been deleted")?;
 
@@ -125,7 +126,7 @@ impl Resolve<AddUserToUserGroup, User> for State {
     };
     let user = db
       .users
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query mongo for users")?
       .context("no matching user found")?;
@@ -138,12 +139,11 @@ impl Resolve<AddUserToUserGroup, User> for State {
       .update_one(
         filter.clone(),
         doc! { "$addToSet": { "users": &user.id } },
-        None,
       )
       .await
       .context("failed to add user to group on db")?;
     db.user_groups
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query db for UserGroups")?
       .context("no user group with given id")
@@ -171,7 +171,7 @@ impl Resolve<RemoveUserFromUserGroup, User> for State {
     };
     let user = db
       .users
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query mongo for users")?
       .context("no matching user found")?;
@@ -184,12 +184,11 @@ impl Resolve<RemoveUserFromUserGroup, User> for State {
       .update_one(
         filter.clone(),
         doc! { "$pull": { "users": &user.id } },
-        None,
       )
       .await
       .context("failed to add user to group on db")?;
     db.user_groups
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query db for UserGroups")?
       .context("no user group with given id")
@@ -229,15 +228,11 @@ impl Resolve<SetUsersInUserGroup, User> for State {
       Err(_) => doc! { "name": &user_group },
     };
     db.user_groups
-      .update_one(
-        filter.clone(),
-        doc! { "$set": { "users": users } },
-        None,
-      )
+      .update_one(filter.clone(), doc! { "$set": { "users": users } })
       .await
-      .context("failed to add user to group on db")?;
+      .context("failed to set users on user group")?;
     db.user_groups
-      .find_one(filter, None)
+      .find_one(filter)
       .await
       .context("failed to query db for UserGroups")?
       .context("no user group with given id")

bin/core/src/api/write/variable.rs

@@ -44,7 +44,7 @@ impl Resolve<CreateVariable, User> for State {
     db_client()
       .await
       .variables
-      .insert_one(&variable, None)
+      .insert_one(&variable)
       .await
       .context("failed to create variable on db")?;
 
@@ -86,7 +86,6 @@ impl Resolve<UpdateVariableValue, User> for State {
       .update_one(
         doc! { "name": &name },
         doc! { "$set": { "value": &value } },
-        None,
       )
       .await
       .context("failed to update variable value on db")?;
@@ -127,7 +126,6 @@ impl Resolve<UpdateVariableDescription, User> for State {
       .update_one(
         doc! { "name": &name },
         doc! { "$set": { "description": &description } },
-        None,
       )
       .await
       .context("failed to update variable description on db")?;
@@ -148,7 +146,7 @@ impl Resolve<DeleteVariable, User> for State {
     db_client()
       .await
       .variables
-      .delete_one(doc! { "name": &name }, None)
+      .delete_one(doc! { "name": &name })
       .await
       .context("failed to delete variable on db")?;
 

bin/core/src/auth/github/client.rs

@@ -216,8 +216,8 @@ impl GithubOauthClient {
 #[derive(Deserialize)]
 pub struct AccessTokenResponse {
   pub access_token: String,
-  pub scope: String,
-  pub token_type: String,
+  // pub scope: String,
+  // pub token_type: String,
 }
 
 #[derive(Deserialize)]
@@ -225,5 +225,5 @@ pub struct GithubUserResponse {
   pub login: String,
   pub id: u128,
   pub avatar_url: String,
-  pub email: Option<String>,
+  // pub email: Option<String>,
 }

bin/core/src/auth/github/mod.rs

@@ -2,6 +2,7 @@ use anyhow::{anyhow, Context};
 use axum::{
   extract::Query, response::Redirect, routing::get, Router,
 };
+use mongo_indexed::Document;
 use monitor_client::entities::{
   monitor_timestamp,
   user::{User, UserConfig},
@@ -66,7 +67,7 @@ async fn callback(
   let db_client = db_client().await;
   let user = db_client
     .users
-    .find_one(doc! { "config.data.github_id": &github_id }, None)
+    .find_one(doc! { "config.data.github_id": &github_id })
     .await
     .context("failed at find user query from mongo")?;
   let jwt = match user {
@@ -76,7 +77,7 @@ async fn callback(
     None => {
       let ts = monitor_timestamp();
       let no_users_exist =
-        db_client.users.find_one(None, None).await?.is_none();
+        db_client.users.find_one(Document::new()).await?.is_none();
       let user = User {
         id: Default::default(),
         username: github_user.login,
@@ -86,11 +87,8 @@ async fn callback(
         create_build_permissions: no_users_exist,
         updated_at: ts,
         last_update_view: 0,
-        recent_servers: Vec::new(),
-        recent_deployments: Vec::new(),
-        recent_builds: Vec::new(),
-        recent_repos: Vec::new(),
-        recent_procedures: Vec::new(),
+        recents: Default::default(),
+        all: Default::default(),
         config: UserConfig::Github {
           github_id,
           avatar: github_user.avatar_url,
@@ -98,7 +96,7 @@ async fn callback(
       };
       let user_id = db_client
         .users
-        .insert_one(user, None)
+        .insert_one(user)
         .await
         .context("failed to create user on mongo")?
         .inserted_id

bin/core/src/auth/google/client.rs

@@ -2,7 +2,9 @@ use std::sync::OnceLock;
 
 use anyhow::{anyhow, Context};
 use jwt::Token;
-use monitor_client::entities::config::core::{CoreConfig, OauthCredentials};
+use monitor_client::entities::config::core::{
+  CoreConfig, OauthCredentials,
+};
 use reqwest::StatusCode;
 use serde::{de::DeserializeOwned, Deserialize};
 use serde_json::Value;
@@ -183,10 +185,10 @@ impl GoogleOauthClient {
 
 #[derive(Deserialize)]
 pub struct AccessTokenResponse {
-  pub access_token: String,
+  // pub access_token: String,
   pub id_token: String,
-  pub scope: String,
-  pub token_type: String,
+  // pub scope: String,
+  // pub token_type: String,
 }
 
 #[derive(Deserialize, Clone)]

bin/core/src/auth/google/mod.rs

@@ -3,6 +3,7 @@ use async_timing_util::unix_timestamp_ms;
 use axum::{
   extract::Query, response::Redirect, routing::get, Router,
 };
+use mongo_indexed::Document;
 use monitor_client::entities::user::{User, UserConfig};
 use mungos::mongodb::bson::doc;
 use reqwest::StatusCode;
@@ -75,7 +76,7 @@ async fn callback(
   let db_client = db_client().await;
   let user = db_client
     .users
-    .find_one(doc! { "config.data.google_id": &google_id }, None)
+    .find_one(doc! { "config.data.google_id": &google_id })
     .await
     .context("failed at find user query from mongo")?;
   let jwt = match user {
@@ -85,7 +86,7 @@ async fn callback(
     None => {
       let ts = unix_timestamp_ms() as i64;
       let no_users_exist =
-        db_client.users.find_one(None, None).await?.is_none();
+        db_client.users.find_one(Document::new()).await?.is_none();
       let user = User {
         id: Default::default(),
         username: google_user
@@ -101,11 +102,8 @@ async fn callback(
         create_build_permissions: no_users_exist,
         updated_at: ts,
         last_update_view: 0,
-        recent_servers: Vec::new(),
-        recent_deployments: Vec::new(),
-        recent_builds: Vec::new(),
-        recent_repos: Vec::new(),
-        recent_procedures: Vec::new(),
+        recents: Default::default(),
+        all: Default::default(),
         config: UserConfig::Google {
           google_id,
           avatar: google_user.picture,
@@ -113,7 +111,7 @@ async fn callback(
       };
       let user_id = db_client
         .users
-        .insert_one(user, None)
+        .insert_one(user)
         .await
         .context("failed to create user on mongo")?
         .inserted_id

bin/core/src/auth/local.rs

@@ -3,6 +3,7 @@ use std::str::FromStr;
 use anyhow::{anyhow, Context};
 use async_timing_util::unix_timestamp_ms;
 use axum::http::HeaderMap;
+use mongo_indexed::Document;
 use monitor_client::{
   api::auth::{
     CreateLocalUser, CreateLocalUserResponse, LoginLocalUser,
@@ -46,7 +47,7 @@ impl Resolve<CreateLocalUser, HeaderMap> for State {
     let no_users_exist = db_client()
       .await
       .users
-      .find_one(None, None)
+      .find_one(Document::new())
       .await?
       .is_none();
 
@@ -61,18 +62,15 @@ impl Resolve<CreateLocalUser, HeaderMap> for State {
       create_build_permissions: no_users_exist,
       updated_at: ts,
       last_update_view: 0,
-      recent_servers: Vec::new(),
-      recent_deployments: Vec::new(),
-      recent_builds: Vec::new(),
-      recent_repos: Vec::new(),
-      recent_procedures: Vec::new(),
+      recents: Default::default(),
+      all: Default::default(),
       config: UserConfig::Local { password },
     };
 
     let user_id = db_client()
       .await
       .users
-      .insert_one(user, None)
+      .insert_one(user)
       .await
       .context("failed to create user")?
       .inserted_id
@@ -102,7 +100,7 @@ impl Resolve<LoginLocalUser, HeaderMap> for State {
     let user = db_client()
       .await
       .users
-      .find_one(doc! { "username": &username }, None)
+      .find_one(doc! { "username": &username })
       .await
       .context("failed at db query for users")?
       .with_context(|| {

bin/core/src/auth/mod.rs

@@ -127,7 +127,7 @@ pub async fn auth_api_key_get_user_id(
   let key = db_client()
     .await
     .api_keys
-    .find_one(doc! { "key": key }, None)
+    .find_one(doc! { "key": key })
     .await
     .context("failed to query db")?
     .context("no api key matching key")?;

bin/core/src/cloud/aws/ec2.rs

@@ -1,9 +1,8 @@
 use std::{str::FromStr, time::Duration};
 
 use anyhow::{anyhow, Context};
-use aws_config::BehaviorVersion;
+use aws_config::{BehaviorVersion, Region};
 use aws_sdk_ec2::{
-  config::Region,
   types::{
     BlockDeviceMapping, EbsBlockDevice,
     InstanceNetworkInterfaceSpecification, InstanceStateChange,
@@ -12,8 +11,9 @@ use aws_sdk_ec2::{
   },
   Client,
 };
+use base64::Engine;
 use monitor_client::entities::{
-  alert::{Alert, AlertData, AlertDataVariant},
+  alert::{Alert, AlertData},
   monitor_timestamp,
   server::stats::SeverityLevel,
   server_template::aws::AwsServerTemplateConfig,
@@ -92,7 +92,10 @@ pub async fn launch_ec2_instance(
     )
     .min_count(1)
     .max_count(1)
-    .user_data(user_data);
+    .user_data(
+      base64::engine::general_purpose::STANDARD_NO_PAD
+        .encode(user_data),
+    );
 
   for volume in volumes {
     let ebs = EbsBlockDevice::builder()
@@ -172,7 +175,6 @@ pub async fn terminate_ec2_instance_with_retry(
             resolved: false,
             level: SeverityLevel::Critical,
             target: ResourceTarget::system(),
-            variant: AlertDataVariant::AwsBuilderTerminationFailed,
             data: AlertData::AwsBuilderTerminationFailed {
               instance_id: instance_id.to_string(),
               message: format!("{e:#}"),

bin/core/src/cloud/aws/ecr.rs

@@ -0,0 +1,82 @@
+use anyhow::{anyhow, Context};
+use aws_config::{BehaviorVersion, Region};
+use aws_sdk_ecr::Client as EcrClient;
+use run_command::async_run_command;
+
+#[tracing::instrument(skip(access_key_id, secret_access_key))]
+async fn make_ecr_client(
+  region: String,
+  access_key_id: &str,
+  secret_access_key: &str,
+) -> EcrClient {
+  std::env::set_var("AWS_ACCESS_KEY_ID", access_key_id);
+  std::env::set_var("AWS_SECRET_ACCESS_KEY", secret_access_key);
+  let region = Region::new(region);
+  let config = aws_config::defaults(BehaviorVersion::v2024_03_28())
+    .region(region)
+    .load()
+    .await;
+  EcrClient::new(&config)
+}
+
+#[tracing::instrument(skip(access_key_id, secret_access_key))]
+pub async fn maybe_create_repo(
+  repo: &str,
+  region: String,
+  access_key_id: &str,
+  secret_access_key: &str,
+) -> anyhow::Result<()> {
+  let client =
+    make_ecr_client(region, access_key_id, secret_access_key).await;
+
+  let existing = client
+    .describe_repositories()
+    .send()
+    .await
+    .context("failed to describe existing repositories")?
+    .repositories
+    .unwrap_or_default();
+
+  if existing.iter().any(|r| {
+    if let Some(name) = r.repository_name() {
+      name == repo
+    } else {
+      false
+    }
+  }) {
+    return Ok(());
+  };
+
+  client
+    .create_repository()
+    .repository_name(repo)
+    .send()
+    .await
+    .context("failed to create repository")?;
+
+  Ok(())
+}
+
+/// Gets a token docker login.
+///
+/// Requires the aws cli be installed on the host
+#[tracing::instrument(skip(access_key_id, secret_access_key))]
+pub async fn get_ecr_token(
+  region: &str,
+  access_key_id: &str,
+  secret_access_key: &str,
+) -> anyhow::Result<String> {
+  let log = async_run_command(&format!(
+    "AWS_ACCESS_KEY_ID={access_key_id} AWS_SECRET_ACCESS_KEY={secret_access_key} aws ecr get-login-password --region {region}"
+  ))
+  .await;
+
+  if log.success() {
+    Ok(log.stdout)
+  } else {
+    Err(
+      anyhow!("stdout: {} | stderr: {}", log.stdout, log.stderr)
+        .context("failed to get aws ecr login token"),
+    )
+  }
+}

bin/core/src/cloud/aws/mod.rs

@@ -0,0 +1,2 @@
+pub mod ec2;
+pub mod ecr;

bin/core/src/cloud/hetzner/client.rs

@@ -49,6 +49,7 @@ impl HetznerClient {
     self.post("/servers", body).await
   }
 
+  #[allow(unused)]
   pub async fn delete_server(
     &self,
     id: i64,
@@ -56,7 +57,6 @@ impl HetznerClient {
     self.delete(&format!("/servers/{id}")).await
   }
 
-  #[allow(unused)]
   pub async fn get_volume(
     &self,
     id: i64,
@@ -121,6 +121,7 @@ impl HetznerClient {
     })
   }
 
+  #[allow(unused)]
   async fn delete<Res: DeserializeOwned>(
     &self,
     path: &str,

bin/core/src/cloud/hetzner/common.rs

@@ -233,32 +233,30 @@ pub enum HetznerActionStatus {
 #[allow(clippy::enum_variant_names)]
 pub enum HetznerServerType {
   // Shared
-  #[serde(rename = "cx11")]
-  SharedIntel1Core2Ram20Disk,
   #[serde(rename = "cpx11")]
   SharedAmd2Core2Ram40Disk,
   #[serde(rename = "cax11")]
   SharedArm2Core4Ram40Disk,
-  #[serde(rename = "cx21")]
+  #[serde(rename = "cx22")]
   SharedIntel2Core4Ram40Disk,
   #[serde(rename = "cpx21")]
   SharedAmd3Core4Ram80Disk,
   #[serde(rename = "cax21")]
   SharedArm4Core8Ram80Disk,
-  #[serde(rename = "cx31")]
-  SharedIntel2Core8Ram80Disk,
+  #[serde(rename = "cx32")]
+  SharedIntel4Core8Ram80Disk,
   #[serde(rename = "cpx31")]
   SharedAmd4Core8Ram160Disk,
   #[serde(rename = "cax31")]
   SharedArm8Core16Ram160Disk,
-  #[serde(rename = "cx41")]
-  SharedIntel4Core16Ram160Disk,
+  #[serde(rename = "cx42")]
+  SharedIntel8Core16Ram160Disk,
   #[serde(rename = "cpx41")]
   SharedAmd8Core16Ram240Disk,
   #[serde(rename = "cax41")]
   SharedArm16Core32Ram320Disk,
-  #[serde(rename = "cx51")]
-  SharedIntel8Core32Ram240Disk,
+  #[serde(rename = "cx52")]
+  SharedIntel16Core32Ram320Disk,
   #[serde(rename = "cpx51")]
   SharedAmd16Core32Ram360Disk,
   // Dedicated

bin/core/src/cloud/hetzner/mod.rs

@@ -1,15 +1,13 @@
-use std::{sync::OnceLock, time::Duration};
+use std::{
+  sync::{Arc, Mutex, OnceLock},
+  time::Duration,
+};
 
 use anyhow::{anyhow, Context};
-use monitor_client::entities::{
-  alert::{Alert, AlertData, AlertDataVariant},
-  monitor_timestamp,
-  server::stats::SeverityLevel,
-  server_template::hetzner::{
-    HetznerDatacenter, HetznerServerTemplateConfig,
-    HetznerServerType, HetznerVolumeFormat,
-  },
-  update::ResourceTarget,
+use futures::future::join_all;
+use monitor_client::entities::server_template::hetzner::{
+  HetznerDatacenter, HetznerServerTemplateConfig, HetznerServerType,
+  HetznerVolumeFormat,
 };
 
 use crate::{
@@ -18,13 +16,9 @@ use crate::{
     create_volume::CreateVolumeBody,
   },
   config::core_config,
-  helpers::alert::send_alerts,
 };
 
-use self::{
-  client::HetznerClient,
-  common::{HetznerAction, HetznerActionResponse},
-};
+use self::{client::HetznerClient, common::HetznerVolumeStatus};
 
 mod client;
 mod common;
@@ -59,7 +53,6 @@ pub async fn launch_hetzner_server(
     *hetzner().as_ref().context("Hetzner token not configured")?;
   let HetznerServerTemplateConfig {
     image,
-    automount,
     datacenter,
     private_network_ids,
     placement_group,
@@ -97,10 +90,35 @@ pub async fn launch_hetzner_server(
     volume_ids.push(id);
   }
 
+  // Make sure volumes are available before continue
+  let vol_ids_poll = Arc::new(Mutex::new(volume_ids.clone()));
+  for _ in 0..MAX_POLL_TRIES {
+    if vol_ids_poll.lock().unwrap().is_empty() {
+      break;
+    }
+    tokio::time::sleep(Duration::from_secs(POLL_RATE_SECS)).await;
+    let ids = vol_ids_poll.lock().unwrap().clone();
+    let futures = ids.into_iter().map(|id| {
+      let vol_ids = vol_ids_poll.clone();
+      async move {
+        let Ok(res) = hetzner.get_volume(id).await else {
+          return;
+        };
+        if matches!(res.volume.status, HetznerVolumeStatus::Available)
+        {
+          vol_ids.lock().unwrap().retain(|_id| *_id != id);
+        }
+      }
+    });
+    join_all(futures).await;
+  }
+  if !vol_ids_poll.lock().unwrap().is_empty() {
+    return Err(anyhow!("Volumes not ready after poll"));
+  }
+
   let body = CreateServerBody {
     name: name.to_string(),
-    // only actually add automount if volumes nonempty
-    automount: (!volume_ids.is_empty()).then_some(automount),
+    automount: None,
     datacenter: Some(datacenter),
     location: None,
     firewalls: firewall_ids
@@ -165,60 +183,6 @@ pub async fn launch_hetzner_server(
   ))
 }
 
-#[allow(unused)]
-const MAX_TERMINATION_TRIES: usize = 5;
-#[allow(unused)]
-const TERMINATION_WAIT_SECS: u64 = 15;
-
-#[allow(unused)]
-pub async fn terminate_hetzner_server_with_retry(
-  id: i64,
-) -> anyhow::Result<()> {
-  let hetzner =
-    *hetzner().as_ref().context("Hetzner token not configured")?;
-
-  for i in 0..MAX_TERMINATION_TRIES {
-    let message = match hetzner.delete_server(id).await {
-      Ok(HetznerActionResponse {
-        action: HetznerAction { error: None, .. },
-      }) => return Ok(()),
-      Ok(HetznerActionResponse {
-        action: HetznerAction { error: Some(e), .. },
-      }) => (i == MAX_TERMINATION_TRIES - 1).then(|| {
-        format!(
-          "failed to terminate instance | code: {} | {}",
-          e.code, e.message
-        )
-      }),
-      Err(e) => {
-        (i == MAX_TERMINATION_TRIES - 1).then(|| format!("{e:#}"))
-      }
-    };
-    if let Some(message) = message {
-      error!("failed to terminate hetzner server {id} | {message}");
-      let alert = Alert {
-        id: Default::default(),
-        ts: monitor_timestamp(),
-        resolved: false,
-        level: SeverityLevel::Critical,
-        target: ResourceTarget::system(),
-        variant: AlertDataVariant::HetznerBuilderTerminationFailed,
-        data: AlertData::HetznerBuilderTerminationFailed {
-          server_id: id,
-          message: message.clone(),
-        },
-        resolved_ts: None,
-      };
-      send_alerts(&[alert]).await;
-      return Err(anyhow::Error::msg(message));
-    }
-    tokio::time::sleep(Duration::from_secs(TERMINATION_WAIT_SECS))
-      .await;
-  }
-
-  Ok(())
-}
-
 fn hetzner_format(
   format: HetznerVolumeFormat,
 ) -> common::HetznerVolumeFormat {
@@ -254,9 +218,6 @@ fn hetzner_server_type(
   server_type: HetznerServerType,
 ) -> common::HetznerServerType {
   match server_type {
-    HetznerServerType::SharedIntel1Core2Ram20Disk => {
-      common::HetznerServerType::SharedIntel1Core2Ram20Disk
-    }
     HetznerServerType::SharedAmd2Core2Ram40Disk => {
       common::HetznerServerType::SharedAmd2Core2Ram40Disk
     }
@@ -272,8 +233,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm4Core8Ram80Disk => {
       common::HetznerServerType::SharedArm4Core8Ram80Disk
     }
-    HetznerServerType::SharedIntel2Core8Ram80Disk => {
-      common::HetznerServerType::SharedIntel2Core8Ram80Disk
+    HetznerServerType::SharedIntel4Core8Ram80Disk => {
+      common::HetznerServerType::SharedIntel4Core8Ram80Disk
     }
     HetznerServerType::SharedAmd4Core8Ram160Disk => {
       common::HetznerServerType::SharedAmd4Core8Ram160Disk
@@ -281,8 +242,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm8Core16Ram160Disk => {
       common::HetznerServerType::SharedArm8Core16Ram160Disk
     }
-    HetznerServerType::SharedIntel4Core16Ram160Disk => {
-      common::HetznerServerType::SharedIntel4Core16Ram160Disk
+    HetznerServerType::SharedIntel8Core16Ram160Disk => {
+      common::HetznerServerType::SharedIntel8Core16Ram160Disk
     }
     HetznerServerType::SharedAmd8Core16Ram240Disk => {
       common::HetznerServerType::SharedAmd8Core16Ram240Disk
@@ -290,8 +251,8 @@ fn hetzner_server_type(
     HetznerServerType::SharedArm16Core32Ram320Disk => {
       common::HetznerServerType::SharedArm16Core32Ram320Disk
     }
-    HetznerServerType::SharedIntel8Core32Ram240Disk => {
-      common::HetznerServerType::SharedIntel8Core32Ram240Disk
+    HetznerServerType::SharedIntel16Core32Ram320Disk => {
+      common::HetznerServerType::SharedIntel16Core32Ram320Disk
     }
     HetznerServerType::SharedAmd16Core32Ram360Disk => {
       common::HetznerServerType::SharedAmd16Core32Ram360Disk

bin/core/src/cloud/mod.rs

@@ -1,4 +1,6 @@
 pub mod aws;
+
+#[allow(unused)]
 pub mod hetzner;
 
 #[derive(Debug)]

bin/core/src/config.rs

@@ -4,8 +4,9 @@ use anyhow::Context;
 use merge_config_files::parse_config_file;
 use monitor_client::entities::{
   config::core::{
-    AwsCredentials, CoreConfig, Env, HetznerCredentials, MongoConfig,
-    OauthCredentials,
+    AwsCredentials, CoreConfig, Env, GithubWebhookAppConfig,
+    GithubWebhookAppInstallationConfig, HetznerCredentials,
+    MongoConfig, OauthCredentials,
   },
   logger::LogConfig,
 };
@@ -36,15 +37,40 @@ pub fn frontend_path() -> &'static String {
 pub fn core_config() -> &'static CoreConfig {
   static CORE_CONFIG: OnceLock<CoreConfig> = OnceLock::new();
   CORE_CONFIG.get_or_init(|| {
-    let env: Env = envy::from_env()
-      .context("failed to parse core Env")
-      .unwrap();
+    let env: Env = match envy::from_env()
+      .context("failed to parse core Env") {
+        Ok(env) => env,
+        Err(e) => {
+          panic!("{e:#?}");
+        }
+      };
     let config_path = &env.monitor_config_path;
     let config =
       parse_config_file::<CoreConfig>(config_path.as_str())
         .unwrap_or_else(|e| {
           panic!("failed at parsing config at {config_path} | {e:#}")
         });
+    let installations = match (env.monitor_github_webhook_app_installations_ids, env.monitor_github_webhook_app_installations_namespaces) {
+      (Some(ids), Some(namespaces)) => {
+        if ids.len() != namespaces.len() {
+          panic!("MONITOR_GITHUB_WEBHOOK_APP_INSTALLATIONS_IDS length and MONITOR_GITHUB_WEBHOOK_APP_INSTALLATIONS_NAMESPACES length mismatch. Got {ids:?} and {namespaces:?}")
+        }
+        ids
+          .into_iter()
+          .zip(namespaces)
+          .map(|(id, namespace)| GithubWebhookAppInstallationConfig {
+            id,
+            namespace
+          })
+          .collect()
+      },
+      (Some(_), None) | (None, Some(_)) => {
+        panic!("Got only one of MONITOR_GITHUB_WEBHOOK_APP_INSTALLATIONS_IDS or MONITOR_GITHUB_WEBHOOK_APP_INSTALLATIONS_NAMESPACES, both MUST be provided");
+      }
+      (None, None) => {
+        config.github_webhook_app.installations
+      }
+    };
     // recreating CoreConfig here makes sure we apply all env overrides.
     CoreConfig {
       title: env.monitor_title.unwrap_or(config.title),
@@ -54,6 +80,12 @@ pub fn core_config() -> &'static CoreConfig {
       jwt_valid_for: env
         .monitor_jwt_valid_for
         .unwrap_or(config.jwt_valid_for),
+      sync_directory: env
+        .monitor_sync_directory
+        .map(|dir|
+          dir.parse()
+            .context("failed to parse env MONITOR_SYNC_DIRECTORY as valid path").unwrap())
+        .unwrap_or(config.sync_directory),
       monitoring_interval: env
         .monitor_monitoring_interval
         .unwrap_or(config.monitoring_interval),
@@ -63,18 +95,18 @@ pub fn core_config() -> &'static CoreConfig {
       keep_alerts_for_days: env
         .monitor_keep_alerts_for_days
         .unwrap_or(config.keep_alerts_for_days),
-      github_webhook_secret: env
-        .monitor_github_webhook_secret
-        .unwrap_or(config.github_webhook_secret),
-      github_webhook_base_url: env
-        .monitor_github_webhook_base_url
-        .or(config.github_webhook_base_url),
-      docker_organizations: env
-        .monitor_docker_organizations
-        .unwrap_or(config.docker_organizations),
+      webhook_secret: env
+        .monitor_webhook_secret
+        .unwrap_or(config.webhook_secret),
+      webhook_base_url: env
+        .monitor_webhook_base_url
+        .or(config.webhook_base_url),
       transparent_mode: env
         .monitor_transparent_mode
         .unwrap_or(config.transparent_mode),
+      ui_write_disabled: env
+        .monitor_ui_write_disabled
+        .unwrap_or(config.ui_write_disabled),
       local_auth: env.monitor_local_auth.unwrap_or(config.local_auth),
       google_oauth: OauthCredentials {
         enabled: env
@@ -98,6 +130,15 @@ pub fn core_config() -> &'static CoreConfig {
           .monitor_github_oauth_secret
           .unwrap_or(config.github_oauth.secret),
       },
+      github_webhook_app: GithubWebhookAppConfig {
+        app_id: env
+          .monitor_github_webhook_app_app_id
+          .unwrap_or(config.github_webhook_app.app_id),
+        pk_path: env
+          .monitor_github_webhook_app_pk_path
+          .unwrap_or(config.github_webhook_app.pk_path),
+        installations,
+      },
       aws: AwsCredentials {
         access_key_id: env
           .monitor_aws_access_key_id
@@ -144,8 +185,9 @@ pub fn core_config() -> &'static CoreConfig {
 
       // These can't be overridden on env
       secrets: config.secrets,
-      github_accounts: config.github_accounts,
-      docker_accounts: config.docker_accounts
+      git_providers: config.git_providers,
+      docker_registries: config.docker_registries,
+      aws_ecr_registries: config.aws_ecr_registries,
     }
   })
 }

bin/core/src/db.rs

@@ -12,6 +12,7 @@ use monitor_client::entities::{
   repo::Repo,
   server::{stats::SystemStatsRecord, Server},
   server_template::ServerTemplate,
+  sync::ResourceSync,
   tag::Tag,
   update::Update,
   user::User,
@@ -42,6 +43,7 @@ pub struct DbClient {
   pub procedures: Collection<Procedure>,
   pub alerters: Collection<Alerter>,
   pub server_templates: Collection<ServerTemplate>,
+  pub resource_syncs: Collection<ResourceSync>,
   //
   pub db: Database,
 }
@@ -101,6 +103,8 @@ impl DbClient {
       procedures: resource_collection(&db, "Procedure").await?,
       server_templates: resource_collection(&db, "ServerTemplate")
         .await?,
+      resource_syncs: resource_collection(&db, "ResourceSync")
+        .await?,
       //
       db,
     };
@@ -108,7 +112,7 @@ impl DbClient {
   }
 }
 
-async fn resource_collection<T>(
+async fn resource_collection<T: Send + Sync>(
   db: &Database,
   collection_name: &str,
 ) -> anyhow::Result<Collection<T>> {

bin/core/src/helpers/action_state.rs

@@ -6,7 +6,7 @@ use monitor_client::{
   entities::{
     build::BuildActionState, deployment::DeploymentActionState,
     procedure::ProcedureActionState, repo::RepoActionState,
-    server::ServerActionState,
+    server::ServerActionState, sync::ResourceSyncActionState,
   },
 };
 
@@ -21,6 +21,8 @@ pub struct ActionStates {
   pub repo: Cache<String, Arc<ActionState<RepoActionState>>>,
   pub procedure:
     Cache<String, Arc<ActionState<ProcedureActionState>>>,
+  pub resource_sync:
+    Cache<String, Arc<ActionState<ResourceSyncActionState>>>,
 }
 
 /// Need to be able to check "busy" with write lock acquired.

bin/core/src/helpers/alert.rs

@@ -1,16 +1,17 @@
 use anyhow::{anyhow, Context};
+use derive_variants::ExtractVariant;
 use futures::future::join_all;
 use monitor_client::entities::{
   alert::{Alert, AlertData},
   alerter::*,
   deployment::DeploymentState,
   server::stats::SeverityLevel,
+  update::ResourceTargetVariant,
 };
 use mungos::{find::find_collect, mongodb::bson::doc};
-use reqwest::StatusCode;
 use slack::types::Block;
 
-use crate::state::db_client;
+use crate::{config::core_config, state::db_client};
 
 #[instrument]
 pub async fn send_alerts(alerts: &[Alert]) {
@@ -18,21 +19,19 @@ pub async fn send_alerts(alerts: &[Alert]) {
     return;
   }
 
-  let alerters = find_collect(
+  let Ok(alerters) = find_collect(
     &db_client().await.alerters,
-    doc! { "config.params.enabled": true },
+    doc! { "config.enabled": true },
     None,
   )
-  .await;
-
-  if let Err(e) = alerters {
+  .await
+  .inspect_err(|e| {
     error!(
       "ERROR sending alerts | failed to get alerters from db | {e:#}"
-    );
+    )
+  }) else {
     return;
-  }
-
-  let alerters = alerters.unwrap();
+  };
 
   let handles =
     alerts.iter().map(|alert| send_alert(&alerters, alert));
@@ -46,23 +45,49 @@ async fn send_alert(alerters: &[Alerter], alert: &Alert) {
     return;
   }
 
+  let alert_type = alert.data.extract_variant();
+
   let handles = alerters.iter().map(|alerter| async {
-    match &alerter.config {
-      AlerterConfig::Slack(SlackAlerterConfig { url, enabled }) => {
-        if !enabled {
-          return Ok(());
-        }
-        send_slack_alert(url, alert)
-          .await
-          .context("failed to send slack alert")
+    // Don't send if not enabled
+    if !alerter.config.enabled {
+      return Ok(());
+    }
+
+    // Don't send if alert type not configured on the alerter
+    if !alerter.config.alert_types.is_empty()
+      && !alerter.config.alert_types.contains(&alert_type)
+    {
+      return Ok(());
+    }
+
+    // Don't send if resource is in the blacklist
+    if alerter.config.except_resources.contains(&alert.target) {
+      return Ok(());
+    }
+
+    // Don't send if whitelist configured and target is not included
+    if !alerter.config.resources.is_empty()
+      && !alerter.config.resources.contains(&alert.target)
+    {
+      return Ok(());
+    }
+
+    match &alerter.config.endpoint {
+      AlerterEndpoint::Slack(SlackAlerterEndpoint { url }) => {
+        send_slack_alert(url, alert).await.with_context(|| {
+          format!(
+            "failed to send alert to slack alerter {}",
+            alerter.name
+          )
+        })
       }
-      AlerterConfig::Custom(CustomAlerterConfig { url, enabled }) => {
-        if !enabled {
-          return Ok(());
-        }
-        send_custom_alert(url, alert).await.context(format!(
-          "failed to send alert to custom alerter at {url}"
-        ))
+      AlerterEndpoint::Custom(CustomAlerterEndpoint { url }) => {
+        send_custom_alert(url, alert).await.with_context(|| {
+          format!(
+            "failed to send alert to custom alerter {}",
+            alerter.name
+          )
+        })
       }
     }
   });
@@ -86,7 +111,7 @@ async fn send_custom_alert(
     .await
     .context("failed at post request to alerter")?;
   let status = res.status();
-  if status != StatusCode::OK {
+  if !status.is_success() {
     let text = res
       .text()
       .await
@@ -105,7 +130,12 @@ async fn send_slack_alert(
 ) -> anyhow::Result<()> {
   let level = fmt_level(alert.level);
   let (text, blocks): (_, Option<_>) = match &alert.data {
-    AlertData::ServerUnreachable { name, region, .. } => {
+    AlertData::ServerUnreachable {
+      id,
+      name,
+      region,
+      err,
+    } => {
       let region = fmt_region(region);
       match alert.level {
         SeverityLevel::Ok => {
@@ -122,10 +152,18 @@ async fn send_slack_alert(
         SeverityLevel::Critical => {
           let text =
             format!("{level} | *{name}*{region} is *unreachable* ❌");
+          let err = err
+            .as_ref()
+            .map(|e| format!("\nerror: {e:#?}"))
+            .unwrap_or_default();
           let blocks = vec![
             Block::header(level),
             Block::section(format!(
-              "*{name}*{region} is *unreachable* ❌"
+              "*{name}*{region} is *unreachable* ❌{err}"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
             )),
           ];
           (text, blocks.into())
@@ -134,70 +172,136 @@ async fn send_slack_alert(
       }
     }
     AlertData::ServerCpu {
+      id,
       name,
       region,
       percentage,
-      ..
     } => {
       let region = fmt_region(region);
-      let text = format!("{level} | *{name}*{region} cpu usage at *{percentage:.1}%* 📈 🚨");
-      let blocks = vec![
-        Block::header(format!("{level} 🚨")),
-        Block::section(format!(
-          "*{name}*{region} cpu usage at *{percentage:.1}%* 📈 🚨"
-        )),
-      ];
-      (text, blocks.into())
+      match alert.level {
+        SeverityLevel::Ok => {
+          let text = format!("{level} | *{name}*{region} cpu usage at *{percentage:.1}%*");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} cpu usage at *{percentage:.1}%*"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
+            )),
+          ];
+          (text, blocks.into())
+        }
+        _ => {
+          let text = format!("{level} | *{name}*{region} cpu usage at *{percentage:.1}%* 📈");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} cpu usage at *{percentage:.1}%* 📈"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
+            )),
+          ];
+          (text, blocks.into())
+        }
+      }
     }
     AlertData::ServerMem {
+      id,
       name,
       region,
       used_gb,
       total_gb,
-      ..
     } => {
       let region = fmt_region(region);
       let percentage = 100.0 * used_gb / total_gb;
-      let text =
-                format!("{level} | *{name}*{region} memory usage at *{percentage:.1}%* 💾 🚨");
-      let blocks = vec![
-        Block::header(level),
-        Block::section(format!(
-          "*{name}*{region} memory usage at *{percentage:.1}%* 💾 🚨"
-        )),
-        Block::section(format!(
-          "using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
-        )),
-      ];
-      (text, blocks.into())
+      match alert.level {
+        SeverityLevel::Ok => {
+          let text = format!("{level} | *{name}*{region} memory usage at *{percentage:.1}%* 💾");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} memory usage at *{percentage:.1}%* 💾"
+            )),
+            Block::section(format!(
+              "using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
+            )),
+          ];
+          (text, blocks.into())
+        }
+        _ => {
+          let text = format!("{level} | *{name}*{region} memory usage at *{percentage:.1}%* 💾");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} memory usage at *{percentage:.1}%* 💾"
+            )),
+            Block::section(format!(
+              "using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
+            )),
+            Block::section(resource_link(
+              ResourceTargetVariant::Server,
+              id,
+            )),
+          ];
+          (text, blocks.into())
+        }
+      }
     }
     AlertData::ServerDisk {
+      id,
       name,
       region,
       path,
       used_gb,
       total_gb,
-      ..
     } => {
       let region = fmt_region(region);
       let percentage = 100.0 * used_gb / total_gb;
-      let text = format!("{level} | *{name}*{region} disk usage at *{percentage:.1}%* | mount point: *{path:?}* 💿 🚨");
-      let blocks = vec![
-        Block::header(level),
-        Block::section(format!(
-          "*{name}*{region} disk usage at *{percentage:.1}%* 💿 🚨"
-        )),
-        Block::section(format!(
-          "mount point: {path:?} | using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
-        )),
-      ];
-      (text, blocks.into())
+      match alert.level {
+        SeverityLevel::Ok => {
+          let text = format!("{level} | *{name}*{region} disk usage at *{percentage:.1}%* | mount point: *{path:?}* 💿");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} disk usage at *{percentage:.1}%* 💿"
+            )),
+            Block::section(format!(
+              "mount point: {path:?} | using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
+            )),
+            Block::section(resource_link(ResourceTargetVariant::Server, id)),
+          ];
+          (text, blocks.into())
+        }
+        _ => {
+          let text = format!("{level} | *{name}*{region} disk usage at *{percentage:.1}%* | mount point: *{path:?}* 💿");
+          let blocks = vec![
+            Block::header(level),
+            Block::section(format!(
+              "*{name}*{region} disk usage at *{percentage:.1}%* 💿"
+            )),
+            Block::section(format!(
+              "mount point: {path:?} | using *{used_gb:.1} GiB* / *{total_gb:.1} GiB*"
+            )),
+            Block::section(resource_link(ResourceTargetVariant::Server, id)),
+          ];
+          (text, blocks.into())
+        }
+      }
     }
     AlertData::ContainerStateChange {
       name,
       server_name,
       from,
       to,
+      id,
       ..
     } => {
       let to = fmt_docker_container_state(to);
@@ -205,7 +309,11 @@ async fn send_slack_alert(
       let blocks = vec![
         Block::header(text.clone()),
         Block::section(format!(
-          "server: {server_name}\nprevious: {from}"
+          "server: {server_name}\nprevious: {from}",
+        )),
+        Block::section(resource_link(
+          ResourceTargetVariant::Deployment,
+          id,
         )),
       ];
       (text, blocks.into())
@@ -215,28 +323,39 @@ async fn send_slack_alert(
       message,
     } => {
       let text = format!(
-        "{level} | Failed to terminated AWS builder instance"
+        "{level} | Failed to terminated AWS builder instance "
       );
       let blocks = vec![
         Block::header(text.clone()),
         Block::section(format!(
-          "instance id: **{instance_id}**\n{message}"
+          "instance id: *{instance_id}*\n{message}"
         )),
       ];
       (text, blocks.into())
     }
-    AlertData::HetznerBuilderTerminationFailed {
-      server_id,
-      message,
-    } => {
-      let text = format!(
-        "{level} | Failed to terminated Hetzner builder instance"
-      );
+    AlertData::ResourceSyncPendingUpdates { id, name } => {
+      let text =
+        format!("{level} | Pending resource sync updates on {name}");
       let blocks = vec![
         Block::header(text.clone()),
         Block::section(format!(
-          "server id: **{server_id}**\n{message}"
+          "sync id: *{id}*\nsync name: *{name}*",
         )),
+        Block::section(resource_link(
+          ResourceTargetVariant::ResourceSync,
+          id,
+        )),
+      ];
+      (text, blocks.into())
+    }
+    AlertData::BuildFailed { id, name, version } => {
+      let text = format!("{level} | Build {name} has failed");
+      let blocks = vec![
+        Block::header(text.clone()),
+        Block::section(format!(
+          "build id: *{id}*\nbuild name: *{name}*\nversion: v{version}",
+        )),
+        Block::section(resource_link(ResourceTargetVariant::Build, id))
       ];
       (text, blocks.into())
     }
@@ -269,7 +388,41 @@ fn fmt_docker_container_state(state: &DeploymentState) -> String {
 fn fmt_level(level: SeverityLevel) -> &'static str {
   match level {
     SeverityLevel::Critical => "CRITICAL 🚨",
-    SeverityLevel::Warning => "WARNING 🚨",
+    SeverityLevel::Warning => "WARNING ‼️",
     SeverityLevel::Ok => "OK ✅",
   }
 }
+
+fn resource_link(
+  resource_type: ResourceTargetVariant,
+  id: &str,
+) -> String {
+  let path = match resource_type {
+    ResourceTargetVariant::System => unreachable!(),
+    ResourceTargetVariant::Build => format!("/builds/{id}"),
+    ResourceTargetVariant::Builder => {
+      format!("/builders/{id}")
+    }
+    ResourceTargetVariant::Deployment => {
+      format!("/deployments/{id}")
+    }
+    ResourceTargetVariant::Server => {
+      format!("/servers/{id}")
+    }
+    ResourceTargetVariant::Repo => format!("/repos/{id}"),
+    ResourceTargetVariant::Alerter => {
+      format!("/alerters/{id}")
+    }
+    ResourceTargetVariant::Procedure => {
+      format!("/procedures/{id}")
+    }
+    ResourceTargetVariant::ServerTemplate => {
+      format!("/server-templates/{id}")
+    }
+    ResourceTargetVariant::ResourceSync => {
+      format!("/resource-syncs/{id}")
+    }
+  };
+
+  format!("{}{path}", core_config().host)
+}

bin/core/src/helpers/mod.rs

@@ -1,13 +1,14 @@
 use std::time::Duration;
 
 use anyhow::{anyhow, Context};
+use mongo_indexed::Document;
 use monitor_client::entities::{
   permission::{Permission, PermissionLevel, UserTarget},
   server::Server,
   update::ResourceTarget,
   user::User,
 };
-use mungos::mongodb::bson::doc;
+use mungos::mongodb::bson::{doc, Bson};
 use periphery_client::PeripheryClient;
 use rand::{thread_rng, Rng};
 
@@ -20,6 +21,7 @@ pub mod channel;
 pub mod procedure;
 pub mod prune;
 pub mod query;
+pub mod sync;
 pub mod update;
 
 // pub mod resource;
@@ -60,7 +62,6 @@ where
           }
         }
       },
-      None,
     )
     .await
     .context("failed to remove resource from users recently viewed")
@@ -102,17 +103,34 @@ pub async fn create_permission<T>(
   if let Err(e) = db_client()
     .await
     .permissions
-    .insert_one(
-      Permission {
-        id: Default::default(),
-        user_target: UserTarget::User(user.id.clone()),
-        resource_target: target.clone(),
-        level,
-      },
-      None,
-    )
+    .insert_one(Permission {
+      id: Default::default(),
+      user_target: UserTarget::User(user.id.clone()),
+      resource_target: target.clone(),
+      level,
+    })
     .await
   {
     error!("failed to create permission for {target:?} | {e:#}");
   };
 }
+
+/// Flattens a document only one level deep
+///
+/// eg `{ config: { label: "yes", thing: { field1: "ok", field2: "ok" } } }` ->
+/// `{ "config.label": "yes", "config.thing": { field1: "ok", field2: "ok" } }`
+pub fn flatten_document(doc: Document) -> Document {
+  let mut target = Document::new();
+
+  for (outer_field, bson) in doc {
+    if let Bson::Document(doc) = bson {
+      for (inner_field, bson) in doc {
+        target.insert(format!("{outer_field}.{inner_field}"), bson);
+      }
+    } else {
+      target.insert(outer_field, bson);
+    }
+  }
+
+  target
+}

bin/core/src/helpers/procedure.rs

@@ -1,219 +1,83 @@
 use std::time::{Duration, Instant};
 
-use anyhow::{anyhow, Context, Ok};
+use anyhow::{anyhow, Context};
+use formatting::{bold, colored, format_serror, muted, Color};
 use futures::future::join_all;
 use monitor_client::{
   api::execute::Execution,
   entities::{
-    monitor_timestamp,
-    procedure::{EnabledExecution, Procedure, ProcedureType},
-    update::Update,
+    procedure::Procedure,
+    update::{Log, Update},
     user::procedure_user,
   },
 };
+use mungos::by_id::find_one_by_id;
 use resolver_api::Resolve;
 use tokio::sync::Mutex;
 
-use crate::state::State;
+use crate::{
+  api::execute::ExecuteRequest,
+  state::{db_client, State},
+};
 
-use super::update::update_update;
+use super::update::{init_execution_update, update_update};
 
-#[instrument]
+#[instrument(skip_all)]
 pub async fn execute_procedure(
   procedure: &Procedure,
   update: &Mutex<Update>,
 ) -> anyhow::Result<()> {
-  let start_ts = monitor_timestamp();
-
-  use ProcedureType::*;
-  match procedure.config.procedure_type {
-    Sequence => {
-      add_line_to_update(
-        update,
-        &format!(
-          "executing sequence: {} ({})",
-          procedure.name, procedure.id
-        ),
-      )
-      .await;
-      execute_sequence(
-        filter_list_by_enabled(&procedure.config.executions),
-        &procedure.id,
-        &procedure.name,
-        update,
-      )
-      .await
-      .with_context(|| {
-        let time = Duration::from_millis(
-          (monitor_timestamp() - start_ts) as u64,
-        );
-        format!(
-          "failed sequence execution after {time:?}. {} ({})",
-          procedure.name, procedure.id
-        )
-      })?;
-      let time = Duration::from_millis(
-        (monitor_timestamp() - start_ts) as u64,
-      );
-      add_line_to_update(
-        update,
-        &format!(
-          "finished sequence execution in {time:?}: {} ({}) ✅",
-          procedure.name, procedure.id
-        ),
-      )
-      .await;
-      Ok(())
+  for stage in &procedure.config.stages {
+    if !stage.enabled {
+      continue;
     }
-    Parallel => {
-      add_line_to_update(
-        update,
-        &format!(
-          "executing parallel: {} ({})",
-          procedure.name, procedure.id
-        ),
-      )
-      .await;
-      execute_parallel(
-        filter_list_by_enabled(&procedure.config.executions),
-        &procedure.id,
-        &procedure.name,
-        update,
-      )
-      .await
-      .with_context(|| {
-        let time = Duration::from_millis(
-          (monitor_timestamp() - start_ts) as u64,
-        );
-        format!(
-          "failed parallel execution after {time:?}. {} ({})",
-          procedure.name, procedure.id
-        )
-      })?;
-      let time = Duration::from_millis(
-        (monitor_timestamp() - start_ts) as u64,
-      );
-      add_line_to_update(
-        update,
-        &format!(
-          "finished parallel execution in {time:?}: {} ({}) ✅",
-          procedure.name, procedure.id
-        ),
-      )
-      .await;
-      Ok(())
-    }
-  }
-}
-
-#[instrument]
-async fn execute_execution(
-  execution: Execution,
-
-  // used to prevent recursive procedure
-  parent_id: &str,
-  parent_name: &str,
-) -> anyhow::Result<()> {
-  let user = procedure_user().to_owned();
-  let update = match execution {
-    Execution::None(_) => return Ok(()),
-    Execution::RunProcedure(req) => {
-      if req.procedure == parent_id || req.procedure == parent_name {
-        return Err(anyhow!("Self referential procedure detected"));
-      }
-      State
-        .resolve(req, user)
-        .await
-        .context("failed at RunProcedure")?
-    }
-    Execution::RunBuild(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at RunBuild")?,
-    Execution::Deploy(req) => {
-      State.resolve(req, user).await.context("failed at Deploy")?
-    }
-    Execution::StartContainer(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at StartContainer")?,
-    Execution::StopContainer(req) => {
-      State
-        .resolve(req, user)
-        .await
-        .context("failed at StopContainer")?
-    }
-    Execution::StopAllContainers(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at StopAllContainers")?,
-    Execution::RemoveContainer(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at RemoveContainer")?,
-    Execution::CloneRepo(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at CloneRepo")?,
-    Execution::PullRepo(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at PullRepo")?,
-    Execution::PruneDockerNetworks(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at PruneDockerNetworks")?,
-    Execution::PruneDockerImages(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at PruneDockerImages")?,
-    Execution::PruneDockerContainers(req) => State
-      .resolve(req, user)
-      .await
-      .context("failed at PruneDockerContainers")?,
-  };
-  if update.success {
-    Ok(())
-  } else {
-    Err(anyhow!(
-      "execution not successful. see update {}",
-      update.id
-    ))
-  }
-}
-
-#[instrument]
-async fn execute_sequence(
-  executions: Vec<Execution>,
-  parent_id: &str,
-  parent_name: &str,
-  update: &Mutex<Update>,
-) -> anyhow::Result<()> {
-  for execution in executions {
-    let now = Instant::now();
-    add_line_to_update(
-      update,
-      &format!("executing stage: {execution:?}"),
-    )
-    .await;
-    let fail_log = format!("failed on {execution:?}");
-    execute_execution(execution.clone(), parent_id, parent_name)
-      .await
-      .context(fail_log)?;
     add_line_to_update(
       update,
       &format!(
-        "finished stage in {:?}: {execution:?}",
-        now.elapsed()
+        "{}: executing stage: '{}'",
+        muted("INFO"),
+        bold(&stage.name)
+      ),
+    )
+    .await;
+    let timer = Instant::now();
+    execute_stage(
+      stage
+        .executions
+        .iter()
+        .filter(|item| item.enabled)
+        .map(|item| item.execution.clone())
+        .collect(),
+      &procedure.id,
+      &procedure.name,
+      update,
+    )
+    .await
+    .with_context(|| {
+      format!(
+        "failed stage '{}' execution after {:?}",
+        bold(&stage.name),
+        timer.elapsed(),
+      )
+    })?;
+    add_line_to_update(
+      update,
+      &format!(
+        "{}: {} stage '{}' execution in {:?}",
+        muted("INFO"),
+        colored("finished", Color::Green),
+        bold(&stage.name),
+        timer.elapsed()
       ),
     )
     .await;
   }
+
   Ok(())
 }
 
-#[instrument]
-async fn execute_parallel(
+#[instrument(skip(update))]
+async fn execute_stage(
   executions: Vec<Execution>,
   parent_id: &str,
   parent_name: &str,
@@ -223,10 +87,13 @@ async fn execute_parallel(
     let now = Instant::now();
     add_line_to_update(
       update,
-      &format!("executing stage: {execution:?}"),
+      &format!("{}: executing: {execution:?}", muted("INFO")),
     )
     .await;
-    let fail_log = format!("failed on {execution:?}");
+    let fail_log = format!(
+      "{}: failed on {execution:?}",
+      colored("ERROR", Color::Red)
+    );
     let res =
       execute_execution(execution.clone(), parent_id, parent_name)
         .await
@@ -234,7 +101,9 @@ async fn execute_parallel(
     add_line_to_update(
       update,
       &format!(
-        "finished stage in {:?}: {execution:?}",
+        "{}: {} execution in {:?}: {execution:?}",
+        muted("INFO"),
+        colored("finished", Color::Green),
         now.elapsed()
       ),
     )
@@ -248,14 +117,270 @@ async fn execute_parallel(
   Ok(())
 }
 
-fn filter_list_by_enabled(
-  list: &[EnabledExecution],
-) -> Vec<Execution> {
-  list
-    .iter()
-    .filter(|item| item.enabled)
-    .map(|item| item.execution.clone())
-    .collect()
+async fn execute_execution(
+  execution: Execution,
+  // used to prevent recursive procedure
+  parent_id: &str,
+  parent_name: &str,
+) -> anyhow::Result<()> {
+  let user = procedure_user().to_owned();
+  let update = match execution {
+    Execution::None(_) => return Ok(()),
+    Execution::RunProcedure(req) => {
+      if req.procedure == parent_id || req.procedure == parent_name {
+        return Err(anyhow!("Self referential procedure detected"));
+      }
+      let req = ExecuteRequest::RunProcedure(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::RunProcedure(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at RunProcedure"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::RunBuild(req) => {
+      let req = ExecuteRequest::RunBuild(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::RunBuild(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at RunBuild"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::Deploy(req) => {
+      let req = ExecuteRequest::Deploy(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::Deploy(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at Deploy"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::StartContainer(req) => {
+      let req = ExecuteRequest::StartContainer(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::StartContainer(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at StartContainer"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::StopContainer(req) => {
+      let req = ExecuteRequest::StopContainer(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::StopContainer(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at StopContainer"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::StopAllContainers(req) => {
+      let req = ExecuteRequest::StopAllContainers(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::StopAllContainers(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at StopAllContainers"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::RemoveContainer(req) => {
+      let req = ExecuteRequest::RemoveContainer(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::RemoveContainer(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at RemoveContainer"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::CloneRepo(req) => {
+      let req = ExecuteRequest::CloneRepo(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::CloneRepo(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at CloneRepo"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::PullRepo(req) => {
+      let req = ExecuteRequest::PullRepo(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::PullRepo(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at PullRepo"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::PruneNetworks(req) => {
+      let req = ExecuteRequest::PruneNetworks(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::PruneNetworks(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at PruneNetworks"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::PruneImages(req) => {
+      let req = ExecuteRequest::PruneImages(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::PruneImages(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at PruneImages"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::PruneContainers(req) => {
+      let req = ExecuteRequest::PruneContainers(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::PruneContainers(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at PruneContainers"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::RunSync(req) => {
+      let req = ExecuteRequest::RunSync(req);
+      let update = init_execution_update(&req, &user).await?;
+      let ExecuteRequest::RunSync(req) = req else {
+        unreachable!()
+      };
+      let update_id = update.id.clone();
+      handle_resolve_result(
+        State
+          .resolve(req, (user, update))
+          .await
+          .context("failed at RunSync"),
+        &update_id,
+      )
+      .await?
+    }
+    Execution::Sleep(req) => {
+      tokio::time::sleep(Duration::from_millis(
+        req.duration_ms as u64,
+      ))
+      .await;
+      Update {
+        success: true,
+        ..Default::default()
+      }
+    }
+  };
+  if update.success {
+    Ok(())
+  } else {
+    Err(anyhow!(
+      "{}: execution not successful. see update '{}'",
+      colored("ERROR", Color::Red),
+      bold(&update.id),
+    ))
+  }
+}
+
+/// If the call to .resolve returns Err, the update may not be closed.
+/// This will ensure it is closed with error log attached.
+async fn handle_resolve_result(
+  res: anyhow::Result<Update>,
+  update_id: &str,
+) -> anyhow::Result<Update> {
+  match res {
+    Ok(res) => Ok(res),
+    Err(e) => {
+      let log =
+        Log::error("execution error", format_serror(&e.into()));
+      let mut update =
+        find_one_by_id(&db_client().await.updates, update_id)
+          .await
+          .context("failed to query to db")?
+          .context("no update exists with given id")?;
+      update.logs.push(log);
+      update.finalize();
+      update_update(update.clone()).await?;
+      Ok(update)
+    }
+  }
 }
 
 /// ASSUMES FIRST LOG IS ALREADY CREATED

bin/core/src/helpers/prune.rs

@@ -68,12 +68,9 @@ async fn prune_stats() -> anyhow::Result<()> {
   let res = db_client()
     .await
     .stats
-    .delete_many(
-      doc! {
-        "ts": { "$lt": delete_before_ts }
-      },
-      None,
-    )
+    .delete_many(doc! {
+      "ts": { "$lt": delete_before_ts }
+    })
     .await?;
   info!("deleted {} stats from db", res.deleted_count);
   Ok(())
@@ -89,12 +86,9 @@ async fn prune_alerts() -> anyhow::Result<()> {
   let res = db_client()
     .await
     .alerts
-    .delete_many(
-      doc! {
-        "ts": { "$lt": delete_before_ts }
-      },
-      None,
-    )
+    .delete_many(doc! {
+      "ts": { "$lt": delete_before_ts }
+    })
     .await?;
   info!("deleted {} alerts from db", res.deleted_count);
   Ok(())

bin/core/src/helpers/query.rs

@@ -9,27 +9,35 @@ use monitor_client::entities::{
   permission::PermissionLevel,
   server::{Server, ServerState},
   tag::Tag,
-  update::ResourceTargetVariant,
+  update::{ResourceTargetVariant, Update},
   user::{admin_service_user, User},
+  user_group::UserGroup,
   variable::Variable,
+  Operation,
 };
 use mungos::{
-  by_id::find_one_by_id,
   find::find_collect,
-  mongodb::bson::{doc, oid::ObjectId, Document},
+  mongodb::{
+    bson::{doc, oid::ObjectId, Document},
+    options::FindOneOptions,
+  },
 };
 
 use crate::{config::core_config, resource, state::db_client};
 
 #[instrument(level = "debug")]
-pub async fn get_user(user_id: &str) -> anyhow::Result<User> {
-  if let Some(user) = admin_service_user(user_id) {
+// user: Id or username
+pub async fn get_user(user: &str) -> anyhow::Result<User> {
+  if let Some(user) = admin_service_user(user) {
     return Ok(user);
   }
-  find_one_by_id(&db_client().await.users, user_id)
+  db_client()
+    .await
+    .users
+    .find_one(id_or_username_filter(user))
     .await
     .context("failed to query mongo for user")?
-    .with_context(|| format!("no user found with id {user_id}"))
+    .with_context(|| format!("no user found with {user}"))
 }
 
 #[instrument(level = "debug")]
@@ -85,7 +93,7 @@ pub async fn get_tag(id_or_name: &str) -> anyhow::Result<Tag> {
   db_client()
     .await
     .tags
-    .find_one(query, None)
+    .find_one(query)
     .await
     .context("failed to query mongo for tag")?
     .with_context(|| format!("no tag found matching {id_or_name}"))
@@ -103,11 +111,23 @@ pub async fn get_tag_check_owner(
   Err(anyhow!("user must be tag owner or admin"))
 }
 
+pub async fn get_id_to_tags(
+  filter: impl Into<Option<Document>>,
+) -> anyhow::Result<HashMap<String, Tag>> {
+  let res = find_collect(&db_client().await.tags, filter, None)
+    .await
+    .context("failed to query db for tags")?
+    .into_iter()
+    .map(|tag| (tag.id.clone(), tag))
+    .collect();
+  Ok(res)
+}
+
 #[instrument(level = "debug")]
-pub async fn get_user_user_group_ids(
+pub async fn get_user_user_groups(
   user_id: &str,
-) -> anyhow::Result<Vec<String>> {
-  let res = find_collect(
+) -> anyhow::Result<Vec<UserGroup>> {
+  find_collect(
     &db_client().await.user_groups,
     doc! {
       "users": user_id
@@ -115,50 +135,84 @@ pub async fn get_user_user_group_ids(
     None,
   )
   .await
-  .context("failed to query db for user groups")?
-  .into_iter()
-  .map(|ug| ug.id)
-  .collect();
+  .context("failed to query db for user groups")
+}
+
+#[instrument(level = "debug")]
+pub async fn get_user_user_group_ids(
+  user_id: &str,
+) -> anyhow::Result<Vec<String>> {
+  let res = get_user_user_groups(user_id)
+    .await?
+    .into_iter()
+    .map(|ug| ug.id)
+    .collect();
   Ok(res)
 }
 
-/// Returns Vec of all queries on permissions that match against the user
-/// or any user groups that the user is a part of.
-/// Result used with Mongodb '$or'.
-#[instrument(level = "debug")]
-pub async fn user_target_query(
+pub fn user_target_query(
   user_id: &str,
+  user_groups: &[UserGroup],
 ) -> anyhow::Result<Vec<Document>> {
   let mut user_target_query = vec![
     doc! { "user_target.type": "User", "user_target.id": user_id },
   ];
-  let user_groups = get_user_user_group_ids(user_id)
-    .await?
-    .into_iter()
-    .map(|ug_id| {
-      doc! {
-        "user_target.type": "UserGroup", "user_target.id": ug_id,
-      }
-    });
+  let user_groups = user_groups.iter().map(|ug| {
+    doc! {
+      "user_target.type": "UserGroup", "user_target.id": &ug.id,
+    }
+  });
   user_target_query.extend(user_groups);
   Ok(user_target_query)
 }
 
 #[instrument(level = "debug")]
 pub async fn get_user_permission_on_resource(
-  user_id: &str,
+  user: &User,
   resource_variant: ResourceTargetVariant,
   resource_id: &str,
 ) -> anyhow::Result<PermissionLevel> {
-  let lowest_permission = if core_config().transparent_mode {
+  if user.admin {
+    return Ok(PermissionLevel::Write);
+  }
+
+  // Start with base of Read or None
+  let mut base = if core_config().transparent_mode {
     PermissionLevel::Read
   } else {
     PermissionLevel::None
   };
+
+  // Overlay users base on resource variant
+  if let Some(level) = user.all.get(&resource_variant).cloned() {
+    if level > base {
+      base = level;
+    }
+  }
+  if base == PermissionLevel::Write {
+    // No reason to keep going if already Write at this point.
+    return Ok(PermissionLevel::Write);
+  }
+
+  // Overlay any user groups base on resource variant
+  let groups = get_user_user_groups(&user.id).await?;
+  for group in &groups {
+    if let Some(level) = group.all.get(&resource_variant).cloned() {
+      if level > base {
+        base = level;
+      }
+    }
+  }
+  if base == PermissionLevel::Write {
+    // No reason to keep going if already Write at this point.
+    return Ok(PermissionLevel::Write);
+  }
+
+  // Overlay any specific permissions
   let permission = find_collect(
     &db_client().await.permissions,
     doc! {
-      "$or": user_target_query(user_id).await?,
+      "$or": user_target_query(&user.id, &groups)?,
       "resource_target.type": resource_variant.as_ref(),
       "resource_target.id": resource_id
     },
@@ -168,7 +222,7 @@ pub async fn get_user_permission_on_resource(
   .context("failed to query db for permissions")?
   .into_iter()
   // get the max permission user has between personal / any user groups
-  .fold(lowest_permission, |level, permission| {
+  .fold(base, |level, permission| {
     if permission.level > level {
       permission.level
     } else {
@@ -178,15 +232,39 @@ pub async fn get_user_permission_on_resource(
   Ok(permission)
 }
 
+/// Returns None if still no need to filter by resource id (eg transparent mode, group membership with all access).
 #[instrument(level = "debug")]
-pub async fn get_resource_ids_for_non_admin(
-  user_id: &str,
+pub async fn get_resource_ids_for_user(
+  user: &User,
   resource_type: ResourceTargetVariant,
-) -> anyhow::Result<Vec<String>> {
-  let permissions = find_collect(
+) -> anyhow::Result<Option<Vec<ObjectId>>> {
+  // Check admin or transparent mode
+  if user.admin || core_config().transparent_mode {
+    return Ok(None);
+  }
+
+  // Check user 'all' on variant
+  if let Some(level) = user.all.get(&resource_type).cloned() {
+    if level > PermissionLevel::None {
+      return Ok(None);
+    }
+  }
+
+  // Check user groups 'all' on variant
+  let groups = get_user_user_groups(&user.id).await?;
+  for group in &groups {
+    if let Some(level) = group.all.get(&resource_type).cloned() {
+      if level > PermissionLevel::None {
+        return Ok(None);
+      }
+    }
+  }
+
+  // Get specific ids
+  let ids = find_collect(
     &db_client().await.permissions,
     doc! {
-      "$or": user_target_query(user_id).await?,
+      "$or": user_target_query(&user.id, &groups)?,
       "resource_target.type": resource_type.as_ref(),
       "level": { "$in": ["Read", "Execute", "Write"] }
     },
@@ -197,8 +275,12 @@ pub async fn get_resource_ids_for_non_admin(
   .into_iter()
   .map(|p| p.resource_target.extract_variant_id().1.to_string())
   // collect into hashset first to remove any duplicates
-  .collect::<HashSet<_>>();
-  Ok(permissions.into_iter().collect())
+  .collect::<HashSet<_>>()
+  .into_iter()
+  .flat_map(|id| ObjectId::from_str(&id))
+  .collect::<Vec<_>>();
+
+  Ok(Some(ids))
 }
 
 pub fn id_or_name_filter(id_or_name: &str) -> Document {
@@ -208,6 +290,13 @@ pub fn id_or_name_filter(id_or_name: &str) -> Document {
   }
 }
 
+pub fn id_or_username_filter(id_or_username: &str) -> Document {
+  match ObjectId::from_str(id_or_username) {
+    Ok(id) => doc! { "_id": id },
+    Err(_) => doc! { "username": id_or_username },
+  }
+}
+
 pub async fn get_global_variables(
 ) -> anyhow::Result<HashMap<String, String>> {
   Ok(
@@ -224,10 +313,32 @@ pub async fn get_variable(name: &str) -> anyhow::Result<Variable> {
   db_client()
     .await
     .variables
-    .find_one(doc! { "name": &name }, None)
+    .find_one(doc! { "name": &name })
     .await
     .context("failed at call to db")?
     .with_context(|| {
       format!("no variable found with given name: {name}")
     })
 }
+
+pub async fn get_latest_update(
+  resource_type: ResourceTargetVariant,
+  id: &str,
+  operation: Operation,
+) -> anyhow::Result<Option<Update>> {
+  db_client()
+    .await
+    .updates
+    .find_one(doc! {
+      "target.type": resource_type.as_ref(),
+      "target.id": id,
+      "operation": operation.as_ref()
+    })
+    .with_options(
+      FindOneOptions::builder()
+        .sort(doc! { "start_ts": -1 })
+        .build(),
+    )
+    .await
+    .context("failed to query db for latest update")
+}

bin/core/src/helpers/sync/deployment.rs

@@ -0,0 +1,858 @@
+use std::{collections::HashMap, time::Duration};
+
+use anyhow::Context;
+use formatting::{bold, colored, muted, Color};
+use futures::future::join_all;
+use monitor_client::{
+  api::{execute::Deploy, read::ListBuildVersions},
+  entities::{
+    deployment::{
+      Deployment, DeploymentConfig, DeploymentImage, DeploymentState,
+      PartialDeploymentConfig,
+    },
+    sync::SyncUpdate,
+    tag::Tag,
+    toml::ResourceToml,
+    update::{Log, ResourceTarget},
+    user::sync_user,
+  },
+};
+use mungos::find::find_collect;
+use partial_derive2::{Diff, FieldDiff, MaybeNone, PartialDiff};
+use resolver_api::Resolve;
+
+use crate::{
+  api::execute::ExecuteRequest,
+  helpers::update::init_execution_update,
+  resource::MonitorResource,
+  state::{deployment_status_cache, State},
+};
+
+use super::resource::{
+  run_update_description, run_update_tags, AllResourcesById,
+  ResourceSync,
+};
+
+pub type ToUpdate = Vec<ToUpdateItem>;
+pub type ToCreate = Vec<ResourceToml<PartialDeploymentConfig>>;
+/// Vec of resource names
+pub type ToDelete = Vec<String>;
+
+type UpdatesResult = (ToCreate, ToUpdate, ToDelete);
+
+pub struct ToUpdateItem {
+  pub id: String,
+  pub resource: ResourceToml<PartialDeploymentConfig>,
+  pub update_description: bool,
+  pub update_tags: bool,
+  pub deploy: bool,
+}
+
+/// Turns all the diffs into a readable string
+pub async fn get_updates_for_view(
+  resources: Vec<ResourceToml<PartialDeploymentConfig>>,
+  delete: bool,
+  all_resources: &AllResourcesById,
+  id_to_tags: &HashMap<String, Tag>,
+) -> anyhow::Result<Option<SyncUpdate>> {
+  let map = find_collect(Deployment::coll().await, None, None)
+    .await
+    .context("failed to get deployments from db")?
+    .into_iter()
+    .map(|r| (r.name.clone(), r))
+    .collect::<HashMap<_, _>>();
+
+  let mut update = SyncUpdate {
+    log: format!("{} Updates", Deployment::resource_type()),
+    ..Default::default()
+  };
+
+  let mut to_delete = Vec::<String>::new();
+  if delete {
+    for resource in map.values() {
+      if !resources.iter().any(|r| r.name == resource.name) {
+        update.to_delete += 1;
+        to_delete.push(resource.name.clone())
+      }
+    }
+  }
+
+  let mut to_deploy_cache = HashMap::<String, bool>::new();
+  let mut to_deploy_build_cache = HashMap::<String, String>::new();
+
+  for mut resource in resources.clone() {
+    match map.get(&resource.name) {
+      Some(original) => {
+        // First merge toml resource config (partial) onto default resource config.
+        // Makes sure things that aren't defined in toml (come through as None) actually get removed.
+        let config: DeploymentConfig = resource.config.into();
+        resource.config = config.into();
+
+        Deployment::validate_partial_config(&mut resource.config);
+
+        let mut diff = Deployment::get_diff(
+          original.config.clone(),
+          resource.config,
+          all_resources,
+        )?;
+
+        Deployment::validate_diff(&mut diff);
+
+        let original_tags = original
+          .tags
+          .iter()
+          .filter_map(|id| id_to_tags.get(id).map(|t| t.name.clone()))
+          .collect::<Vec<_>>();
+
+        let (to_deploy, state, reason) = extract_to_deploy_and_state(
+          all_resources,
+          &map,
+          &resources,
+          resource.name.clone(),
+          &mut to_deploy_cache,
+          &mut to_deploy_build_cache,
+        )
+        .await?;
+
+        // Only proceed if there are any fields to update,
+        // or a change to tags / description
+        if diff.is_none()
+          && !to_deploy
+          && resource.description == original.description
+          && resource.tags == original_tags
+        {
+          if state == DeploymentState::Unknown {
+            update.log.push_str(&format!(
+              "\n\n{}: {}: '{}'\nDeployment sync actions could not be computed due to Unknown deployment state\n-------------------",
+              colored("ERROR", Color::Red),
+              Deployment::resource_type(),
+              bold(&resource.name)
+            ));
+          }
+          continue;
+        }
+
+        update.to_update += 1;
+
+        update.log.push_str(&format!(
+          "\n\n{}: {}: '{}'\n-------------------",
+          colored("UPDATE", Color::Blue),
+          Deployment::resource_type(),
+          bold(&resource.name)
+        ));
+
+        let mut lines = Vec::<String>::new();
+        if resource.description != original.description {
+          lines.push(format!(
+            "{}: 'description'\n{}:  {}\n{}:    {}",
+            muted("field"),
+            muted("from"),
+            colored(&original.description, Color::Red),
+            muted("to"),
+            colored(&resource.description, Color::Green)
+          ));
+        }
+        if resource.tags != original_tags {
+          let from =
+            colored(&format!("{:?}", original_tags), Color::Red);
+          let to =
+            colored(&format!("{:?}", resource.tags), Color::Green);
+          lines.push(format!(
+            "{}: 'tags'\n{}:  {from}\n{}:    {to}",
+            muted("field"),
+            muted("from"),
+            muted("to"),
+          ));
+        }
+        lines.extend(diff.iter_field_diffs().map(
+          |FieldDiff { field, from, to }| {
+            format!(
+              "{}: '{field}'\n{}:  {}\n{}:    {}",
+              muted("field"),
+              muted("from"),
+              colored(from, Color::Red),
+              muted("to"),
+              colored(to, Color::Green)
+            )
+          },
+        ));
+        if state == DeploymentState::Unknown {
+          lines.push(format!(
+						"{}: Deployment sync actions {} due to Unknown deployment state",
+						colored("ERROR", Color::Red),
+						bold("could not be computed")
+					));
+        } else if to_deploy {
+          let mut line = if state == DeploymentState::Running {
+            format!(
+              "{}: {reason}, {}",
+              muted("deploy"),
+              bold("sync will trigger deploy")
+            )
+          } else {
+            format!(
+              "{}: deployment is currently in {} state, {}",
+              muted("deploy"),
+              colored(&state.to_string(), Color::Red),
+              bold("sync will trigger deploy")
+            )
+          };
+          if !resource.after.is_empty() {
+            line.push_str(&format!(
+              "\n{}: {:?}",
+              muted("deploy after"),
+              resource.after
+            ));
+          }
+          lines.push(line);
+        }
+        update.log.push('\n');
+        update.log.push_str(&lines.join("\n-------------------\n"));
+      }
+      None => {
+        update.to_create += 1;
+        let mut lines = vec![
+          format!(
+            "{}: {}",
+            muted("description"),
+            resource.description,
+          ),
+          format!("{}: {:?}", muted("tags"), resource.tags,),
+          format!(
+            "{}: {}",
+            muted("config"),
+            serde_json::to_string_pretty(&resource.config)
+              .context("failed to serialize config to json")?
+          ),
+        ];
+        if resource.deploy {
+          lines.push(format!(
+            "{}: {}",
+            muted("will deploy"),
+            colored("true", Color::Green)
+          ));
+          if !resource.after.is_empty() {
+            lines.push(format!(
+              "{}: {:?}",
+              muted("deploy after"),
+              resource.after
+            ));
+          }
+        }
+        update.log.push_str(&format!(
+          "\n\n{}: {}: {}\n{}",
+          colored("CREATE", Color::Green),
+          Deployment::resource_type(),
+          bold(&resource.name),
+          lines.join("\n")
+        ))
+      }
+    }
+  }
+
+  for name in to_delete {
+    update.log.push_str(&format!(
+      "\n\n{}: {}: '{}'\n-------------------",
+      colored("DELETE", Color::Red),
+      Deployment::resource_type(),
+      bold(&name)
+    ));
+  }
+
+  let any_change = update.to_create > 0
+    || update.to_update > 0
+    || update.to_delete > 0;
+
+  Ok(any_change.then_some(update))
+}
+
+/// Gets all the resources to update. For use in sync execution.
+pub async fn get_updates_for_execution(
+  resources: Vec<ResourceToml<PartialDeploymentConfig>>,
+  delete: bool,
+  all_resources: &AllResourcesById,
+  id_to_tags: &HashMap<String, Tag>,
+) -> anyhow::Result<UpdatesResult> {
+  let map = find_collect(Deployment::coll().await, None, None)
+    .await
+    .context("failed to get deployments from db")?
+    .into_iter()
+    .map(|r| (r.name.clone(), r))
+    .collect::<HashMap<_, _>>();
+
+  let mut to_create = ToCreate::new();
+  let mut to_update = ToUpdate::new();
+  let mut to_delete = ToDelete::new();
+
+  if delete {
+    for resource in map.values() {
+      if !resources.iter().any(|r| r.name == resource.name) {
+        to_delete.push(resource.name.clone());
+      }
+    }
+  }
+
+  let mut to_deploy_cache = HashMap::<String, bool>::new();
+  let mut to_deploy_build_cache = HashMap::<String, String>::new();
+
+  for mut resource in resources.clone() {
+    match map.get(&resource.name) {
+      Some(original) => {
+        // First merge toml resource config (partial) onto default resource config.
+        // Makes sure things that aren't defined in toml (come through as None) actually get removed.
+        let config: DeploymentConfig = resource.config.into();
+        resource.config = config.into();
+
+        Deployment::validate_partial_config(&mut resource.config);
+
+        let mut diff = Deployment::get_diff(
+          original.config.clone(),
+          resource.config,
+          all_resources,
+        )?;
+
+        Deployment::validate_diff(&mut diff);
+
+        let original_tags = original
+          .tags
+          .iter()
+          .filter_map(|id| id_to_tags.get(id).map(|t| t.name.clone()))
+          .collect::<Vec<_>>();
+
+        let (to_deploy, _state, _reason) =
+          extract_to_deploy_and_state(
+            all_resources,
+            &map,
+            &resources,
+            resource.name.clone(),
+            &mut to_deploy_cache,
+            &mut to_deploy_build_cache,
+          )
+          .await?;
+
+        // Only proceed if there are any fields to update,
+        // or a change to tags / description
+        if diff.is_none()
+          && !to_deploy
+          && resource.description == original.description
+          && resource.tags == original_tags
+        {
+          continue;
+        }
+
+        // Minimizes updates through diffing.
+        resource.config = diff.into();
+
+        let update = ToUpdateItem {
+          id: original.id.clone(),
+          update_description: resource.description
+            != original.description,
+          update_tags: resource.tags != original_tags,
+          resource,
+          deploy: to_deploy,
+        };
+
+        to_update.push(update);
+      }
+      None => to_create.push(resource),
+    }
+  }
+
+  Ok((to_create, to_update, to_delete))
+}
+
+type Res<'a> = std::pin::Pin<
+  Box<
+    dyn std::future::Future<
+        Output = anyhow::Result<(bool, DeploymentState, String)>,
+      > + Send
+      + 'a,
+  >,
+>;
+
+fn extract_to_deploy_and_state<'a>(
+  all_resources: &'a AllResourcesById,
+  map: &'a HashMap<String, Deployment>,
+  resources: &'a [ResourceToml<PartialDeploymentConfig>],
+  name: String,
+  // name to 'to_deploy'
+  cache: &'a mut HashMap<String, bool>,
+  // build id to latest built version string
+  build_cache: &'a mut HashMap<String, String>,
+) -> Res<'a> {
+  Box::pin(async move {
+    let mut reason = String::new();
+    let Some(deployment) = resources.iter().find(|r| r.name == name)
+    else {
+      // this case should be unreachable, the names come off of a loop over resources
+      cache.insert(name, false);
+      return Ok((false, DeploymentState::Unknown, reason));
+    };
+    if deployment.deploy {
+      let Some(original) = map.get(&name) else {
+        // not created, definitely deploy
+        cache.insert(name, true);
+        // Don't need reason here, will be populated automatically
+        return Ok((true, DeploymentState::NotDeployed, reason));
+      };
+
+      // First merge toml resource config (partial) onto default resource config.
+      // Makes sure things that aren't defined in toml (come through as None) actually get removed.
+      let config: DeploymentConfig = deployment.config.clone().into();
+      let mut config: PartialDeploymentConfig = config.into();
+
+      Deployment::validate_partial_config(&mut config);
+
+      let mut diff = Deployment::get_diff(
+        original.config.clone(),
+        config,
+        all_resources,
+      )?;
+
+      Deployment::validate_diff(&mut diff);
+
+      let status = &deployment_status_cache()
+        .get_or_insert_default(&original.id)
+        .await
+        .curr;
+      let state = status.state;
+
+      let mut to_deploy = match state {
+        DeploymentState::Unknown => false,
+        DeploymentState::Running => {
+          // Needs to only check config fields that affect docker run
+          let changed = diff.server_id.is_some()
+            || diff.image.is_some()
+            || diff.image_registry_account.is_some()
+            || diff.skip_secret_interp.is_some()
+            || diff.network.is_some()
+            || diff.restart.is_some()
+            || diff.command.is_some()
+            || diff.extra_args.is_some()
+            || diff.ports.is_some()
+            || diff.volumes.is_some()
+            || diff.environment.is_some()
+            || diff.labels.is_some();
+          if changed {
+            reason = String::from("deployment config has changed")
+          }
+          changed
+        }
+        // All other cases will require Deploy to enter Running state.
+        // Don't need reason here as this case is handled outside, using returned state.
+        _ => true,
+      };
+
+      // Check if build attached, version latest, and there is a new build.
+      if !to_deploy {
+        // only need to check original, if diff.image was Some, to_deploy would be true.
+        if let DeploymentImage::Build { build_id, version } =
+          &original.config.image
+        {
+          // check if version is none, ie use latest build
+          if version.is_none() {
+            let deployed_version = status
+              .container
+              .as_ref()
+              .and_then(|c| c.image.split(':').last())
+              .unwrap_or("0.0.0");
+            match build_cache.get(build_id) {
+              Some(version) if deployed_version != version => {
+                to_deploy = true;
+                reason = format!(
+                  "attached build has new version ({version})"
+                );
+              }
+              Some(_) => {}
+              None => {
+                let Some(version) = State
+                  .resolve(
+                    ListBuildVersions {
+                      build: build_id.to_string(),
+                      limit: Some(1),
+                      ..Default::default()
+                    },
+                    sync_user().to_owned(),
+                  )
+                  .await
+                  .context("failed to get build versions")?
+                  .pop()
+                else {
+                  // this case shouldn't ever happen, how would deployment be deployed if build was never built?
+                  return Ok((
+                    false,
+                    DeploymentState::NotDeployed,
+                    reason,
+                  ));
+                };
+                let version = version.version.to_string();
+                build_cache
+                  .insert(build_id.to_string(), version.clone());
+                if deployed_version != version {
+                  to_deploy = true;
+                  reason = format!(
+                    "attached build has new version ({version})"
+                  );
+                }
+              }
+            };
+          }
+        }
+      }
+
+      // Still need to check 'after' if they need deploy
+      if !to_deploy {
+        for name in &deployment.after {
+          match cache.get(name) {
+            Some(will_deploy) if *will_deploy => {
+              to_deploy = true;
+              reason = format!(
+                "parent dependency '{}' is deploying",
+                bold(name)
+              );
+              break;
+            }
+            Some(_) => {}
+            None => {
+              let (will_deploy, _, _) = extract_to_deploy_and_state(
+                all_resources,
+                map,
+                resources,
+                name.to_string(),
+                cache,
+                build_cache,
+              )
+              .await?;
+              if will_deploy {
+                to_deploy = true;
+                reason = format!(
+                  "parent dependency '{}' is deploying",
+                  bold(name)
+                );
+                break;
+              }
+            }
+          }
+        }
+      }
+
+      cache.insert(name, to_deploy);
+      Ok((to_deploy, state, reason))
+    } else {
+      // The state in this case doesn't matter and won't be read (as long as it isn't 'Unknown' which will log in all cases)
+      cache.insert(name, false);
+      Ok((false, DeploymentState::NotDeployed, reason))
+    }
+  })
+}
+
+pub async fn run_updates(
+  to_create: ToCreate,
+  to_update: ToUpdate,
+  to_delete: ToDelete,
+) -> Option<Vec<Log>> {
+  if to_create.is_empty()
+    && to_update.is_empty()
+    && to_delete.is_empty()
+  {
+    return None;
+  }
+
+  let mut has_error = false;
+  let mut log = String::new();
+
+  // Collect all the deployment names that need to be deployed
+  // and their 'after' dependencies
+  let mut to_deploy = Vec::<(String, Vec<String>)>::new();
+
+  for resource in to_create {
+    let name = resource.name.clone();
+    let tags = resource.tags.clone();
+    let description = resource.description.clone();
+    let id = match crate::resource::create::<Deployment>(
+      &resource.name,
+      resource.config,
+      sync_user(),
+    )
+    .await
+    {
+      Ok(resource) => resource.id,
+      Err(e) => {
+        has_error = true;
+        log.push_str(&format!(
+          "\n{}: failed to create {} '{}' | {e:#}",
+          colored("ERROR", Color::Red),
+          Deployment::resource_type(),
+          bold(&name)
+        ));
+        continue;
+      }
+    };
+    run_update_tags::<Deployment>(
+      id.clone(),
+      &name,
+      tags,
+      &mut log,
+      &mut has_error,
+    )
+    .await;
+    run_update_description::<Deployment>(
+      id,
+      &name,
+      description,
+      &mut log,
+      &mut has_error,
+    )
+    .await;
+    log.push_str(&format!(
+      "\n{}: {} {} '{}'",
+      muted("INFO"),
+      colored("created", Color::Green),
+      Deployment::resource_type(),
+      bold(&name)
+    ));
+    if resource.deploy {
+      to_deploy.push((resource.name, resource.after));
+    }
+  }
+
+  for ToUpdateItem {
+    id,
+    resource,
+    update_description,
+    update_tags,
+    deploy,
+  } in to_update
+  {
+    // Update resource
+    let name = resource.name.clone();
+    let tags = resource.tags.clone();
+    let description = resource.description.clone();
+
+    if update_description {
+      run_update_description::<Deployment>(
+        id.clone(),
+        &name,
+        description,
+        &mut log,
+        &mut has_error,
+      )
+      .await;
+    }
+
+    if update_tags {
+      run_update_tags::<Deployment>(
+        id.clone(),
+        &name,
+        tags,
+        &mut log,
+        &mut has_error,
+      )
+      .await;
+    }
+
+    let mut config_update_error = false;
+    if !resource.config.is_none() {
+      if let Err(e) = crate::resource::update::<Deployment>(
+        &id,
+        resource.config,
+        sync_user(),
+      )
+      .await
+      {
+        has_error = true;
+        config_update_error = true;
+        log.push_str(&format!(
+          "\n{}: failed to update config on {} '{}' | {e:#}",
+          colored("ERROR", Color::Red),
+          Deployment::resource_type(),
+          bold(&name),
+        ))
+      } else {
+        log.push_str(&format!(
+          "\n{}: {} {} '{}' configuration",
+          muted("INFO"),
+          colored("updated", Color::Blue),
+          Deployment::resource_type(),
+          bold(&name)
+        ));
+      }
+    }
+
+    if !config_update_error && deploy {
+      to_deploy.push((resource.name, resource.after));
+    }
+  }
+
+  for resource in to_delete {
+    if let Err(e) =
+      crate::resource::delete::<Deployment>(&resource, sync_user())
+        .await
+    {
+      has_error = true;
+      log.push_str(&format!(
+        "\n{}: failed to delete {} '{}' | {e:#}",
+        colored("ERROR", Color::Red),
+        Deployment::resource_type(),
+        bold(&resource),
+      ))
+    } else {
+      log.push_str(&format!(
+        "\n{}: {} {} '{}'",
+        muted("INFO"),
+        colored("deleted", Color::Red),
+        Deployment::resource_type(),
+        bold(&resource)
+      ));
+    }
+  }
+
+  let mut logs = Vec::with_capacity(1);
+
+  let stage = format!("Update {}s", Deployment::resource_type());
+  if has_error {
+    let log = format!(
+      "running updates on {}s{log}",
+      Deployment::resource_type()
+    );
+    logs.push(Log::error(&stage, log));
+    return Some(logs);
+  } else if !log.is_empty() {
+    let log = format!(
+      "running updates on {}s{log}",
+      Deployment::resource_type()
+    );
+    logs.push(Log::simple(&stage, log));
+  }
+
+  if to_deploy.is_empty() {
+    return Some(logs);
+  }
+
+  let mut log = format!(
+    "{}: running executions to sync deployment state",
+    muted("INFO")
+  );
+  let mut round = 1;
+
+  while !to_deploy.is_empty() {
+    // Collect all waiting deployments without waiting dependencies.
+    let good_to_deploy = to_deploy
+      .iter()
+      .filter(|(_, after)| {
+        to_deploy.iter().all(|(name, _)| !after.contains(name))
+      })
+      .map(|(name, _)| name.clone())
+      .collect::<Vec<_>>();
+
+    // Deploy the ones ready for deployment
+    let res =
+      join_all(good_to_deploy.iter().map(|name| async move {
+        let res = async {
+          let req = ExecuteRequest::Deploy(Deploy {
+            deployment: name.to_string(),
+            stop_signal: None,
+            stop_time: None,
+          });
+          let user = sync_user();
+          let update = init_execution_update(&req, user).await?;
+          let ExecuteRequest::Deploy(req) = req else {
+            unreachable!()
+          };
+          State.resolve(req, (user.to_owned(), update)).await
+        }
+        .await;
+        (name, res)
+      }))
+      .await;
+
+    // Log results of deploy
+    for (name, res) in res {
+      if let Err(e) = res {
+        has_error = true;
+        log.push_str(&format!(
+          "\n{}: failed to deploy '{}' in round {} | {e:#}",
+          colored("ERROR", Color::Red),
+          bold(name),
+          bold(round)
+        ));
+      } else {
+        log.push_str(&format!(
+          "\n{}: deployed '{}' in round {}",
+          muted("INFO"),
+          bold(name),
+          bold(round)
+        ));
+      }
+    }
+
+    // Early exit if any deploy has errors
+    if has_error {
+      log.push_str(&format!(
+        "\n{}: exited in round {} {}",
+        muted("INFO"),
+        bold(round),
+        colored("with errors", Color::Red)
+      ));
+      logs.push(Log::error("Sync Deployment State", log));
+      return Some(logs);
+    }
+
+    // Remove the deployed ones from 'to_deploy'
+    to_deploy.retain(|(name, _)| !good_to_deploy.contains(name));
+
+    // If there must be another round, these are dependent on the first round.
+    // Sleep for 1s to allow for first round to startup
+    if !to_deploy.is_empty() {
+      // Increment the round
+      round += 1;
+      tokio::time::sleep(Duration::from_secs(1)).await;
+    }
+  }
+
+  log.push_str(&format!(
+    "\n{}: finished after {} round{}",
+    muted("INFO"),
+    bold(round),
+    (round > 1).then_some("s").unwrap_or_default()
+  ));
+
+  logs.push(Log::simple("Sync Deployment State", log));
+
+  Some(logs)
+}
+
+impl ResourceSync for Deployment {
+  fn resource_target(id: String) -> ResourceTarget {
+    ResourceTarget::Deployment(id)
+  }
+
+  fn get_diff(
+    mut original: Self::Config,
+    update: Self::PartialConfig,
+    resources: &AllResourcesById,
+  ) -> anyhow::Result<Self::ConfigDiff> {
+    // need to replace the server id with name
+    original.server_id = resources
+      .servers
+      .get(&original.server_id)
+      .map(|s| s.name.clone())
+      .unwrap_or_default();
+
+    // need to replace the build id with name
+    if let DeploymentImage::Build { build_id, version } =
+      &original.image
+    {
+      original.image = DeploymentImage::Build {
+        build_id: resources
+          .builds
+          .get(build_id)
+          .map(|b| b.name.clone())
+          .unwrap_or_default(),
+        version: *version,
+      };
+    }
+
+    Ok(original.partial_diff(update))
+  }
+}